@qduc/term2 0.6.1 → 0.7.1

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

@@ -20,6 +20,7 @@ class MockStream {
     newItems;
     history;
     finalOutput;
+    output;
     constructor(events) {
         this.events = events;
         this.completed = Promise.resolve();
@@ -29,6 +30,7 @@ class MockStream {
         this.newItems = [];
         this.history = [];
         this.finalOutput = '';
+        this.output = [];
     }
     async *[Symbol.asyncIterator]() {
         for (const event of this.events) {
@@ -120,7 +122,9 @@ test('integration: approval round-trip (approval_required -> continue -> final)'
     t.is(final?.type === 'response' ? final.finalText : '', 'Approved run');
     t.deepEqual(approvalState.approved, [interruption]);
     t.deepEqual(approvalState.rejected, []);
-    t.deepEqual(continueOptions, { previousResponseId: 'resp-before-approval' });
+    t.truthy(continueOptions);
+    t.is(continueOptions.previousResponseId, 'resp-before-approval');
+    t.is(continueOptions.sessionId, 'default');
 });
 test('integration: hallucination retry retries once and succeeds', async (t) => {
     let startCalls = 0;
@@ -152,4 +156,111 @@ test('integration: hallucination retry retries once and succeeds', async (t) =>
         t.is(result.finalText, 'Retried successfully');
     }
 });
+// Regression: terminal-write gate prevents store writes on interrupted streams.
+// The store must NOT contain pending tool call/output from the initial
+// interrupted stream; only the completed continuation may write the cumulative
+// stream.output once.
+test('integration: terminal-write gate prevents store write on interrupted stream; continuation writes cumulative output once', async (t) => {
+    const interruption = {
+        name: 'shell',
+        agent: { name: 'CLI Agent' },
+        arguments: JSON.stringify({ command: 'ls' }),
+        callId: 'call-terminal-gate-1',
+    };
+    const approvalState = {
+        approved: [],
+        rejected: [],
+        approve(arg) {
+            this.approved.push(arg);
+        },
+        reject(arg) {
+            this.rejected.push(arg);
+        },
+    };
+    // Initial interrupted stream: has output but also interruptions.
+    // The output items simulate what the SDK produces before an approval pause.
+    const initialOutput = [
+        {
+            role: 'assistant',
+            type: 'message',
+            status: 'completed',
+            content: [{ type: 'output_text', text: 'I will list files for you.' }],
+        },
+    ];
+    const initialStream = new MockStream([]);
+    initialStream.interruptions = [interruption];
+    initialStream.state = approvalState;
+    initialStream.lastResponseId = 'resp-before-gate';
+    initialStream.output = initialOutput;
+    // Continuation stream: cumulative output (includes initial items),
+    // no interruptions — terminal.
+    const continuationOutput = [
+        ...initialOutput,
+        {
+            role: 'assistant',
+            type: 'message',
+            status: 'completed',
+            content: [{ type: 'output_text', text: 'Here are your files: file1.txt, file2.txt' }],
+        },
+    ];
+    const continuationStream = new MockStream([
+        { type: 'response.output_text.delta', delta: 'Here are your files: ' },
+        { type: 'response.output_text.delta', delta: 'file1.txt, file2.txt' },
+    ]);
+    continuationStream.finalOutput = 'Here are your files: file1.txt, file2.txt';
+    continuationStream.lastResponseId = 'resp-after-gate';
+    continuationStream.output = continuationOutput;
+    let continueOptions = null;
+    const service = new ConversationService({
+        agentClient: {
+            async startStream() {
+                return initialStream;
+            },
+            async continueRunStream(_state, options) {
+                continueOptions = options;
+                return continuationStream;
+            },
+        },
+        deps: { logger: mockLogger },
+    });
+    // Step 1: sendMessage triggers approval
+    const first = await service.sendMessage('list files');
+    t.is(first.type, 'approval_required');
+    if (first.type === 'approval_required') {
+        t.is(first.approval.toolName, 'shell');
+        t.is(first.approval.argumentsText, 'ls');
+    }
+    // Step 2: store must NOT contain the initial output.
+    // The terminal gate prevented writing because the stream was interrupted.
+    const historyAfterInterrupt = service.exportState().history;
+    t.is(historyAfterInterrupt.length, 1, 'store should have only the user message after interrupted stream');
+    t.is(historyAfterInterrupt[0].role, 'user');
+    t.is(historyAfterInterrupt[0].content, 'list files');
+    // Step 3: approve and continue
+    const final = await service.handleApprovalDecision('y');
+    t.truthy(final);
+    t.is(final?.type, 'response');
+    t.is(final?.type === 'response' ? final.finalText : '', 'Here are your files: file1.txt, file2.txt');
+    t.deepEqual(approvalState.approved, [interruption]);
+    // Step 4: store must now contain user message + cumulative output,
+    // with no duplicated assistant text items.
+    const historyAfterComplete = service.exportState().history;
+    const expectedLength = 1 + continuationOutput.length; // user msg + output items
+    t.is(historyAfterComplete.length, expectedLength, 'store should have user message + cumulative output items');
+    // User message is still first
+    t.is(historyAfterComplete[0].role, 'user');
+    t.is(historyAfterComplete[0].content, 'list files');
+    // Collect assistant text items — each should appear exactly once
+    const assistantTexts = [];
+    for (let i = 1; i < historyAfterComplete.length; i++) {
+        const item = historyAfterComplete[i];
+        if (item.role === 'assistant' && Array.isArray(item.content) && item.content[0]?.text) {
+            assistantTexts.push(item.content[0].text);
+        }
+    }
+    t.deepEqual(assistantTexts, ['I will list files for you.', 'Here are your files: file1.txt, file2.txt'], 'assistant output texts should appear exactly once, no duplicates');
+    // Continuation options must thread previousResponseId from the initial stream
+    t.truthy(continueOptions);
+    t.is(continueOptions.previousResponseId, 'resp-before-gate');
+});
 //# sourceMappingURL=conversation-integration.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"conversation-integration.test.js","sourceRoot":"","sources":["../../source/services/conversation-integration.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-integration.test.js","sourceRoot":"","sources":["../../source/services/conversation-integration.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,UAAU,GAAG;IACjB,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,GAAE,CAAC;IAC1B,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,UAAU;IACd,MAAM,CAAQ;IACd,SAAS,CAAgB;IACzB,cAAc,CAAS;IACvB,aAAa,CAAQ;IACrB,KAAK,CAAM;IACX,QAAQ,CAAQ;IAChB,OAAO,CAAQ;IACf,WAAW,CAAS;IACpB,MAAM,CAAQ;IAEd,YAAY,MAAa;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC;QAClC,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF;AAED,IAAI,CAAC,8DAA8D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC/E,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC;QAC5B,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,OAAO,EAAE;QACtD,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,QAAQ,EAAE;KACxD,CAAC,CAAC;IACH,MAAM,CAAC,WAAW,GAAG,aAAa,CAAC;IAEnC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;QACtC,WAAW,EAAE;YACX,KAAK,CAAC,WAAW;gBACf,OAAO,MAAM,CAAC;YAChB,CAAC;SACK;QACR,IAAI,EAAE,EAAE,MAAM,EAAE,UAAiB,EAAE;KACpC,CAAC,CAAC;IAEH,MAAM,MAAM,GAA2C,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE;QAC7C,WAAW,CAAC,IAAI,EAAE,KAAK;YACrB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,CAAC,KAAK;YACX,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE;QAClB,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE;QACjC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAE;KACzC,CAAC,CAAC;IACH,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2EAA2E,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC5F,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;QAC5B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;QACjD,MAAM,EAAE,iBAAiB;KAC1B,CAAC;IAEF,MAAM,aAAa,GAAG;QACpB,QAAQ,EAAE,EAAW;QACrB,QAAQ,EAAE,EAAW;QACrB,OAAO,CAAC,GAAQ;YACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QACD,MAAM,CAAC,GAAQ;YACb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;KACF,CAAC;IAEF,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IACzC,aAAa,CAAC,aAAa,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7C,aAAa,CAAC,KAAK,GAAG,aAAa,CAAC;IACpC,aAAa,CAAC,cAAc,GAAG,sBAAsB,CAAC;IAEtD,MAAM,kBAAkB,GAAG,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IAC3G,kBAAkB,CAAC,WAAW,GAAG,cAAc,CAAC;IAChD,kBAAkB,CAAC,cAAc,GAAG,qBAAqB,CAAC;IAE1D,IAAI,eAAe,GAAQ,IAAI,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;QACtC,WAAW,EAAE;YACX,KAAK,CAAC,WAAW;gBACf,OAAO,aAAa,CAAC;YACvB,CAAC;YACD,KAAK,CAAC,iBAAiB,CAAC,KAAU,EAAE,OAAY;gBAC9C,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;gBAC3B,eAAe,GAAG,OAAO,CAAC;gBAC1B,OAAO,kBAAkB,CAAC;YAC5B,CAAC;SACK;QACR,IAAI,EAAE,EAAE,MAAM,EAAE,UAAiB,EAAE;KACpC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACvD,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACvC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IACxE,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC1B,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;IACjE,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAC7C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC7E,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,MAAM,gBAAgB,GAAG,IAAI,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;IACjH,gBAAgB,CAAC,WAAW,GAAG,sBAAsB,CAAC;IAEtD,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;QACtC,WAAW,EAAE;YACX,KAAK,CAAC,WAAW;gBACf,UAAU,EAAE,CAAC;gBACb,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;oBACrB,MAAM,IAAI,kBAAkB,CAAC,4DAA4D,CAAC,CAAC;gBAC7F,CAAC;gBACD,OAAO,gBAAgB,CAAC;YAC1B,CAAC;SACK;QACR,IAAI,EAAE,EAAE,MAAM,EAAE,UAAiB,EAAE;KACpC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE;QACvD,OAAO,CAAC,KAAK;YACX,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IACxC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,gFAAgF;AAChF,uEAAuE;AACvE,+EAA+E;AAC/E,sBAAsB;AACtB,IAAI,CAAC,yHAAyH,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1I,MAAM,YAAY,GAAG;QACnB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;QAC5B,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC5C,MAAM,EAAE,sBAAsB;KAC/B,CAAC;IAEF,MAAM,aAAa,GAAG;QACpB,QAAQ,EAAE,EAAW;QACrB,QAAQ,EAAE,EAAW;QACrB,OAAO,CAAC,GAAQ;YACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QACD,MAAM,CAAC,GAAQ;YACb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;KACF,CAAC;IAEF,iEAAiE;IACjE,4EAA4E;IAC5E,MAAM,aAAa,GAAU;QAC3B;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,4BAA4B,EAAE,CAAC;SACvE;KACF,CAAC;IACF,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IACzC,aAAa,CAAC,aAAa,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7C,aAAa,CAAC,KAAK,GAAG,aAAa,CAAC;IACpC,aAAa,CAAC,cAAc,GAAG,kBAAkB,CAAC;IAClD,aAAa,CAAC,MAAM,GAAG,aAAa,CAAC;IAErC,mEAAmE;IACnE,+BAA+B;IAC/B,MAAM,kBAAkB,GAAU;QAChC,GAAG,aAAa;QAChB;YACE,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,2CAA2C,EAAE,CAAC;SACtF;KACF,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAI,UAAU,CAAC;QACxC,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,uBAAuB,EAAE;QACtE,EAAE,IAAI,EAAE,4BAA4B,EAAE,KAAK,EAAE,sBAAsB,EAAE;KACtE,CAAC,CAAC;IACH,kBAAkB,CAAC,WAAW,GAAG,2CAA2C,CAAC;IAC7E,kBAAkB,CAAC,cAAc,GAAG,iBAAiB,CAAC;IACtD,kBAAkB,CAAC,MAAM,GAAG,kBAAkB,CAAC;IAE/C,IAAI,eAAe,GAAQ,IAAI,CAAC;IAChC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;QACtC,WAAW,EAAE;YACX,KAAK,CAAC,WAAW;gBACf,OAAO,aAAa,CAAC;YACvB,CAAC;YACD,KAAK,CAAC,iBAAiB,CAAC,MAAW,EAAE,OAAY;gBAC/C,eAAe,GAAG,OAAO,CAAC;gBAC1B,OAAO,kBAAkB,CAAC;YAC5B,CAAC;SACK;QACR,IAAI,EAAE,EAAE,MAAM,EAAE,UAAiB,EAAE;KACpC,CAAC,CAAC;IAEH,wCAAwC;IACxC,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IACtC,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACvC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,qDAAqD;IACrD,0EAA0E;IAC1E,MAAM,qBAAqB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,OAAgB,CAAC;IACrE,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,EAAE,CAAC,EAAE,kEAAkE,CAAC,CAAC;IAC1G,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAErD,+BAA+B;IAC/B,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACxD,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9B,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,2CAA2C,CAAC,CAAC;IACrG,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEpD,mEAAmE;IACnE,2CAA2C;IAC3C,MAAM,oBAAoB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,OAAgB,CAAC;IACpE,MAAM,cAAc,GAAG,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,0BAA0B;IAChF,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,cAAc,EAAE,0DAA0D,CAAC,CAAC;IAE9G,8BAA8B;IAC9B,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAEpD,iEAAiE;IACjE,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrD,MAAM,IAAI,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;YACtF,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,CAAC,CAAC,SAAS,CACT,cAAc,EACd,CAAC,4BAA4B,EAAE,2CAA2C,CAAC,EAC3E,kEAAkE,CACnE,CAAC;IAEF,8EAA8E;IAC9E,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAC1B,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;AAC/D,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,113 @@
+import type { AgentInputItem } from '@openai/agents';
+import type { NormalizedUsage } from '../utils/token-usage.js';
+import type { CommandMessage } from '../tools/types.js';
+import type { SubagentResult } from './subagents/types.js';
+import type { SavedToolExecution } from './tool-execution-ledger.js';
+import type { SavedAppMode, SavedMessage, PersistedAssistantTurn } from './conversation-persistence-types.js';
+export declare const LOG_ENVELOPE_VERSION = 3;
+export interface StateSnapshot {
+    history: AgentInputItem[];
+    previousResponseId: string | null;
+    toolLedger: SavedToolExecution[];
+    model?: string;
+    provider?: string;
+}
+export interface AssistantTurnState {
+    previousResponseId: string | null;
+    model?: string;
+    provider?: string;
+}
+export interface SessionInitEvent {
+    type: 'session_init';
+    id: string;
+    createdAt: string;
+    projectPath?: string;
+    sshHost?: string;
+    appMode?: SavedAppMode;
+    model?: string;
+    provider?: string;
+    reasoningEffort?: string;
+    forkedFrom?: string;
+}
+export interface SettingsChangedEvent {
+    type: 'settings_changed';
+    key: string;
+    value: unknown;
+}
+export interface UserMessageEvent {
+    type: 'user_message';
+    message: SavedMessage;
+}
+export interface ToolStartedLogEvent {
+    type: 'tool_started';
+    toolCallId: string;
+    toolName: string;
+    arguments: unknown;
+}
+export interface ToolResultLogEvent {
+    type: 'tool_result';
+    callId: string;
+    toolName: string;
+    status: 'completed' | 'failed' | 'aborted';
+    output?: unknown;
+    historyItems?: unknown[];
+}
+export interface CommandMessageLogEvent {
+    type: 'command_message';
+    message: CommandMessage;
+}
+export interface ApprovalRequiredLogEvent {
+    type: 'approval_required';
+    approval: {
+        callId?: string;
+        toolName: string;
+        argumentsText?: string;
+        agentName?: string;
+    };
+}
+export interface ApprovalResolvedLogEvent {
+    type: 'approval_resolved';
+    answer: 'y' | 'n';
+    rejectionReason?: string;
+}
+export interface SubagentStartedLogEvent {
+    type: 'subagent_started';
+    agentId: string;
+    role: string;
+    task: string;
+}
+export interface SubagentCompletedLogEvent {
+    type: 'subagent_completed';
+    result: SubagentResult;
+}
+export interface ErrorLogEvent {
+    type: 'error';
+    message: string;
+    kind?: string;
+    stack?: string;
+}
+export interface AssistantTurnEvent {
+    type: 'assistant_turn';
+    turn: PersistedAssistantTurn;
+    usage?: NormalizedUsage;
+    state?: AssistantTurnState;
+    /** Present in v2 logs. New v3 logs use `state` to avoid cumulative snapshots. */
+    snapshot?: StateSnapshot;
+}
+export interface UndoEvent {
+    type: 'undo';
+    removedUserTurns: number;
+    snapshot: StateSnapshot;
+}
+export interface SessionClearedEvent {
+    type: 'session_cleared';
+}
+export type LogEvent = SessionInitEvent | SettingsChangedEvent | UserMessageEvent | ToolStartedLogEvent | ToolResultLogEvent | CommandMessageLogEvent | ApprovalRequiredLogEvent | ApprovalResolvedLogEvent | SubagentStartedLogEvent | SubagentCompletedLogEvent | ErrorLogEvent | AssistantTurnEvent | UndoEvent | SessionClearedEvent;
+export interface LogEnvelope {
+    v: number;
+    seq: number;
+    ts: string;
+    event: LogEvent;
+}
+export declare const AGENT_AFFECTING_SETTINGS: Set<string>;
+//# sourceMappingURL=conversation-log-events.d.ts.map

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

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

package/dist/services/conversation-log-events.js

@@ -0,0 +1,12 @@
+export const LOG_ENVELOPE_VERSION = 3;
+export const AGENT_AFFECTING_SETTINGS = new Set([
+    'agent.model',
+    'agent.provider',
+    'agent.reasoningEffort',
+    'agent.temperature',
+    'app.mentorMode',
+    'app.liteMode',
+    'app.planMode',
+    'app.orchestratorMode',
+]);
+//# sourceMappingURL=conversation-log-events.js.map

package/dist/services/conversation-log-events.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-log-events.js","sourceRoot":"","sources":["../../source/services/conversation-log-events.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AA0ItC,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAS;IACtD,aAAa;IACb,gBAAgB;IAChB,uBAAuB;IACvB,mBAAmB;IACnB,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,sBAAsB;CACvB,CAAC,CAAC"}

package/dist/services/conversation-log-writer.d.ts

@@ -0,0 +1,40 @@
+import type { ILoggingService } from './service-interfaces.js';
+import { type LogEvent, type SessionInitEvent } from './conversation-log-events.js';
+export interface ConversationLogWriter {
+    readonly sessionId: string;
+    init(meta: Omit<SessionInitEvent, 'type'>): void;
+    append(event: LogEvent): void;
+    rotate(newSessionId: string, meta: Omit<SessionInitEvent, 'type'>): void;
+    flush(): Promise<void>;
+    close(): Promise<void>;
+}
+export declare class LockConflictError extends Error {
+    readonly sessionId: string;
+    readonly lockPath: string;
+    readonly lockInfo: {
+        pid: number;
+        startedAt: string;
+        host: string;
+    } | null;
+    constructor(sessionId: string, lockPath: string, lockInfo: {
+        pid: number;
+        startedAt: string;
+        host: string;
+    } | null);
+}
+interface WriterOptions {
+    sessionId: string;
+    dir: string;
+    logger: ILoggingService;
+}
+declare function truncateForLog(event: LogEvent): LogEvent;
+declare function acquireLock(dir: string, sessionId: string): void;
+declare function releaseLock(dir: string, sessionId: string): void;
+export declare function createConversationLogWriter(opts: WriterOptions): ConversationLogWriter;
+export declare const __testing: {
+    truncateForLog: typeof truncateForLog;
+    acquireLock: typeof acquireLock;
+    releaseLock: typeof releaseLock;
+};
+export {};
+//# sourceMappingURL=conversation-log-writer.d.ts.map

package/dist/services/conversation-log-writer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-log-writer.d.ts","sourceRoot":"","sources":["../../source/services/conversation-log-writer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAMtC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACzE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;gBAC/D,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;CAWnH;AAED,UAAU,aAAa;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;CACzB;AAuDD,iBAAS,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,CA+BjD;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAwBzD;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAQzD;AAwHD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,aAAa,GAAG,qBAAqB,CAEtF;AAED,eAAO,MAAM,SAAS;;;;CAIrB,CAAC"}

package/dist/services/conversation-log-writer.js

@@ -0,0 +1,264 @@
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { LOG_ENVELOPE_VERSION, } from './conversation-log-events.js';
+import { saveLastConversation } from './conversation-persistence.js';
+const FSYNC_EVENTS = new Set(['user_message', 'assistant_turn', 'undo', 'session_init']);
+const MAX_EVENT_BYTES = 256 * 1024;
+export class LockConflictError extends Error {
+    sessionId;
+    lockPath;
+    lockInfo;
+    constructor(sessionId, lockPath, lockInfo) {
+        super(lockInfo
+            ? `Conversation ${sessionId} is locked (pid ${lockInfo.pid}, started ${lockInfo.startedAt}, host ${lockInfo.host}).`
+            : `Conversation ${sessionId} is locked.`);
+        this.name = 'LockConflictError';
+        this.sessionId = sessionId;
+        this.lockPath = lockPath;
+        this.lockInfo = lockInfo;
+    }
+}
+function logPath(dir, sessionId) {
+    return path.join(dir, `${sessionId}.jsonl`);
+}
+function lockPath(dir, sessionId) {
+    return path.join(dir, `${sessionId}.lock`);
+}
+function ensureDir(dir) {
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+}
+function sanitizeSubagentResult(value) {
+    if (!value) {
+        return value;
+    }
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
+            try {
+                const parsed = JSON.parse(trimmed);
+                if (parsed && typeof parsed === 'object') {
+                    const sanitized = sanitizeSubagentResult(parsed);
+                    return JSON.stringify(sanitized);
+                }
+            }
+            catch {
+                // Return original string
+            }
+        }
+        return value;
+    }
+    if (Array.isArray(value)) {
+        return value.map(sanitizeSubagentResult);
+    }
+    if (typeof value === 'object') {
+        const obj = { ...value };
+        if ('nestedRunResult' in obj) {
+            delete obj.nestedRunResult;
+        }
+        for (const key of Object.keys(obj)) {
+            obj[key] = sanitizeSubagentResult(obj[key]);
+        }
+        return obj;
+    }
+    return value;
+}
+function truncateForLog(event) {
+    const serialized = JSON.stringify(event);
+    if (serialized.length <= MAX_EVENT_BYTES) {
+        return event;
+    }
+    const truncate = (value) => {
+        if (typeof value === 'string' && value.length > 1024) {
+            return value.slice(0, 1024) + '…[truncated for log]';
+        }
+        if (Array.isArray(value)) {
+            return value.map(truncate);
+        }
+        if (value && typeof value === 'object') {
+            const out = {};
+            for (const [k, v] of Object.entries(value)) {
+                out[k] = truncate(v);
+            }
+            return out;
+        }
+        return value;
+    };
+    const truncated = truncate(event);
+    const reserialized = JSON.stringify(truncated);
+    if (reserialized.length <= MAX_EVENT_BYTES) {
+        return truncated;
+    }
+    return {
+        type: event.type,
+        truncated: true,
+        originalSize: serialized.length,
+    };
+}
+function acquireLock(dir, sessionId) {
+    const lp = lockPath(dir, sessionId);
+    const payload = JSON.stringify({ pid: process.pid, startedAt: new Date().toISOString(), host: os.hostname() });
+    let fd;
+    try {
+        fd = fs.openSync(lp, 'wx');
+    }
+    catch (err) {
+        if (err?.code === 'EEXIST') {
+            let info = null;
+            try {
+                info = JSON.parse(fs.readFileSync(lp, 'utf-8'));
+            }
+            catch {
+                info = null;
+            }
+            throw new LockConflictError(sessionId, lp, info);
+        }
+        throw err;
+    }
+    try {
+        fs.writeSync(fd, payload);
+        fs.fsyncSync(fd);
+    }
+    finally {
+        fs.closeSync(fd);
+    }
+}
+function releaseLock(dir, sessionId) {
+    try {
+        fs.unlinkSync(lockPath(dir, sessionId));
+    }
+    catch (err) {
+        if (err?.code !== 'ENOENT') {
+            // best-effort
+        }
+    }
+}
+class ConversationLogWriterImpl {
+    #sessionId;
+    #dir;
+    #logger;
+    #fd = null;
+    #seq = 0;
+    #closed = false;
+    #writeErrorLogged = false;
+    #projectPath;
+    #sshHost;
+    constructor(opts) {
+        this.#sessionId = opts.sessionId;
+        this.#dir = opts.dir;
+        this.#logger = opts.logger;
+    }
+    get sessionId() {
+        return this.#sessionId;
+    }
+    init(meta) {
+        this.#projectPath = meta.projectPath;
+        this.#sshHost = meta.sshHost;
+        ensureDir(this.#dir);
+        acquireLock(this.#dir, this.#sessionId);
+        this.#fd = fs.openSync(logPath(this.#dir, this.#sessionId), 'a');
+        this.append({ type: 'session_init', ...meta });
+    }
+    append(event) {
+        if (this.#closed || this.#fd === null) {
+            return;
+        }
+        const sanitizedEvent = sanitizeSubagentResult(event);
+        const safeEvent = truncateForLog(sanitizedEvent);
+        const envelope = {
+            v: LOG_ENVELOPE_VERSION,
+            seq: ++this.#seq,
+            ts: new Date().toISOString(),
+            event: safeEvent,
+        };
+        const line = JSON.stringify(envelope) + '\n';
+        try {
+            fs.writeSync(this.#fd, line);
+            if (FSYNC_EVENTS.has(sanitizedEvent.type)) {
+                try {
+                    fs.fsyncSync(this.#fd);
+                }
+                catch {
+                    // ignore fsync errors; data is in kernel buffer
+                }
+                saveLastConversation(this.#sessionId, this.#projectPath, this.#sshHost);
+            }
+        }
+        catch (err) {
+            if (!this.#writeErrorLogged) {
+                this.#writeErrorLogged = true;
+                this.#logger.error('Conversation log write failed', {
+                    eventType: 'conversation_log.write_failed',
+                    category: 'persistence',
+                    sessionId: this.#sessionId,
+                    errorMessage: err instanceof Error ? err.message : String(err),
+                });
+            }
+        }
+    }
+    rotate(newSessionId, meta) {
+        if (this.#fd !== null) {
+            try {
+                fs.fsyncSync(this.#fd);
+            }
+            catch {
+                // ignore
+            }
+            try {
+                fs.closeSync(this.#fd);
+            }
+            catch {
+                // ignore
+            }
+            this.#fd = null;
+        }
+        releaseLock(this.#dir, this.#sessionId);
+        this.#sessionId = newSessionId;
+        this.#seq = 0;
+        this.#writeErrorLogged = false;
+        this.init(meta);
+    }
+    async flush() {
+        if (this.#fd !== null) {
+            try {
+                fs.fsyncSync(this.#fd);
+            }
+            catch {
+                // ignore
+            }
+        }
+    }
+    async close() {
+        if (this.#closed)
+            return;
+        this.#closed = true;
+        if (this.#fd !== null) {
+            try {
+                fs.fsyncSync(this.#fd);
+            }
+            catch {
+                // ignore
+            }
+            try {
+                fs.closeSync(this.#fd);
+            }
+            catch {
+                // ignore
+            }
+            this.#fd = null;
+        }
+        saveLastConversation(this.#sessionId, this.#projectPath, this.#sshHost);
+        releaseLock(this.#dir, this.#sessionId);
+    }
+}
+export function createConversationLogWriter(opts) {
+    return new ConversationLogWriterImpl(opts);
+}
+export const __testing = {
+    truncateForLog,
+    acquireLock,
+    releaseLock,
+};
+//# sourceMappingURL=conversation-log-writer.js.map

package/dist/services/conversation-log-writer.js.map

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