mirror of
https://github.com/stablyai/orca.git
synced 2026-11-18 11:54:46 +00:00
fix(agent-status): keep a finished Codex turn done while its background terminal runs
This commit is contained in:
@@ -41,11 +41,19 @@ export function programStatusHookYieldEndsAt(
|
||||
) {
|
||||
return Infinity
|
||||
}
|
||||
// Settled turns are naturally silent; a later wait must prove intervening program work.
|
||||
if (previous.payload.state === 'done' && payload.state === 'waiting') {
|
||||
return programWorkingSince !== undefined && programWorkingSince > previous.receivedAt
|
||||
// A settled turn yields only to program work begun after it (a replayed done keeps its own time):
|
||||
// Codex re-reports the settled turn's working while a background terminal it started runs.
|
||||
if (
|
||||
previous.payload.state === 'done' &&
|
||||
(payload.state === 'waiting' || payload.state === 'working')
|
||||
) {
|
||||
const doneAt = previous.evidenceObservedAt ?? previous.receivedAt
|
||||
if (programWorkingSince === undefined || programWorkingSince <= doneAt) {
|
||||
return Infinity
|
||||
}
|
||||
return payload.state === 'waiting'
|
||||
? undefined
|
||||
: Infinity
|
||||
: previous.receivedAt + HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS
|
||||
}
|
||||
// A question sends no hooks while open, so a `working` that began before it (e.g. re-sent by the
|
||||
// lease renewal) proves nothing; a working transition after it keeps the silence fallback.
|
||||
|
||||
+2
-9
@@ -4,7 +4,7 @@ import { join } from 'node:path'
|
||||
import { afterEach, beforeEach, expect, it, vi } from 'vitest'
|
||||
import { AgentHookServer } from '../../agent-hook-server'
|
||||
import { HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS } from '../../program-status/hook-precedence'
|
||||
import { buildBody, PANE, postHookEvent } from '../server.test-fixtures'
|
||||
import { buildBody, ingestProgramStatusOsc, PANE, postHookEvent } from '../server.test-fixtures'
|
||||
|
||||
const SESSION = '70efcb3f-ae17-4863-9318-649f5469408b'
|
||||
|
||||
@@ -54,14 +54,7 @@ it('keeps the start folder and effort when a terminal status row precedes the ne
|
||||
vi.useFakeTimers({ toFake: ['Date'] })
|
||||
vi.setSystemTime(Date.now() + HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS)
|
||||
// Claude reports OSC 7501 `working` just before UserPromptSubmit.
|
||||
server.ingestTerminalStatus({
|
||||
paneKey: PANE,
|
||||
tabId: 'tab-1',
|
||||
worktreeId: 'wt-1',
|
||||
connectionId: null,
|
||||
fromProgramStatus: true,
|
||||
payload: { prompt: '', state: 'working', agentType: 'claude' }
|
||||
})
|
||||
ingestProgramStatusOsc(server, '\x1b]7501;state=working:app=claude-code\x1b\\')
|
||||
await claudeHook({ hook_event_name: 'UserPromptSubmit', prompt: 'next', cwd: '/repo/sub' })
|
||||
|
||||
expect(recordedSession()).toMatchObject({ id: SESSION, cwd: '/repo', effort: 'max' })
|
||||
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
import { afterEach, beforeEach, expect, it, vi } from 'vitest'
|
||||
import { AgentHookServer } from '../../../agent-hook-server'
|
||||
import { HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS } from '../../../program-status/hook-precedence'
|
||||
import { buildBody, ingestProgramStatusOsc, postHookEvent } from '../../server.test-fixtures'
|
||||
|
||||
const TURN = { session_id: 'session-1', turn_id: 'turn-1' }
|
||||
|
||||
let server: AgentHookServer
|
||||
|
||||
beforeEach(async () => {
|
||||
server = new AgentHookServer()
|
||||
await server.start({ env: 'production' })
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
vi.useRealTimers()
|
||||
server.stop()
|
||||
})
|
||||
|
||||
async function codexHook(hookEventName: string, payload: Record<string, unknown> = {}) {
|
||||
const response = await postHookEvent(
|
||||
server,
|
||||
buildBody({ ...TURN, hook_event_name: hookEventName, ...payload }),
|
||||
'/hook/codex'
|
||||
)
|
||||
expect(response.status).toBe(204)
|
||||
}
|
||||
|
||||
it('keeps a finished Codex turn done while its background terminal keeps OSC 7501 working', async () => {
|
||||
await codexHook('UserPromptSubmit', { prompt: 'start sleep 900 in the background' })
|
||||
// Codex 0.167 sends this at the turn start and nothing after it while `sleep 900` runs.
|
||||
const working = ingestProgramStatusOsc(server, '\x1b]7501;state=working:app=codex\x1b\\')
|
||||
await codexHook('Stop', { last_assistant_message: 'ok' })
|
||||
|
||||
vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
|
||||
server.ingestTerminalStatus({ ...working, renewsProgramStatusLease: true })
|
||||
vi.advanceTimersByTime(HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS + 1)
|
||||
|
||||
expect(server.getStatusSnapshot()[0]?.state).toBe('done')
|
||||
})
|
||||
@@ -1,4 +1,5 @@
|
||||
import { makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
|
||||
import { createProgramStatusProjector } from '../../../../shared/program-status/agent-status-projector'
|
||||
import type { AgentHookServer } from '../agent-hook-server'
|
||||
|
||||
export const LEAF_1 = '11111111-1111-4111-8111-111111111111'
|
||||
@@ -44,6 +45,22 @@ export function buildBody(payload: Record<string, unknown>, overrides: Partial<B
|
||||
}
|
||||
}
|
||||
|
||||
/** Feed one OSC 7501 report to the server as the runtime does: its facet, then its status row. */
|
||||
export function ingestProgramStatusOsc(server: AgentHookServer, osc: string) {
|
||||
const { payloads, facet } = createProgramStatusProjector().process(osc)
|
||||
server.ingestProgramStatusFacet({ paneKey: PANE, facet: facet ?? null })
|
||||
const event = {
|
||||
paneKey: PANE,
|
||||
tabId: 'tab-1',
|
||||
worktreeId: 'wt-1',
|
||||
connectionId: null,
|
||||
fromProgramStatus: true as const,
|
||||
payload: payloads[0]!.payload
|
||||
}
|
||||
server.ingestTerminalStatus(event)
|
||||
return event
|
||||
}
|
||||
|
||||
// Stay within the seven-day hydration limit without racing now.
|
||||
export function recentTs(offsetMs = 0): number {
|
||||
return Date.now() - 60 * 60 * 1000 + offsetMs
|
||||
|
||||
Reference in New Issue
Block a user