@qduc/term2 0.11.1 → 0.13.0

package/dist/services/session/terminal-result-collector.js

@@ -1,6 +1,15 @@
+import { AmbiguousModelOutcomeError } from '../retry/retry-errors.js';
 const isEmptyUsage = (usage) => !usage || Object.keys(usage).length === 0;
+/**
+ * The collector observed a stream end before the run loop emitted a terminal
+ * event. It is still unsafe to replay, but its provenance lets cancellation
+ * handling distinguish this local exhaustion from a provider-origin ambiguity.
+ */
+export class TerminalResultCollectorExhaustionError extends AmbiguousModelOutcomeError {
+}
 export async function collectTerminalResult(events, { onTextChunk, onReasoningChunk, onCommandMessage, onEvent, getRawInterruption, onFinalEvent, } = {}) {
     let finalText = '';
+    let hasFinalEvent = false;
     let reasoningText = '';
     const commandMessages = [];
     const turnItems = [];
@@ -16,10 +25,10 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
             currentTextBuffer = '';
         }
     };
-    // Token usage is sourced from a single authoritative value: the Agents SDK
+    // Token usage is sourced from a single authoritative value: the application
     // run-state accumulator, which is already cumulative for the entire run
     // (every model turn, including turns resumed after an approval - the
-    // continuation reuses the same live RunState so its accumulator already
+    // continuation reuses the same live run state so its accumulator already
     // includes the pre-approval turns). It arrives on `final` /
     // `approval_required` events. We therefore do NOT re-sum per-turn
     // `usage_update` snapshots here; doing so double-counted on long,
@@ -27,6 +36,12 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
     // value for display when a terminal usage figure is unavailable.
     let runUsage;
     let latestStreamedUsage;
