@nanocollective/nanocoder 1.22.5 → 1.24.0

package/dist/custom-commands/parser.js

@@ -1,49 +1,61 @@
 import { readFileSync } from 'fs';
 import { logError } from '../utils/message-queue.js';
 /**
- * Enhanced YAML frontmatter parser with support for multi-line strings and nested objects
+ * Set of frontmatter keys that are always parsed as arrays
+ */
+const ARRAY_KEYS = new Set([
+    'aliases',
+    'parameters',
+    'tags',
+    'triggers',
+    'examples',
+    'references',
+    'dependencies',
+]);
+/**
+ * Set of frontmatter keys that are parsed as numbers
+ */
+const NUMBER_KEYS = new Set(['estimated-tokens']);
+/**
+ * Parse a value that may be a JSON-style array or a single item.
+ * Returns an array of strings.
+ */
+function parseArrayValue(value) {
+    const trimmed = value.trim();
+    if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
+        const content = trimmed.slice(1, -1);
+        return content
+            .split(',')
+            .map(s => s.trim().replace(/^["']|["']$/g, ''))
+            .filter(s => s.length > 0);
+    }
+    const cleaned = trimmed.replace(/^["']|["']$/g, '');
+    return cleaned ? [cleaned] : [];
+}
+/**
+ * Enhanced YAML frontmatter parser with support for multi-line strings,
+ * arrays, and all command/skill metadata fields.
  */
 function parseEnhancedFrontmatter(frontmatter) {
-    const metadata = {};
+    const raw = {};
     const lines = frontmatter.split('\n');
     let currentKey = null;
     let currentValue = [];
     let isMultiline = false;
     let indentLevel = 0;
-    const processKeyValue = (key, value) => {
+    const storeValue = (key, value) => {
         const trimmedValue = value.trim();
-        if (key === 'description') {
-            metadata.description = trimmedValue.replace(/^["']|["']$/g, '');
+        if (ARRAY_KEYS.has(key)) {
+            raw[key] = parseArrayValue(trimmedValue);
         }
-        else if (key === 'aliases') {
-            // Support both array syntax and YAML dash syntax
-            if (trimmedValue.startsWith('[') && trimmedValue.endsWith(']')) {
-                // JSON-style array: [alias1, alias2]
-                const content = trimmedValue.slice(1, -1);
-                metadata.aliases = content
-                    .split(',')
-                    .map(s => s.trim().replace(/^["']|["']$/g, ''))
-                    .filter(s => s.length > 0);
-            }
-            else {
-                // Single value or will be handled by dash parsing below
-                metadata.aliases = [trimmedValue.replace(/^["']|["']$/g, '')];
+        else if (NUMBER_KEYS.has(key)) {
+            const num = Number(trimmedValue);
+            if (!Number.isNaN(num)) {
+                raw[key] = num;
             }
         }
-        else if (key === 'parameters') {
-            // Support both array syntax and YAML dash syntax
-            if (trimmedValue.startsWith('[') && trimmedValue.endsWith(']')) {
-                // JSON-style array: [param1, param2]
-                const content = trimmedValue.slice(1, -1);
-                metadata.parameters = content
-                    .split(',')
-                    .map(s => s.trim().replace(/^["']|["']$/g, ''))
-                    .filter(s => s.length > 0);
-            }
-            else {
-                // Single value or will be handled by dash parsing below
-                metadata.parameters = [trimmedValue.replace(/^["']|["']$/g, '')];
-            }
+        else {
+            raw[key] = trimmedValue.replace(/^["']|["']$/g, '');
         }
     };
     for (let i = 0; i < lines.length; i++) {
@@ -56,21 +68,16 @@ function parseEnhancedFrontmatter(frontmatter) {
             continue;
         }
         // Check for YAML dash syntax (array items)
-        if (trimmedLine.startsWith('- ') && currentKey) {
+        if (trimmedLine.startsWith('- ') &&
+            currentKey &&
+            ARRAY_KEYS.has(currentKey)) {
             const arrayItem = trimmedLine
                 .slice(2)
                 .trim()
                 .replace(/^["']|["']$/g, '');
-            if (currentKey === 'aliases') {
-                if (!metadata.aliases)
-                    metadata.aliases = [];
-                metadata.aliases.push(arrayItem);
-            }
-            else if (currentKey === 'parameters') {
-                if (!metadata.parameters)
-                    metadata.parameters = [];
-                metadata.parameters.push(arrayItem);
-            }
+            const arr = raw[currentKey] ?? [];
+            arr.push(arrayItem);
+            raw[currentKey] = arr;
             continue;
         }
         // Check for multi-line string indicators
@@ -96,7 +103,7 @@ function parseEnhancedFrontmatter(frontmatter) {
             else if (trimmedLine && lineIndent < indentLevel) {
                 // End of multi-line block
                 const multilineContent = currentValue.join('\n').trim();
-                processKeyValue(currentKey, multilineContent);
+                storeValue(currentKey, multilineContent);
                 isMultiline = false;
                 currentKey = null;
                 currentValue = [];
@@ -111,24 +118,75 @@ function parseEnhancedFrontmatter(frontmatter) {
             // If this is the last line, process the accumulated multi-line value
             if (i === lines.length - 1 && currentValue.length > 0) {
                 const multilineContent = currentValue.join('\n').trim();
-                processKeyValue(currentKey, multilineContent);
+                storeValue(currentKey, multilineContent);
             }
             continue;
         }
-        // Handle regular key-value pairs
-        const colonIndex = line.indexOf(':');
+        // Handle regular key-value pairs — find colon outside quotes
+        const colonIndex = findColonOutsideQuotes(line);
         if (colonIndex === -1)
             continue;
         const key = line.slice(0, colonIndex).trim();
         const value = line.slice(colonIndex + 1).trim();
         if (value) {
-            processKeyValue(key, value);
+            storeValue(key, value);
             currentKey = key; // For potential array items following
         }
         else {
             currentKey = key; // Key with no immediate value, might have array items below
         }
     }
+    return mapRawToMetadata(raw);
+}
+/**
+ * Find the first colon that is not inside single or double quotes.
+ */
+function findColonOutsideQuotes(line) {
+    let inSingleQuote = false;
+    let inDoubleQuote = false;
+    for (let i = 0; i < line.length; i++) {
+        const char = line[i];
+        if (char === "'" && !inDoubleQuote) {
+            inSingleQuote = !inSingleQuote;
+        }
+        else if (char === '"' && !inSingleQuote) {
+            inDoubleQuote = !inDoubleQuote;
+        }
+        else if (char === ':' && !inSingleQuote && !inDoubleQuote) {
+            return i;
+        }
+    }
+    return -1;
+}
+/**
+ * Map raw parsed key-value pairs to typed CustomCommandMetadata.
+ */
+function mapRawToMetadata(raw) {
+    const metadata = {};
+    if (raw.description)
+        metadata.description = raw.description;
+    if (raw.aliases)
+        metadata.aliases = raw.aliases;
+    if (raw.parameters)
+        metadata.parameters = raw.parameters;
+    if (raw.tags)
+        metadata.tags = raw.tags;
+    if (raw.triggers)
+        metadata.triggers = raw.triggers;
+    if (typeof raw['estimated-tokens'] === 'number')
+        metadata.estimatedTokens = raw['estimated-tokens'];
+    if (raw.category)
+        metadata.category = raw.category;
+    if (raw.version)
+        metadata.version = raw.version;
+    if (raw.author)
+        metadata.author = raw.author;
+    if (raw.examples)
+        metadata.examples = raw.examples;
+    if (raw.references)
+        metadata.references = raw.references;
+    if (raw.dependencies)
+        metadata.dependencies = raw.dependencies;
     return metadata;
 }
 /**

package/dist/custom-commands/parser.js.map

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

package/dist/hooks/chat-handler/conversation/conversation-loop.d.ts

@@ -17,13 +17,18 @@ interface ProcessAssistantResponseParams {
     getNextComponentKey: () => number;
     currentProvider: string;
     currentModel: string;
-    developmentMode: 'normal' | 'auto-accept' | 'plan';
+    developmentMode: 'normal' | 'auto-accept' | 'plan' | 'scheduler';
     nonInteractiveMode: boolean;
     conversationStateManager: React.MutableRefObject<ConversationStateManager>;
     onStartToolConfirmationFlow: (toolCalls: ToolCall[], updatedMessages: Message[], assistantMsg: Message, systemMessage: Message) => void;
     onConversationComplete?: () => void;
     conversationStartTime?: number;
+    compactToolDisplayRef?: React.RefObject<boolean>;
+    onSetCompactToolCounts?: (counts: Record<string, number> | null) => void;
+    compactToolCountsRef?: React.MutableRefObject<Record<string, number>>;
 }
+/** Reset the fallback notice flag (for testing). */
+export declare const resetFallbackNotice: () => void;
 /**
  * Main conversation loop that processes assistant responses and handles tool calls.
  * This function orchestrates the entire conversation flow including:

package/dist/hooks/chat-handler/conversation/conversation-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-loop.d.ts","sourceRoot":"","sources":["../../../../source/hooks/chat-handler/conversation/conversation-loop.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,gCAAgC,CAAC;AAM7E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAa,MAAM,cAAc,CAAC;AAS3E,UAAU,8BAA8B;IACvC,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,kBAAkB,EAAE,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,KAAK,IAAI,CAAC;IACjE,eAAe,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC;IACrD,mBAAmB,EAAE,MAAM,MAAM,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,QAAQ,GAAG,aAAa,GAAG,MAAM,CAAC;IACnD,kBAAkB,EAAE,OAAO,CAAC;IAC5B,wBAAwB,EAAE,KAAK,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAC3E,2BAA2B,EAAE,CAC5B,SAAS,EAAE,QAAQ,EAAE,EACrB,eAAe,EAAE,OAAO,EAAE,EAC1B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,KAClB,IAAI,CAAC;IACV,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,GACpC,QAAQ,8BAA8B,KACpC,OAAO,CAAC,IAAI,CA4ed,CAAC"}
+{"version":3,"file":"conversation-loop.d.ts","sourceRoot":"","sources":["../../../../source/hooks/chat-handler/conversation/conversation-loop.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAC,wBAAwB,EAAC,MAAM,gCAAgC,CAAC;AAM7E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,KAAK,EACX,SAAS,EACT,OAAO,EAEP,QAAQ,EAER,MAAM,cAAc,CAAC;AAStB,UAAU,8BAA8B;IACvC,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;IAChC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,kBAAkB,EAAE,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI,KAAK,IAAI,CAAC;IACjE,eAAe,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,mBAAmB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC3C,cAAc,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC;IACrD,mBAAmB,EAAE,MAAM,MAAM,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,QAAQ,GAAG,aAAa,GAAG,MAAM,GAAG,WAAW,CAAC;IACjE,kBAAkB,EAAE,OAAO,CAAC;IAC5B,wBAAwB,EAAE,KAAK,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,CAAC;IAC3E,2BAA2B,EAAE,CAC5B,SAAS,EAAE,QAAQ,EAAE,EACrB,eAAe,EAAE,OAAO,EAAE,EAC1B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,OAAO,KAClB,IAAI,CAAC;IACV,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,qBAAqB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACjD,sBAAsB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IACzE,oBAAoB,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACtE;AAKD,oDAAoD;AACpD,eAAO,MAAM,mBAAmB,YAE/B,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,GACpC,QAAQ,8BAA8B,KACpC,OAAO,CAAC,IAAI,CAwfd,CAAC"}

package/dist/hooks/chat-handler/conversation/conversation-loop.js

@@ -3,15 +3,21 @@ import React from 'react';
 import AssistantMessage from '../../../components/assistant-message.js';
 import { ErrorMessage, InfoMessage } from '../../../components/message-box.js';
 import UserMessage from '../../../components/user-message.js';
-import { appConfig, getAppConfig } from '../../../config/index.js';
+import { getAppConfig } from '../../../config/index.js';
 import { parseToolCalls } from '../../../tool-calling/index.js';
 import { performAutoCompact } from '../../../utils/auto-compact.js';
 import { formatElapsedTime, getRandomAdjective } from '../../../utils/completion-note.js';
 import { MessageBuilder } from '../../../utils/message-builder.js';
 import { parseToolArguments } from '../../../utils/tool-args-parser.js';
-import { displayToolResult } from '../../../utils/tool-result-display.js';
+import { displayCompactCountsSummary } from '../../../utils/tool-result-display.js';
 import { filterValidToolCalls } from '../utils/tool-filters.js';
 import { executeToolsDirectly } from './tool-executor.js';
+// Module-level flag: show XML fallback notice only once per process lifetime.
+let hasShownFallbackNotice = false;
+/** Reset the fallback notice flag (for testing). */
+export const resetFallbackNotice = () => {
+    hasShownFallbackNotice = false;
+};
 /**
  * Main conversation loop that processes assistant responses and handles tool calls.
  * This function orchestrates the entire conversation flow including:
@@ -22,8 +28,19 @@ import { executeToolsDirectly } from './tool-executor.js';
  * - Managing the conversation state
  */
 export const processAssistantResponse = async (params) => {
-    const { systemMessage, messages, client, toolManager, abortController, setAbortController, setIsGenerating, setStreamingContent, setTokenCount, setMessages, addToChatQueue, getNextComponentKey, currentProvider, currentModel, developmentMode, nonInteractiveMode, conversationStateManager, onStartToolConfirmationFlow, onConversationComplete, conversationStartTime, } = params;
+    const { systemMessage, messages, client, toolManager, abortController, setAbortController, setIsGenerating, setStreamingContent, setTokenCount, setMessages, addToChatQueue, getNextComponentKey, currentProvider, currentModel, nonInteractiveMode, conversationStateManager, onStartToolConfirmationFlow, onConversationComplete, conversationStartTime, compactToolDisplayRef, onSetCompactToolCounts, compactToolCountsRef, } = params;
     const startTime = conversationStartTime ?? Date.now();
+    // Helper to flush accumulated compact counts to the static chat queue and clear live display
+    const flushCompactCounts = () => {
+        if (compactToolCountsRef) {
+            const counts = compactToolCountsRef.current;
+            if (Object.keys(counts).length > 0) {
+                displayCompactCountsSummary(counts, addToChatQueue, getNextComponentKey);
+                compactToolCountsRef.current = {};
+            }
+        }
+        onSetCompactToolCounts?.(null);
+    };
     // Ensure we have an abort controller for this request
     let controller = abortController;
     if (!controller) {
@@ -34,32 +51,32 @@ export const processAssistantResponse = async (params) => {
     setIsGenerating(true);
     setStreamingContent('');
     setTokenCount(0);
-    const result = await client.chat([systemMessage, ...messages], toolManager?.getAllTools() || {}, {
-        onToolExecuted: (toolCall, result) => {
-            // Display formatter for auto-executed tools (after execution with results)
-            void (async () => {
-                const toolResult = {
-                    tool_call_id: toolCall.id,
-                    role: 'tool',
-                    name: toolCall.function.name,
-                    content: result,
-                };
-                await displayToolResult(toolCall, toolResult, toolManager, addToChatQueue, getNextComponentKey);
-            })();
-        },
-        onFinish: () => {
-            setIsGenerating(false);
-        },
-    }, controller.signal);
+    // Build mode overrides for non-interactive mode
+    const modeOverrides = nonInteractiveMode
+        ? {
+            nonInteractiveMode: true,
+            nonInteractiveAlwaysAllow: getAppConfig().alwaysAllow ?? [],
+        }
+        : undefined;
+    const result = await client.chat([systemMessage, ...messages], toolManager?.getAllToolsWithoutExecute() || {}, {}, controller.signal, modeOverrides);
     if (!result || !result.choices || result.choices.length === 0) {
         throw new Error('No response received from model');
     }
     const message = result.choices[0].message;
     const toolCalls = message.tool_calls || null;
     const fullContent = message.content || '';
-    // Parse any tool calls from content for non-tool-calling models
-    const parseResult = parseToolCalls(fullContent);
+    // Only parse text for XML tool calls on the fallback path (non-tool-calling models).
+    // On the native path, response text is just text - no tool calls are embedded in it.
+    const parseResult = result.toolsDisabled
+        ? parseToolCalls(fullContent)
+        : { success: true, toolCalls: [], cleanedContent: fullContent };
+    // Notify the user once per session when the XML fallback path is active
+    if (result.toolsDisabled && !hasShownFallbackNotice) {
+        hasShownFallbackNotice = true;
+        addToChatQueue(_jsx(InfoMessage, { message: "Model does not support native tool calling. Using XML fallback.", hideBox: true }, `xml-fallback-notice-${getNextComponentKey()}`));
+    }
     // Check for malformed tool calls and send error back to model for self-correction
+    // (only happens on the XML fallback path)
     if (!parseResult.success) {
         const errorContent = `${parseResult.error}\n\n${parseResult.examples}`;
         // Display error to user
@@ -81,9 +98,6 @@ export const processAssistantResponse = async (params) => {
             .addMessage(errorFeedbackMessage);
         const updatedMessagesWithError = malformedBuilder.build();
         setMessages(updatedMessagesWithError);
-        // Clear streaming state before recursing
-        setIsGenerating(false);
-        setStreamingContent('');
         // Continue the main conversation loop with error message as context
         await processAssistantResponse({
             ...params,
@@ -94,12 +108,19 @@ export const processAssistantResponse = async (params) => {
     }
     const parsedToolCalls = parseResult.toolCalls;
     const cleanedContent = parseResult.cleanedContent;
+    // Combine native tool calls with any parsed from content (XML fallback path)
+    // Native and parsed are mutually exclusive: native comes from tool-calling models,
+    // parsed comes from non-tool-calling models using XML in text
+    const allToolCalls = [...(toolCalls || []), ...parsedToolCalls];
+    // If this is the final response (no tool calls), flush compact counts
+    // BEFORE the assistant message so the summary appears above it
+    if (allToolCalls.length === 0) {
+        flushCompactCounts();
+    }
     // Display the assistant response (cleaned of any tool calls)
     if (cleanedContent.trim()) {
         addToChatQueue(_jsx(AssistantMessage, { message: cleanedContent, model: currentModel }, `assistant-${getNextComponentKey()}`));
     }
-    // Merge structured tool calls from AI SDK with content-parsed tool calls
-    const allToolCalls = [...(toolCalls || []), ...parsedToolCalls];
     const { validToolCalls, errorResults } = filterValidToolCalls(allToolCalls, toolManager);
     // Add assistant message to conversation history only if it has content or tool_calls
     // Empty assistant messages cause API errors: "Assistant message must have either content or tool_calls"
@@ -111,11 +132,6 @@ export const processAssistantResponse = async (params) => {
     const hasValidAssistantMessage = cleanedContent.trim() || validToolCalls.length > 0;
     // Build updated messages array using MessageBuilder
     const builder = new MessageBuilder(messages);
-    // Add auto-executed messages (assistant + tool results) from AI SDK multi-step execution
-    // This ensures they're counted in usage tracking and included in context
-    if (result.autoExecutedMessages && result.autoExecutedMessages.length > 0) {
-        builder.addAutoExecutedMessages(result.autoExecutedMessages);
-    }
     // Add the final assistant message if it has content or tool calls
     if (hasValidAssistantMessage) {
         builder.addAssistantMessage(assistantMsg);
@@ -125,8 +141,7 @@ export const processAssistantResponse = async (params) => {
     // Build the final messages array
     const updatedMessages = builder.build();
     // Update messages state once with all changes
-    if ((result.autoExecutedMessages && result.autoExecutedMessages.length > 0) ||
-        hasValidAssistantMessage) {
+    if (hasValidAssistantMessage) {
         setMessages(updatedMessages);
     }
     // Check for auto-compact after messages are updated
@@ -153,8 +168,8 @@ export const processAssistantResponse = async (params) => {
     catch (_error) {
         // Silently fail auto-compact, don't interrupt the conversation
     }
-    // Clear streaming state after response is complete
-    setIsGenerating(false);
+    // Clear streaming content (but don't set isGenerating=false yet —
+    // we may still need to execute tools and recurse)
     setStreamingContent('');
     // Handle error results for non-existent tools
     if (errorResults.length > 0) {
@@ -162,9 +177,20 @@ export const processAssistantResponse = async (params) => {
         for (const error of errorResults) {
             addToChatQueue(_jsx(ErrorMessage, { message: error.content, hideBox: true }, `unknown-tool-${error.tool_call_id}-${Date.now()}`));
         }
+        // FIX: Satisfy the AI SDK's strict 1:1 Tool Call/Result mapping.
+        // If we are aborting this turn to self-correct the bad tools,
+        // we MUST provide a cancellation result for the valid tools we are skipping.
+        const abortedResults = validToolCalls.map(tc => ({
+            tool_call_id: tc.id,
+            role: 'tool',
+            name: tc.function.name,
+            content: 'Execution aborted because another tool call in this request was invalid. Please fix the invalid tool call and try again.',
+        }));
+        // Combine the actual errors with the aborted placeholders
+        const allResultsForThisTurn = [...errorResults, ...abortedResults];
         // Send error results back to model for self-correction
         const errorBuilder = new MessageBuilder(updatedMessages);
-        errorBuilder.addToolResults(errorResults);
+        errorBuilder.addToolResults(allResultsForThisTurn);
         const updatedMessagesWithError = errorBuilder.build();
         setMessages(updatedMessagesWithError);
         // Continue the main conversation loop with error messages as context
@@ -177,20 +203,14 @@ export const processAssistantResponse = async (params) => {
     }
     // Handle tool calls if present - this continues the loop
     if (validToolCalls && validToolCalls.length > 0) {
-        // Note: Plan mode tool blocking was removed - the referenced tools
-        // (create_file, delete_lines, insert_lines, replace_lines) no longer exist.
-        // Plan mode restrictions are handled via needsApproval in tool definitions.
-        // TODO: Implement registry-based blocking for plan mode (track as separate issue).
-        // Separate tools that need confirmation vs those that don't
-        // Check tool's needsApproval property to determine if confirmation is needed
+        // Both native and XML fallback paths now use the same logic:
+        // the SDK never auto-executes tools (execute is stripped), so we
+        // evaluate needsApproval ourselves and split into direct vs confirmation.
         const toolsNeedingConfirmation = [];
         const toolsToExecuteDirectly = [];
-        // Tools that are permitted to auto-run in non-interactive mode
-        const nonInteractiveAllowList = new Set(appConfig.alwaysAllow ?? []);
         for (const toolCall of validToolCalls) {
-            // Check if tool has a validator
+            // Run validators (for XML fallback path, catches parse errors)
             let validationFailed = false;
-            // XML validation errors are treated as validation failures
             if (toolCall.function.name === '__xml_validation_error__') {
                 validationFailed = true;
             }
@@ -205,13 +225,12 @@ export const processAssistantResponse = async (params) => {
                         }
                     }
                     catch {
-                        // Validation threw an error - treat as validation failure
                         validationFailed = true;
                     }
                 }
             }
-            // Check tool's needsApproval property from the tool definition
-            let toolNeedsApproval = true; // Default to requiring approval for safety
+            // Evaluate needsApproval from tool definition
+            let toolNeedsApproval = true;
             if (toolManager) {
                 const toolEntry = toolManager.getToolEntry(toolCall.function.name);
                 if (toolEntry?.tool) {
@@ -220,43 +239,35 @@ export const processAssistantResponse = async (params) => {
                         toolNeedsApproval = needsApprovalProp;
                     }
                     else if (typeof needsApprovalProp === 'function') {
-                        // Evaluate function - our tools use getCurrentMode() internally
-                        // and don't actually need the args parameter
                         try {
                             const parsedArgs = parseToolArguments(toolCall.function.arguments);
-                            // Cast to any to handle AI SDK type signature mismatch
-                            // Our tool implementations don't use the second parameter
                             toolNeedsApproval = await needsApprovalProp(parsedArgs);
                         }
                         catch {
-                            // If evaluation fails, require approval for safety
                             toolNeedsApproval = true;
                         }
                     }
                 }
             }
-            // Execute directly if:
-            // 1. Validation failed (need to send error back to model)
-            // 2. Tool has needsApproval: false
-            // 3. Explicitly allowed in non-interactive mode
-            // 4. In auto-accept mode (except bash which always needs approval)
-            const isBashTool = toolCall.function.name === 'execute_bash';
-            const isNonInteractiveAllowed = nonInteractiveMode &&
-                nonInteractiveAllowList.has(toolCall.function.name);
-            const shouldExecuteDirectly = validationFailed ||
-                !toolNeedsApproval ||
-                isNonInteractiveAllowed ||
-                (developmentMode === 'auto-accept' && !isBashTool);
-            if (shouldExecuteDirectly) {
+            if (validationFailed || !toolNeedsApproval) {
                 toolsToExecuteDirectly.push(toolCall);
             }
             else {
                 toolsNeedingConfirmation.push(toolCall);
             }
         }
-        // Execute non-confirmation tools directly
+        // Execute tools that don't need confirmation (parallel via Promise.all)
         if (toolsToExecuteDirectly.length > 0) {
-            const directResults = await executeToolsDirectly(toolsToExecuteDirectly, toolManager, conversationStateManager, addToChatQueue, getNextComponentKey);
+            const directResults = await executeToolsDirectly(toolsToExecuteDirectly, toolManager, conversationStateManager, addToChatQueue, getNextComponentKey, {
+                compactDisplay: compactToolDisplayRef?.current,
+                onCompactToolCount: (toolName) => {
+                    if (compactToolCountsRef) {
+                        const counts = compactToolCountsRef.current;
+                        counts[toolName] = (counts[toolName] ?? 0) + 1;
+                        onSetCompactToolCounts?.({ ...counts });
+                    }
+                },
+            });
             if (directResults.length > 0) {
                 // Add tool results to messages
                 const directBuilder = new MessageBuilder(updatedMessages);
@@ -264,10 +275,8 @@ export const processAssistantResponse = async (params) => {
                 const updatedMessagesWithTools = directBuilder.build();
                 setMessages(updatedMessagesWithTools);
                 // If there are also tools needing confirmation, start that flow
-                // instead of recursing. Recursing would send messages to the API
-                // with the assistant's tool_calls for ALL tools but only results
-                // for the direct ones, causing "Tool result is missing" errors.
                 if (toolsNeedingConfirmation.length > 0) {
+                    flushCompactCounts();
                     onStartToolConfirmationFlow(toolsNeedingConfirmation, updatedMessagesWithTools, assistantMsg, systemMessage);
                     return;
                 }
@@ -282,6 +291,8 @@ export const processAssistantResponse = async (params) => {
         }
         // Start confirmation flow only for tools that need it
         if (toolsNeedingConfirmation.length > 0) {
+            // Flush compact counts before entering confirmation or exiting
+            flushCompactCounts();
             // In non-interactive mode, exit when tool approval is required
             if (nonInteractiveMode) {
                 const toolNames = toolsNeedingConfirmation
@@ -300,13 +311,14 @@ export const processAssistantResponse = async (params) => {
                 errorBuilder.addMessage(errorMessage);
                 setMessages(errorBuilder.build());
                 // Signal completion to trigger exit
+                setIsGenerating(false);
                 if (onConversationComplete) {
                     onConversationComplete();
                 }
                 return;
             }
-            // Pass complete messages including assistant msg
-            // useToolHandler will add tool results
+            // Hand off to confirmation flow — it manages its own generating state
+            setIsGenerating(false);
             onStartToolConfirmationFlow(toolsNeedingConfirmation, updatedMessages, // Includes assistant message
             assistantMsg, systemMessage);
         }
@@ -327,7 +339,7 @@ export const processAssistantResponse = async (params) => {
             role: 'user',
             content: nudgeContent,
         };
-        // Display a "continue" message in chat so user knows what happened
+        // Display a "continue" message when the model produced empty text
         addToChatQueue(_jsx(UserMessage, { message: "continue" }, `auto-continue-${getNextComponentKey()}`));
         // Don't include the empty assistantMsg - it would cause API error
         // "Assistant message must have either content or tool_calls"
@@ -344,6 +356,7 @@ export const processAssistantResponse = async (params) => {
         return;
     }
     if (validToolCalls.length === 0 && cleanedContent.trim()) {
+        setIsGenerating(false);
         const adjective = getRandomAdjective();
         const elapsed = formatElapsedTime(startTime);
         addToChatQueue(_jsx(InfoMessage, { message: `Worked for a ${adjective} ${elapsed}.`, hideBox: true, marginBottom: 2 }, `completion-time-${getNextComponentKey()}`));