starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-10-28 00:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(orchestration): wait for Codex composer render (#14575)

Browse Source
This commit is contained in:
Jinwoo Hong
2026-08-14 12:56:35 -07:00
committed by GitHub
parent ebb60a0757
commit ff9bc0f079
3 changed files with 152 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/runtime/orca-runtime.ts
+22 -11
View File
@@ -1864,10 +1864,10 @@ const BRACKETED_PASTE_BEGIN = '\x1b[200~'
const BRACKETED_PASTE_END = '\x1b[201~'
const BRACKETED_PASTE_QUIET_MS = 1500
const DRAFT_PASTE_READY_TIMEOUT_MS = 8000
const CLAUDE_AGENT_PROMPT_RENDER_TIMEOUT_MS = 8000
const CLAUDE_AGENT_PROMPT_RENDER_QUIET_MS = 1500
// Why: Claude emits show-cursor while rendering its composer; output must settle afterward.
const CLAUDE_AGENT_PROMPT_RENDER_MARKER = '\x1b[?25h'
const AGENT_PROMPT_RENDER_TIMEOUT_MS = 8000
const AGENT_PROMPT_RENDER_QUIET_MS = 1500
// Why: Claude and Codex emit show-cursor while rendering pasted composer content.
const AGENT_PROMPT_RENDER_MARKER = '\x1b[?25h'
const MOBILE_TERMINAL_SURFACE_TIMEOUT_MS = 10_000
// Why: the split already failed; the caller waits on this teardown only to learn whether the
// fallback kill is needed, so keep it short — an unreachable host must not stall the rejection.
@@ -17557,7 +17557,7 @@ export class OrcaRuntimeService {
suffixFailureError?: string
} = {}
): Promise<void> {
const renderGate = this.createClaudeAgentPromptRenderGate(ptyId)
const renderGate = this.createAgentPromptRenderGate(ptyId)
let wrotePasteBytes = false
let completedPaste = false
try {
@@ -17608,13 +17608,14 @@ export class OrcaRuntimeService {
}
}
private createClaudeAgentPromptRenderGate(ptyId: string): {
private createAgentPromptRenderGate(ptyId: string): {
arm: () => void
wait: () => Promise<void>
dispose: () => void
} | null {
const pty = this.ptysById.get(ptyId)
if ((pty?.launchAgent ?? pty?.foregroundAgent) !== 'claude') {
const agent = pty?.launchAgent ?? pty?.foregroundAgent
if (agent !== 'claude' && agent !== 'codex') {
return null
}
let armed = false
@@ -17647,7 +17648,13 @@ export class OrcaRuntimeService {
if (quietTimer) {
clearTimeout(quietTimer)
}
quietTimer = setTimeout(finish, CLAUDE_AGENT_PROMPT_RENDER_QUIET_MS)
quietTimer = setTimeout(finish, AGENT_PROMPT_RENDER_QUIET_MS)
}
const armHardTimer = (): void => {
if (hardTimer) {
clearTimeout(hardTimer)
}
hardTimer = setTimeout(finish, AGENT_PROMPT_RENDER_TIMEOUT_MS)
}
const unsubscribe = this.subscribeToTerminalData(ptyId, (data) => {
if (!armed || settled) {
@@ -17655,11 +17662,13 @@ export class OrcaRuntimeService {
}
if (!observedMarker) {
const combined = markerCarry + data
markerCarry = combined.slice(-(CLAUDE_AGENT_PROMPT_RENDER_MARKER.length - 1))
if (!combined.includes(CLAUDE_AGENT_PROMPT_RENDER_MARKER)) {
markerCarry = combined.slice(-(AGENT_PROMPT_RENDER_MARKER.length - 1))
if (!combined.includes(AGENT_PROMPT_RENDER_MARKER)) {
return
}
observedMarker = true
// Why: a slow initial redraw must still receive the full settlement window.
armHardTimer()
}
armQuietTimer()
})
@@ -17672,7 +17681,9 @@ export class OrcaRuntimeService {
if (settled) {
return
}
hardTimer = setTimeout(finish, CLAUDE_AGENT_PROMPT_RENDER_TIMEOUT_MS)
if (!hardTimer) {
armHardTimer()
}
await rendered
},
dispose: () => {