+    // Cost records are cumulative for the run on the same terms as `runUsage`:
+    // each terminal event carries every record so far, so the latest one
+    // supersedes rather than appends. Without copying them onto the returned
+    // terminal the session cost accumulator — and so the status bar — never sees
+    // a single record.
+    let runCostRecords;
     const resolvedUsage = () => {
         const usage = !isEmptyUsage(runUsage) ? runUsage : latestStreamedUsage;
         return isEmptyUsage(usage) ? undefined : usage;
@@ -58,6 +73,7 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
             }
             case 'approval_required': {
                 const usage = event.usage ?? resolvedUsage();
+                const costRecords = event.costRecords?.length ? event.costRecords : runCostRecords;
                 return {
                     type: 'approval_required',
                     approval: {
@@ -67,8 +83,10 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
                         rawInterruption: getRawInterruption?.(),
                         callId: event.approval.callId,
                         llmAdvisory: event.approval.llmAdvisory,
+                        postExecute: event.approval.postExecute,
                     },
                     ...(usage ? { usage } : {}),
+                    ...(costRecords?.length ? { costRecords } : {}),
                 };
             }
             case 'usage_update': {
@@ -77,15 +95,19 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
             }
             case 'final': {
                 onFinalEvent?.(event);
+                hasFinalEvent = true;
                 finalText = event.finalText;
                 reasoningText = event.reasoningText ?? '';
                 if (event.usage) {
                     // Each `final` carries the run-cumulative usage as of that point.
                     // A later `final` (e.g. after an auto-approved continuation)
-                    // supersedes an earlier one because the SDK accumulator keeps
+                    // supersedes an earlier one because the run-state accumulator keeps
                     // growing on the same run state.
                     runUsage = event.usage;
                 }
+                if (event.costRecords?.length) {
+                    runCostRecords = event.costRecords;
+                }
                 if (event.commandMessages?.length) {
                     for (const msg of event.commandMessages) {
                         commandMessages.push(msg);
@@ -125,14 +147,18 @@ export async function collectTerminalResult(events, { onTextChunk, onReasoningCh
                 break;
         }
     }
+    if (!hasFinalEvent) {
+        throw new TerminalResultCollectorExhaustionError('Conversation event stream ended without an authoritative terminal event');
+    }
     const usage = resolvedUsage();
     flushBuffers();
     return {
         type: 'response',
         commandMessages,
-        finalText: finalText || 'Done.',
+        finalText,
         ...(reasoningText ? { reasoningText } : {}),
         ...(usage ? { usage } : {}),
+        ...(runCostRecords?.length ? { costRecords: runCostRecords } : {}),
         turnItems,
     };
 }

package/dist/services/session/terminal-result-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-result-collector.js","sourceRoot":"","sources":["../../../source/services/session/terminal-result-collector.ts"],"names":[],"mappings":"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"}

package/dist/services/session/test-helpers/conversation-session-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF,eAAO,MAAM,UAAU,EAAE,eASxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,sBAGnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,yBAAyB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAQ,gBAG7E,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAQ,uBAStC,CAAC"}
+{"version":3,"file":"conversation-session-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF,eAAO,MAAM,UAAU,EAAE,eASxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,sBAGnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,yBAAyB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAQ,gBAU7E,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAQ,uBAStC,CAAC"}

package/dist/services/session/test-helpers/conversation-session-fixtures.js

@@ -15,7 +15,14 @@ export const sessionContextService = {
 };
 export const createMockSettingsService = (entries = []) => {
     const settings = new Map(entries);
-    return { get: (key) => settings.get(key), set: () => { } };
+    return {
+        get: (key) => settings.get(key),
+        getDynamic: (key) => settings.get(key),
+        set: () => { },
+        setDynamic: () => { },
+        setPersistent: () => { },
+        setPersistentDynamic: () => { },
+    };
 };
 export const createMockAgentClient = (overrides = {}) => ({
     startStream: async () => new MockStream([]),

package/dist/services/session/test-helpers/conversation-session-fixtures.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session-fixtures.js","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAI/D,MAAM,CAAC,MAAM,UAAU,GAAoB;IACzC,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;IACtC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;CACvB,CAAC;AAIF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAO,GAAwB,EAAE,EAAoB,EAAE;IAC/F,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO,EAAE,GAAG,EAAE,CAAI,GAAW,EAAK,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC;AAC/E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAS,GAA4B,EAAE,EAA2B,EAAE,CACxG,CAAC;IACC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IAC3C,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IACjD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,kBAAkB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;IAClC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;IACpB,GAAG,SAAS;CAC0B,CAAA,CAAC"}
+{"version":3,"file":"conversation-session-fixtures.js","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAI/D,MAAM,CAAC,MAAM,UAAU,GAAoB;IACzC,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;IACtC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;CACvB,CAAC;AAIF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAO,GAAwB,EAAE,EAAoB,EAAE;IAC/F,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO;QACL,GAAG,EAAE,CAAC,GAAQ,EAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QACzC,UAAU,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QACvD,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;QACb,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC;QACpB,aAAa,EAAE,GAAG,EAAE,GAAE,CAAC;QACvB,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;KAC/B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAS,GAA4B,EAAE,EAA2B,EAAE,CACxG,CAAC;IACC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IAC3C,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;IACjD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,kBAAkB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;IAClC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;IACpB,GAAG,SAAS;CAC0B,CAAA,CAAC"}

package/dist/services/session/turn-attempt-factory.d.ts

@@ -1,4 +1,4 @@
-import type { RunState } from '@openai/agents';
+import type { ContinuationHandle } from '../../contracts/continuation-handle.js';
 import type { ConversationAgentClient } from '../conversation-agent-client.js';
 import type { AbortedApprovalContext } from '../approval/approval-state.js';
 import type { GenerationGuard } from '../generation-guard.js';
@@ -11,7 +11,7 @@ import { TurnAttempt } from './turn-attempt.js';
 export type InitialTurnRunOptions = {
     skipUserMessage?: boolean;
     replayFromHistory?: boolean;
-    resumeState?: RunState<any, any>;
+    resumeState?: ContinuationHandle;
     resumePreviousResponseId?: string | null;
     abortedContext?: AbortedApprovalContext | null;
     token?: number;

package/dist/services/session/turn-attempt-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-attempt-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,cAAc,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,kBAAkB,CAAC;IAChC,KAAK,EAAE,gBAAgB,CAAC;IACxB,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtG,qBAAa,kBAAkB;;IACjB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,sBAAsB,EAAI;IAE7D,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,qBAA0B,GAAG,yBAAyB,CAkC/F;CAoBF"}
+{"version":3,"file":"turn-attempt-factory.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,cAAc,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC/C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,kBAAkB,CAAC;IAChC,KAAK,EAAE,gBAAgB,CAAC;IACxB,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtG,qBAAa,kBAAkB;;IACjB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,sBAAsB,EAAI;IAE7D,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,qBAA0B,GAAG,yBAAyB,CAkC/F;CAoBF"}

package/dist/services/session/turn-attempt.d.ts

@@ -1,10 +1,11 @@
-import type { AgentInputItem } from '@openai/agents';
 import type { AgentStream } from '../agent-stream.js';
+import type { ProviderInput } from '../../contracts/provider-input.js';
 import type { UserTurn } from '../../types/user-turn.js';
 import type { RetryCounts } from '../retry/retry-contracts.js';
 import type { AssistantJournalItemLogEvent } from '../logging/conversation-log-events.js';
 import type { SessionInputPlan } from './session-input-planner.js';
 import type { GenerationToken } from '../generation-guard.js';
+import type { ProviderHistorySnapshot } from '../conversation/conversation-store.js';
 export declare class TurnAttempt {
     #private;
     constructor(options: {
@@ -25,8 +26,9 @@ export declare class TurnAttempt {
     get maxModelRetries(): number | undefined;
     get retryCounts(): RetryCounts;
     get stream(): AgentStream | null;
-    get streamInput(): string | AgentInputItem | AgentInputItem[] | undefined;
+    get streamInput(): ProviderInput | undefined;
     get inputMode(): 'delta' | 'full_history' | undefined;
+    get providerHistorySnapshot(): ProviderHistorySnapshot | undefined;
     get addedUserMessage(): boolean;
     get closed(): boolean;
     markUserMessageAdded(): void;

package/dist/services/session/turn-attempt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-attempt.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,qBAAa,WAAW;;IAkBtB,YAAY,OAAO,EAAE;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,KAAK,EAAE,eAAe,CAAC;QACvB,kBAAkB,EAAE,WAAW,CAAC;QAChC,sBAAsB,EAAE,4BAA4B,EAAE,CAAC;QACvD,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;KACtB,EAwBA;IAED,IAAI,IAAI,IAAI,QAAQ,CAEnB;IAED,IAAI,KAAK,IAAI,eAAe,CAE3B;IAED,IAAI,kBAAkB,IAAI,WAAW,CAEpC;IAED,IAAI,sBAAsB,IAAI,4BAA4B,EAAE,CAE3D;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,MAAM,IAAI,WAAW,GAAG,IAAI,CAE/B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,cAAc,GAAG,cAAc,EAAE,GAAG,SAAS,CAExE;IAED,IAAI,SAAS,IAAI,OAAO,GAAG,cAAc,GAAG,SAAS,CAEpD;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,oBAAoB,IAAI,IAAI,CAE3B;IAED,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAGxC;IAED,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAE7C;IAED,YAAY,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI,CAE1C;IAED,KAAK,IAAI,IAAI,CAOZ;CACF"}
+{"version":3,"file":"turn-attempt.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAErF,qBAAa,WAAW;;IAmBtB,YAAY,OAAO,EAAE;QACnB,IAAI,EAAE,QAAQ,CAAC;QACf,KAAK,EAAE,eAAe,CAAC;QACvB,kBAAkB,EAAE,WAAW,CAAC;QAChC,sBAAsB,EAAE,4BAA4B,EAAE,CAAC;QACvD,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,MAAM,CAAC,EAAE,WAAW,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;KACtB,EAwBA;IAED,IAAI,IAAI,IAAI,QAAQ,CAEnB;IAED,IAAI,KAAK,IAAI,eAAe,CAE3B;IAED,IAAI,kBAAkB,IAAI,WAAW,CAEpC;IAED,IAAI,sBAAsB,IAAI,4BAA4B,EAAE,CAE3D;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,eAAe,IAAI,MAAM,GAAG,SAAS,CAExC;IAED,IAAI,WAAW,IAAI,WAAW,CAE7B;IAED,IAAI,MAAM,IAAI,WAAW,GAAG,IAAI,CAE/B;IAED,IAAI,WAAW,IAAI,aAAa,GAAG,SAAS,CAE3C;IAED,IAAI,SAAS,IAAI,OAAO,GAAG,cAAc,GAAG,SAAS,CAEpD;IAED,IAAI,uBAAuB,IAAI,uBAAuB,GAAG,SAAS,CAEjE;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,oBAAoB,IAAI,IAAI,CAE3B;IAED,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAIxC;IAED,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAE7C;IAED,YAAY,CAAC,UAAU,EAAE,WAAW,GAAG,IAAI,CAE1C;IAED,KAAK,IAAI,IAAI,CAOZ;CACF"}

package/dist/services/session/turn-attempt.js

@@ -9,6 +9,7 @@ export class TurnAttempt {
     #stream = null;
     #streamInput = undefined;
     #inputMode = undefined;
+    #providerHistorySnapshot = undefined;
     #addedUserMessage = false;
     #closed = false;
     #signal;
@@ -67,6 +68,9 @@ export class TurnAttempt {
     get inputMode() {
         return this.#inputMode;
     }
+    get providerHistorySnapshot() {
+        return this.#providerHistorySnapshot;
+    }
     get addedUserMessage() {
         return this.#addedUserMessage;
     }
@@ -79,6 +83,7 @@ export class TurnAttempt {
     attachInput(plan) {
         this.#streamInput = plan.streamInput;
         this.#inputMode = plan.inputSurgeKind;
+        this.#providerHistorySnapshot = plan.providerHistorySnapshot;
     }
     attachStream(stream) {
         this.#stream = stream;

package/dist/services/session/turn-attempt.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-attempt.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"turn-attempt.js","sourceRoot":"","sources":["../../../source/services/session/turn-attempt.ts"],"names":[],"mappings":"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"}

package/dist/services/session/turn-coordinator.d.ts

@@ -1,26 +1,56 @@
 import type { ConversationEvent } from '../conversation/conversation-events.js';
+import type { ProviderInputItem } from '../../contracts/provider-input.js';
 import { type UserTurn } from '../../types/user-turn.js';
 import { TurnStatusMachine } from './turn-status-machine.js';
 import { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
+import type { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
 import type { TurnWorkflow } from './turn-workflow.js';
 import type { ProviderContinuity } from '../provider-continuity.js';
 import type { InitialTurnRunOptions } from './turn-attempt-factory.js';
-export type TurnStartOptions = Pick<InitialTurnRunOptions, 'skipUserMessage' | 'replayFromHistory' | 'retries' | 'maxModelRetries' | 'signal' | 'resumeState' | 'resumePreviousResponseId' | 'bypassInputSurgeGuard'>;
+import type { HookLifecyclePort } from '../hooks/hook-service.js';
+import type { HookEventFactory } from '../hooks/hook-event-factory.js';
+import type { SteerOutcome } from '../agent-runtime/application-run-loop.js';
+export type TurnStartOptions = Pick<InitialTurnRunOptions, 'skipUserMessage' | 'replayFromHistory' | 'retries' | 'maxModelRetries' | 'signal' | 'resumeState' | 'resumePreviousResponseId' | 'bypassInputSurgeGuard'> & {
+    origin?: 'user' | 'queued';
+};
 export interface TurnCoordinatorDeps {
     statusMachine: TurnStatusMachine;
     turnWorkflow: TurnWorkflow;
     approvalFlow: ApprovalFlowCoordinator;
     providerContinuity: ProviderContinuity;
+    shellAutoApproval: ShellAutoApprovalResolver;
+    sessionId?: string;
+    hookLifecycle?: HookLifecyclePort;
+    hookEvents?: HookEventFactory;
 }
 export declare class TurnCoordinator {
     #private;
     private readonly deps;
     constructor(deps: TurnCoordinatorDeps);
     start(input: string | UserTurn, options?: TurnStartOptions): AsyncIterable<ConversationEvent>;
-    continueAfterApproval({ answer, rejectionReason, }: {
+    continueAfterApproval({ answer, rejectionReason, stopAfterApprovalResolution, }: {
         answer: string;
         rejectionReason?: string;
+        stopAfterApprovalResolution?: boolean;
     }): AsyncIterable<ConversationEvent>;
+    continueAfterPostExecuteApproval(): AsyncIterable<ConversationEvent>;
     abort(): void;
+    /** Close a live turn before a lifecycle reset invalidates its lease. */
+    terminate(): void;
+    /**
+     * Admit a user message into the running turn.
+     *
+     * A turn parked on an approval is paused, not over: answering it resumes the
+     * turn with another request boundary ahead. The message waits for that
+     * boundary rather than being refused, which is the state the user is most
+     * likely to be typing in — the approval pause is the visible gap in a turn.
+     */
+    steer(items: readonly ProviderInputItem[], options?: {
+        id?: string;
+    }): Promise<SteerOutcome>;
+    /** Drop a still-waiting steer. False when it was already admitted. */
+    retractSteer(id: string): boolean;
+    /** Replace a waiting steer's items in place, keeping its position. */
+    editSteer(id: string, items: readonly ProviderInputItem[]): boolean;
 }
 //# sourceMappingURL=turn-coordinator.d.ts.map

package/dist/services/session/turn-coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"turn-coordinator.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAoB,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,qBAAqB,EACnB,iBAAiB,GACjB,mBAAmB,GACnB,SAAS,GACT,iBAAiB,GACjB,QAAQ,GACR,aAAa,GACb,0BAA0B,GAC1B,uBAAuB,CAC1B,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,iBAAiB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,uBAAuB,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,CAAC;CACxC;AAED,qBAAa,eAAe;;IACd,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,mBAAmB,EAAI;IAEnD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,gBAAqB,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAsBvG;IAEM,qBAAqB,CAAC,EAC3B,MAAM,EACN,eAAe,GAChB,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAkBnC;IAED,KAAK,IAAI,IAAI,CAIZ;CASF"}
+{"version":3,"file":"turn-coordinator.d.ts","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAE3E,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAsD,MAAM,0BAA0B,CAAC;AACjH,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6CAA6C,CAAC;AAE7F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAEvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAE7E,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,qBAAqB,EACnB,iBAAiB,GACjB,mBAAmB,GACnB,SAAS,GACT,iBAAiB,GACjB,QAAQ,GACR,aAAa,GACb,0BAA0B,GAC1B,uBAAuB,CAC1B,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAE,CAAC;AAEnC,MAAM,WAAW,mBAAmB;IAClC,aAAa,EAAE,iBAAiB,CAAC;IACjC,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,uBAAuB,CAAC;IACtC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B;AAED,qBAAa,eAAe;;IAId,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,mBAAmB,EAAI;IAEnD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,EAAE,OAAO,GAAE,gBAAqB,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAwCvG;IAEM,qBAAqB,CAAC,EAC3B,MAAM,EACN,eAAe,EACf,2BAA2B,GAC5B,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,2BAA2B,CAAC,EAAE,OAAO,CAAC;KACvC,GAAG,aAAa,CAAC,iBAAiB,CAAC,CA+BnC;IAEM,gCAAgC,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAsB1E;IAED,KAAK,IAAI,IAAI,CAOZ;IAED,wEAAwE;IACxE,SAAS,IAAI,IAAI,CAEhB;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,KAAK,EAAE,SAAS,iBAAiB,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAE3F;IAED,sEAAsE;IACtE,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAEhC;IAED,sEAAsE;IACtE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,iBAAiB,EAAE,GAAG,OAAO,CAElE;CA+GF"}

package/dist/services/session/turn-coordinator.js

@@ -1,6 +1,10 @@
 import { toTerminalEvent } from '../conversation/conversation-result-builder.js';
+import { getToolInfoFromInterruption } from '../interruption-info.js';
+import { randomUUID } from 'node:crypto';
 export class TurnCoordinator {
     deps;
+    #activeTurnId;
+    #activeTurnStartedAt = 0;
     constructor(deps) {
         this.deps = deps;
     }
@@ -12,48 +16,215 @@ export class TurnCoordinator {
         // turn. The follow-up user message must be sent as a normal new turn, not
         // as a rejection reason used to continue the abandoned SDK run.
         this.deps.approvalFlow.getAbortedStatus();
-        this.deps.statusMachine.beginTurn();
+        const lease = this.deps.statusMachine.beginTurn();
+        // Before the hooks, the input preparation and the provider's own start-up:
+        // a message steered during any of that belongs to this turn, and only this
+        // method knows the turn exists that early.
+        this.deps.turnWorkflow.openTurn?.();
+        const turnId = this.deps.hookLifecycle && this.deps.hookEvents ? randomUUID() : undefined;
+        this.#activeTurnId = turnId;
+        this.#activeTurnStartedAt = turnId ? Date.now() : 0;
+        this.deps.turnWorkflow.setHookTurnId?.(turnId);
+        if (turnId)
+            await this.#emitTurnStart(input, options.origin ?? 'user', turnId);
         let processed = false;
         try {
-            const turnOutcome = yield* this.deps.turnWorkflow.executeInitial(input, options);
+            const turnOutcome = yield* this.#forwardOwned(this.deps.turnWorkflow.executeInitial(input, options), lease);
             processed = true;
-            yield* this.#executeTerminalCommand(this.deps.statusMachine.completeOutcome(turnOutcome));
+            await this.#emitTurnEnd(turnOutcome);
+            yield* this.#executeTerminalCommand(this.deps.statusMachine.completeOutcome(turnOutcome, lease));
+        }
+        catch (error) {
+            if (!processed) {
+                await this.#emitTurnError(error);
+                await this.#emitTurnEnd({ kind: 'failed' });
+            }
+            throw error;
         }
         finally {
             if (!processed) {
                 // Error during initial run — reset status to idle
-                this.deps.statusMachine.complete();
+                this.deps.statusMachine.complete(lease);
             }
+            this.#closeTurnIfSettled();
         }
     }
-    async *continueAfterApproval({ answer, rejectionReason, }) {
+    async *continueAfterApproval({ answer, rejectionReason, stopAfterApprovalResolution, }) {
         if (!this.deps.statusMachine.is('awaiting_approval')) {
             throw new Error('No pending approval to continue.');
         }
-        this.deps.statusMachine.beginContinuation();
+        this.#recordManualShellDecision(answer);
+        const lease = this.deps.statusMachine.beginContinuation();
+        this.deps.turnWorkflow.setHookTurnId?.(this.#activeTurnId);
         let processed = false;
         try {
-            const turnOutcome = yield* this.deps.turnWorkflow.executeContinuation(this.deps.approvalFlow.buildApprovalDecision(answer, rejectionReason));
+            const turnOutcome = yield* this.#forwardOwned(this.deps.turnWorkflow.executeContinuation(this.deps.approvalFlow.buildApprovalDecision(answer, rejectionReason, stopAfterApprovalResolution)), lease);
             processed = true;
-            yield* this.#executeTerminalCommand(this.deps.statusMachine.completeContinuationOutcome(turnOutcome));
+            await this.#emitTurnEnd(turnOutcome);
+            yield* this.#executeTerminalCommand(this.deps.statusMachine.completeContinuationOutcome(turnOutcome, lease));
+        }
+        catch (error) {
+            if (!processed) {
+                await this.#emitTurnError(error);
+                await this.#emitTurnEnd({ kind: 'failed' });
+            }
+            throw error;
         }
         finally {
             if (!processed) {
                 // Error during continuation drive — reset status to idle
-                this.deps.statusMachine.complete();
+                this.deps.statusMachine.complete(lease);
             }
+            this.#closeTurnIfSettled();
+        }
+    }
+    async *continueAfterPostExecuteApproval() {
+        if (!this.deps.statusMachine.is('awaiting_approval')) {
+            throw new Error('No pending approval to continue.');
+        }
+        const lease = this.deps.statusMachine.beginContinuation();
+        this.deps.turnWorkflow.setHookTurnId?.(this.#activeTurnId);
+        let processed = false;
+        try {
+            const turnOutcome = yield* this.#forwardOwned(this.deps.turnWorkflow.continuePostExecute(), lease);
+            processed = true;
+            await this.#emitTurnEnd(turnOutcome);
+            yield* this.#executeTerminalCommand(this.deps.statusMachine.completeContinuationOutcome(turnOutcome, lease));
+        }
+        catch (error) {
+            if (!processed) {
+                await this.#emitTurnError(error);
+                await this.#emitTurnEnd({ kind: 'failed' });
+            }
+            throw error;
+        }
+        finally {
+            if (!processed)
+                this.deps.statusMachine.complete(lease);
+            this.#closeTurnIfSettled();
         }
     }
     abort() {
+        this.deps.turnWorkflow.abortLiveRun();
         this.deps.approvalFlow.abort();
         this.deps.statusMachine.abort();
         this.deps.providerContinuity.clear();
+        this.deps.turnWorkflow.closeTurn?.();
+        void this.#emitTurnEnd({ kind: 'failed' });
+    }
+    /** Close a live turn before a lifecycle reset invalidates its lease. */
+    terminate() {
+        void this.#emitTurnEnd({ kind: 'failed' });
+    }
+    /**
+     * Admit a user message into the running turn.
+     *
+     * A turn parked on an approval is paused, not over: answering it resumes the
+     * turn with another request boundary ahead. The message waits for that
+     * boundary rather than being refused, which is the state the user is most
+     * likely to be typing in — the approval pause is the visible gap in a turn.
+     */
+    steer(items, options) {
+        return this.deps.turnWorkflow.steer(items, options);
+    }
+    /** Drop a still-waiting steer. False when it was already admitted. */
+    retractSteer(id) {
+        return this.deps.turnWorkflow.retractSteer(id);
+    }
+    /** Replace a waiting steer's items in place, keeping its position. */
+    editSteer(id, items) {
+        return this.deps.turnWorkflow.editSteer(id, items);
     }
     // ── Private helpers ──────────────────────────────────────────
+    /**
+     * End the turn's steer scope only once the turn itself is over.
+     *
+     * A turn parked on an approval has returned from `start` without finishing:
+     * the status machine still holds it, and `continueAfterApproval` will offer
+     * another request boundary. Idle is the one state that means no boundary is
+     * coming.
+     */
+    #closeTurnIfSettled() {
+        if (this.deps.statusMachine.is('idle'))
+            this.deps.turnWorkflow.closeTurn?.();
+    }
+    /** Records the human's shell/bash approval so later auto-approval evaluations can weigh it as precedent. */
+    #recordManualShellDecision(answer) {
+        const pending = this.deps.approvalFlow.getPending();
+        if (!pending)
+            return;
+        const { toolName, argumentsText } = getToolInfoFromInterruption(pending.interruption);
+        if (toolName !== 'shell' && toolName !== 'bash')
+            return;
+        this.deps.shellAutoApproval.recordManualDecision(argumentsText, answer === 'n' ? 'rejected' : 'approved');
+    }
+    async *#forwardOwned(events, lease) {
+        while (true) {
+            const next = await events.next();
+            if (!this.deps.statusMachine.owns(lease)) {
+                await events.return({ kind: 'stale' });
+                return { kind: 'stale' };
+            }
+            if (next.done)
+                return next.value;
+            yield next.value;
+        }
+    }
     async *#executeTerminalCommand(command) {
         if (command.kind === 'emit_terminal') {
             yield toTerminalEvent(command.terminal);
         }
     }
+    async #emitTurnStart(input, origin, turnId) {
+        if (!this.deps.hookLifecycle || !this.deps.hookEvents)
+            return;
+        const text = typeof input === 'string' ? input : input.text;
+        await this.#emit(this.deps.hookEvents.create('turn.start', {
+            origin,
+            ...(this.deps.hookEvents.includeUserText ? { userText: text } : {}),
+        }, { turnId }));
+    }
+    async #emitTurnError(error) {
+        if (!this.#activeTurnId || !this.deps.hookLifecycle || !this.deps.hookEvents)
+            return;
+        const message = error instanceof Error ? error.message : String(error);
+        await this.#emit(this.deps.hookEvents.create('turn.error', {
+            errorCategory: 'unknown',
+            safeMessage: message.slice(0, 500),
+            recoverable: false,
+        }, { turnId: this.#activeTurnId }));
+    }
+    async #emitTurnEnd(outcome) {
+        const turnId = this.#activeTurnId;
+        if (!turnId)
+            return;
+        const terminalKind = outcome.kind;
+        const shouldClear = terminalKind !== 'approval_required';
+        if (this.deps.hookLifecycle && this.deps.hookEvents) {
+            const event = this.deps.hookEvents.create('turn.end', {
+                terminalKind,
+                duration: Math.max(0, Date.now() - this.#activeTurnStartedAt),
+            }, { turnId });
+            if (shouldClear) {
+                this.#activeTurnId = undefined;
+                this.#activeTurnStartedAt = 0;
+                this.deps.turnWorkflow.setHookTurnId?.(undefined);
+            }
+            await this.#emit(event);
+        }
+        else if (shouldClear) {
+            this.#activeTurnId = undefined;
+            this.#activeTurnStartedAt = 0;
+            this.deps.turnWorkflow.setHookTurnId?.(undefined);
+        }
+    }
+    async #emit(event) {
+        try {
+            await this.deps.hookLifecycle?.emit(event);
+        }
+        catch {
+            // Public hooks are passive and fail open.
+        }
+    }
 }
 //# sourceMappingURL=turn-coordinator.js.map

package/dist/services/session/turn-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-coordinator.js","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AA2BjF,MAAM,OAAO,eAAe;IACG,IAAI;IAAjC,YAA6B,IAAyB;oBAAzB,IAAI;IAAwB,CAAC;IAE1D,KAAK,CAAC,CAAC,KAAK,CAAC,KAAwB,EAAE,OAAO,GAAqB,EAAE;QACnE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,wEAAwE;QACxE,0EAA0E;QAC1E,gEAAgE;QAChE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;QACpC,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACjF,SAAS,GAAG,IAAI,CAAC;YAEjB,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;QAC5F,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,kDAAkD;gBAClD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,CAAC,qBAAqB,CAAC,EAC3B,MAAM,EACN,eAAe,GAIhB;QACC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;QAC5C,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CACnE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,MAAM,EAAE,eAAe,CAAC,CACtE,CAAC;YACF,SAAS,GAAG,IAAI,CAAC;YACjB,KAAK,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,2BAA2B,CAAC,WAAW,CAAC,CAAC,CAAC;QACxG,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,yDAAyD;gBACzD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YACrC,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;IACvC,CAAC;IAED,gEAAgE;IAEhE,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAoB;QACjD,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACrC,MAAM,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"turn-coordinator.js","sourceRoot":"","sources":["../../../source/services/session/turn-coordinator.ts"],"names":[],"mappings":"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"}