mirror of
https://github.com/stablyai/orca.git
synced 2026-10-27 00:02:48 +00:00
* feat(native-chat): show a Codex chat's goal above the composer and set it from goal mode Structured Codex chat now treats the thread goal as session state: a banner above the composer shows the current goal (pursuing / paused) with clear, pause/resume and expand; /goal enters a goal mode whose send calls thread/goal/set; the objective is journaled as a user message marked as sent as a goal. The banner is derived from the journaled goal rows, which Codex's resume snapshot refreshes, so a reopened or adopted chat shows its goal. Fixes STA-8159 * fix(native-chat): replace a recorded goal by clearing first, and recover a lost goal-change response - A set while the journal records a goal (any status) clears it before setting, so the new goal starts with its own time and token counters instead of rewriting the old goal's objective in place. - The threadGoal plan answers an unknown outcome from the goal the journal records and reruns otherwise, so one request timeout no longer refuses every later Clear/Pause/Resume as unknown for the mounted session. - The goal-mode chip says "Exit goal mode"; "Clear goal" stays the banner's action on the provider goal. - A typed bare /goal on Enter enters goal mode, the same as picking it. - The renderer reads the goal off the tail of its ordered snapshot; the host's unordered map keeps the by-sequence reader. - Drop the composer's duplicate in-flight guard; the goal controller already serializes changes. - Pin that a counter-only revision reaches a subscriber's live page under its original sequence. * fix(native-chat): keep a bare /goal inside goal mode as the entrance, and pin goal delivery and serialization - A bare `/goal` submitted while already in goal mode re-enters the mode instead of setting a goal whose objective is the literal text "/goal". - The counter-only revision pin now drives the host's own event sink bound to a real journal, so it goes red when the publish after a lifecycle transition is dropped; the previous fake sink never published. - Pin that a set which threw after journaling its objective puts that objective back exactly once when the ledger reruns the same operation id. - Cover the goal controller hook: absent without host support, the loaded window wins over the host's answer, a second change while one is unsettled answers false without a request, and a refused change frees the next one. * fix(native-chat): resume a blocked or usage-limited goal, and keep goal-mode drafts honest - The goal bar offers Resume on a blocked or usage-limited goal, which the provider resumes exactly as it resumes a paused one; a goal whose token budget is spent still offers only Clear. The rule lives beside the other goal facts in shared code so every reader answers it the same way. - A `/goal <text>` typed inside goal mode sets the objective `<text>`, as it does outside goal mode, instead of a goal whose objective is the literal command. - Setting a goal is a host round trip; a draft edited while it was in flight is no longer wiped when the goal lands, matching every other host command. - Pin that a lost status-change response is read as applied only when the recorded goal is in that status, that a cleared row in the loaded window outranks the host's earlier answer, and that the PTY lane is untouched. * fix(native-chat): keep the load-older anchor on the loaded window when a live revision lands below it A live revision of a row keeps that row's original sequence. When the row is older than the client's loaded window, the shared reducer merged it in and it became the load-older anchor, so paging `before` it skipped every row between. A goal's counter-only revisions during a long goal turn reach any client that attached after the goal row left its window, so a reopened chat lost rows on scroll-back. The reducer now admits live rows only at or above the window's oldest row while older rows remain on the host; the journal keeps the revision and the page reader serves it once the window reaches the row. With nothing older on the host the window is the whole journal, so a row below the head is admitted as before. Also drain accepted provider events before a goal set reads the journal to decide whether it replaces a recorded goal.
317 lines
12 KiB
TypeScript
317 lines
12 KiB
TypeScript
import * as codexRewind from './codex-structured-rewind'
|
|
import type {
|
|
AgentJournalMessageItem,
|
|
AgentSessionJournalIdentity
|
|
} from '../../shared/agent-session-journal-types'
|
|
import { StructuredSessionCompaction } from '../native-chat/agent-session-wire/structured-session-compaction'
|
|
import { isCodexAppServerRequestError } from './codex-app-server-connection'
|
|
import type {
|
|
AgentSessionAcquisition,
|
|
AgentSessionDispatchOutcome,
|
|
StructuredAgentSessionAcquireInput,
|
|
StructuredAgentSessionAdapter,
|
|
StructuredAgentSessionSetOptionInput
|
|
} from '../native-chat/agent-session-wire/structured-agent-session-adapter'
|
|
import type { CodexJournalTranslationAdmission } from './codex-structured-journal-translation'
|
|
import { dispatchCodexTurn, isCodexTurnOptionKey } from './codex-structured-turn-start'
|
|
import { supportsCodexStructuredLocation } from './codex-structured-location-support'
|
|
import { CodexStructuredSessionTeardown } from './codex-structured-session-teardown'
|
|
import {
|
|
applyCodexStructuredSessionOption,
|
|
readLiveCodexSessionOptions
|
|
} from './codex-structured-session-options'
|
|
import {
|
|
CodexAcquisitionRegistry,
|
|
requireLiveCodexSession,
|
|
type CodexAcquisitionAttempt,
|
|
type CodexSession,
|
|
type CodexStructuredSessionAdapterDeps,
|
|
type CodexStructuredSessionEvent
|
|
} from './codex-structured-session-state'
|
|
import {
|
|
deliverCodexServerRequest,
|
|
deliverCodexUnhandledFrame,
|
|
translateCodexNotification
|
|
} from './codex-structured-provider-events'
|
|
import { CodexStructuredTurnCancellation } from './codex-structured-turn-cancellation'
|
|
import { createCodexStructuredNotificationRetry } from './codex-structured-notification-retry'
|
|
import { acquireCodexStructuredSession } from './codex-structured-session-acquire'
|
|
import { changeCodexThreadGoal } from './codex-structured-thread-goal'
|
|
import {
|
|
answerCodexStructuredPrompt,
|
|
cancelCodexStructuredTurn
|
|
} from './codex-structured-prompt-ownership'
|
|
|
|
export type {
|
|
CodexStructuredLaunch,
|
|
CodexStructuredSessionAdapterDeps,
|
|
CodexStructuredSessionEvent
|
|
} from './codex-structured-session-state'
|
|
|
|
export class CodexStructuredSessionAdapter implements StructuredAgentSessionAdapter {
|
|
private readonly compactions = new StructuredSessionCompaction()
|
|
private readonly sessions = new Map<string, CodexSession>()
|
|
private readonly acquisitions = new CodexAcquisitionRegistry()
|
|
private readonly turnCancellation: CodexStructuredTurnCancellation
|
|
private readonly notificationRetries: ReturnType<typeof createCodexStructuredNotificationRetry>
|
|
private readonly teardown: CodexStructuredSessionTeardown
|
|
|
|
constructor(private readonly deps: CodexStructuredSessionAdapterDeps) {
|
|
this.notificationRetries = createCodexStructuredNotificationRetry({
|
|
sessionFor: (sessionId) => this.sessions.get(sessionId),
|
|
translate: (sessionId, session, method, params, observedAt, dispatchSequenceAtReceipt) =>
|
|
translateCodexNotification({
|
|
sessionId,
|
|
session,
|
|
method,
|
|
params,
|
|
observedAt,
|
|
dispatchSequenceAtReceipt,
|
|
turnCancellation: this.turnCancellation,
|
|
emit: (current, event) => this.emit(current, event)
|
|
})
|
|
})
|
|
this.teardown = new CodexStructuredSessionTeardown({
|
|
sessions: this.sessions,
|
|
acquisitions: this.acquisitions,
|
|
...(deps.onEvent ? { onEvent: deps.onEvent } : {}),
|
|
...(deps.onBackgroundTasksChanged
|
|
? { onBackgroundTasksChanged: deps.onBackgroundTasksChanged }
|
|
: {}),
|
|
forgetNotificationRetries: (sessionId) => this.notificationRetries.clear(sessionId, null)
|
|
})
|
|
this.turnCancellation = new CodexStructuredTurnCancellation({
|
|
captureTurnProcesses: deps.captureTurnProcesses,
|
|
terminateTurnProcesses: deps.terminateTurnProcesses,
|
|
requestTimeoutMs: deps.requestTimeoutMs,
|
|
emit: (session, event) => {
|
|
const admission = this.emit(session, event)
|
|
if (!admission.accepted && event.type === 'notification') {
|
|
const { sessionId, method, params, observedAt, dispatchSequenceAtReceipt } = event
|
|
this.notificationRetries.handle(
|
|
sessionId,
|
|
method,
|
|
params,
|
|
observedAt,
|
|
dispatchSequenceAtReceipt
|
|
)
|
|
}
|
|
return admission
|
|
}
|
|
})
|
|
}
|
|
|
|
supportsLocation = (location: Parameters<typeof supportsCodexStructuredLocation>[0]): boolean =>
|
|
supportsCodexStructuredLocation(location, this.deps.isWindowsProcessStartTimeAvailable)
|
|
|
|
acquire = (input: StructuredAgentSessionAcquireInput): Promise<AgentSessionAcquisition> =>
|
|
acquireCodexStructuredSession({
|
|
input,
|
|
deps: this.deps,
|
|
sessions: this.sessions,
|
|
acquisitions: this.acquisitions,
|
|
turnCancellation: this.turnCancellation,
|
|
notificationRetries: this.notificationRetries,
|
|
deliver: (acquisition, sessionId, event, retainedBytes) =>
|
|
this.deliver(acquisition, sessionId, event, retainedBytes),
|
|
handleServerRequest: (sessionId, request) => this.handleServerRequest(sessionId, request),
|
|
handleUnhandledFrame: (sessionId, kind, payload) =>
|
|
this.handleUnhandledFrame(sessionId, kind, payload),
|
|
forceCloseUnexpected: (sessionId, fence, acquisitionGeneration, reason) =>
|
|
this.teardown.forceCloseUnexpected(sessionId, fence, acquisitionGeneration, reason)
|
|
})
|
|
|
|
/** Buffers pre-publication events and drops events from superseded children. */
|
|
private deliver(
|
|
acquisition: CodexAcquisitionAttempt['window'],
|
|
sessionId: string,
|
|
event: () => unknown,
|
|
retainedBytes?: number
|
|
): void {
|
|
if (acquisition.buffer(event, retainedBytes)) {
|
|
return
|
|
}
|
|
if (this.sessions.get(sessionId)?.connection === acquisition.connection) {
|
|
event()
|
|
} else if (acquisition.isOverflowed) {
|
|
// Pre-publication overflow is an acquisition failure, not a dropped
|
|
// notification; tear down the child so callers retry explicitly.
|
|
void acquisition.connection?.close()
|
|
}
|
|
}
|
|
|
|
/** Journal first so observers never see an event ahead of its durable row. */
|
|
private emit(
|
|
session: CodexSession,
|
|
event: CodexStructuredSessionEvent
|
|
): CodexJournalTranslationAdmission {
|
|
if (event.type === 'notification' && !session.backgroundTasks.canObserve(event)) {
|
|
return { accepted: false, reason: 'failed' }
|
|
}
|
|
const admission = session.translator?.handle(event) ?? { accepted: true }
|
|
if (!admission.accepted) {
|
|
return admission
|
|
}
|
|
if (event.type === 'notification') {
|
|
this.compactions.codex(event.sessionId, event.method, event.params)
|
|
// After the admission check, so a refused frame is observed by the strip
|
|
// only on the retry that also reaches the journal.
|
|
if (session.backgroundTasks.observe(event)) {
|
|
this.deps.onBackgroundTasksChanged?.(event.sessionId, session.backgroundTasks.state)
|
|
}
|
|
}
|
|
if (event.type === 'ended') {
|
|
this.compactions.ended(event.sessionId)
|
|
}
|
|
this.deps.onEvent?.(event)
|
|
return admission
|
|
}
|
|
|
|
private handleServerRequest(
|
|
sessionId: string,
|
|
request: Parameters<typeof deliverCodexServerRequest>[2]
|
|
): void {
|
|
deliverCodexServerRequest(sessionId, this.sessions.get(sessionId), request, (session, event) =>
|
|
this.emit(session, event)
|
|
)
|
|
}
|
|
|
|
private handleUnhandledFrame(sessionId: string, kind: string, params: unknown): void {
|
|
deliverCodexUnhandledFrame(
|
|
sessionId,
|
|
this.sessions.get(sessionId),
|
|
kind,
|
|
params,
|
|
(session, event) => this.emit(session, event)
|
|
)
|
|
}
|
|
|
|
backgroundTaskState: NonNullable<StructuredAgentSessionAdapter['backgroundTaskState']> = (
|
|
sessionId
|
|
) => this.sessions.get(sessionId)?.backgroundTasks.state
|
|
|
|
bindPromptItemId = (
|
|
sessionId: string,
|
|
journalItemId: string,
|
|
promptKey: string,
|
|
turnId?: string | null,
|
|
threadId?: string
|
|
): void =>
|
|
this.sessions
|
|
.get(sessionId)
|
|
?.prompts.bindJournalItemId(
|
|
journalItemId,
|
|
threadId ?? this.session(sessionId).threadId,
|
|
promptKey,
|
|
turnId
|
|
)
|
|
|
|
async dispatch(input: {
|
|
sessionId: string
|
|
clientMessageId: string
|
|
body: AgentJournalMessageItem
|
|
fence: number
|
|
requestedAt?: number
|
|
beforeDispatch?: () => Promise<void>
|
|
}): Promise<AgentSessionDispatchOutcome> {
|
|
const session = this.session(input.sessionId)
|
|
session.dispatchPending = true
|
|
try {
|
|
await this.turnCancellation.captureBaseline(session)
|
|
await input.beforeDispatch?.()
|
|
return await dispatchCodexTurn(session, input, this.deps.requestTimeoutMs)
|
|
} finally {
|
|
session.dispatchPending = false
|
|
}
|
|
}
|
|
|
|
cancelTurn: StructuredAgentSessionAdapter['cancelTurn'] = (request) =>
|
|
cancelCodexStructuredTurn({
|
|
request,
|
|
sessions: this.sessions,
|
|
compactions: this.compactions,
|
|
cancellation: this.turnCancellation
|
|
})
|
|
|
|
rewindSupport: NonNullable<StructuredAgentSessionAdapter['rewindSupport']> = (sessionId) =>
|
|
this.sessions.get(sessionId)?.historyMode === 'legacy'
|
|
? { supported: false, reason: 'history-not-paginated' }
|
|
: { supported: true }
|
|
|
|
rewind: NonNullable<StructuredAgentSessionAdapter['rewind']> = (input) =>
|
|
codexRewind.rewindCodexSession(this.session(input.sessionId), input, this.deps.requestTimeoutMs)
|
|
|
|
recoverRewind: NonNullable<StructuredAgentSessionAdapter['recoverRewind']> = (input) =>
|
|
codexRewind.recoverCodexRewind(this.session(input.sessionId), input, this.deps.requestTimeoutMs)
|
|
|
|
compact: NonNullable<StructuredAgentSessionAdapter['compact']> = (input) => {
|
|
const session = this.session(input.sessionId)
|
|
return this.compactions.run(
|
|
input.sessionId,
|
|
session.threadId,
|
|
async () => {
|
|
await this.turnCancellation.captureBaseline(session)
|
|
return session.connection
|
|
.request(
|
|
'thread/compact/start',
|
|
{ threadId: session.threadId },
|
|
{ timeoutMs: this.deps.requestTimeoutMs }
|
|
)
|
|
.catch((error) => {
|
|
if (isCodexAppServerRequestError(error)) {
|
|
return { error: error.message }
|
|
}
|
|
throw error
|
|
})
|
|
},
|
|
input.onLateResult,
|
|
input.turnId
|
|
)
|
|
}
|
|
|
|
changeThreadGoal: NonNullable<StructuredAgentSessionAdapter['changeThreadGoal']> = (input) =>
|
|
changeCodexThreadGoal(
|
|
this.session(input.sessionId),
|
|
input.change,
|
|
input.replacesGoal,
|
|
this.deps.requestTimeoutMs
|
|
)
|
|
|
|
supportsThreadGoal = (sessionId: string): boolean => this.sessions.has(sessionId)
|
|
|
|
answerPrompt: StructuredAgentSessionAdapter['answerPrompt'] = (request) =>
|
|
answerCodexStructuredPrompt({ request, sessions: this.sessions })
|
|
|
|
async setOption(
|
|
input: StructuredAgentSessionSetOptionInput
|
|
): Promise<Readonly<Record<string, string>>> {
|
|
if (!isCodexTurnOptionKey(input.key)) {
|
|
throw new Error(`codex app-server has no thread option named ${input.key}`)
|
|
}
|
|
return applyCodexStructuredSessionOption(
|
|
this.session(input.sessionId),
|
|
input.key,
|
|
input.value,
|
|
this.deps.requestTimeoutMs
|
|
)
|
|
}
|
|
|
|
readOptions = (input: { sessionId: string; fence: number }) =>
|
|
readLiveCodexSessionOptions(this.session(input.sessionId), this.deps.requestTimeoutMs)
|
|
|
|
historyFilePath = async (input: {
|
|
identity: AgentSessionJournalIdentity
|
|
}): Promise<string | null> => this.sessions.get(input.identity.sessionId)?.historyPath ?? null
|
|
|
|
closeSession = (sessionId: string): Promise<boolean> => this.teardown.close(sessionId)
|
|
forceCloseSession = (sessionId: string): Promise<boolean> => this.teardown.forceClose(sessionId)
|
|
disposeSession = (sessionId: string): Promise<boolean> => this.teardown.close(sessionId)
|
|
closeAll = (): Promise<void> => this.teardown.closeAll()
|
|
releaseAcquisition = (input: { sessionId: string }): Promise<boolean> =>
|
|
this.teardown.close(input.sessionId)
|
|
|
|
private session(sessionId: string): CodexSession {
|
|
return requireLiveCodexSession(this.sessions, sessionId)
|
|
}
|
|
}
|