@qduc/term2 0.6.1 → 0.7.1

package/dist/services/conversation-store.merge-modes.test.js.map

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

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

@@ -1,5 +1,12 @@
 import test from 'ava';
 import { ConversationStore, SHELL_CONTEXT_PREFIX } from './conversation-store.js';
+const addLegacyModeNotice = (store, text) => {
+    store.addImportedItem({
+        role: 'user',
+        type: 'message',
+        content: `[Mode Notice] ${text}`,
+    });
+};
 test('addUserMessage() appends a user message item', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('Hello');
@@ -65,192 +72,65 @@ test('getLastUserMessage() returns the most recent user message text', (t) => {
     store.addUserMessage('Second');
     t.is(store.getLastUserMessage(), 'Second');
 });
-test('updateFromResult() merges run history without duplicating overlap', (t) => {
+test('appendOutput() appends items to existing history', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('Hi');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Hi' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hello!' }] },
-        ],
-    });
-    let history = store.getHistory();
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hello!' }] },
+    ]);
+    const history = store.getHistory();
     t.is(history.length, 2);
-    let last = history[history.length - 1];
+    const last = history[history.length - 1];
     t.is(last.role, 'assistant');
     t.is(last.content[0].text, 'Hello!');
-    // Next turn: user message is already in store; incoming history contains it too.
     store.addUserMessage('How are you?');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'How are you?' },
-            {
-                role: 'assistant',
-                type: 'message',
-                status: 'completed',
-                content: [{ type: 'output_text', text: 'Doing great.' }],
-            },
-        ],
-    });
-    history = store.getHistory();
-    t.is(history.length, 4);
-    last = history[history.length - 1];
-    t.is(last.role, 'assistant');
-    t.is(last.content[0].text, 'Doing great.');
+    store.appendOutput([
+        {
+            role: 'assistant',
+            type: 'message',
+            status: 'completed',
+            content: [{ type: 'output_text', text: 'Doing great.' }],
+        },
+    ]);
+    t.is(store.getHistory().length, 4);
 });
