@zds-ai/cli 0.1.4 → 0.1.5

package/dist/agent/grok-agent.d.ts

@@ -229,6 +229,7 @@ export declare class GrokAgent extends EventEmitter {
         baseUrl: string;
         apiKeyEnvVar: string;
         model: string;
+        supportsVision: boolean;
     };
     /**
      * Restore session state from persistence
@@ -249,7 +250,14 @@ export declare class GrokAgent extends EventEmitter {
         baseUrl?: string;
         apiKeyEnvVar?: string;
         model?: string;
+        supportsVision?: boolean;
     }): Promise<void>;
+    /**
+     * Compact conversation context by keeping system prompt and last N messages
+     * Reduces context size when it grows too large for backend to handle
+     * @returns Number of messages removed
+     */
+    compactContext(keepLastMessages?: number): number;
     /**
      * Get all tool instances and their class names for display purposes
      */

package/dist/agent/grok-agent.js

@@ -5,6 +5,7 @@ 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 { Variable } from "./prompt-variables.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";
@@ -413,25 +414,26 @@ Current working directory: ${process.cwd()}`;
                 }
             }
         }
+        // Clear one-shot variables
+        Variable.clearOneShot();
+        // Parse images once if present (for both text extraction and later assembly)
+        const parsed = hasImageReferences(messageToSend)
+            ? parseImagesFromMessage(messageToSend)
+            : { text: messageToSend, images: [] };
+        // Set USER:PROMPT variable (text only, images stripped)
+        Variable.set("USER:PROMPT", parsed.text);
+        // Assemble final message from variables
+        const assembledMessage = Variable.renderFull("USER");
         // 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;
-            }
+        let messageContent = assembledMessage;
+        if (messageType === "user" && parsed.images.length > 0 && supportsVision) {
+            // Construct content array with assembled text and images
+            messageContent = [
+                { type: "text", text: assembledMessage },
+                ...parsed.images
+            ];
         }
         const userEntry = {
             type: messageType,
@@ -691,6 +693,22 @@ Current working directory: ${process.cwd()}`;
             return newEntries;
         }
         catch (error) {
+            // Check if context is too large (413 error when vision already disabled)
+            if (error.message && error.message.startsWith('CONTEXT_TOO_LARGE:')) {
+                const beforeCount = this.chatHistory.length;
+                this.compactContext(20);
+                const afterCount = this.chatHistory.length;
+                const removedCount = beforeCount - afterCount;
+                const compactEntry = {
+                    type: "system",
+                    content: `Context was too large for backend. Automatically compacted: removed ${removedCount} older messages, keeping last 20 messages. Please retry your request.`,
+                    timestamp: new Date(),
+                };
+                this.chatHistory.push(compactEntry);
+                // Mark first message as processed
+                this.firstMessageProcessed = true;
+                return [userEntry, compactEntry];
+            }
             const errorEntry = {
                 type: "assistant",
                 content: `Sorry, I encountered an error: ${error.message}`,
@@ -862,25 +880,26 @@ Current working directory: ${process.cwd()}`;
                 }
             }
         }
+        // Clear one-shot variables
+        Variable.clearOneShot();
+        // Parse images once if present (for both text extraction and later assembly)
+        const parsed = hasImageReferences(messageToSend)
+            ? parseImagesFromMessage(messageToSend)
+            : { text: messageToSend, images: [] };
+        // Set USER:PROMPT variable (text only, images stripped)
+        Variable.set("USER:PROMPT", parsed.text);
+        // Assemble final message from variables
+        const assembledMessage = Variable.renderFull("USER");
         // 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;
-            }
+        let messageContent = assembledMessage;
+        if (messageType === "user" && parsed.images.length > 0 && supportsVision) {
+            // Construct content array with assembled text and images
+            messageContent = [
+                { type: "text", text: assembledMessage },
+                ...parsed.images
+            ];
         }
         const userEntry = {
             type: messageType,
@@ -894,7 +913,7 @@ Current working directory: ${process.cwd()}`;
         }
         else {
             // System messages must have string content only
-            this.messages.push({ role: "system", content: typeof messageContent === "string" ? messageContent : messageToSend });
+            this.messages.push({ role: "system", content: typeof messageContent === "string" ? messageContent : assembledMessage });
         }
         await this.emitContextChange();
         // Yield user message so UI can display it immediately
@@ -1237,6 +1256,25 @@ Current working directory: ${process.cwd()}`;
                 yield { type: "done" };
                 return;
             }
+            // Check if context is too large (413 error when vision already disabled)
+            if (error.message && error.message.startsWith('CONTEXT_TOO_LARGE:')) {
+                const beforeCount = this.chatHistory.length;
+                this.compactContext(20);
+                const afterCount = this.chatHistory.length;
+                const removedCount = beforeCount - afterCount;
+                const compactEntry = {
+                    type: "system",
+                    content: `Context was too large for backend. Automatically compacted: removed ${removedCount} older messages, keeping last 20 messages. Please retry your request.`,
+                    timestamp: new Date(),
+                };
+                this.chatHistory.push(compactEntry);
+                yield {
+                    type: "content",
+                    content: getTextContent(compactEntry.content),
+                };
+                yield { type: "done" };
+                return;
+            }
             const errorEntry = {
                 type: "assistant",
                 content: `Sorry, I encountered an error: ${error.message}`,
@@ -1496,7 +1534,7 @@ Current working directory: ${process.cwd()}`;
                 case "generateImage":
                     return await this.imageTool.generateImage(args.prompt, args.negativePrompt, args.width, args.height, args.model, args.sampler, args.configScale, args.numSteps, args.nsfw, args.name, args.move, args.seed);
                 case "captionImage":
-                    return await this.imageTool.captionImage(args.filename, args.prompt);
+                    return await this.imageTool.captionImage(args.filename, args.backend);
                 case "pngInfo":
                     return await this.imageTool.pngInfo(args.filename);
                 case "listImageModels":
@@ -2038,6 +2076,8 @@ Current working directory: ${process.cwd()}`;
     }
     setModel(model) {
         this.grokClient.setModel(model);
+        // Reset supportsVision flag for new model
+        this.grokClient.setSupportsVision(true);
         // Update token counter for new model
         this.tokenCounter.dispose();
         this.tokenCounter = createTokenCounter(model);
@@ -2412,6 +2452,7 @@ Current working directory: ${process.cwd()}`;
             baseUrl: this.grokClient.getBaseURL(),
             apiKeyEnvVar: this.apiKeyEnvVar,
             model: this.getCurrentModel(),
+            supportsVision: this.grokClient.getSupportsVision(),
         };
     }
     /**
@@ -2441,6 +2482,10 @@ Current working directory: ${process.cwd()}`;
                     const model = state.model || this.getCurrentModel();
                     this.grokClient = new GrokClient(apiKey, model, state.baseUrl, state.backend);
                     this.apiKeyEnvVar = state.apiKeyEnvVar;
+                    // Restore supportsVision flag if present
+                    if (state.supportsVision !== undefined) {
+                        this.grokClient.setSupportsVision(state.supportsVision);
+                    }
                     // Reinitialize MCP servers when restoring session
                     try {
                         const config = loadMCPConfig();
@@ -2494,6 +2539,58 @@ Current working directory: ${process.cwd()}`;
             }
         }
     }
+    /**
+     * Compact conversation context by keeping system prompt and last N messages
+     * Reduces context size when it grows too large for backend to handle
+     * @returns Number of messages removed
+     */
+    compactContext(keepLastMessages = 20) {
+        if (this.chatHistory.length <= keepLastMessages) {
+            // Nothing to compact
+            return 0;
+        }
+        const removedCount = this.chatHistory.length - keepLastMessages;
+        const keptMessages = this.chatHistory.slice(-keepLastMessages);
+        // Clear both arrays
+        this.chatHistory = keptMessages;
+        this.messages = [];
+        // Add system message noting the compaction
+        const compactionNote = {
+            type: 'system',
+            content: `Context compacted: removed ${removedCount} older messages, keeping last ${keepLastMessages} messages.`,
+            timestamp: new Date()
+        };
+        this.chatHistory.push(compactionNote);
+        // Rebuild this.messages from compacted chatHistory
+        for (const entry of this.chatHistory) {
+            if (entry.type === 'system') {
+                this.messages.push({
+                    role: 'system',
+                    content: entry.content
+                });
+            }
+            else if (entry.type === 'user') {
+                this.messages.push({
+                    role: 'user',
+                    content: entry.content
+                });
+            }
+            else if (entry.type === 'assistant') {
+                this.messages.push({
+                    role: 'assistant',
+                    content: entry.content
+                });
+            }
+            else if (entry.type === 'tool_result') {
+                this.messages.push({
+                    role: 'tool',
+                    tool_call_id: entry.toolResult.output || '',
+                    content: JSON.stringify(entry.toolResult)
+                });
+            }
+        }
+        return removedCount;
+    }
     /**
      * Get all tool instances and their class names for display purposes
      */