@zds-ai/cli 0.1.2 → 0.1.4

package/dist/agent/grok-agent.js

@@ -3,12 +3,75 @@ import { getAllGrokTools, getMCPManager, initializeMCPServers, } from "../grok/t
 import { loadMCPConfig } from "../mcp/config.js";
 import { ChatHistoryManager } from "../utils/chat-history-manager.js";
 import { logApiError } from "../utils/error-logger.js";
+import { parseImagesFromMessage, hasImageReferences } from "../utils/image-encoder.js";
+import { getTextContent } from "../utils/content-utils.js";
 import fs from "fs";
 import { TextEditorTool, MorphEditorTool, ZshTool, ConfirmationTool, SearchTool, EnvTool, IntrospectTool, ClearCacheTool, CharacterTool, TaskTool, InternetTool, ImageTool, FileConversionTool, RestartTool } from "../tools/index.js";
 import { EventEmitter } from "events";
 import { createTokenCounter } from "../utils/token-counter.js";
 import { getSettingsManager } from "../utils/settings-manager.js";
 import { executeOperationHook, executeToolApprovalHook, applyHookCommands } from "../utils/hook-executor.js";
+// Interval (ms) between token count updates when streaming
+const TOKEN_UPDATE_INTERVAL_MS = 250;
+// Minimum delay (in ms) applied when stopping a task to ensure smooth UI/UX.
+const MINIMUM_STOP_TASK_DELAY_MS = 3000;
+// Maximum number of attempts to parse nested JSON strings in executeTool
+const MAX_JSON_PARSE_ATTEMPTS = 5;
+/**
+ * Threshold used to determine whether an AI response is "substantial" (in characters).
+ */
+const SUBSTANTIAL_RESPONSE_THRESHOLD = 50;
+/**
+ * Extracts the first complete JSON object from a string.
+ * Handles duplicate/concatenated JSON objects (LLM bug) like: {"key":"val"}{"key":"val"}
+ * @param jsonString The string potentially containing concatenated JSON objects
+ * @returns The first complete JSON object, or the original string if no duplicates found
+ */
+function extractFirstJsonObject(jsonString) {
+    if (!jsonString.includes('}{'))
+        return jsonString;
+    try {
+        // Find the end of the first complete JSON object
+        let depth = 0;
+        let firstObjEnd = -1;
+        for (let i = 0; i < jsonString.length; i++) {
+            if (jsonString[i] === "{")
+                depth++;
+            if (jsonString[i] === "}") {
+                depth--;
+                if (depth === 0) {
+                    firstObjEnd = i + 1;
+                    break;
+                }
+            }
+        }
+        if (firstObjEnd > 0 && firstObjEnd < jsonString.length) {
+            // Extract and validate first object
+            const firstObj = jsonString.substring(0, firstObjEnd);
+            JSON.parse(firstObj); // Validate it's valid JSON
+            return firstObj;
+        }
+    }
+    catch {
+        // If extraction fails, return the original string
+    }
+    return jsonString;
+}
+/**
+ * Cleans up LLM-generated JSON argument strings for tool calls.
+ * Removes duplicate/concatenated JSON objects and trims.
+ * @param args The raw arguments string from the tool call
+ * @returns Cleaned and sanitized argument string
+ */
+function sanitizeToolArguments(args) {
+    let argsString = args?.trim() || "{}";
+    // Handle duplicate/concatenated JSON objects (LLM bug)
+    const extractedArgsString = extractFirstJsonObject(argsString);
+    if (extractedArgsString !== argsString) {
+        argsString = extractedArgsString;
+    }
+    return argsString;
+}
 export class GrokAgent extends EventEmitter {
     grokClient;
     textEditor;
@@ -44,7 +107,8 @@ export class GrokAgent extends EventEmitter {
     activeTaskAction = "";
     activeTaskColor = "white";
     apiKeyEnvVar = "GROK_API_KEY";
-    pendingContextEdit = null;
+    pendingContextEditSession = null;
+    rephraseState = null;
     constructor(apiKey, baseURL, model, maxToolRounds, debugLogFile, startupHookOutput, temperature, maxTokens) {
         super();
         const manager = getSettingsManager();
@@ -168,21 +232,24 @@ Current working directory: ${process.cwd()}`;
             switch (entry.type) {
                 case "system":
                     // All system messages from chatHistory go into conversation (persona, mood, etc.)
+                    // System messages must always be strings
                     historyMessages.push({
                         role: "system",
-                        content: entry.content,
+                        content: getTextContent(entry.content),
                     });
                     break;
                 case "user":
+                    // User messages can have images (content arrays)
                     historyMessages.push({
                         role: "user",
-                        content: entry.content,
+                        content: entry.content || "",
                     });
                     break;
                 case "assistant":
+                    // Assistant messages are always text (no images in responses)
                     const assistantMessage = {
                         role: "assistant",
-                        content: entry.content || "", // Ensure content is never null/undefined
+                        content: getTextContent(entry.content) || "", // Ensure content is never null/undefined
                     };
                     if (entry.tool_calls && entry.tool_calls.length > 0) {
                         // For assistant messages with tool calls, collect the tool results that correspond to them
@@ -283,6 +350,39 @@ Current working directory: ${process.cwd()}`;
         return false;
     }
     async processUserMessage(message) {
+        // Detect rephrase commands
+        let isRephraseCommand = false;
+        let isSystemRephrase = false;
+        let messageToSend = message;
+        let messageType = "user";
+        if (message.startsWith("/system rephrase")) {
+            isRephraseCommand = true;
+            isSystemRephrase = true;
+            messageToSend = message.substring(8).trim(); // Strip "/system " (8 chars including space)
+            messageType = "system";
+        }
+        else if (message.startsWith("/rephrase")) {
+            isRephraseCommand = true;
+            messageToSend = message; // Keep full text including "/rephrase"
+            messageType = "user";
+        }
+        // If this is a rephrase command, find the last assistant message
+        if (isRephraseCommand) {
+            // Find index of last assistant message in chatHistory
+            let lastAssistantIndex = -1;
+            for (let i = this.chatHistory.length - 1; i >= 0; i--) {
+                if (this.chatHistory[i].type === "assistant") {
+                    lastAssistantIndex = i;
+                    break;
+                }
+            }
+            if (lastAssistantIndex === -1) {
+                throw new Error("No previous assistant message to rephrase");
+            }
+            // Store rephrase state (will be updated with newResponseIndex after response)
+            // For now, just mark that we're in rephrase mode
+            this.setRephraseState(lastAssistantIndex, this.chatHistory.length, -1, messageType);
+        }
         // Before adding the new user message, check if there are incomplete tool calls
         // from a previous interrupted turn. This prevents malformed message sequences
         // that cause Ollama 500 errors.
@@ -313,14 +413,40 @@ Current working directory: ${process.cwd()}`;
                 }
             }
         }
-        // Add user message to conversation
+        // Add user/system message to conversation
+        // Check for image references and parse if present
+        // Note: System messages can only have string content, so images are only supported for user messages
+        const supportsVision = this.grokClient.getSupportsVision();
+        let messageContent = messageToSend;
+        if (messageType === "user" && hasImageReferences(messageToSend) && supportsVision) {
+            // Parse images from message (only for user messages)
+            const parsed = parseImagesFromMessage(messageToSend);
+            if (parsed.images.length > 0) {
+                // Construct content array with text and images
+                messageContent = [
+                    { type: "text", text: parsed.text },
+                    ...parsed.images
+                ];
+            }
+            else {
+                // No valid images found (errors will be in parsed.text)
+                messageContent = parsed.text;
+            }
+        }
         const userEntry = {
-            type: "user",
-            content: message,
+            type: messageType,
+            content: messageContent,
             timestamp: new Date(),
         };
         this.chatHistory.push(userEntry);
-        this.messages.push({ role: "user", content: message });
+        // Push to messages array with proper typing based on role
+        if (messageType === "user") {
+            this.messages.push({ role: "user", content: messageContent });
+        }
+        else {
+            // System messages must have string content only
+            this.messages.push({ role: "system", content: typeof messageContent === "string" ? messageContent : messageToSend });
+        }
         await this.emitContextChange();
         const newEntries = [userEntry];
         const maxToolRounds = this.maxToolRounds; // Prevent infinite loops
@@ -350,33 +476,7 @@ Current working directory: ${process.cwd()}`;
                     // Clean up tool call arguments before adding to conversation history
                     // This prevents Ollama from rejecting malformed tool calls on subsequent API calls
                     const cleanedToolCalls = assistantMessage.tool_calls.map(toolCall => {
-                        let argsString = toolCall.function.arguments?.trim() || "{}";
-                        // Handle duplicate/concatenated JSON objects (LLM bug)
-                        if (argsString.includes('}{')) {
-                            try {
-                                let depth = 0;
-                                let firstObjEnd = -1;
-                                for (let i = 0; i < argsString.length; i++) {
-                                    if (argsString[i] === '{')
-                                        depth++;
-                                    if (argsString[i] === '}') {
-                                        depth--;
-                                        if (depth === 0) {
-                                            firstObjEnd = i + 1;
-                                            break;
-                                        }
-                                    }
-                                }
-                                if (firstObjEnd > 0 && firstObjEnd < argsString.length) {
-                                    const firstObj = argsString.substring(0, firstObjEnd);
-                                    JSON.parse(firstObj); // Validate
-                                    argsString = firstObj; // Use cleaned version
-                                }
-                            }
-                            catch (e) {
-                                // Keep original if cleaning fails
-                            }
-                        }
+                        let argsString = sanitizeToolArguments(toolCall.function.arguments);
                         return {
                             ...toolCall,
                             function: {
@@ -494,10 +594,11 @@ Current working directory: ${process.cwd()}`;
                         // Collect system messages that appeared after this assistant message
                         for (let i = assistantIndex + 1; i < this.chatHistory.length; i++) {
                             const entry = this.chatHistory[i];
-                            if (entry.type === 'system' && entry.content && entry.content.trim()) {
+                            const content = getTextContent(entry.content);
+                            if (entry.type === 'system' && content && content.trim()) {
                                 this.messages.push({
                                     role: 'system',
-                                    content: entry.content
+                                    content: content
                                 });
                             }
                             // Stop if we hit another assistant or user message (next turn)
@@ -538,6 +639,11 @@ Current working directory: ${process.cwd()}`;
                             content: trimmedContent,
                         });
                         newEntries.push(responseEntry);
+                        // Update rephrase state with the new response index
+                        if (this.rephraseState && this.rephraseState.newResponseIndex === -1) {
+                            const newResponseIndex = this.chatHistory.length - 1;
+                            this.setRephraseState(this.rephraseState.originalAssistantMessageIndex, this.rephraseState.rephraseRequestIndex, newResponseIndex, this.rephraseState.messageType);
+                        }
                     }
                     // TODO: HACK - This is a temporary fix to prevent duplicate responses.
                     // We need a proper way for the bot to signal task completion, such as:
@@ -546,8 +652,8 @@ Current working directory: ${process.cwd()}`;
                     // - A structured response format that explicitly marks completion
                     // For now, we break immediately after a substantial response to avoid
                     // the cascade of duplicate responses caused by "give it one more chance" logic.
-                    // If the AI provided a substantial response (>50 chars), task is complete
-                    if (assistantMessage.content && assistantMessage.content.trim().length > 50) {
+                    // If the AI provided a substantial response (>SUBSTANTIAL_RESPONSE_THRESHOLD chars), task is complete
+                    if (assistantMessage.content && assistantMessage.content.trim().length > SUBSTANTIAL_RESPONSE_THRESHOLD) {
                         break; // Task complete - bot gave a full response
                     }
                     // Short/empty response, give AI another chance
@@ -693,6 +799,39 @@ Current working directory: ${process.cwd()}`;
     async *processUserMessageStream(message) {
         // Create new abort controller for this request
         this.abortController = new AbortController();
+        // Detect rephrase commands
+        let isRephraseCommand = false;
+        let isSystemRephrase = false;
+        let messageToSend = message;
+        let messageType = "user";
+        if (message.startsWith("/system rephrase")) {
+            isRephraseCommand = true;
+            isSystemRephrase = true;
+            messageToSend = message.substring(8).trim(); // Strip "/system " (8 chars including space)
+            messageType = "system";
+        }
+        else if (message.startsWith("/rephrase")) {
+            isRephraseCommand = true;
+            messageToSend = message; // Keep full text including "/rephrase"
+            messageType = "user";
+        }
+        // If this is a rephrase command, find the last assistant message
+        if (isRephraseCommand) {
+            // Find index of last assistant message in chatHistory
+            let lastAssistantIndex = -1;
+            for (let i = this.chatHistory.length - 1; i >= 0; i--) {
+                if (this.chatHistory[i].type === "assistant") {
+                    lastAssistantIndex = i;
+                    break;
+                }
+            }
+            if (lastAssistantIndex === -1) {
+                throw new Error("No previous assistant message to rephrase");
+            }
+            // Store rephrase state (will be updated with newResponseIndex after response)
+            // For now, just mark that we're in rephrase mode
+            this.setRephraseState(lastAssistantIndex, this.chatHistory.length, -1, messageType);
+        }
         // Before adding the new user message, check if there are incomplete tool calls
         // from a previous interrupted turn. This prevents malformed message sequences
         // that cause Ollama 500 errors.
@@ -723,14 +862,40 @@ Current working directory: ${process.cwd()}`;
                 }
             }
         }
-        // Add user message to both API conversation and chat history
+        // Add user/system message to both API conversation and chat history
+        // Check for image references and parse if present
+        // Note: System messages can only have string content, so images are only supported for user messages
+        const supportsVision = this.grokClient.getSupportsVision();
+        let messageContent = messageToSend;
+        if (messageType === "user" && hasImageReferences(messageToSend) && supportsVision) {
+            // Parse images from message (only for user messages)
+            const parsed = parseImagesFromMessage(messageToSend);
+            if (parsed.images.length > 0) {
+                // Construct content array with text and images
+                messageContent = [
+                    { type: "text", text: parsed.text },
+                    ...parsed.images
+                ];
+            }
+            else {
+                // No valid images found (errors will be in parsed.text)
+                messageContent = parsed.text;
+            }
+        }
         const userEntry = {
-            type: "user",
-            content: message,
+            type: messageType,
+            content: messageContent,
             timestamp: new Date(),
         };
         this.chatHistory.push(userEntry);
-        this.messages.push({ role: "user", content: message });
+        // Push to messages array with proper typing based on role
+        if (messageType === "user") {
+            this.messages.push({ role: "user", content: messageContent });
+        }
+        else {
+            // System messages must have string content only
+            this.messages.push({ role: "system", content: typeof messageContent === "string" ? messageContent : messageToSend });
+        }
         await this.emitContextChange();
         // Yield user message so UI can display it immediately
         yield {
@@ -847,7 +1012,7 @@ Current working directory: ${process.cwd()}`;
                             };
                             // Emit token count update
                             const now = Date.now();
-                            if (now - lastTokenUpdate > 250) {
+                            if (now - lastTokenUpdate > TOKEN_UPDATE_INTERVAL_MS) {
                                 lastTokenUpdate = now;
                                 yield {
                                     type: "token_count",
@@ -875,33 +1040,7 @@ Current working directory: ${process.cwd()}`;
                 // Clean up tool call arguments before adding to conversation history
                 // This prevents Ollama from rejecting malformed tool calls on subsequent API calls
                 const cleanedToolCalls = accumulatedMessage.tool_calls?.map(toolCall => {
-                    let argsString = toolCall.function.arguments?.trim() || "{}";
-                    // Handle duplicate/concatenated JSON objects (LLM bug)
-                    if (argsString.includes('}{')) {
-                        try {
-                            let depth = 0;
-                            let firstObjEnd = -1;
-                            for (let i = 0; i < argsString.length; i++) {
-                                if (argsString[i] === '{')
-                                    depth++;
-                                if (argsString[i] === '}') {
-                                    depth--;
-                                    if (depth === 0) {
-                                        firstObjEnd = i + 1;
-                                        break;
-                                    }
-                                }
-                            }
-                            if (firstObjEnd > 0 && firstObjEnd < argsString.length) {
-                                const firstObj = argsString.substring(0, firstObjEnd);
-                                JSON.parse(firstObj); // Validate
-                                argsString = firstObj; // Use cleaned version
-                            }
-                        }
-                        catch (e) {
-                            // Keep original if cleaning fails
-                        }
-                    }
+                    let argsString = sanitizeToolArguments(toolCall.function.arguments);
                     return {
                         ...toolCall,
                         function: {
@@ -925,6 +1064,11 @@ Current working directory: ${process.cwd()}`;
                 };
                 this.chatHistory.push(assistantEntry);
                 await this.emitContextChange();
+                // Update rephrase state if this is a final response (no tool calls)
+                if (this.rephraseState && this.rephraseState.newResponseIndex === -1 && (!accumulatedMessage.tool_calls || accumulatedMessage.tool_calls.length === 0)) {
+                    const newResponseIndex = this.chatHistory.length - 1;
+                    this.setRephraseState(this.rephraseState.originalAssistantMessageIndex, this.rephraseState.rephraseRequestIndex, newResponseIndex, this.rephraseState.messageType);
+                }
                 // Handle tool calls if present
                 if (accumulatedMessage.tool_calls?.length > 0) {
                     toolRounds++;
@@ -1039,10 +1183,11 @@ Current working directory: ${process.cwd()}`;
                         // Collect system messages that appeared after this assistant message
                         for (let i = assistantIndex + 1; i < this.chatHistory.length; i++) {
                             const entry = this.chatHistory[i];
-                            if (entry.type === 'system' && entry.content && entry.content.trim()) {
+                            const content = getTextContent(entry.content);
+                            if (entry.type === 'system' && content && content.trim()) {
                                 this.messages.push({
                                     role: 'system',
-                                    content: entry.content
+                                    content: content
                                 });
                             }
                             // Stop if we hit another assistant or user message (next turn)
@@ -1100,7 +1245,7 @@ Current working directory: ${process.cwd()}`;
             this.chatHistory.push(errorEntry);
             yield {
                 type: "content",
-                content: errorEntry.content,
+                content: getTextContent(errorEntry.content),
             };
             // Mark first message as processed even on error
             this.firstMessageProcessed = true;
@@ -1178,41 +1323,16 @@ Current working directory: ${process.cwd()}`;
             // Handle duplicate/concatenated JSON objects (LLM bug)
             // Pattern: {"key":"val"}{"key":"val"}
             let hadDuplicateJson = false;
-            if (argsString.includes('}{')) {
-                try {
-                    // Find the end of the first complete JSON object
-                    let depth = 0;
-                    let firstObjEnd = -1;
-                    for (let i = 0; i < argsString.length; i++) {
-                        if (argsString[i] === '{')
-                            depth++;
-                        if (argsString[i] === '}') {
-                            depth--;
-                            if (depth === 0) {
-                                firstObjEnd = i + 1;
-                                break;
-                            }
-                        }
-                    }
-                    if (firstObjEnd > 0 && firstObjEnd < argsString.length) {
-                        // Extract and validate first object
-                        const firstObj = argsString.substring(0, firstObjEnd);
-                        JSON.parse(firstObj); // Validate it's valid JSON
-                        // Use only the first object
-                        hadDuplicateJson = true;
-                        argsString = firstObj;
-                    }
-                }
-                catch (e) {
-                    // If extraction fails, continue with original string
-                    // The error will be caught by the main JSON.parse below
-                }
+            const extractedArgsString = extractFirstJsonObject(argsString);
+            if (extractedArgsString !== argsString) {
+                hadDuplicateJson = true;
+                argsString = extractedArgsString;
             }
             let args = JSON.parse(argsString);
             // Handle multiple layers of JSON encoding (API bug)
             // Keep parsing until we get an object, not a string
             let parseCount = 0;
-            while (typeof args === 'string' && parseCount < 5) {
+            while (typeof args === 'string' && parseCount < MAX_JSON_PARSE_ATTEMPTS) {
                 parseCount++;
                 try {
                     args = JSON.parse(args);
@@ -1261,18 +1381,9 @@ Current working directory: ${process.cwd()}`;
             // Validate tool arguments against schema
             const validationError = await this.validateToolArguments(toolCall.function.name, args);
             if (validationError) {
-                // Add system message explaining the validation error
-                const systemMsg = `Tool call validation failed: ${validationError}. Please try again with correct parameters.`;
-                console.warn(`[VALIDATION ERROR] ${systemMsg}`);
-                this.messages.push({
-                    role: 'system',
-                    content: systemMsg
-                });
-                this.chatHistory.push({
-                    type: 'system',
-                    content: systemMsg,
-                    timestamp: new Date()
-                });
+                // Validation failed - return error
+                const errorMsg = `Tool call validation failed: ${validationError}. Please try again with correct parameters.`;
+                console.warn(`[VALIDATION ERROR] ${errorMsg}`);
                 return {
                     success: false,
                     error: validationError
@@ -1388,6 +1499,8 @@ Current working directory: ${process.cwd()}`;
                     return await this.imageTool.captionImage(args.filename, args.prompt);
                 case "pngInfo":
                     return await this.imageTool.pngInfo(args.filename);
+                case "listImageModels":
+                    return await this.imageTool.listImageModels();
                 case "readXlsx":
                     return await this.fileConversionTool.readXlsx(args.filename, args.sheetName, args.outputFormat, args.output);
                 case "listXlsxSheets":
@@ -1509,17 +1622,17 @@ Current working directory: ${process.cwd()}`;
             const timestamp = entry.timestamp.toLocaleTimeString();
             if (entry.type === 'user') {
                 lines.push(`(${msgNum}) ${userName} (user) - ${timestamp}`);
-                lines.push(entry.content || "");
+                lines.push(getTextContent(entry.content) || "");
                 lines.push("");
             }
             else if (entry.type === 'assistant') {
                 lines.push(`(${msgNum}) ${agentName} (assistant) - ${timestamp}`);
-                lines.push(entry.content || "");
+                lines.push(getTextContent(entry.content) || "");
                 lines.push("");
             }
             else if (entry.type === 'system') {
                 lines.push(`(${msgNum}) System (system) - ${timestamp}`);
-                lines.push(entry.content || "");
+                lines.push(getTextContent(entry.content) || "");
                 lines.push("");
             }
             else if (entry.type === 'tool_call') {
@@ -1534,7 +1647,7 @@ Current working directory: ${process.cwd()}`;
                 const toolCall = entry.toolCall;
                 const toolName = toolCall?.function?.name || "unknown";
                 lines.push(`(${msgNum}) System (tool_result: ${toolName}) - ${timestamp}`);
-                lines.push(entry.content || "");
+                lines.push(getTextContent(entry.content) || "");
                 lines.push("");
             }
         });
@@ -1561,14 +1674,23 @@ Current working directory: ${process.cwd()}`;
     getActiveTaskColor() {
         return this.activeTaskColor;
     }
-    setPendingContextEdit(tmpJsonPath, contextFilePath) {
-        this.pendingContextEdit = { tmpJsonPath, contextFilePath };
+    setPendingContextEditSession(tmpJsonPath, contextFilePath) {
+        this.pendingContextEditSession = { tmpJsonPath, contextFilePath };
+    }
+    getPendingContextEditSession() {
+        return this.pendingContextEditSession;
+    }
+    clearPendingContextEditSession() {
+        this.pendingContextEditSession = null;
+    }
+    setRephraseState(originalAssistantMessageIndex, rephraseRequestIndex, newResponseIndex, messageType) {
+        this.rephraseState = { originalAssistantMessageIndex, rephraseRequestIndex, newResponseIndex, messageType };
     }
-    getPendingContextEdit() {
-        return this.pendingContextEdit;
+    getRephraseState() {
+        return this.rephraseState;
     }
-    clearPendingContextEdit() {
-        this.pendingContextEdit = null;
+    clearRephraseState() {
+        this.rephraseState = null;
     }
     async setPersona(persona, color) {
         // Execute hook if configured
@@ -1577,12 +1699,6 @@ Current working directory: ${process.cwd()}`;
         const hookMandatory = settings.isPersonaHookMandatory();
         if (!hookPath && hookMandatory) {
             const reason = "Persona hook is mandatory but not configured";
-            // Note: Don't add to this.messages during tool execution - only chatHistory
-            this.chatHistory.push({
-                type: 'system',
-                content: `Failed to change persona to "${persona}": ${reason}`,
-                timestamp: new Date()
-            });
             return {
                 success: false,
                 error: reason
@@ -1600,24 +1716,13 @@ Current working directory: ${process.cwd()}`;
                 // Even in rejection, we process commands (might have MODEL change)
                 await this.processHookResult(hookResult);
                 // Note: We ignore the return value here since we're already rejecting the persona
-                // Note: Don't add to this.messages during tool execution - only chatHistory
-                this.chatHistory.push({
-                    type: 'system',
-                    content: `Failed to change persona to "${persona}": ${reason}`,
-                    timestamp: new Date()
-                });
                 return {
                     success: false,
                     error: reason
                 };
             }
             if (hookResult.timedOut) {
-                // Note: Don't add to this.messages during tool execution - only chatHistory
-                this.chatHistory.push({
-                    type: 'system',
-                    content: `Persona hook timed out (auto-approved)`,
-                    timestamp: new Date()
-                });
+                // Hook timed out but was auto-approved
             }
             // Process hook commands (ENV, MODEL, SYSTEM)
             const result = await this.processHookResult(hookResult, 'ZDS_AI_AGENT_PERSONA');
@@ -1638,25 +1743,7 @@ Current working directory: ${process.cwd()}`;
         this.persona = persona;
         this.personaColor = color || "white";
         process.env.ZDS_AI_AGENT_PERSONA = persona;
-        // Add system message for recordkeeping
-        let systemContent;
-        if (oldPersona) {
-            const oldColorStr = oldColor && oldColor !== "white" ? ` (${oldColor})` : "";
-            const newColorStr = this.personaColor && this.personaColor !== "white" ? ` (${this.personaColor})` : "";
-            systemContent = `Assistant changed the persona from "${oldPersona}"${oldColorStr} to "${this.persona}"${newColorStr}`;
-        }
-        else {
-            const colorStr = this.personaColor && this.personaColor !== "white" ? ` (${this.personaColor})` : "";
-            systemContent = `Assistant set the persona to "${this.persona}"${colorStr}`;
-        }
-        // Note: Don't add to this.messages during tool execution - only chatHistory
-        // System messages added during tool execution create invalid message sequences
-        // because they get inserted between tool_calls and tool_results
-        this.chatHistory.push({
-            type: 'system',
-            content: systemContent,
-            timestamp: new Date()
-        });
+        // Persona hook generates success message - no need for redundant CLI message
         this.emit('personaChange', {
             persona: this.persona,
             color: this.personaColor
@@ -1670,12 +1757,6 @@ Current working directory: ${process.cwd()}`;
         const hookMandatory = settings.isMoodHookMandatory();
         if (!hookPath && hookMandatory) {
             const reason = "Mood hook is mandatory but not configured";
-            // Note: Don't add to this.messages during tool execution - only chatHistory
-            this.chatHistory.push({
-                type: 'system',
-                content: `Failed to change mood to "${mood}": ${reason}`,
-                timestamp: new Date()
-            });
             return {
                 success: false,
                 error: reason
@@ -1691,24 +1772,13 @@ Current working directory: ${process.cwd()}`;
                 const reason = hookResult.reason || "Hook rejected mood change";
                 // Process rejection commands (MODEL, SYSTEM)
                 await this.processHookResult(hookResult);
-                // Note: Don't add to this.messages during tool execution - only chatHistory
-                this.chatHistory.push({
-                    type: 'system',
-                    content: `Failed to change mood to "${mood}": ${reason}`,
-                    timestamp: new Date()
-                });
                 return {
                     success: false,
                     error: reason
                 };
             }
             if (hookResult.timedOut) {
-                // Note: Don't add to this.messages during tool execution - only chatHistory
-                this.chatHistory.push({
-                    type: 'system',
-                    content: `Mood hook timed out (auto-approved)`,
-                    timestamp: new Date()
-                });
+                // Hook timed out but was auto-approved
             }
             // Process hook commands (ENV, MODEL, SYSTEM)
             const result = await this.processHookResult(hookResult, 'ZDS_AI_AGENT_MOOD');
@@ -1776,20 +1846,13 @@ Current working directory: ${process.cwd()}`;
             await this.processHookResult(hookResult);
             if (!hookResult.approved) {
                 const reason = hookResult.reason || "Hook rejected task start";
-                this.messages.push({
-                    role: 'system',
-                    content: `Failed to start task "${activeTask}": ${reason}`
-                });
                 return {
                     success: false,
                     error: reason
                 };
             }
             if (hookResult.timedOut) {
-                this.messages.push({
-                    role: 'system',
-                    content: `Task start hook timed out (auto-approved)`
-                });
+                // Hook timed out but was auto-approved
             }
         }
         // Set the task
@@ -1831,20 +1894,13 @@ Current working directory: ${process.cwd()}`;
             await this.processHookResult(hookResult);
             if (!hookResult.approved) {
                 const reason = hookResult.reason || "Hook rejected task status transition";
-                this.messages.push({
-                    role: 'system',
-                    content: `Failed to transition task "${this.activeTask}" from ${this.activeTaskAction} to ${action}: ${reason}`
-                });
                 return {
                     success: false,
                     error: reason
                 };
             }
             if (hookResult.timedOut) {
-                this.messages.push({
-                    role: 'system',
-                    content: `Task transition hook timed out (auto-approved)`
-                });
+                // Hook timed out but was auto-approved
             }
         }
         // Store old action for system message
@@ -1890,25 +1946,18 @@ Current working directory: ${process.cwd()}`;
             await this.processHookResult(hookResult);
             if (!hookResult.approved) {
                 const hookReason = hookResult.reason || "Hook rejected task stop";
-                this.messages.push({
-                    role: 'system',
-                    content: `Failed to stop task "${this.activeTask}": ${hookReason}`
-                });
                 return {
                     success: false,
                     error: hookReason
                 };
             }
             if (hookResult.timedOut) {
-                this.messages.push({
-                    role: 'system',
-                    content: `Task stop hook timed out (auto-approved)`
-                });
+                // Hook timed out but was auto-approved
             }
         }
         // Calculate remaining time to meet 3-second minimum
         const elapsed = Date.now() - startTime;
-        const minimumDelay = 3000;
+        const minimumDelay = MINIMUM_STOP_TASK_DELAY_MS;
         const remainingDelay = Math.max(0, minimumDelay - elapsed);
         // Wait for remaining time if needed
         if (remainingDelay > 0) {
@@ -2410,7 +2459,7 @@ Current working directory: ${process.cwd()}`;
                     this.emit('modelChange', { model });
                 }
                 else {
-                    console.warn(`Failed to restore backend: API key not found in environment variable ${state.apiKeyEnvVar}`);
+                    console.warn("Failed to restore backend: API key not found in environment.");
                 }
             }
             catch (error) {