-test('updateFromResult() replaces history when incoming history is a superset', (t) => {
+test('replaceHistory() overwrites the store with a full transcript', (t) => {
     const store = new ConversationStore();
-    store.addUserMessage('One');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'One' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Ack' }] },
-        ],
-    });
-    store.addUserMessage('Two');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'One' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Ack' }] },
-            { role: 'user', type: 'message', content: 'Two' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Ack2' }] },
-        ],
-    });
-    const history = store.getHistory();
-    t.is(history.length, 4);
-    const last = history[3];
-    t.is(last.content[0].text, 'Ack2');
-});
-test('updateFromResult() treats tool callId as stable across full-history replays with changed item ids', (t) => {
-    const store = new ConversationStore();
-    store.addUserMessage('Inspect the repo');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Inspect the repo' },
-            { type: 'function_call', id: 'fc_1', callId: 'call-read', name: 'read_file', arguments: '{}' },
-            { type: 'function_call_result', id: 'fcr_1', callId: 'call-read', output: { text: 'contents' } },
-        ],
-    });
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Inspect the repo' },
-            { type: 'function_call', id: 'fc_1_replayed', callId: 'call-read', name: 'read_file', arguments: '{}' },
-            { type: 'function_call_result', id: 'fcr_1_replayed', callId: 'call-read', output: { text: 'contents' } },
-            { type: 'function_call', id: 'fc_2', callId: 'call-grep', name: 'grep', arguments: '{}' },
-            { type: 'function_call_result', id: 'fcr_2', callId: 'call-grep', output: { text: 'matches' } },
-        ],
-    });
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Inspect the repo' },
-            { type: 'function_call', id: 'fc_1_replayed_again', callId: 'call-read', name: 'read_file', arguments: '{}' },
-            { type: 'function_call_result', id: 'fcr_1_replayed_again', callId: 'call-read', output: { text: 'contents' } },
-            { type: 'function_call', id: 'fc_2_replayed', callId: 'call-grep', name: 'grep', arguments: '{}' },
-            { type: 'function_call_result', id: 'fcr_2_replayed', callId: 'call-grep', output: { text: 'matches' } },
-            { role: 'assistant', type: 'message', content: [{ type: 'output_text', text: 'Done' }] },
-        ],
-    });
-    const history = store.getHistory();
-    t.is(history.length, 6);
-    t.is(history.filter((item) => (item.rawItem ?? item).callId === 'call-read').length, 2);
-    t.is(history.filter((item) => (item.rawItem ?? item).callId === 'call-grep').length, 2);
-});
-test('updateFromResult() collapses SDK replayed history prefixes', (t) => {
-    const store = new ConversationStore();
-    store.addUserMessage('Investigate upgrade');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Investigate upgrade' },
-            { type: 'function_call', callId: 'call-search', name: 'web_search', arguments: '{}' },
-            { type: 'function_call_result', callId: 'call-search', name: 'web_search', output: { text: 'search results' } },
-            { role: 'user', type: 'message', content: 'Investigate upgrade' },
-            { type: 'function_call', callId: 'call-search', name: 'web_search', arguments: '{}' },
-            { type: 'function_call_result', callId: 'call-search', name: 'web_search', output: { text: 'search results' } },
-            { type: 'function_call', callId: 'call-read', name: 'read_file', arguments: '{}' },
-            { type: 'function_call_result', callId: 'call-read', name: 'read_file', output: { text: 'file contents' } },
-            { role: 'assistant', type: 'message', content: [{ type: 'output_text', text: 'Done' }] },
-        ],
-    });
-    const history = store.getHistory();
-    t.is(history.length, 6);
-    t.is(history.filter((item) => (item.rawItem ?? item).callId === 'call-search').length, 2);
-    t.is(history.filter((item) => (item.rawItem ?? item).callId === 'call-read').length, 2);
-    t.is((history[0].rawItem ?? history[0]).content, 'Investigate upgrade');
-    t.is((history[5].rawItem ?? history[5]).role, 'assistant');
-});
-test('updateFromResult() keeps repeated user text when it is not a tool replay', (t) => {
-    const store = new ConversationStore();
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'again' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'first' }] },
-            { role: 'user', type: 'message', content: 'again' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'second' }] },
-        ],
-    });
+    store.addUserMessage('Old');
+    store.replaceHistory([
+        { role: 'user', type: 'message', content: 'New Q' },
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'New A' }] },
+    ]);
     const history = store.getHistory();
-    t.is(history.length, 4);
+    t.is(history.length, 2);
+    t.is(history[0].content, 'New Q');
+    t.is(history[1].content[0].text, 'New A');
 });
