Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,13 @@ import {
type SessionStore,
} from '../session-manager.js';
import type { AgentBackend } from '../ai-sdk-backend.js';
import { classifyTerminalRuntimeLedger, commitTerminalRunWithRuntimeFact } from '../terminal-run-commit.js';
import {
buildRecoveredTerminalRuntimeEvent,
buildSyntheticTerminalRuntimeEvent,
classifyTerminalRuntimeLedger,
commitOrCreateTerminalRunFact,
commitTerminalRunWithRuntimeFact,
} from '../terminal-run-commit.js';
import { RuntimeReadModel } from '../runtime-read-model.js';
import { RuntimeKernel } from '../runtime-kernel.js';

Expand DownExpand Up@@ -185,6 +191,62 @@ describe('SessionManager terminal ledger invariants', () => {
expect((await runStore.readRun(run.sessionId, run.runId)).status).toBe('running');
});

test('synthetic cancelled terminal commits the fallback abortSource to the run header', async () => {
const runStore = new TinyAgentRunStore();
const run = makeRunHeader({ status: 'running' });
await runStore.createRun(run);

await commitOrCreateTerminalRunFact({
runStore,
runtimeEventStore: runStore,
newId: nextId(),
sessionId: run.sessionId,
runId: run.runId,
turnId: run.turnId,
ts: 3,
fallbackStatus: 'cancelled',
fallbackInvocationId: run.runId,
});

const header = await runStore.readRun(run.sessionId, run.runId);
expect(header.status).toBe('cancelled');
expect(header.abortSource).toBe('user_stop');
const terminalEvents = (await runStore.readRuntimeEvents(run.sessionId, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('user_stop');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
});

test('synthetic terminal builder keeps live and recovered metadata distinct', () => {
const run = makeRunHeader({ status: 'running' });
const live = buildSyntheticTerminalRuntimeEvent({
id: 'live-terminal',
invocationId: run.runId,
run,
status: 'failed',
ts: 3,
failureClass: 'missing_terminal_event',
});
expect(live.invocationId).toBe(run.runId);
expect(live.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(live.actions?.stateDelta?.recovered).toBeUndefined();
expect(live.actions?.stateDelta?.recoveryReason).toBeUndefined();

const recovered = buildRecoveredTerminalRuntimeEvent({
id: 'recovered-terminal',
run,
status: 'failed',
ts: 4,
failureClass: 'missing_terminal_event',
recoveryReason: 'run_interrupted',
});
expect(recovered.invocationId).toBe(`recovery-${run.runId}`);
expect(recovered.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(recovered.actions?.stateDelta?.recovered).toBe(true);
expect(recovered.actions?.stateDelta?.recoveryReason).toBe('run_interrupted');
});

test('terminal ledger classification rejects multiple terminal RuntimeEvent signals', () => {
const run = makeRunHeader({ status: 'running' });

Expand DownExpand Up@@ -465,7 +527,59 @@ describe('SessionManager terminal ledger invariants', () => {
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

test('direct AgentRun stop synthesizes a cancelled terminal fact when no terminal event was recorded', async () => {
const store = new TinySessionStore();
const runStore = new TinyAgentRunStore();
const session = await store.create(makeInput());
const backend = new ScriptBackend({ sessionId: session.id } as BackendFactoryContext, []);
const activeRuns = new Map<string, AgentRun>();
const turnToRunId = new Map<string, string>();
const run = new AgentRun({
sessionId: session.id,
header: session,
userInput: { turnId: 'turn-1', text: 'hello' },
store,
runStore,
runtimeEventStore: runStore,
newId: nextId(),
now: nextNow(41_250),
hooks: {
ensureActive: async () => ({ sessionId: session.id, backend, cachedHeader: session, activeRuns, turnToRunId }),
registerRun: (_active, activeRun) => {
activeRuns.set(activeRun.runId, activeRun);
turnToRunId.set(activeRun.turnId, activeRun.runId);
},
unregisterRun: (_active, activeRun) => {
activeRuns.delete(activeRun.runId);
turnToRunId.delete(activeRun.turnId);
},
updateHeader: (sessionId, patch) => store.updateHeader(sessionId, patch),
updateStatus: async () => {},
appendTurnState: async () => {},
},
});

const begin = await run.begin();
run.stop('stop_button');
await run.finalize();

const header = await runStore.readRun(session.id, run.runId);
expect(header.status).toBe('cancelled');
expect(header.failureClass).toBeUndefined();
expect(header.abortSource).toBe('renderer.stop_button');
const terminalEvents = (await runStore.readRuntimeEvents(session.id, run.runId)).filter(isTerminalRuntimeEvent);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('aborted');
expect(terminalEvents[0]?.invocationId).toBe(begin.initialRuntimeEvent.invocationId);
expect(terminalEvents[0]?.actions?.stateDelta?.abortSource).toBe('renderer.stop_button');
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
await new RuntimeReadModel({ runStore, runtimeEventStore: runStore }).getSessionView(session.id);
});

Expand Down
7 changes: 5 additions & 2 deletions packages/runtime/src/__tests__/session-manager.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -526,7 +526,9 @@ describe('SessionManager permission mode updates', () => {
expect(runtimeEvents[2]?.id).toBe(terminalEvents[0]?.id);
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();

const view = await new RuntimeReadModel({
runStore,
Expand DownExpand Up@@ -618,8 +620,9 @@ describe('SessionManager permission mode updates', () => {
expect(run.failureClass).toBe('missing_terminal_event');
expect(terminalEvents).toHaveLength(1);
expect(terminalEvents[0]?.status).toBe('failed');
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBe(true);
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBe('missing_terminal_event');
expect(terminalEvents[0]?.invocationId).toBe(run.runId);
expect(terminalEvents[0]?.actions?.stateDelta?.recovered).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.recoveryReason).toBeUndefined();
expect(terminalEvents[0]?.actions?.stateDelta?.failureClass).toBe('missing_terminal_event');

const view = await new RuntimeReadModel({
Expand Down
13 changes: 8 additions & 5 deletions packages/runtime/src/agent-run.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -786,6 +786,7 @@ export class AgentRun {
const runStore = this.input.runStore;
const runtimeEventStore = this.input.runtimeEventStore;
if (!runStore || !this.runStoreAvailable || !runtimeEventStore || !this.runtimeEventStoreAvailable) return;
const fallbackStatus = this.stopped || finalStatus?.status === 'aborted' ? 'cancelled' : 'failed';
const fallbackFailureClass = 'missing_terminal_event';
const fallbackFailureMessage = this.failureMessage ?? 'run finalized without a terminal RuntimeEvent';
try {
Expand All@@ -807,13 +808,15 @@ export class AgentRun {
? { failureClass: this.failureClass ?? finalStatus?.blockedReason }
: {}),
...(this.failureMessage ? { failureMessage: this.failureMessage } : {}),
...(this.abortSource ? { abortSource: this.abortSource } : {}),
fallbackFailureClass,
fallbackRecoveryReason: fallbackFailureClass,
fallbackFailureMessage,
...(this.abortSource || fallbackStatus === 'cancelled'
? { abortSource: this.abortSource ?? 'user_stop' }
: {}),
fallbackStatus,
fallbackInvocationId: this.runId,
...(fallbackStatus === 'failed' ? { fallbackFailureClass, fallbackFailureMessage } : {}),
allowHeaderCommitFailure: true,
});
if (result.createdTerminalEvent) {
if (result.createdTerminalEvent && result.status === 'failed') {
this.failureClass = result.failureClass ?? fallbackFailureClass;
this.failureMessage = fallbackFailureMessage;
}
Expand Down
9 changes: 0 additions & 9 deletions packages/runtime/src/runtime-runner.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,12 +95,6 @@ export interface RuntimeRunnerDeps {
gate?: RuntimeGate;
/** Injectable id/time providers. Defaults to crypto.randomUUID / Date.now. */
providers?: InvocationProviders;
/**
* Called after the initial user RuntimeEvent is built and before the flow is
* dispatched. RuntimeRunner still does not own storage; orchestration layers
* can use this to keep durable ledgers ahead of renderer-visible events.
*/
onInitialRuntimeEvent?: (event: RuntimeEvent) => Promise<void> | void;
/**
* Whether to stop collecting at the first terminal RuntimeEvent. Defaults
* to true for standalone runner callers; production bridges can set false
Expand DownExpand Up@@ -129,14 +123,12 @@ export class RuntimeRunner {
private readonly flow: RunnableAgentFlow;
private readonly gate: RuntimeGate | undefined;
private readonly providers: InvocationProviders;
private readonly onInitialRuntimeEvent: RuntimeRunnerDeps['onInitialRuntimeEvent'];
private readonly stopOnTerminal: boolean;

constructor(deps: RuntimeRunnerDeps) {
this.flow = deps.flow;
this.gate = deps.gate;
this.providers = deps.providers ?? createDefaultInvocationProviders();
this.onInitialRuntimeEvent = deps.onInitialRuntimeEvent;
this.stopOnTerminal = deps.stopOnTerminal ?? true;
}

Expand DownExpand Up@@ -229,7 +221,6 @@ export class RuntimeRunner {
text: request.text,
...(request.attachments !== undefined ? { attachments: request.attachments } : {}),
});
await this.onInitialRuntimeEvent?.(userEvent);
events.push(userEvent);
const flowInput = buildFlowInput(request);

Expand Down
71 changes: 53 additions & 18 deletions packages/runtime/src/terminal-run-commit.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -127,10 +127,10 @@ export interface CommitOrCreateTerminalRunFactInput extends Omit<
> {
terminalEvent?: RuntimeEvent;
allowHeaderCommitFailure?: boolean;
fallbackFailureClass: string;
fallbackStatus: TerminalAgentRunStatus;
fallbackInvocationId: string;
fallbackFailureClass?: string;
fallbackFailureMessage?: string;
fallbackRecoveryReason?: string;
fallbackDiagnostic?: Record<string, unknown>;
}

export interface CommitOrCreateTerminalRunFactResult {
Expand All@@ -146,19 +146,24 @@ export async function commitOrCreateTerminalRunFact(
input: CommitOrCreateTerminalRunFactInput,
): Promise<CommitOrCreateTerminalRunFactResult> {
const createdTerminalEvent = !input.terminalEvent;
const terminalEvent = input.terminalEvent ?? buildRecoveredTerminalRuntimeEvent({
const effectiveAbortSource = input.fallbackStatus === 'cancelled'
? input.abortSource ?? 'user_stop'
: input.abortSource;
const terminalEvent = input.terminalEvent ?? buildSyntheticTerminalRuntimeEvent({
id: input.newId(),
invocationId: input.fallbackInvocationId,
run: {
sessionId: input.sessionId,
runId: input.runId,
turnId: input.turnId,
},
status: 'failed',
status: input.fallbackStatus,
ts: input.ts,
failureClass: input.fallbackFailureClass,
recoveryReason: input.fallbackRecoveryReason ?? input.fallbackFailureClass,
...(input.fallbackDiagnostic ? { diagnostic: input.fallbackDiagnostic } : {}),
message: input.fallbackFailureMessage ?? input.failureMessage ?? input.fallbackFailureClass,
...(input.fallbackFailureClass ? { failureClass: input.fallbackFailureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
...(input.fallbackFailureMessage ?? input.failureMessage
? { message: input.fallbackFailureMessage ?? input.failureMessage }
: {}),
});
const status = terminalRunStatusFromRuntimeEvent(terminalEvent);
if (!status) {
Expand DownExpand Up@@ -193,6 +198,7 @@ export async function commitOrCreateTerminalRunFact(
terminalEvent,
status,
...(failureClass ? { failureClass } : {}),
...(effectiveAbortSource ? { abortSource: effectiveAbortSource } : {}),
terminalEventAlreadyPersisted,
});
headerCommitted = true;
Expand All@@ -210,27 +216,27 @@ export async function commitOrCreateTerminalRunFact(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
export interface BuildSyntheticTerminalRuntimeEventInput {
id: string;
invocationId: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
recoveryReason?: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
export function buildSyntheticTerminalRuntimeEvent(
input: BuildSyntheticTerminalRuntimeEventInput,
): RuntimeEvent {
const failureClass = input.status === 'failed' ? input.failureClass ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource ?? 'unknown' : undefined;
const abortSource = input.status === 'cancelled' ? input.abortSource : undefined;
return {
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
invocationId: input.invocationId,
runId: input.run.runId,
sessionId: input.run.sessionId,
turnId: input.run.turnId,
Expand All@@ -252,8 +258,7 @@ export function buildRecoveredTerminalRuntimeEvent(
actions: {
endInvocation: true,
stateDelta: {
recovered: true,
recoveryReason: input.recoveryReason,
...(input.recoveryReason ? { recovered: true, recoveryReason: input.recoveryReason } : {}),
...(input.diagnostic ?? {}),
...(failureClass ? { failureClass } : {}),
...(abortSource ? { abortSource } : {}),
Expand All@@ -262,6 +267,36 @@ export function buildRecoveredTerminalRuntimeEvent(
};
}

export interface BuildRecoveredTerminalRuntimeEventInput {
id: string;
run: Pick<AgentRunHeader, 'runId' | 'sessionId' | 'turnId'>;
status: TerminalAgentRunStatus;
ts: number;
invocationId?: string;
failureClass?: string;
abortSource?: string;
recoveryReason: string;
diagnostic?: Record<string, unknown>;
message?: string;
}

export function buildRecoveredTerminalRuntimeEvent(
input: BuildRecoveredTerminalRuntimeEventInput,
): RuntimeEvent {
return buildSyntheticTerminalRuntimeEvent({
id: input.id,
invocationId: input.invocationId ?? `recovery-${input.run.runId}`,
run: input.run,
ts: input.ts,
status: input.status,
...(input.failureClass ? { failureClass: input.failureClass } : {}),
...(input.status === 'cancelled' ? { abortSource: input.abortSource ?? 'unknown' } : {}),
recoveryReason: input.recoveryReason,
...(input.diagnostic ? { diagnostic: input.diagnostic } : {}),
...(input.message ? { message: input.message } : {}),
});
}

export function hasTerminalAgentRunEvent(events: readonly Pick<AgentRunEvent, 'type'>[]): boolean {
return events.some((event) =>
event.type === 'run_completed' ||
Expand Down