@zds-ai/cli 0.1.5 → 0.1.6

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

@@ -5,6 +5,7 @@ import { EventEmitter } from "events";
 export interface ChatEntry {
     type: "user" | "assistant" | "tool_result" | "tool_call" | "system";
     content?: string | ChatCompletionContentPart[];
+    originalContent?: string | ChatCompletionContentPart[];
     timestamp: Date;
     tool_calls?: GrokToolCall[];
     toolCall?: GrokToolCall;
@@ -68,9 +69,11 @@ export declare class GrokAgent extends EventEmitter {
     private apiKeyEnvVar;
     private pendingContextEditSession;
     private rephraseState;
+    private hookPrefillText;
     constructor(apiKey: string, baseURL?: string, model?: string, maxToolRounds?: number, debugLogFile?: string, startupHookOutput?: string, temperature?: number, maxTokens?: number);
     private startupHookOutput?;
     private systemPrompt;
+    private hasRunInstanceHook;
     /**
      * Initialize the agent with dynamic system prompt
      * Must be called after construction
@@ -131,12 +134,13 @@ export declare class GrokAgent extends EventEmitter {
         contextFilePath: string;
     } | null;
     clearPendingContextEditSession(): void;
-    setRephraseState(originalAssistantMessageIndex: number, rephraseRequestIndex: number, newResponseIndex: number, messageType: "user" | "system"): void;
+    setRephraseState(originalAssistantMessageIndex: number, rephraseRequestIndex: number, newResponseIndex: number, messageType: "user" | "system", prefillText?: string): void;
     getRephraseState(): {
         originalAssistantMessageIndex: number;
         rephraseRequestIndex: number;
         newResponseIndex: number;
         messageType: "user" | "system";
+        prefillText?: string;
     } | null;
     clearRephraseState(): void;
     setPersona(persona: string, color?: string): Promise<{

package/dist/agent/grok-agent.js

@@ -110,6 +110,7 @@ export class GrokAgent extends EventEmitter {
     apiKeyEnvVar = "GROK_API_KEY";
     pendingContextEditSession = null;
     rephraseState = null;
+    hookPrefillText = null;
     constructor(apiKey, baseURL, model, maxToolRounds, debugLogFile, startupHookOutput, temperature, maxTokens) {
         super();
         const manager = getSettingsManager();
@@ -161,6 +162,7 @@ export class GrokAgent extends EventEmitter {
     }
     startupHookOutput;
     systemPrompt = "Initializing..."; // THE system prompt (always at messages[0])
+    hasRunInstanceHook = false;
     /**
      * Initialize the agent with dynamic system prompt
      * Must be called after construction
@@ -168,35 +170,19 @@ export class GrokAgent extends EventEmitter {
     async initialize() {
         // Build system message
         await this.buildSystemMessage();
-        // Execute instance hook on every startup (fresh or not)
-        const settings = getSettingsManager();
-        const instanceHookPath = settings.getInstanceHook();
-        if (instanceHookPath) {
-            const hookResult = await executeOperationHook(instanceHookPath, "instance", {}, 30000, false, // Instance hook is not mandatory
-            this.getCurrentTokenCount(), this.getMaxContextSize());
-            if (hookResult.approved && hookResult.commands && hookResult.commands.length > 0) {
-                // Apply hook commands (ENV, TOOL_RESULT, MODEL, SYSTEM)
-                await this.processHookResult(hookResult);
-            }
-        }
     }
     /**
      * Build/rebuild the system message with current tool availability
      * Updates this.systemPrompt which is always used for messages[0]
      */
     async buildSystemMessage() {
-        // Add startup hook output if provided
-        const startupHookSection = this.startupHookOutput
-            ? `${this.startupHookOutput}\n`
-            : "";
         // Generate dynamic tool list using introspect tool
         const toolsResult = await this.introspect.introspect("tools");
         const toolsSection = toolsResult.success ? toolsResult.output : "Tools: Unknown";
+        // Set APP:TOOLS variable
+        Variable.set("APP:TOOLS", toolsSection);
         // Build THE system prompt
-        this.systemPrompt = `${startupHookSection}
-${toolsSection}
-
-Current working directory: ${process.cwd()}`;
+        this.systemPrompt = Variable.renderFull('SYSTEM');
         // Update messages[0] with the system prompt
         this.messages[0] = {
             role: "system",
@@ -356,16 +342,27 @@ Current working directory: ${process.cwd()}`;
         let isSystemRephrase = false;
         let messageToSend = message;
         let messageType = "user";
+        let prefillText;
         if (message.startsWith("/system rephrase")) {
             isRephraseCommand = true;
             isSystemRephrase = true;
             messageToSend = message.substring(8).trim(); // Strip "/system " (8 chars including space)
             messageType = "system";
+            // Extract prefill text after "/system rephrase "
+            const prefillMatch = message.match(/^\/system rephrase\s+(.+)$/);
+            if (prefillMatch) {
+                prefillText = prefillMatch[1];
+            }
         }
         else if (message.startsWith("/rephrase")) {
             isRephraseCommand = true;
             messageToSend = message; // Keep full text including "/rephrase"
             messageType = "user";
+            // Extract prefill text after "/rephrase "
+            const prefillMatch = message.match(/^\/rephrase\s+(.+)$/);
+            if (prefillMatch) {
+                prefillText = prefillMatch[1];
+            }
         }
         // If this is a rephrase command, find the last assistant message
         if (isRephraseCommand) {
@@ -382,7 +379,7 @@ Current working directory: ${process.cwd()}`;
             }
             // 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);
+            this.setRephraseState(lastAssistantIndex, this.chatHistory.length, -1, messageType, prefillText);
         }
         // Before adding the new user message, check if there are incomplete tool calls
         // from a previous interrupted turn. This prevents malformed message sequences
@@ -416,12 +413,62 @@ Current working directory: ${process.cwd()}`;
         }
         // Clear one-shot variables
         Variable.clearOneShot();
+        // Execute instance hook once per session (after first clearOneShot)
+        if (!this.hasRunInstanceHook) {
+            this.hasRunInstanceHook = true;
+            const settings = getSettingsManager();
+            const instanceHookPath = settings.getInstanceHook();
+            if (instanceHookPath) {
+                const hookResult = await executeOperationHook(instanceHookPath, "instance", {}, 30000, false, // Instance hook is not mandatory
+                this.getCurrentTokenCount(), this.getMaxContextSize());
+                if (hookResult.approved && hookResult.commands && hookResult.commands.length > 0) {
+                    // Apply hook commands (ENV, TOOL_RESULT, MODEL, SYSTEM, SET*)
+                    const results = applyHookCommands(hookResult.commands);
+                    // Apply prompt variables from SET* commands
+                    for (const [varName, value] of results.promptVars.entries()) {
+                        Variable.set(varName, value);
+                    }
+                    // Process other hook commands (MODEL, BACKEND, ENV)
+                    await this.processHookCommands(results);
+                    // Add SYSTEM message to messages array if present
+                    if (results.system) {
+                        this.messages.push({
+                            role: 'system',
+                            content: results.system
+                        });
+                    }
+                    // Store prefill text from hook if present
+                    if (results.prefill) {
+                        this.hookPrefillText = results.prefill;
+                    }
+                }
+            }
+        }
         // 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);
+        // Execute prePrompt hook if configured
+        const hookPath = getSettingsManager().getPrePromptHook();
+        if (hookPath) {
+            const hookResult = await executeOperationHook(hookPath, "prePrompt", { USER_MESSAGE: parsed.text }, 30000, false, // prePrompt hook is never mandatory
+            this.getCurrentTokenCount(), this.getMaxContextSize());
+            if (hookResult.approved && hookResult.commands) {
+                const results = applyHookCommands(hookResult.commands);
+                // Set prompt variables from hook output (SET, SET_FILE, SET_TEMP_FILE)
+                for (const [varName, value] of results.promptVars.entries()) {
+                    Variable.set(varName, value);
+                }
+                // Process other hook commands (MODEL, BACKEND, SYSTEM, etc.)
+                await this.processHookCommands(results);
+                // Store prefill text from hook if present
+                if (results.prefill) {
+                    this.hookPrefillText = results.prefill;
+                }
+            }
+        }
         // Assemble final message from variables
         const assembledMessage = Variable.renderFull("USER");
         // Add user/system message to conversation
@@ -438,6 +485,9 @@ Current working directory: ${process.cwd()}`;
         const userEntry = {
             type: messageType,
             content: messageContent,
+            originalContent: messageType === "user" ? (parsed.images.length > 0 && supportsVision
+                ? [{ type: "text", text: parsed.text }, ...parsed.images]
+                : parsed.text) : undefined,
             timestamp: new Date(),
         };
         this.chatHistory.push(userEntry);
@@ -455,6 +505,20 @@ Current working directory: ${process.cwd()}`;
         let toolRounds = 0;
         let consecutiveNonToolResponses = 0;
         try {
+            // If this is a rephrase with prefill text, add the assistant message now
+            if (this.rephraseState?.prefillText) {
+                this.messages.push({
+                    role: "assistant",
+                    content: this.rephraseState.prefillText
+                });
+            }
+            // If a hook returned prefill text, add the assistant message now
+            if (this.hookPrefillText) {
+                this.messages.push({
+                    role: "assistant",
+                    content: this.hookPrefillText
+                });
+            }
             // Always fetch tools fresh - getAllGrokTools() handles lazy refresh internally
             const supportsTools = this.grokClient.getSupportsTools();
             let currentResponse = await this.grokClient.chat(this.messages, supportsTools ? await getAllGrokTools() : [], undefined, this.isGrokModel() && this.shouldUseSearchFor(message)
@@ -628,7 +692,16 @@ Current working directory: ${process.cwd()}`;
                 }
                 else {
                     // No tool calls in this response - only add it if there's actual content
-                    const trimmedContent = assistantMessage.content?.trim();
+                    let trimmedContent = assistantMessage.content?.trim();
+                    // If this was a rephrase with prefill, prepend the prefill text to the response
+                    if (trimmedContent && this.rephraseState?.prefillText) {
+                        trimmedContent = this.rephraseState.prefillText + trimmedContent;
+                    }
+                    // If a hook provided prefill, prepend it to the response
+                    if (trimmedContent && this.hookPrefillText) {
+                        trimmedContent = this.hookPrefillText + trimmedContent;
+                        this.hookPrefillText = null; // Clear after use
+                    }
                     if (trimmedContent) {
                         const responseEntry = {
                             type: "assistant",
@@ -644,7 +717,7 @@ Current working directory: ${process.cwd()}`;
                         // 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);
+                            this.setRephraseState(this.rephraseState.originalAssistantMessageIndex, this.rephraseState.rephraseRequestIndex, newResponseIndex, this.rephraseState.messageType, this.rephraseState.prefillText);
                         }
                     }
                     // TODO: HACK - This is a temporary fix to prevent duplicate responses.
@@ -822,16 +895,27 @@ Current working directory: ${process.cwd()}`;
         let isSystemRephrase = false;
         let messageToSend = message;
         let messageType = "user";
+        let prefillText;
         if (message.startsWith("/system rephrase")) {
             isRephraseCommand = true;
             isSystemRephrase = true;
             messageToSend = message.substring(8).trim(); // Strip "/system " (8 chars including space)
             messageType = "system";
+            // Extract prefill text after "/system rephrase "
+            const prefillMatch = message.match(/^\/system rephrase\s+(.+)$/);
+            if (prefillMatch) {
+                prefillText = prefillMatch[1];
+            }
         }
         else if (message.startsWith("/rephrase")) {
             isRephraseCommand = true;
             messageToSend = message; // Keep full text including "/rephrase"
             messageType = "user";
+            // Extract prefill text after "/rephrase "
+            const prefillMatch = message.match(/^\/rephrase\s+(.+)$/);
+            if (prefillMatch) {
+                prefillText = prefillMatch[1];
+            }
         }
         // If this is a rephrase command, find the last assistant message
         if (isRephraseCommand) {
@@ -848,7 +932,7 @@ Current working directory: ${process.cwd()}`;
             }
             // 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);
+            this.setRephraseState(lastAssistantIndex, this.chatHistory.length, -1, messageType, prefillText);
         }
         // Before adding the new user message, check if there are incomplete tool calls
         // from a previous interrupted turn. This prevents malformed message sequences
@@ -882,12 +966,62 @@ Current working directory: ${process.cwd()}`;
         }
         // Clear one-shot variables
         Variable.clearOneShot();
+        // Execute instance hook once per session (after first clearOneShot)
+        if (!this.hasRunInstanceHook) {
+            this.hasRunInstanceHook = true;
+            const settings = getSettingsManager();
+            const instanceHookPath = settings.getInstanceHook();
+            if (instanceHookPath) {
+                const hookResult = await executeOperationHook(instanceHookPath, "instance", {}, 30000, false, // Instance hook is not mandatory
+                this.getCurrentTokenCount(), this.getMaxContextSize());
+                if (hookResult.approved && hookResult.commands && hookResult.commands.length > 0) {
+                    // Apply hook commands (ENV, TOOL_RESULT, MODEL, SYSTEM, SET*)
+                    const results = applyHookCommands(hookResult.commands);
+                    // Apply prompt variables from SET* commands
+                    for (const [varName, value] of results.promptVars.entries()) {
+                        Variable.set(varName, value);
+                    }
+                    // Process other hook commands (MODEL, BACKEND, ENV)
+                    await this.processHookCommands(results);
+                    // Add SYSTEM message to messages array if present
+                    if (results.system) {
+                        this.messages.push({
+                            role: 'system',
+                            content: results.system
+                        });
+                    }
+                    // Store prefill text from hook if present
+                    if (results.prefill) {
+                        this.hookPrefillText = results.prefill;
+                    }
+                }
+            }
+        }
         // 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);
+        // Execute prePrompt hook if configured
+        const hookPath = getSettingsManager().getPrePromptHook();
+        if (hookPath) {
+            const hookResult = await executeOperationHook(hookPath, "prePrompt", { USER_MESSAGE: parsed.text }, 30000, false, // prePrompt hook is never mandatory
+            this.getCurrentTokenCount(), this.getMaxContextSize());
+            if (hookResult.approved && hookResult.commands) {
+                const results = applyHookCommands(hookResult.commands);
+                // Set prompt variables from hook output (SET, SET_FILE, SET_TEMP_FILE)
+                for (const [varName, value] of results.promptVars.entries()) {
+                    Variable.set(varName, value);
+                }
+                // Process other hook commands (MODEL, BACKEND, SYSTEM, etc.)
+                await this.processHookCommands(results);
+                // Store prefill text from hook if present
+                if (results.prefill) {
+                    this.hookPrefillText = results.prefill;
+                }
+            }
+        }
         // Assemble final message from variables
         const assembledMessage = Variable.renderFull("USER");
         // Add user/system message to both API conversation and chat history
@@ -904,6 +1038,9 @@ Current working directory: ${process.cwd()}`;
         const userEntry = {
             type: messageType,
             content: messageContent,
+            originalContent: messageType === "user" ? (parsed.images.length > 0 && supportsVision
+                ? [{ type: "text", text: parsed.text }, ...parsed.images]
+                : parsed.text) : undefined,
             timestamp: new Date(),
         };
         this.chatHistory.push(userEntry);
@@ -921,6 +1058,20 @@ Current working directory: ${process.cwd()}`;
             type: "user_message",
             userEntry: userEntry,
         };
+        // If this is a rephrase with prefill text, add the assistant message now
+        if (this.rephraseState?.prefillText) {
+            this.messages.push({
+                role: "assistant",
+                content: this.rephraseState.prefillText
+            });
+        }
+        // If a hook returned prefill text, add the assistant message now
+        if (this.hookPrefillText) {
+            this.messages.push({
+                role: "assistant",
+                content: this.hookPrefillText
+            });
+        }
         // Calculate input tokens
         let inputTokens = this.tokenCounter.countMessageTokens(this.messages);
         yield {
@@ -959,6 +1110,23 @@ Current working directory: ${process.cwd()}`;
                 let tool_calls_yielded = false;
                 let streamFinished = false;
                 let insideThinkTag = false;
+                // If this is a rephrase with prefill, yield the prefill text first and add to accumulated content
+                if (this.rephraseState?.prefillText) {
+                    yield {
+                        type: "content",
+                        content: this.rephraseState.prefillText,
+                    };
+                    accumulatedContent = this.rephraseState.prefillText;
+                }
+                // If a hook provided prefill, yield it first and add to accumulated content
+                if (this.hookPrefillText) {
+                    yield {
+                        type: "content",
+                        content: this.hookPrefillText,
+                    };
+                    accumulatedContent = this.hookPrefillText;
+                    this.hookPrefillText = null; // Clear after use
+                }
                 try {
                     for await (const chunk of stream) {
                         // Check for cancellation in the streaming loop
@@ -1721,8 +1889,8 @@ Current working directory: ${process.cwd()}`;
     clearPendingContextEditSession() {
         this.pendingContextEditSession = null;
     }
-    setRephraseState(originalAssistantMessageIndex, rephraseRequestIndex, newResponseIndex, messageType) {
-        this.rephraseState = { originalAssistantMessageIndex, rephraseRequestIndex, newResponseIndex, messageType };
+    setRephraseState(originalAssistantMessageIndex, rephraseRequestIndex, newResponseIndex, messageType, prefillText) {
+        this.rephraseState = { originalAssistantMessageIndex, rephraseRequestIndex, newResponseIndex, messageType, prefillText };
     }
     getRephraseState() {
         return this.rephraseState;
@@ -2466,10 +2634,15 @@ Current working directory: ${process.cwd()}`;
         // Restore cwd early (hooks may need correct working directory)
         if (state.cwd) {
             try {
-                process.chdir(state.cwd);
+                const fs = await import('fs');
+                // Only attempt to change directory if it exists
+                if (fs.existsSync(state.cwd)) {
+                    process.chdir(state.cwd);
+                }
+                // Silently skip if directory doesn't exist (common in containerized environments)
             }
             catch (error) {
-                console.warn(`Failed to restore working directory to ${state.cwd}:`, error);
+                // Silently skip on any error - working directory restoration is non-critical
             }
         }
         // Restore backend/baseUrl/apiKeyEnvVar/model if present (creates initial client)
@@ -2514,28 +2687,68 @@ Current working directory: ${process.cwd()}`;
         // Restore persona (hook may change backend/model and sets env vars)
         if (state.persona) {
             try {
-                await this.setPersona(state.persona, state.personaColor);
+                const result = await this.setPersona(state.persona, state.personaColor);
+                if (!result.success) {
+                    // If persona hook failed (e.g., backend test failed), still set the persona values
+                    // but don't change backend/model. This prevents losing persona state on transitory errors.
+                    console.warn(`Persona hook failed, setting persona without backend change: ${result.error}`);
+                    this.persona = state.persona;
+                    this.personaColor = state.personaColor;
+                    process.env.ZDS_AI_AGENT_PERSONA = state.persona;
+                }
             }
             catch (error) {
                 console.warn(`Failed to restore persona "${state.persona}":`, error);
+                // Still set persona values even if hook crashed
+                this.persona = state.persona;
+                this.personaColor = state.personaColor;
+                process.env.ZDS_AI_AGENT_PERSONA = state.persona;
             }
         }
         // Restore mood (hook sets env vars)
         if (state.mood) {
             try {
-                await this.setMood(state.mood, state.moodColor);
+                const result = await this.setMood(state.mood, state.moodColor);
+                if (!result.success) {
+                    // If mood hook failed (e.g., backend test failed), still set the mood values
+                    // but don't change backend/model. This prevents losing mood state on transitory errors.
+                    console.warn(`Mood hook failed, setting mood without backend change: ${result.error}`);
+                    this.mood = state.mood;
+                    this.moodColor = state.moodColor;
+                    process.env.ZDS_AI_AGENT_MOOD = state.mood;
+                }
             }
             catch (error) {
                 console.warn(`Failed to restore mood "${state.mood}":`, error);
+                // Still set mood values even if hook crashed
+                this.mood = state.mood;
+                this.moodColor = state.moodColor;
+                process.env.ZDS_AI_AGENT_MOOD = state.mood;
             }
         }
         // Restore active task (hook sets env vars)
         if (state.activeTask) {
             try {
-                await this.startActiveTask(state.activeTask, state.activeTaskAction, state.activeTaskColor);
+                const result = await this.startActiveTask(state.activeTask, state.activeTaskAction, state.activeTaskColor);
+                if (!result.success) {
+                    // If task hook failed (e.g., backend test failed), still set the task values
+                    // but don't change backend/model. This prevents losing task state on transitory errors.
+                    console.warn(`Task hook failed, setting active task without backend change: ${result.error}`);
+                    this.activeTask = state.activeTask;
+                    this.activeTaskAction = state.activeTaskAction;
+                    this.activeTaskColor = state.activeTaskColor;
+                    process.env.ZDS_AI_AGENT_ACTIVE_TASK = state.activeTask;
+                    process.env.ZDS_AI_AGENT_ACTIVE_TASK_ACTION = state.activeTaskAction;
+                }
             }
             catch (error) {
                 console.warn(`Failed to restore active task "${state.activeTask}":`, error);
+                // Still set task values even if hook crashed
+                this.activeTask = state.activeTask;
+                this.activeTaskAction = state.activeTaskAction;
+                this.activeTaskColor = state.activeTaskColor;
+                process.env.ZDS_AI_AGENT_ACTIVE_TASK = state.activeTask;
+                process.env.ZDS_AI_AGENT_ACTIVE_TASK_ACTION = state.activeTaskAction;
             }
         }
     }