@qduc/term2 0.5.0 → 0.6.1

package/dist/providers/registry.test.js

@@ -51,9 +51,34 @@ test('provider definitions have required properties', (t) => {
         }
     }
 });
-test('openai provider has createRunner set to undefined (uses SDK default)', (t) => {
+test('openai provider has createRunner function', (t) => {
     const provider = getProvider('openai');
-    t.is(provider?.createRunner, undefined);
+    t.is(typeof provider?.createRunner, 'function');
+});
+test('openai provider createRunner returns a runner instance', (t) => {
+    const provider = getProvider('openai');
+    const runner = provider?.createRunner?.({
+        settingsService: {
+            get: (key) => {
+                if (key === 'agent.model')
+                    return 'gpt-5';
+                return undefined;
+            },
+            set: () => { },
+        },
+        loggingService: {
+            info: () => { },
+            warn: () => { },
+            error: () => { },
+            debug: () => { },
+            security: () => { },
+            setCorrelationId: () => { },
+            getCorrelationId: () => undefined,
+            clearCorrelationId: () => { },
+            getTrafficContext: () => null,
+        },
+    });
+    t.truthy(runner);
 });
 test('openrouter provider has createRunner function', (t) => {
     const provider = getProvider('openrouter');

package/dist/providers/registry.test.js.map

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

package/dist/scripts/eval-auto-approval/dataset.d.ts

@@ -7,15 +7,15 @@ export declare const CaseSchema: z.ZodObject<{
     command: z.ZodString;
     history: z.ZodArray<z.ZodObject<{
         role: z.ZodEnum<{
+            system: "system";
             assistant: "assistant";
             user: "user";
-            system: "system";
         }>;
         content: z.ZodString;
     }, z.core.$strip>>;
     expected: z.ZodEnum<{
-        approve: "approve";
         reject: "reject";
+        approve: "approve";
     }>;
     category: z.ZodString;
     severity: z.ZodEnum<{

package/dist/services/agent-stream.d.ts

@@ -7,5 +7,6 @@ export type AgentStream = AsyncIterable<unknown> & {
     newItems?: unknown[];
     history?: unknown[];
     finalOutput?: string;
+    cancelled?: boolean;
 };
 //# sourceMappingURL=agent-stream.d.ts.map

package/dist/services/agent-stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-stream.d.ts","sourceRoot":"","sources":["../../source/services/agent-stream.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG;IACjD,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC"}
+{"version":3,"file":"agent-stream.d.ts","sourceRoot":"","sources":["../../source/services/agent-stream.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG;IACjD,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC"}

package/dist/services/approval-flow-coordinator.d.ts

@@ -27,6 +27,8 @@ export declare class ApprovalFlowCoordinator {
     /**
      * Drive an aborted-approval resolution: install rejection interceptor and approve the
      * interruption so the agent gets the rejection text via the interceptor.
+     * For nested subagent approvals, use SDK-native reject() instead of the
+     * parent interceptor path to avoid interceptor stacking issues.
      */
     prepareAbortResolution(abortedContext: AbortedApprovalContext, userText: string): AbortResolutionPlan;
     /**

package/dist/services/approval-flow-coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approval-flow-coordinator.d.ts","sourceRoot":"","sources":["../../source/services/approval-flow-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAe9G,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,sBAAsB,CAAC;IACvC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,2BAA2B;IAE9D,KAAK,IAAI,OAAO;IAehB,cAAc,IAAI,sBAAsB,GAAG,IAAI;IAI/C;;;OAGG;IACH,sBAAsB,CAAC,cAAc,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,GAAG,mBAAmB;IAkBrG;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,gBAAgB,GAAG,IAAI;IAoEjG,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAIpD,YAAY,IAAI,IAAI;IAIpB,UAAU,IAAI,sBAAsB,GAAG,IAAI;IAI3C,sBAAsB,IAAI,OAAO;CAGlC"}
+{"version":3,"file":"approval-flow-coordinator.d.ts","sourceRoot":"","sources":["../../source/services/approval-flow-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAe9G,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,iBAAiB,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,sBAAsB,CAAC;IACvC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,2BAA2B;IAE9D,KAAK,IAAI,OAAO;IAehB,cAAc,IAAI,sBAAsB,GAAG,IAAI;IAI/C;;;;;OAKG;IACH,sBAAsB,CAAC,cAAc,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,GAAG,mBAAmB;IA4BrG;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,gBAAgB,GAAG,IAAI;IAoFjG,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAIpD,YAAY,IAAI,IAAI;IAIpB,UAAU,IAAI,sBAAsB,GAAG,IAAI;IAI3C,sBAAsB,IAAI,OAAO;CAGlC"}

package/dist/services/approval-flow-coordinator.js

@@ -26,19 +26,32 @@ export class ApprovalFlowCoordinator {
     /**
      * Drive an aborted-approval resolution: install rejection interceptor and approve the
      * interruption so the agent gets the rejection text via the interceptor.
+     * For nested subagent approvals, use SDK-native reject() instead of the
+     * parent interceptor path to avoid interceptor stacking issues.
      */
     prepareAbortResolution(abortedContext, userText) {
         const interruptionRecord = asRecord(abortedContext.interruption);
         const toolName = getString(interruptionRecord, 'name') ?? 'unknown';
         const expectedCallId = getCallIdFromObject(abortedContext.interruption);
         const rejectionMessage = `Tool execution was not approved. User provided new input instead: ${userText}`;
-        const removeInterceptor = installApprovalRejectionInterceptor(this.deps.agentClient, {
-            toolName,
-            expectedCallId,
-            rejectionMessage,
-        });
-        const approve = getMethod(abortedContext.state, 'approve');
-        approve?.call(abortedContext.state, abortedContext.interruption);
+        const removeInterceptor = abortedContext.nestedSubagent
+            ? () => {
+                // no-op: nested path uses SDK-native reject() instead of
+                // a parent interceptor, so there is nothing to clean up.
+            }
+            : installApprovalRejectionInterceptor(this.deps.agentClient, {
+                toolName,
+                expectedCallId,
+                rejectionMessage,
+            });
+        if (abortedContext.nestedSubagent) {
+            const reject = getMethod(abortedContext.state, 'reject');
+            reject?.call(abortedContext.state, abortedContext.interruption);
+        }
+        else {
+            const approve = getMethod(abortedContext.state, 'approve');
+            approve?.call(abortedContext.state, abortedContext.interruption);
+        }
         return { abortedContext, removeInterceptor };
     }
     /**
@@ -79,20 +92,34 @@ export class ApprovalFlowCoordinator {
             const rejectionMessage = rejectionReason
                 ? `Tool execution was not approved. User's reason: ${rejectionReason}`
                 : 'Tool execution was not approved.';
-            const installedInterceptor = tryInstallApprovalRejectionInterceptor(this.deps.agentClient, {
-                toolName,
-                expectedCallId,
-                rejectionMessage,
-            });
-            if (installedInterceptor) {
-                const approve = getMethod(state, 'approve');
-                approve?.call(state, interruption);
-                this.deps.approvalState.setPendingRemoveInterceptor(installedInterceptor);
-            }
-            else {
+            if (pendingApprovalContext.nestedSubagent) {
+                // Nested subagent: use SDK-native rejection path (no parent interceptor).
                 const reject = getMethod(state, 'reject');
                 reject?.call(state, interruption);
             }
+            else {
+                const installedInterceptor = tryInstallApprovalRejectionInterceptor(this.deps.agentClient, {
+                    toolName,
+                    expectedCallId,
+                    rejectionMessage,
+                });
+                if (installedInterceptor) {
+                    const approve = getMethod(state, 'approve');
+                    approve?.call(state, interruption);
+                    this.deps.approvalState.setPendingRemoveInterceptor(installedInterceptor);
+                }
+                else {
+                    this.deps.logger.warn('Approval rejection interceptor could not be installed — agent client lacks addToolInterceptor support. Falling back to SDK-native reject.', {
+                        eventType: 'approval.interceptor_missing',
+                        category: 'approval',
+                        phase: 'approval',
+                        sessionId: this.deps.sessionId,
+                        traceId: this.deps.logger.getCorrelationId(),
+                    });
+                    const reject = getMethod(state, 'reject');
+                    reject?.call(state, interruption);
+                }
+            }
             this.deps.logger.debug('Tool approval rejected', {
                 eventType: 'approval.rejected',
                 category: 'approval',

package/dist/services/approval-flow-coordinator.js.map

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

package/dist/services/approval-flow-coordinator.test.js

@@ -144,6 +144,93 @@ test('prepareContinuation rejection: without interceptor support, falls back to
     t.false(approved);
     t.true(rejected);
 });
+test('prepareContinuation rejection: nested subagent approval rejects without parent interceptor', (t) => {
+    let approved = false;
+    let rejected = false;
+    const state = {
+        approve: () => (approved = true),
+        reject: () => (rejected = true),
+    };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption: { name: 'shell', callId: 'worker-shell', arguments: { command: 'npm test' } },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        nestedSubagent: true,
+    });
+    const { client, installs } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+    });
+    const plan = coord.prepareContinuation('n', 'do not run it');
+    t.truthy(plan);
+    t.false(approved);
+    t.true(rejected);
+    t.is(installs.length, 0);
+});
+test('prepareContinuation rejection: non-nested with no interceptor support falls back to reject (distinct from nested path)', (t) => {
+    // This test verifies that non-nested + no interceptor is handled via a distinct branch
+    // (not the same as nested subagent rejection). The observable outcome is:
+    //   - reject() is called (not approve())
+    //   - no interceptor is installed
+    let approved = false;
+    let rejected = false;
+    const state = {
+        approve: () => (approved = true),
+        reject: () => (rejected = true),
+    };
+    const interruption = { name: 'shell', callId: 'c1', arguments: { command: 'rm -rf /' } };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption,
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        // nestedSubagent is NOT set — this is the non-nested path
+    });
+    // agentClient lacks addToolInterceptor — interceptor cannot be installed
+    const noInterceptorClient = {};
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: noInterceptorClient,
+        approvalState,
+        logger,
+        sessionId: 's1',
+    });
+    const plan = coord.prepareContinuation('n', undefined);
+    t.truthy(plan);
+    t.false(approved, 'approve should not be called when interceptor cannot be installed');
+    t.true(rejected, 'non-nested rejection without interceptor support falls back to reject');
+});
+test('prepareContinuation rejection: nested subagent where state.reject is undefined — does not throw', (t) => {
+    // state has no reject method — simulates SDK state that only has approve
+    const state = {
+        approve: () => undefined,
+        // reject is intentionally absent
+    };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption: { name: 'shell', callId: 'nested-c1', arguments: { command: 'ls' } },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        nestedSubagent: true,
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+    });
+    // Should not throw — reject is optional-chained in the implementation
+    t.notThrows(() => {
+        coord.prepareContinuation('n', undefined);
+    });
+});
 test('prepareAbortResolution installs interceptor and approves', (t) => {
     let approved = false;
     const state = { approve: () => (approved = true) };

package/dist/services/approval-flow-coordinator.test.js.map

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

package/dist/services/approval-state.d.ts

@@ -4,12 +4,16 @@ export type PendingApprovalContext = {
     emittedCommandIds: Set<string>;
     toolCallArgumentsById: Map<string, unknown>;
     removeInterceptor?: () => void;
+    /** Nested agent-tool approvals must resume through SDK state, not parent tool interceptors. */
+    nestedSubagent?: boolean;
 };
 export type AbortedApprovalContext = {
     state: unknown;
     interruption: unknown;
     emittedCommandIds: Set<string>;
     toolCallArgumentsById: Map<string, unknown>;
+    removeInterceptor?: () => void;
+    nestedSubagent?: boolean;
 };
 export declare class ApprovalState {
     private pending;

package/dist/services/approval-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,OAAO,CAAuC;IAEtD,UAAU,IAAI,sBAAsB,GAAG,IAAI;IAI3C,UAAU,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAIjD,YAAY,IAAI,IAAI;IAIpB,2BAA2B,CAAC,iBAAiB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAWzE,YAAY,IAAI,OAAO;IAevB,cAAc,IAAI,sBAAsB,GAAG,IAAI;CAKhD"}
+{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,+FAA+F;IAC/F,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,OAAO,CAAuC;IAEtD,UAAU,IAAI,sBAAsB,GAAG,IAAI;IAI3C,UAAU,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI;IAIjD,YAAY,IAAI,IAAI;IAIpB,2BAA2B,CAAC,iBAAiB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAWzE,YAAY,IAAI,OAAO;IAiBvB,cAAc,IAAI,sBAAsB,GAAG,IAAI;CAKhD"}

package/dist/services/approval-state.js

@@ -28,6 +28,8 @@ export class ApprovalState {
             interruption: this.pending.interruption,
             emittedCommandIds: this.pending.emittedCommandIds,
             toolCallArgumentsById: this.pending.toolCallArgumentsById,
+            removeInterceptor: this.pending.removeInterceptor,
+            nestedSubagent: this.pending.nestedSubagent,
         };
         this.pending = null;
         return true;

package/dist/services/approval-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"approval-state.js","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAeA,MAAM,OAAO,aAAa;IAChB,OAAO,GAAkC,IAAI,CAAC;IAC9C,OAAO,GAAkC,IAAI,CAAC;IAEtD,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,OAA+B;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,YAAY;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,2BAA2B,CAAC,iBAAsC;QAChE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;YACf,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACpD,CAAC;IACJ,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;SAC1D,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
+{"version":3,"file":"approval-state.js","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAmBA,MAAM,OAAO,aAAa;IAChB,OAAO,GAAkC,IAAI,CAAC;IAC9C,OAAO,GAAkC,IAAI,CAAC;IAEtD,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,OAA+B;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,YAAY;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,2BAA2B,CAAC,iBAAsC;QAChE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;YACf,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACpD,CAAC;IACJ,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;YACzD,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;SAC5C,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/services/approval-state.test.js

@@ -56,4 +56,25 @@ test('consumeAborted() returns aborted context and clears it', (t) => {
     t.truthy(aborted);
     t.is(state.consumeAborted(), null);
 });
+test('abortPending carries forward removeInterceptor when set', (t) => {
+    const state = new ApprovalState();
+    let interceptorCalled = false;
+    const removeInterceptor = () => {
+        interceptorCalled = true;
+    };
+    state.setPending({
+        state: { id: 'state' },
+        interruption: { name: 'tool' },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        removeInterceptor,
+    });
+    state.abortPending();
+    const aborted = state.consumeAborted();
+    t.truthy(aborted);
+    t.is(typeof aborted?.removeInterceptor, 'function', 'removeInterceptor should be carried to aborted context');
+    // Calling it should invoke the original cleanup
+    aborted?.removeInterceptor?.();
+    t.true(interceptorCalled, 'removeInterceptor should delegate to the original cleanup function');
+});
 //# sourceMappingURL=approval-state.test.js.map

package/dist/services/approval-state.test.js.map

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

package/dist/services/conversation-clear-save.test.d.ts

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

package/dist/services/conversation-clear-save.test.d.ts.map

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

package/dist/services/conversation-clear-save.test.js

@@ -0,0 +1,85 @@
+import test from 'ava';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import * as persistenceModule from './conversation-persistence.js';
+import { hasConversationContent } from '../app.js';
+let testDir = '';
+test.beforeEach(() => {
+    testDir = fs.mkdtempSync(path.join(os.tmpdir(), 'term2-cli-clear-test-'));
+    persistenceModule.setConversationsDirForTest(testDir);
+});
+test.afterEach.always(() => {
+    if (testDir && fs.existsSync(testDir)) {
+        fs.rmSync(testDir, { recursive: true, force: true });
+    }
+    persistenceModule.setConversationsDirForTest(null);
+    testDir = '';
+});
+test.serial('CLI clear behavior: saves old conversation, starts new in-memory, avoids empty save on exit', async (t) => {
+    // 1. Initial State
+    let effectiveSessionId = 'session-old';
+    let effectiveCreatedAt = new Date().toISOString();
+    let pendingMessages = [{ id: '1', sender: 'user', text: 'hello in old session' }];
+    const savedSessionIds = new Set();
+    const saveAndPrintResume = async (messages, overrideSessionId, overrideCreatedAt) => {
+        const sessionIdToSave = overrideSessionId || effectiveSessionId;
+        const createdAtToSave = overrideCreatedAt || effectiveCreatedAt;
+        if (savedSessionIds.has(sessionIdToSave)) {
+            return;
+        }
+        if (!hasConversationContent(messages)) {
+            return;
+        }
+        savedSessionIds.add(sessionIdToSave);
+        persistenceModule.saveConversation({
+            id: sessionIdToSave,
+            createdAt: createdAtToSave,
+            updatedAt: new Date().toISOString(),
+            projectPath: '/test/project',
+            model: 'gpt-4o',
+            provider: 'openai',
+            previousResponseId: null,
+            history: [],
+            messages: messages,
+        });
+    };
+    // 2. Perform Clear Action
+    // Simulating: onClear / handleClearConversation
+    if (hasConversationContent(pendingMessages)) {
+        await saveAndPrintResume(pendingMessages, effectiveSessionId, effectiveCreatedAt);
+    }
+    // Verify old session is saved to disk
+    const oldSessionFile = path.join(testDir, 'session-old.json');
+    t.true(fs.existsSync(oldSessionFile));
+    t.true(savedSessionIds.has('session-old'));
+    // Simulate parent onSessionIdChange callback
+    const onSessionIdChange = (newId, createdAt) => {
+        effectiveSessionId = newId;
+        effectiveCreatedAt = createdAt;
+        pendingMessages = []; // Reset pending messages immediately!
+    };
+    const newId = 'session-new';
+    const newCreatedAt = new Date().toISOString();
+    onSessionIdChange(newId, newCreatedAt);
+    // 3. Verify new session is only in-memory (not written to disk yet)
+    const newSessionFile = path.join(testDir, 'session-new.json');
+    t.false(fs.existsSync(newSessionFile));
+    t.is(effectiveSessionId, 'session-new');
+    t.deepEqual(pendingMessages, []);
+    // 4. Simulate exit without sending messages in new session
+    await saveAndPrintResume(pendingMessages);
+    // Verify new session file STILL does not exist (not saved because empty)
+    t.false(fs.existsSync(newSessionFile));
+    t.false(savedSessionIds.has('session-new'));
+    // 5. Send message in new session
+    pendingMessages = [{ id: '2', sender: 'user', text: 'first message in new session' }];
+    // Simulate exit now that new session has content
+    await saveAndPrintResume(pendingMessages);
+    // Verify new session is saved to disk
+    t.true(fs.existsSync(newSessionFile));
+    t.true(savedSessionIds.has('session-new'));
+    const savedData = JSON.parse(fs.readFileSync(newSessionFile, 'utf-8'));
+    t.is(savedData.messages[0].text, 'first message in new session');
+});
+//# sourceMappingURL=conversation-clear-save.test.js.map

package/dist/services/conversation-clear-save.test.js.map

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

package/dist/services/conversation-history-repair.d.ts

@@ -0,0 +1,25 @@
+export interface ConversationHistoryRepairStats {
+    count: number;
+    duplicatePairs: number;
+    maxCopies: number;
+}
+export interface ConversationHistoryRepair {
+    kind: 'replayed_full_history_prefix' | 'duplicated_tool_call_result_pair';
+    removedItems: number;
+    beforeCount: number;
+    afterCount: number;
+    duplicatePairsBefore: number;
+    maxCopiesBefore: number;
+}
+export interface ConversationHistoryRepairSummary {
+    repaired: boolean;
+    removedItems: number;
+    repairs: ConversationHistoryRepair[];
+    statsBefore: ConversationHistoryRepairStats;
+    statsAfter: ConversationHistoryRepairStats;
+}
+export interface ConversationHistoryRepairResult extends ConversationHistoryRepairSummary {
+    history: unknown[];
+}
+export declare function repairConversationHistory(history: unknown[]): ConversationHistoryRepairResult;
+//# sourceMappingURL=conversation-history-repair.d.ts.map

package/dist/services/conversation-history-repair.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-history-repair.d.ts","sourceRoot":"","sources":["../../source/services/conversation-history-repair.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,8BAA8B,GAAG,kCAAkC,CAAC;IAC1E,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,yBAAyB,EAAE,CAAC;IACrC,WAAW,EAAE,8BAA8B,CAAC;IAC5C,UAAU,EAAE,8BAA8B,CAAC;CAC5C;AAED,MAAM,WAAW,+BAAgC,SAAQ,gCAAgC;IACvF,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AA0PD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,+BAA+B,CAsB7F"}