mirror of
https://github.com/stablyai/orca.git
synced 2026-10-04 00:02:21 +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.
127 lines
4.5 KiB
TypeScript
127 lines
4.5 KiB
TypeScript
// The session's current thread goal, derived from the journal rather than stored
|
|
// beside it. The latest goal transition in journal order is the whole answer.
|
|
|
|
import { isRootAgentJournalItem } from './agent-session-journal-producer'
|
|
import {
|
|
AGENT_JOURNAL_THREAD_GOAL_STATUSES,
|
|
type AgentJournalItemBody,
|
|
type AgentJournalRenderItem,
|
|
type AgentJournalThreadGoal,
|
|
type AgentJournalThreadGoalStatus
|
|
} from './agent-session-journal-types'
|
|
|
|
const GOAL_FRAME_KINDS = new Set([
|
|
'notification:thread/goal/updated',
|
|
'notification:thread/goal/cleared'
|
|
])
|
|
|
|
type GoalCandidate = Pick<AgentJournalRenderItem, 'sequence' | 'body' | 'agentId'>
|
|
|
|
export function isAgentJournalThreadGoalStatus(
|
|
value: string
|
|
): value is AgentJournalThreadGoalStatus {
|
|
return AGENT_JOURNAL_THREAD_GOAL_STATUSES.some((status) => status === value)
|
|
}
|
|
|
|
/** Whether a provider frame reports a goal transition. */
|
|
export function isAgentSessionThreadGoalFrame(
|
|
frame: { provider: string; kind: string } | undefined
|
|
): boolean {
|
|
return frame?.provider === 'codex' && GOAL_FRAME_KINDS.has(frame.kind)
|
|
}
|
|
|
|
/** Whether a row records a goal transition. Rows written before the typed
|
|
* snapshot existed are still recognized by their frame. */
|
|
export function isAgentJournalThreadGoalRow(body: AgentJournalItemBody): boolean {
|
|
return (
|
|
body.kind === 'status' &&
|
|
(body.threadGoal !== undefined || isAgentSessionThreadGoalFrame(body.providerFrame))
|
|
)
|
|
}
|
|
|
|
function goalFromRow(body: AgentJournalItemBody): AgentJournalThreadGoal | null {
|
|
if (body.kind !== 'status' || body.threadGoal?.state !== 'set') {
|
|
// Cleared, an unknown state, or a legacy row whose payload may be truncated.
|
|
return null
|
|
}
|
|
return isAgentJournalThreadGoalStatus(body.threadGoal.goal.status) ? body.threadGoal.goal : null
|
|
}
|
|
|
|
function isGoalTransition(item: GoalCandidate): boolean {
|
|
return isRootAgentJournalItem(item) && isAgentJournalThreadGoalRow(item.body)
|
|
}
|
|
|
|
/**
|
|
* The current goal as far as these rows can tell: `undefined` when none of them
|
|
* records a goal transition, otherwise the latest one's goal, or null when it
|
|
* cleared the goal or cannot be read. Scans backwards because every caller passes
|
|
* a rendered snapshot, which is already in sequence order; a revision keeps its
|
|
* row's sequence, so the last goal row is the answer.
|
|
*/
|
|
export function currentAgentSessionThreadGoal(
|
|
items: readonly GoalCandidate[]
|
|
): AgentJournalThreadGoal | null | undefined {
|
|
for (let index = items.length - 1; index >= 0; index -= 1) {
|
|
const item = items[index]
|
|
if (item && isGoalTransition(item)) {
|
|
return goalFromRow(item.body)
|
|
}
|
|
}
|
|
return undefined
|
|
}
|
|
|
|
/** The same answer for items a caller holds unordered, such as the host's own map. */
|
|
export function currentAgentSessionThreadGoalBySequence(
|
|
items: Iterable<GoalCandidate>
|
|
): AgentJournalThreadGoal | null | undefined {
|
|
let latest: GoalCandidate | null = null
|
|
for (const item of items) {
|
|
if (isGoalTransition(item) && (latest === null || item.sequence > latest.sequence)) {
|
|
latest = item
|
|
}
|
|
}
|
|
return latest === null ? undefined : goalFromRow(latest.body)
|
|
}
|
|
|
|
/** Goal statuses that still describe work in progress, so readers keep them in view. */
|
|
export function isAgentSessionThreadGoalOpen(goal: AgentJournalThreadGoal | null): boolean {
|
|
return goal !== null && goal.status !== 'complete'
|
|
}
|
|
|
|
/** The status change a goal in this status accepts, or null when it accepts none:
|
|
* a stalled or usage-limited goal resumes the same way a paused one does, while
|
|
* a spent token budget and a completed goal can only be cleared or replaced. */
|
|
export function agentSessionThreadGoalStatusChange(
|
|
status: AgentJournalThreadGoalStatus
|
|
): 'active' | 'paused' | null {
|
|
switch (status) {
|
|
case 'active':
|
|
return 'paused'
|
|
case 'paused':
|
|
case 'blocked':
|
|
case 'usageLimited':
|
|
return 'active'
|
|
case 'budgetLimited':
|
|
case 'complete':
|
|
return null
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Seconds of goal work. The provider's `timeUsedSeconds` is exact as of `updatedAt`;
|
|
* only an active goal with a turn running accrues more, counted from whichever of
|
|
* that report and the turn's start is later.
|
|
*/
|
|
export function agentSessionThreadGoalElapsedSeconds(
|
|
goal: AgentJournalThreadGoal,
|
|
now: number,
|
|
runningTurn: { startedAt: number | null } | null
|
|
): number {
|
|
const reported = Math.max(0, goal.timeUsedSeconds)
|
|
if (goal.status !== 'active' || runningTurn === null) {
|
|
return reported
|
|
}
|
|
const since = Math.max(goal.updatedAt, runningTurn.startedAt ?? goal.updatedAt)
|
|
return reported + Math.max(0, Math.floor((now - since) / 1000))
|
|
}
|