-test('updateFromResult() preserves reasoning_details across overlap merges', (t) => {
+test('appendOutput() is a no-op on empty or non-array input', (t) => {
     const store = new ConversationStore();
-    // Initial transcript where the assistant message has no reasoning_details.
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'First' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hello' }] },
-        ],
-    });
-    // Later, the SDK returns incremental history starting with the last assistant
-    // message, now enriched with reasoning_details (common in tool flows).
-    const reasoning_details = [{ type: 'text', text: 'thinking' }];
-    store.updateFromResult({
-        history: [
-            {
-                role: 'assistant',
-                type: 'message',
-                content: 'Hello',
-                reasoning_details,
-            },
-            {
-                type: 'function_call',
-                id: 'call-1',
-                name: 'bash',
-                arguments: '{"cmd":"ls"}',
-            },
-            { type: 'function_call_result', callId: 'call-1', output: 'files\n' },
-        ],
-    });
-    const history = store.getHistory();
-    const assistantHello = history.find((item) => (item?.rawItem ?? item)?.role === 'assistant' && (item?.rawItem ?? item)?.content === 'Hello');
-    t.truthy(assistantHello);
-    t.deepEqual((assistantHello?.rawItem ?? assistantHello)?.reasoning_details, reasoning_details);
-});
-test('updateFromResult() preserves reasoning (reasoning tokens) across overlap merges', (t) => {
-    const store = new ConversationStore();
-    // Initial transcript where the assistant message has no reasoning field.
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'First' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hello' }] },
-        ],
-    });
-    // Later, the SDK returns incremental history starting with the last assistant
-    // message, now enriched with OpenRouter-style reasoning.
-    store.updateFromResult({
-        history: [
-            {
-                role: 'assistant',
-                type: 'message',
-                content: 'Hello',
-                reasoning: 'Some hidden thinking',
-            },
-            { role: 'user', type: 'message', content: 'Next' },
-        ],
-    });
+    store.addUserMessage('A');
+    store.appendOutput([]);
+    store.appendOutput(null);
+    store.appendOutput(undefined);
+    t.is(store.getHistory().length, 1);
+});
+test('replaceHistory() is a no-op on empty or non-array input', (t) => {
+    const store = new ConversationStore();
+    store.addUserMessage('A');
+    store.replaceHistory([]);
+    store.replaceHistory(null);
+    t.is(store.getHistory().length, 1);
+    t.is(store.getHistory()[0].content, 'A');
+});
+test('appendOutput() returns deep clones (external mutation does not affect store)', (t) => {
+    const store = new ConversationStore();
+    const items = [
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Original' }] },
+    ];
+    store.appendOutput(items);
+    items[0].content[0].text = 'Mutated';
     const history = store.getHistory();
-    const assistantHello = history.find((item) => (item?.rawItem ?? item)?.role === 'assistant' && (item?.rawItem ?? item)?.content === 'Hello');
-    t.truthy(assistantHello);
-    t.is((assistantHello?.rawItem ?? assistantHello)?.reasoning, 'Some hidden thinking');
+    t.is(history[0].content[0].text, 'Original');
 });
 test('clear() resets history', (t) => {
     const store = new ConversationStore();
@@ -275,19 +155,13 @@ test('addShellContext() appends shell history as user message', (t) => {
 test('removeLastUserTurn() removes the last user message and everything after it', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('First');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'First' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
+    ]);
     store.addUserMessage('Second');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Second' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 2' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 2' }] },
+    ]);
     t.is(store.getHistory().length, 4);
     const result = store.removeLastUserTurn();
     t.deepEqual(result, { text: 'Second', imageCount: 0 });
@@ -298,11 +172,9 @@ test('removeLastUserTurn() removes the last user message and everything after it
 });
 test('removeLastUserTurn() returns null when no user message exists', (t) => {
     const store = new ConversationStore();
-    store.updateFromResult({
-        history: [
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hi' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hi' }] },
+    ]);
     const result = store.removeLastUserTurn();
     t.is(result, null);
     t.is(store.getHistory().length, 1);
@@ -318,17 +190,14 @@ test('removeLastUserTurn() clears history when only one user message exists', (t
 test('removeLastUserTurn() returns { text, imageCount: 0 } and removes turn + everything after it', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('hello');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'hello' },
-            {
-                role: 'assistant',
-                type: 'message',
-                status: 'completed',
-                content: [{ type: 'output_text', text: 'world' }],
-            },
-        ],
-    });
+    store.appendOutput([
+        {
+            role: 'assistant',
+            type: 'message',
+            status: 'completed',
+            content: [{ type: 'output_text', text: 'world' }],
+        },
+    ]);
     const result = store.removeLastUserTurn();
     t.deepEqual(result, { text: 'hello', imageCount: 0 });
     t.is(store.getHistory().length, 0);
