@qduc/term2 0.3.1 → 0.5.0

package/dist/services/approval-rejection-interceptor.test.js

@@ -1,11 +1,16 @@
 import test from 'ava';
 import { installApprovalRejectionInterceptor, tryInstallApprovalRejectionInterceptor, } from './approval-rejection-interceptor.js';
+import { clearToolFormatters, registerToolFormatters } from '../tools/command-message-formatters.js';
+import { formatShellCommandMessage } from '../tools/shell.js';
 import { clearApprovalRejectionMarkers, extractCommandMessages } from '../utils/extract-command-messages.js';
 test.beforeEach(() => {
     clearApprovalRejectionMarkers();
+    clearToolFormatters();
+    registerToolFormatters([{ name: 'shell', formatCommandMessage: formatShellCommandMessage }]);
 });
 test.afterEach(() => {
     clearApprovalRejectionMarkers();
+    clearToolFormatters();
 });
 test('installApprovalRejectionInterceptor intercepts matching tool call and marks approval rejection', async (t) => {
     let capturedInterceptor;

package/dist/services/approval-rejection-interceptor.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"approval-rejection-interceptor.test.js","sourceRoot":"","sources":["../../source/services/approval-rejection-interceptor.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EACL,mCAAmC,EACnC,sCAAsC,GACvC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE7G,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE;IACnB,6BAA6B,EAAE,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;IAClB,6BAA6B,EAAE,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gGAAgG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACjH,IAAI,mBAAmB,CAAC;IACxB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,MAAM,MAAM,GAAG,mCAAmC,CAChD;QACE,kBAAkB,CAAC,WAAW;YAC5B,mBAAmB,GAAG,WAAW,CAAC;YAClC,OAAO,GAAG,EAAE;gBACV,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC,CAAC;QACJ,CAAC;KACF,EACD;QACE,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,QAAQ;QACxB,gBAAgB,EAAE,kCAAkC;KACrD,CACF,CAAC;IAEF,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC9B,CAAC,CAAC,EAAE,CAAC,MAAM,mBAAmB,CAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,EAAE,CAAC,MAAM,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,EAAE,CAAC,MAAM,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,kCAAkC,CAAC,CAAC;IAE3F,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACtC;YACE,OAAO,EAAE;gBACP,IAAI,EAAE,eAAe;gBACrB,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;aACpD;SACF;QACD;YACE,OAAO,EAAE;gBACP,IAAI,EAAE,sBAAsB;gBAC5B,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,gBAAgB;aACzB;SACF;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,mBAAmB,KAAK,IAAI,CAAC,CAAC;IAEjD,MAAM,EAAE,CAAC;IACT,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6FAA6F,EAAE,CAAC,CAAC,EAAE,EAAE;IACxG,MAAM,MAAM,GAAG,sCAAsC,CACnD,EAAE,EACF;QACE,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,QAAQ;QACxB,gBAAgB,EAAE,kCAAkC;KACrD,CACF,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"approval-rejection-interceptor.test.js","sourceRoot":"","sources":["../../source/services/approval-rejection-interceptor.test.ts"],"names":[],"mappings":"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"}

package/dist/services/check_mock.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=check_mock.d.ts.map

package/dist/services/check_mock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"check_mock.d.ts","sourceRoot":"","sources":["../../source/services/check_mock.ts"],"names":[],"mappings":""}

package/dist/services/check_mock.js

@@ -0,0 +1,22 @@
+import { createMockSettingsService } from './settings-service.mock.js';
+console.log('--- Tesing MockSettingsService ---');
+try {
+    // Test 1: Check if overrides work with nested object (expected to work)
+    const service1 = createMockSettingsService({
+        agent: { model: 'nested-model' }
+    });
+    console.log(`Nested override 'agent.model': ${service1.get('agent.model')}`);
+    // Test 2: Check if overrides work with dot notation (likely to fail based on my analysis)
+    const service2 = createMockSettingsService({
+        'agent.model': 'flat-model'
+    });
+    console.log(`Dot-notation override 'agent.model': ${service2.get('agent.model')}`);
+    // Test 3: Check directory creation
+    // We need to inspect the settingsDir of the service.
+    // We can't access private 'settingsDir', but we can check the known path if we know tmpdir
+    // actually, let's just see if we can infer anything or just rely on code analysis for that part.
+}
+catch (err) {
+    console.error(err);
+}
+//# sourceMappingURL=check_mock.js.map

package/dist/services/check_mock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"check_mock.js","sourceRoot":"","sources":["../../source/services/check_mock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAIvE,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAElD,IAAI,CAAC;IACH,wEAAwE;IACxE,MAAM,QAAQ,GAAG,yBAAyB,CAAC;QACvC,KAAK,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE;KACnC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,kCAAkC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAE7E,0FAA0F;IAC1F,MAAM,QAAQ,GAAG,yBAAyB,CAAC;QACvC,aAAa,EAAE,YAAY;KAC9B,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,wCAAwC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAEnF,mCAAmC;IACnC,qDAAqD;IACrD,2FAA2F;IAC3F,iGAAiG;AAEnG,CAAC;AAAC,OAAO,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC"}

package/dist/services/conversation-events.d.ts

@@ -1,13 +1,15 @@
 import type { CommandMessage } from '../tools/types.js';
 import type { NormalizedUsage } from '../utils/token-usage.js';
 import type { ApprovalDescriptor, LLMAdvisory } from '../contracts/conversation.js';
-export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent;
+import type { SubagentResult } from './subagents/types.js';
+export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent | SubagentStartedEvent | SubagentToolStartedEvent | SubagentCommandMessageEvent | SubagentCompletedEvent;
 export interface RetryEvent {
     type: 'retry';
     toolName: string;
     attempt: number;
     maxRetries: number;
     errorMessage: string;
+    retryType?: 'hallucination' | 'parsing_error' | 'behavior' | 'flex_service_tier' | 'upstream';
 }
 /**
  * Transport-friendly text streaming event.
@@ -43,6 +45,8 @@ export interface ApprovalRequiredEvent {
     approval: Omit<ApprovalDescriptor, 'rawInterruption'> & {
         llmAdvisory?: LLMAdvisory;
     };
+    /** Token usage for the model turn that requested approval. */
+    usage?: NormalizedUsage;
 }
 /**
  * Emitted when token usage information is received during streaming.
@@ -70,4 +74,27 @@ export interface ErrorEvent {
     message: string;
     kind?: string;
 }
+export interface SubagentStartedEvent {
+    type: 'subagent_started';
+    agentId: string;
+    role: string;
+    task: string;
+}
+export interface SubagentToolStartedEvent {
+    type: 'subagent_tool_started';
+    agentId: string;
+    role: string;
+    toolName: string;
+    commandMessages?: CommandMessage[];
+}
+export interface SubagentCommandMessageEvent {
+    type: 'subagent_command_message';
+    agentId: string;
+    role: string;
+    message: CommandMessage;
+}
+export interface SubagentCompletedEvent {
+    type: 'subagent_completed';
+    result: SubagentResult;
+}
 //# sourceMappingURL=conversation-events.d.ts.map

package/dist/services/conversation-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEpF,MAAM,MAAM,iBAAiB,GACzB,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,qBAAqB,GACrB,gBAAgB,GAChB,kBAAkB,GAClB,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,GAAG;QACtD,WAAW,CAAC,EAAE,WAAW,CAAC;KAC3B,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,4DAA4D;IAC5D,eAAe,CAAC,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;IACnD,iCAAiC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"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"}

package/dist/services/conversation-result-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAA;CAAE,GACjG;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,uBAAuB,CAAC;IACtC,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,kBAAkB,CAAC,CAqF7B;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,kBAAkB,KAAG,iBAqB5D,CAAC"}
+{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAA;CAAE,GACjG;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,uBAAuB,CAAC;IACtC,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAcD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,kBAAkB,CAAC,CAsF7B;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,kBAAkB,KAAG,iBAsB5D,CAAC"}

package/dist/services/conversation-result-builder.js

@@ -1,6 +1,14 @@
 import { extractUsage } from '../utils/token-usage.js';
 import { extractCommandMessages } from '../utils/extract-command-messages.js';
 import { asRecord, getCallIdFromObject, getString, getToolInfoFromInterruption } from './interruption-info.js';
+const resolveFinalText = (streamedText, completedText) => {
+    if (completedText !== undefined &&
+        completedText !== '' &&
+        !(streamedText !== undefined && completedText === 'Done.')) {
+        return completedText;
+    }
+    return streamedText ?? completedText ?? 'Done.';
+};
 export async function buildConversationResult(input, deps) {
     const { result, finalOutputOverride, reasoningOutputOverride, emittedCommandIds, usage, toolCallArgumentsById } = input;
     const { approvalFlow, shellAutoApproval, logger, sessionId } = deps;
@@ -53,6 +61,7 @@ export async function buildConversationResult(input, deps) {
                     ...(callId ? { callId: String(callId) } : {}),
                     llmAdvisory,
                 },
+                usage: usage ?? extractUsage(result),
             },
         };
     }
@@ -68,7 +77,7 @@ export async function buildConversationResult(input, deps) {
         result: {
             type: 'response',
             commandMessages: visibleCommandMessages,
-            finalText: finalOutputOverride ?? result.finalOutput ?? 'Done.',
+            finalText: resolveFinalText(finalOutputOverride, result.finalOutput),
             reasoningText: reasoningOutputOverride,
             usage: usage ?? extractUsage(result),
         },
@@ -85,6 +94,7 @@ export const toTerminalEvent = (result) => {
                 ...(result.approval.callId ? { callId: result.approval.callId } : {}),
                 ...(result.approval.llmAdvisory ? { llmAdvisory: result.approval.llmAdvisory } : {}),
             },
+            ...(result.usage ? { usage: result.usage } : {}),
         };
     }
     return {

package/dist/services/conversation-result-builder.js.map

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

package/dist/services/conversation-result-builder.test.js

@@ -49,6 +49,57 @@ test('response outcome when stream has no interruptions', async (t) => {
         t.deepEqual(outcome.result.commandMessages, []);
     }
 });
+test('response outcome uses completed final output when it extends streamed output', async (t) => {
+    const stream = makeStream({
+        finalOutput: 'Intro\n\n## Missing Header\n\nBody',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'Intro\n\n',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    t.is(outcome.kind, 'response');
+    if (outcome.kind === 'response') {
+        t.is(outcome.result.finalText, 'Intro\n\n## Missing Header\n\nBody');
+    }
+});
+test('response outcome uses completed final output when it corrects streamed text with the same length', async (t) => {
+    const stream = makeStream({
+        finalOutput: 'Hello world',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'Hello wrold',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    t.is(outcome.kind, 'response');
+    if (outcome.kind === 'response') {
+        t.is(outcome.result.finalText, 'Hello world');
+    }
+});
+test('response outcome uses completed final output when it shortens streamed text', async (t) => {
+    const stream = makeStream({
+        finalOutput: 'The answer is 42.',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'The answer is 42. Extra hallucinated sentence.',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    t.is(outcome.kind, 'response');
+    if (outcome.kind === 'response') {
+        t.is(outcome.result.finalText, 'The answer is 42.');
+    }
+});
 test('approval_required outcome when stream has interruptions', async (t) => {
     const stream = makeStream({
         interruptions: [
@@ -69,6 +120,25 @@ test('approval_required outcome when stream has interruptions', async (t) => {
         t.is(outcome.result.approval.agentName, 'TestAgent');
     }
 });
+test('approval_required outcome preserves usage from model turn', async (t) => {
+    const stream = makeStream({
+        interruptions: [
+            {
+                name: 'shell',
+                callId: 'call-usage',
+                arguments: { command: 'ls' },
+                agent: { name: 'TestAgent' },
+            },
+        ],
+        state: { id: 'state-usage' },
+    });
+    const usage = { prompt_tokens: 100, completion_tokens: 20, total_tokens: 120 };
+    const outcome = await buildConversationResult({ result: stream, usage, toolCallArgumentsById: new Map() }, makeDeps());
+    t.is(outcome.kind, 'approval_required');
+    if (outcome.kind === 'approval_required') {
+        t.deepEqual(outcome.result.usage, usage);
+    }
+});
 test('auto_approve outcome when LLM advises approval and mode=auto', async (t) => {
     const stream = makeStream({
         interruptions: [
@@ -146,11 +216,13 @@ test('toTerminalEvent shapes approval_required with optional fields', (t) => {
             callId: 'c1',
             rawInterruption: { name: 'shell' },
         },
+        usage: { prompt_tokens: 10, completion_tokens: 2, total_tokens: 12 },
     });
     t.is(event.type, 'approval_required');
     if (event.type === 'approval_required') {
         t.is(event.approval.callId, 'c1');
         t.is(event.approval.toolName, 'shell');
+        t.deepEqual(event.usage, { prompt_tokens: 10, completion_tokens: 2, total_tokens: 12 });
     }
 });
 //# sourceMappingURL=conversation-result-builder.test.js.map

package/dist/services/conversation-result-builder.test.js.map

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

package/dist/services/conversation-service.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=conversation-service.test.d.ts.map

package/dist/services/conversation-service.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-service.test.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.test.ts"],"names":[],"mappings":""}

package/dist/services/conversation-service.test.js

@@ -0,0 +1,156 @@
+import test from 'ava';
+import { ConversationService } from './conversation-service.js';
+class MockStream {
+    constructor(events) {
+        this.events = events;
+        this.completed = Promise.resolve();
+        this.lastResponseId = 'resp_test';
+        this.interruptions = [];
+        this.state = {};
+        this.newItems = [];
+        this.history = [];
+        this.finalOutput = '';
+    }
+    async *[Symbol.asyncIterator]() {
+        for (const event of this.events) {
+            yield event;
+        }
+    }
+}
+test('emits live text chunks for response.output_text.delta events', async (t) => {
+    t.plan(3);
+    const events = [
+        { type: 'response.output_text.delta', delta: 'Hello' },
+        { type: 'response.output_text.delta', delta: ' world' },
+    ];
+    const mockClient = {
+        async startStream() {
+            return new MockStream(events);
+        },
+    };
+    const chunks = [];
+    const service = new ConversationService({ agentClient: mockClient });
+    const result = await service.sendMessage('hi', {
+        onTextChunk(full, chunk) {
+            chunks.push({ full, chunk });
+        },
+    });
+    t.deepEqual(chunks, [
+        { full: 'Hello', chunk: 'Hello' },
+        { full: 'Hello world', chunk: ' world' },
+    ]);
+    t.is(result.type, 'response');
+    t.is(result.finalText, 'Hello world');
+});
+test('passes previous response ids into subsequent runs', async (t) => {
+    const streams = [new MockStream([]), new MockStream([])];
+    streams[0].lastResponseId = 'resp-1';
+    streams[0].finalOutput = 'First run done.';
+    streams[1].lastResponseId = 'resp-2';
+    streams[1].finalOutput = 'Second run done.';
+    const startCalls = [];
+    const mockClient = {
+        async startStream(text, options) {
+            const index = startCalls.length;
+            startCalls.push({ text, options });
+            return streams[index];
+        },
+    };
+    const service = new ConversationService({ agentClient: mockClient });
+    await service.sendMessage('first');
+    const secondResult = await service.sendMessage('second');
+    t.deepEqual(startCalls, [
+        { text: 'first', options: { previousResponseId: null } },
+        { text: 'second', options: { previousResponseId: 'resp-1' } },
+    ]);
+    t.is(secondResult.type, 'response');
+    t.is(secondResult.finalText, 'Second run done.');
+});
+test('emits approval interruptions and resumes after approval', async (t) => {
+    const interruption = {
+        name: 'bash',
+        agent: { name: 'CLI Agent' },
+        arguments: JSON.stringify({ command: 'echo hi' }),
+    };
+    const initialStream = new MockStream([]);
+    initialStream.interruptions = [interruption];
+    initialStream.state = {
+        approveCalls: [],
+        rejectCalls: [],
+        approve(arg) {
+            this.approveCalls.push(arg);
+        },
+        reject(arg) {
+            this.rejectCalls.push(arg);
+        },
+    };
+    const continuationStream = new MockStream([
+        { type: 'response.output_text.delta', delta: 'Approved run' },
+    ]);
+    continuationStream.finalOutput = 'Approved run';
+    const mockClient = {
+        async startStream() {
+            return initialStream;
+        },
+        async continueRunStream(state) {
+            t.is(state, initialStream.state);
+            return continuationStream;
+        },
+    };
+    const service = new ConversationService({ agentClient: mockClient });
+    const approvalResult = await service.sendMessage('run command');
+    t.is(approvalResult.type, 'approval_required');
+    t.is(approvalResult.approval.toolName, 'bash');
+    t.is(approvalResult.approval.argumentsText, 'echo hi');
+    const finalResult = await service.handleApprovalDecision('y');
+    t.truthy(finalResult);
+    t.is(finalResult.type, 'response');
+    t.is(finalResult.finalText, 'Approved run');
+    t.deepEqual(initialStream.state.approveCalls, [interruption]);
+    t.deepEqual(initialStream.state.rejectCalls, []);
+});
+test('dedupes command messages emitted live from run events', async (t) => {
+    const commandPayload = JSON.stringify({
+        command: 'ls',
+        stdout: 'file.txt',
+        success: true,
+    });
+    const rawItem = {
+        id: 'call-123',
+        type: 'function_call_result',
+        name: 'bash',
+        arguments: JSON.stringify({ command: 'ls' }),
+    };
+    const commandItem = {
+        type: 'tool_call_output_item',
+        name: 'bash',
+        output: commandPayload,
+        rawItem,
+    };
+    const events = [{ type: 'run_item_stream_event', item: commandItem }];
+    const stream = new MockStream(events);
+    stream.newItems = [commandItem];
+    const emitted = [];
+    const mockClient = {
+        async startStream() {
+            return stream;
+        },
+    };
+    const service = new ConversationService({ agentClient: mockClient });
+    const result = await service.sendMessage('run bash', {
+        onCommandMessage(message) {
+            emitted.push(message);
+        },
+    });
+    t.deepEqual(emitted, [
+        {
+            id: 'call-123',
+            sender: 'command',
+            command: 'ls',
+            output: 'file.txt',
+            success: true,
+        },
+    ]);
+    t.deepEqual(result.commandMessages, []);
+});
+//# sourceMappingURL=conversation-service.test.js.map

package/dist/services/conversation-service.test.js.map

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

package/dist/services/conversation-session.auto-approval.test.js

@@ -597,6 +597,58 @@ test('auto mode: batch of two commands — first auto-approved, second triggers
     t.is(approval.llmAdvisory?.source, 'llm');
     t.is(chatCalls.length, 1);
 });
+test('auto mode: response usage includes the auto-approved first turn, not just the continuation', async (t) => {
+    const initialStream = createInterruptedStream([
+        createShellInterruption({ callId: 'call-usage-1', command: 'ls source' }),
+    ]);
+    initialStream.state.usage = { inputTokens: 100, outputTokens: 20, totalTokens: 120 };
+    // The continuation reuses the same live RunState, so its run-state usage
+    // accumulator is already cumulative for the whole run (first turn included).
+    const finalStream = createFinalStream('Files listed.');
+    finalStream.state.usage = { inputTokens: 300, outputTokens: 50, totalTokens: 350 };
+    const { session } = createSessionHarness({
+        settingsOverrides: { 'shell.autoApproveMode': 'auto' },
+        startStreams: [initialStream],
+        continuationStreams: [finalStream],
+        chatImpl: async () => JSON.stringify({
+            results: [{ id: 'call-usage-1', reasoning: 'Listing files is read-only and safe.', approved: true }],
+        }),
+    });
+    const result = getResponseResult(t, await session.sendMessage('list the source files'));
+    // The auto-approved first turn must be reflected in the reported usage. The
+    // SDK run-state accumulator already includes it (300 in / 50 out cumulative);
+    // it must be reported verbatim, not added on top of the first turn again.
+    t.is(result.usage?.prompt_tokens, 300);
+    t.is(result.usage?.completion_tokens, 50);
+});
+test('auto mode: approval_required usage includes the auto-approved first turn', async (t) => {
+    const first = createShellInterruption({ callId: 'call-usage-batch-1', command: 'ls source' });
+    const second = createShellInterruption({ callId: 'call-usage-batch-2', command: 'git log --all --format="%H"' });
+    const initialStream = createInterruptedStream([first, second]);
+    initialStream.state.usage = { inputTokens: 100, outputTokens: 20, totalTokens: 120 };
+    // Continuation reuses the same RunState; its accumulator is cumulative and
+    // already includes the auto-approved first turn (300 in / 50 out).
+    const continuationAfterFirst = createInterruptedStream([second]);
+    continuationAfterFirst.state.usage = { inputTokens: 300, outputTokens: 50, totalTokens: 350 };
+    const { session } = createSessionHarness({
+        settingsOverrides: { 'shell.autoApproveMode': 'auto' },
+        startStreams: [initialStream],
+        continuationStreams: [continuationAfterFirst],
+        chatImpl: async () => JSON.stringify({
+            results: [
+                { id: 'call-usage-batch-1', reasoning: 'Listing files is safe.', approved: true },
+                {
+                    id: 'call-usage-batch-2',
+                    reasoning: 'Dumping all commit hashes is not aligned with the current task.',
+                    approved: false,
+                },
+            ],
+        }),
+    });
+    const approvalResult = getApprovalResult(t, await session.sendMessage('inspect repository and dump history'));
+    t.is(approvalResult.usage?.prompt_tokens, 300);
+    t.is(approvalResult.usage?.completion_tokens, 50);
+});
 test('auto mode: evaluator error falls back to prompt without crashing', async (t) => {
     const initialStream = createInterruptedStream([
         createShellInterruption({ callId: 'call-auto-err', command: 'ls source' }),