@vybestack/llxprt-code 0.1.23-nightly.250905.97906524 → 0.2.2-nightly.250908.7b895396

package/dist/src/zed-integration/schema.d.ts

@@ -197,11 +197,11 @@ export declare const planEntrySchema: z.ZodObject<{
     status: z.ZodUnion<[z.ZodLiteral<"pending">, z.ZodLiteral<"in_progress">, z.ZodLiteral<"completed">]>;
 }, "strip", z.ZodTypeAny, {
     content: string;
-    status: "pending" | "in_progress" | "completed";
+    status: "in_progress" | "completed" | "pending";
     priority: "high" | "medium" | "low";
 }, {
     content: string;
-    status: "pending" | "in_progress" | "completed";
+    status: "in_progress" | "completed" | "pending";
     priority: "high" | "medium" | "low";
 }>;
 export declare const permissionOptionSchema: z.ZodObject<{
@@ -1581,7 +1581,7 @@ export declare const toolCallSchema: z.ZodObject<{
     title: z.ZodString;
     toolCallId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    status: "pending" | "in_progress" | "completed" | "failed";
+    status: "in_progress" | "completed" | "pending" | "failed";
     title: string;
     kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
     toolCallId: string;
@@ -1655,7 +1655,7 @@ export declare const toolCallSchema: z.ZodObject<{
     }[] | undefined;
     rawInput?: unknown;
 }, {
-    status: "pending" | "in_progress" | "completed" | "failed";
+    status: "in_progress" | "completed" | "pending" | "failed";
     title: string;
     kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
     toolCallId: string;
@@ -3486,7 +3486,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
     title: z.ZodString;
     toolCallId: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    status: "pending" | "in_progress" | "completed" | "failed";
+    status: "in_progress" | "completed" | "pending" | "failed";
     title: string;
     kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
     toolCallId: string;
@@ -3561,7 +3561,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
     }[] | undefined;
     rawInput?: unknown;
 }, {
-    status: "pending" | "in_progress" | "completed" | "failed";
+    status: "in_progress" | "completed" | "pending" | "failed";
     title: string;
     kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
     toolCallId: string;
@@ -4075,7 +4075,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
         newText: string;
         oldText: string | null;
     })[] | null | undefined;
-    status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+    status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
     title?: string | null | undefined;
     kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
     locations?: {
@@ -4150,7 +4150,7 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
         newText: string;
         oldText: string | null;
     })[] | null | undefined;