@@ -336,17 +205,14 @@ test('removeLastUserTurn() returns { text, imageCount: 0 } and removes turn + ev
 test('removeLastUserTurn() skips trailing shell-context item and removes genuine user turn', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('A');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'A' },
-            {
-                role: 'assistant',
-                type: 'message',
-                status: 'completed',
-                content: [{ type: 'output_text', text: 'reply' }],
-            },
-        ],
-    });
+    store.appendOutput([
+        {
+            role: 'assistant',
+            type: 'message',
+            status: 'completed',
+            content: [{ type: 'output_text', text: 'reply' }],
+        },
+    ]);
     store.addShellContext(`${SHELL_CONTEXT_PREFIX}\n\n$ ls\nExit: 0`);
     const result = store.removeLastUserTurn();
     t.deepEqual(result, { text: 'A', imageCount: 0 });
@@ -359,7 +225,12 @@ test('removeLastUserTurn() returns imageCount > 0 for multimodal turn', (t) => {
         images: [{ id: 'img-1', data: 'AAAA', mimeType: 'image/png', byteSize: 3, displayNumber: 1 }],
     });
     const result = store.removeLastUserTurn();
-    t.deepEqual(result, { text: 'hi', imageCount: 1 });
+    t.is(result?.text, 'hi');
+    t.is(result?.imageCount, 1);
+    t.is(result?.images?.[0]?.data, 'AAAA');
+    t.is(result?.images?.[0]?.mimeType, 'image/png');
+    t.is(result?.images?.[0]?.byteSize, 3);
+    t.is(result?.images?.[0]?.displayNumber, 1);
     t.is(store.getHistory().length, 0);
 });
 test('removeLastUserTurn() returns null when only a shell-context item is present', (t) => {
@@ -373,12 +244,9 @@ test('removeLastUserTurn() returns null when only a shell-context item is presen
 test('listUserTurns() returns all genuine user turns with index and text', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('First');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'First' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
+    ]);
     store.addUserMessage('Second');
     const turns = store.listUserTurns();
     t.is(turns.length, 2);
@@ -395,11 +263,9 @@ test('listUserTurns() excludes shell context items', (t) => {
 });
 test('listUserTurns() returns empty array when no user turns', (t) => {
     const store = new ConversationStore();
-    store.updateFromResult({
-        history: [
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hi' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Hi' }] },
+    ]);
     const turns = store.listUserTurns();
     t.is(turns.length, 0);
 });
@@ -418,19 +284,13 @@ test('listUserTurns() includes imageCount for multimodal turns', (t) => {
 test('removeNLastUserTurns(1) behaves the same as removeLastUserTurn()', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('First');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'First' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
+    ]);
     store.addUserMessage('Second');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Second' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 2' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 2' }] },
+    ]);
     const result = store.removeNLastUserTurns(1);
     t.deepEqual(result, { text: 'Second', imageCount: 0 });
     const history = store.getHistory();
@@ -441,26 +301,17 @@ test('removeNLastUserTurns(1) behaves the same as removeLastUserTurn()', (t) =>
 test('removeNLastUserTurns(2) removes last 2 user turns and their responses', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('First');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'First' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 1' }] },
+    ]);
     store.addUserMessage('Second');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Second' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 2' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 2' }] },
+    ]);
     store.addUserMessage('Third');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Third' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 3' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply 3' }] },
+    ]);
     const result = store.removeNLastUserTurns(2);
     t.deepEqual(result, { text: 'Second', imageCount: 0 });
     const history = store.getHistory();
@@ -471,12 +322,9 @@ test('removeNLastUserTurns(2) removes last 2 user turns and their responses', (t
 test('removeNLastUserTurns(3) removes all when fewer than n turns exist', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('Only');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'Only' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'Reply' }] },
+    ]);
     const result = store.removeNLastUserTurns(3);
     t.deepEqual(result, { text: 'Only', imageCount: 0 });
     t.is(store.getHistory().length, 0);