-    status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+    status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
     title?: string | null | undefined;
     kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
     locations?: {
@@ -4165,25 +4165,25 @@ export declare const sessionUpdateSchema: z.ZodUnion<[z.ZodObject<{
         status: z.ZodUnion<[z.ZodLiteral<"pending">, z.ZodLiteral<"in_progress">, z.ZodLiteral<"completed">]>;
     }, "strip", z.ZodTypeAny, {
         content: string;
-        status: "pending" | "in_progress" | "completed";
+        status: "in_progress" | "completed" | "pending";
         priority: "high" | "medium" | "low";
     }, {
         content: string;
-        status: "pending" | "in_progress" | "completed";
+        status: "in_progress" | "completed" | "pending";
         priority: "high" | "medium" | "low";
     }>, "many">;
     sessionUpdate: z.ZodLiteral<"plan">;
 }, "strip", z.ZodTypeAny, {
     entries: {
         content: string;
-        status: "pending" | "in_progress" | "completed";
+        status: "in_progress" | "completed" | "pending";
         priority: "high" | "medium" | "low";
     }[];
     sessionUpdate: "plan";
 }, {
     entries: {
         content: string;
-        status: "pending" | "in_progress" | "completed";
+        status: "in_progress" | "completed" | "pending";
         priority: "high" | "medium" | "low";
     }[];
     sessionUpdate: "plan";
@@ -4664,7 +4664,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
         title: z.ZodString;
         toolCallId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -4738,7 +4738,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
         }[] | undefined;
         rawInput?: unknown;
     }, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -4820,7 +4820,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
         optionId: string;
     }[];
     toolCall: {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -4902,7 +4902,7 @@ export declare const requestPermissionRequestSchema: z.ZodObject<{
         optionId: string;
     }[];
     toolCall: {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -6414,7 +6414,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
         title: z.ZodString;
         toolCallId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -6489,7 +6489,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
         }[] | undefined;
         rawInput?: unknown;
     }, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -7003,7 +7003,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -7078,7 +7078,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -7093,25 +7093,25 @@ export declare const sessionNotificationSchema: z.ZodObject<{
             status: z.ZodUnion<[z.ZodLiteral<"pending">, z.ZodLiteral<"in_progress">, z.ZodLiteral<"completed">]>;
         }, "strip", z.ZodTypeAny, {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }, {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }>, "many">;
         sessionUpdate: z.ZodLiteral<"plan">;
     }, "strip", z.ZodTypeAny, {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";
     }, {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";
@@ -7293,7 +7293,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
         };
         sessionUpdate: "agent_thought_chunk";
     } | {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -7434,7 +7434,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -7445,7 +7445,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
     } | {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";
@@ -7627,7 +7627,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
         };
         sessionUpdate: "agent_thought_chunk";
     } | {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -7768,7 +7768,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -7779,7 +7779,7 @@ export declare const sessionNotificationSchema: z.ZodObject<{
     } | {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";
@@ -8200,7 +8200,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
         title: z.ZodString;
         toolCallId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -8274,7 +8274,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
         }[] | undefined;
         rawInput?: unknown;
     }, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -8356,7 +8356,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
         optionId: string;
     }[];
     toolCall: {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -8438,7 +8438,7 @@ export declare const clientRequestSchema: z.ZodUnion<[z.ZodObject<{
         optionId: string;
     }[];
     toolCall: {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -10409,7 +10409,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
         title: z.ZodString;
         toolCallId: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -10484,7 +10484,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
         }[] | undefined;
         rawInput?: unknown;
     }, {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -10998,7 +10998,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -11073,7 +11073,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -11088,25 +11088,25 @@ export declare const agentNotificationSchema: z.ZodObject<{
             status: z.ZodUnion<[z.ZodLiteral<"pending">, z.ZodLiteral<"in_progress">, z.ZodLiteral<"completed">]>;
         }, "strip", z.ZodTypeAny, {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }, {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }>, "many">;
         sessionUpdate: z.ZodLiteral<"plan">;
     }, "strip", z.ZodTypeAny, {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";
     }, {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";
@@ -11288,7 +11288,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
         };
         sessionUpdate: "agent_thought_chunk";
     } | {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -11429,7 +11429,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -11440,7 +11440,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
     } | {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";
@@ -11622,7 +11622,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
         };
         sessionUpdate: "agent_thought_chunk";
     } | {
-        status: "pending" | "in_progress" | "completed" | "failed";
+        status: "in_progress" | "completed" | "pending" | "failed";
         title: string;
         kind: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think";
         toolCallId: string;
@@ -11763,7 +11763,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
             newText: string;
             oldText: string | null;
         })[] | null | undefined;
-        status?: "pending" | "in_progress" | "completed" | "failed" | null | undefined;
+        status?: "in_progress" | "completed" | "pending" | "failed" | null | undefined;
         title?: string | null | undefined;
         kind?: "search" | "fetch" | "delete" | "move" | "other" | "edit" | "read" | "execute" | "think" | null | undefined;
         locations?: {
@@ -11774,7 +11774,7 @@ export declare const agentNotificationSchema: z.ZodObject<{
     } | {
         entries: {
             content: string;
-            status: "pending" | "in_progress" | "completed";
+            status: "in_progress" | "completed" | "pending";
             priority: "high" | "medium" | "low";
         }[];
         sessionUpdate: "plan";

package/dist/src/zed-integration/zedIntegration.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, DiscoveredMCPTool, DebugLogger, getFunctionCalls, } from '@vybestack/llxprt-code-core';
+import { AuthType, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, clearCachedCredentialFile, isNodeError, getErrorMessage, isWithinRoot, getErrorStatus, DiscoveredMCPTool, DebugLogger, getFunctionCalls, EmojiFilter, } from '@vybestack/llxprt-code-core';
 import * as acp from './acp.js';
 import { AcpFileSystemService } from './fileSystemService.js';
 import { Readable, Writable } from 'node:stream';
@@ -279,11 +279,16 @@ class Session {
     config;
     client;
     pendingPrompt = null;
+    emojiFilter;
     constructor(id, chat, config, client) {
         this.id = id;
         this.chat = chat;
         this.config = config;
         this.client = client;
+        // Initialize emoji filter from settings
+        const emojiFilterMode = this.config.getEphemeralSetting('emojifilter') || 'auto';
+        const filterConfig = { mode: emojiFilterMode };
+        this.emojiFilter = new EmojiFilter(filterConfig);
     }
     async cancelPendingPrompt() {
         if (!this.pendingPrompt) {
@@ -301,10 +306,6 @@ class Session {
         const parts = await this.#resolvePrompt(params.prompt, pendingSend.signal);
         let nextMessage = { role: 'user', parts };
         while (nextMessage !== null) {
-            if (pendingSend.signal.aborted) {
-                chat.addHistory(nextMessage);
-                return { stopReason: 'cancelled' };
-            }
             const functionCalls = [];
             try {
                 const responseStream = await chat.sendMessageStream({
@@ -316,7 +317,9 @@ class Session {
                 nextMessage = null;
                 for await (const resp of responseStream) {
                     if (pendingSend.signal.aborted) {
-                        return { stopReason: 'cancelled' };
+                        // Let the stream processing complete naturally to handle cancellation properly
+                        // Don't return early here - let the tool pipeline handle cleanup
+                        break;
                     }
                     if (resp.candidates && resp.candidates.length > 0) {
                         const candidate = resp.candidates[0];
@@ -324,9 +327,27 @@ class Session {
                             if (!part.text) {
                                 continue;
                             }
+                            // Filter the content through emoji filter
+                            const filterResult = this.emojiFilter.filterStreamChunk(part.text);
+                            if (filterResult.blocked) {
+                                // In error mode: inject error feedback to model for retry
+                                this.sendUpdate({
+                                    sessionUpdate: 'agent_message_chunk',
+                                    content: {
+                                        type: 'text',
+                                        text: '[Error: Response blocked due to emoji detection]',
+                                    },
+                                });
+                                // Add system feedback to be sent with next tool response
+                                // This could be done by queueing feedback similar to TUI implementation
+                                continue;
+                            }
+                            const filteredText = typeof filterResult.filtered === 'string'
+                                ? filterResult.filtered
+                                : '';
                             const content = {
                                 type: 'text',
-                                text: part.text,
+                                text: filteredText,
                             };
                             this.sendUpdate({
                                 sessionUpdate: part.thought
@@ -347,11 +368,31 @@ class Session {
                 if (getErrorStatus(error) === 429) {
                     throw new acp.RequestError(429, 'Rate limit exceeded. Try again later.');
                 }
-                throw error;
+                // If this is an abort error due to cancellation, handle it gracefully
+                if (pendingSend.signal.aborted &&
+                    isNodeError(error) &&
+                    error.name === 'AbortError') {
+                    // Don't throw - let the cancellation be handled below
+                }
+                else {
+                    throw error;
+                }
+            }
+            // Check for cancellation after stream processing but before tool execution
+            if (pendingSend.signal.aborted) {
+                // Return cancellation without adding to conversation history
+                // The conversation state should remain clean for proper context handling
+                return { stopReason: 'cancelled' };
             }
             if (functionCalls.length > 0) {
                 const toolResponseParts = [];
                 for (const fc of functionCalls) {
+                    // Check for cancellation before each tool execution
+                    if (pendingSend.signal.aborted) {
+                        // Return cancellation without polluting conversation history
+                        // Tool execution cancellation should be handled by the tool execution system
+                        return { stopReason: 'cancelled' };
+                    }
                     const response = await this.runTool(pendingSend.signal, promptId, fc);
                     const parts = Array.isArray(response) ? response : [response];
                     for (const part of parts) {
@@ -363,7 +404,14 @@ class Session {
                         }
                     }
                 }
-                nextMessage = { role: 'user', parts: toolResponseParts };
+                // For multiple tool responses, send them all together as the TUI does
+                // This ensures proper conversation history structure for providers like Anthropic
+                if (toolResponseParts.length > 0) {
+                    nextMessage = { role: 'user', parts: toolResponseParts };
+                }
+                else {
+                    nextMessage = null;
+                }
             }
         }
         return { stopReason: 'end_turn' };
@@ -394,7 +442,15 @@ class Session {
                     ? 'mcp'
                     : 'native',
             });
+            // Return paired function call and function response for proper conversation history
             return [
+                {
+                    functionCall: {
+                        id: callId,
+                        name: fc.name ?? '',
+                        args,
+                    },
+                },
                 {
                     functionResponse: {
                         id: callId,
@@ -491,7 +547,21 @@ class Session {
                     ? 'mcp'
                     : 'native',
             });
-            return convertToFunctionResponse(fc.name, callId, toolResult.llmContent);
+            // Return paired function call and function response like the TUI does
+            // This ensures proper conversation history for providers that need it (like Anthropic)
+            const functionResponseParts = convertToFunctionResponse(fc.name, callId, toolResult.llmContent);
+            return [
+                {
+                    functionCall: {
+                        id: callId,
+                        name: fc.name,
+                        args,
+                    },
+                },
+                ...(Array.isArray(functionResponseParts)
+                    ? functionResponseParts
+                    : [functionResponseParts]),
+            ];
         }
         catch (e) {
             const error = e instanceof Error ? e : new Error(String(e));