@@ -496,20 +344,14 @@ test('removeNLastUserTurns() returns null when no user turns exist', (t) => {
 test('removeNLastUserTurns() skips shell context items', (t) => {
     const store = new ConversationStore();
     store.addUserMessage('A');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'A' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'reply' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'reply' }] },
+    ]);
     store.addShellContext(`${SHELL_CONTEXT_PREFIX}\n\n$ ls\nExit: 0`);
     store.addUserMessage('B');
-    store.updateFromResult({
-        history: [
-            { role: 'user', type: 'message', content: 'B' },
-            { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'reply2' }] },
-        ],
-    });
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'reply2' }] },
+    ]);
     // Remove both user turns (skipping shell context)
     const result = store.removeNLastUserTurns(2);
     t.deepEqual(result, { text: 'A', imageCount: 0 });
@@ -518,31 +360,52 @@ test('removeNLastUserTurns() skips shell context items', (t) => {
     const history = store.getHistory();
     t.is(history.length, 0);
 });
-test('addModeNotice() appends a persisted system message at the tail', (t) => {
+test('removeLastUserTurn() skips trailing legacy mode-notice item', (t) => {
     const store = new ConversationStore();
-    store.addUserMessage('First');
-    store.addModeNotice('Plan Mode ON');
-    const history = store.getHistory();
-    t.is(history.length, 2);
-    t.is(history[0].content, 'First');
-    t.is(history[1].role, 'user');
-    t.is(history[1].content, 'Plan Mode ON');
+    store.addUserMessage('A');
+    store.appendOutput([
+        {
+            role: 'assistant',
+            type: 'message',
+            status: 'completed',
+            content: [{ type: 'output_text', text: 'reply' }],
+        },
+    ]);
+    addLegacyModeNotice(store, 'Plan Mode ON');
+    const result = store.removeLastUserTurn();
+    t.deepEqual(result, { text: 'A', imageCount: 0 });
+    t.is(store.getHistory().length, 0);
 });
-test('addModeNotice() preserves the existing prefix (append-only, never mid-history)', (t) => {
+test('removeLastUserTurn() returns null when only a legacy mode-notice item is present', (t) => {
     const store = new ConversationStore();
-    store.addUserMessage('First');
-    store.addUserMessage('Second');
-    const prefix = store.getHistory();
-    store.addModeNotice('Plan Mode OFF');
-    const history = store.getHistory();
-    t.deepEqual(history.slice(0, prefix.length), prefix);
-    t.is(history.length, prefix.length + 1);
-    t.is(history[history.length - 1].content, 'Plan Mode OFF');
+    addLegacyModeNotice(store, 'Plan Mode ON');
+    const result = store.removeLastUserTurn();
+    t.is(result, null);
+    t.is(store.getHistory().length, 1);
 });
-test('addModeNotice() ignores blank text', (t) => {
+test('listUserTurns() excludes legacy mode notice items', (t) => {
     const store = new ConversationStore();
-    store.addUserMessage('First');
-    store.addModeNotice('   ');
-    t.is(store.getHistory().length, 1);
+    addLegacyModeNotice(store, 'Plan Mode ON');
+    store.addUserMessage('Hello');
+    const turns = store.listUserTurns();
+    t.is(turns.length, 1);
+    t.is(turns[0].text, 'Hello');
+});
+test('removeNLastUserTurns() skips legacy mode notice items', (t) => {
+    const store = new ConversationStore();
+    store.addUserMessage('A');
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'reply' }] },
+    ]);
+    addLegacyModeNotice(store, 'Plan Mode ON');
+    store.addUserMessage('B');
+    store.appendOutput([
+        { role: 'assistant', type: 'message', status: 'completed', content: [{ type: 'output_text', text: 'reply2' }] },
+    ]);
+    // Remove both user turns (skipping legacy mode notice)
+    const result = store.removeNLastUserTurns(2);
+    t.deepEqual(result, { text: 'A', imageCount: 0 });
+    const history = store.getHistory();
+    t.is(history.length, 0);
 });
 //# sourceMappingURL=conversation-store.test.js.map