dexto 1.5.8 → 1.6.0

package/dist/cli/ink-cli/containers/InputContainer.js

@@ -17,9 +17,10 @@ import { capture } from '../../../analytics/index.js';
  * Smart container for input area
  * Manages submission, history, and overlay triggers
  */
-export const InputContainer = forwardRef(function InputContainer({ buffer, input, ui, session, approval, queuedMessages, setInput, setUi, setSession, setMessages, setPendingMessages, setDequeuedBuffer, setQueuedMessages, setApproval, setApprovalQueue, setTodos, agent, inputService, onKeyboardScroll, useStreaming = true, }, ref) {
+export const InputContainer = forwardRef(function InputContainer({ buffer, input, ui, session, initialPrompt, approval, queuedMessages, setInput, setUi, setSession, setMessages, setPendingMessages, setDequeuedBuffer, setQueuedMessages, setApproval, setApprovalQueue, setTodos, agent, inputService, configFilePath, onKeyboardScroll, useStreaming = true, }, ref) {
     // Track pending session creation to prevent race conditions
     const sessionCreationPromiseRef = useRef(null);
+    const didAutoSubmitInitialPromptRef = useRef(false);
     // Sound notification service from context
     const soundService = useSoundService();
     // Ref to track autoApproveEdits so processStream can read latest value mid-stream
@@ -329,7 +330,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
             const { CommandService } = await import('../services/CommandService.js');
             const commandService = new CommandService();
             try {
-                const result = await commandService.executeCommand(parsed.command, parsed.args || [], agent, session.id || undefined);
+                const result = await commandService.executeCommand(parsed.command, parsed.args || [], agent, session.id || undefined, configFilePath);
                 if (result.type === 'output' && result.output) {
                     const output = result.output;
                     setMessages((prev) => [
@@ -398,7 +399,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
                     }, {
                         useStreaming,
                         autoApproveEditsRef,
-                        eventBus: agent.agentEventBus,
+                        eventBus: agent,
                         setTodos,
                         ...(soundService && { soundService }),
                     });
@@ -473,7 +474,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
                 let messageText = trimmed;
                 if (ui.planModeActive && !ui.planModeInitialized) {
                     try {
-                        const planSkill = await agent.resolvePrompt('plan', {});
+                        const planSkill = await agent.resolvePrompt('config:dexto-plan-mode', {});
                         if (planSkill.text) {
                             messageText = `<plan-mode>\n${planSkill.text}\n</plan-mode>\n\n${trimmed}`;
                             // Mark plan mode as initialized after injection
@@ -482,7 +483,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
                     }
                     catch {
                         // Plan skill not found - continue without injection
-                        // This can happen if the plan-tools plugin is not enabled
+                        // This can happen if the agent config/image doesn't include `config:dexto-plan-mode`.
                     }
                 }
                 if (pendingImages.length > 0) {
@@ -529,7 +530,7 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
                 }, {
                     useStreaming,
                     autoApproveEditsRef,
-                    eventBus: agent.agentEventBus,
+                    eventBus: agent,
                     setTodos,
                     ...(soundService && { soundService }),
                 });
@@ -579,6 +580,27 @@ export const InputContainer = forwardRef(function InputContainer({ buffer, input
         useStreaming,
         soundService,
     ]);
+    useEffect(() => {
+        if (!initialPrompt || didAutoSubmitInitialPromptRef.current) {
+            return;
+        }
+        didAutoSubmitInitialPromptRef.current = true;
+        handleSubmit(initialPrompt, true).catch((error) => {
+            agent.logger.error('InputContainer initial prompt submission failed', {
+                error,
+                initialPrompt,
+            });
+            setMessages((prev) => [
+                ...prev,
+                {
+                    id: generateMessageId('error'),
+                    role: 'system',
+                    content: `Failed to submit initial prompt: ${error instanceof Error ? error.message : String(error)}`,
+                    timestamp: new Date(),
+                },
+            ]);
+        });
+    }, [agent.logger, handleSubmit, initialPrompt, setMessages]);
     // Determine if input should be active (not blocked by approval/overlay/history search)
     // Input stays active for filter-type overlays (so user can keep typing to filter)
     // Disable for approval prompts, overlays with their own text input, and history search mode

package/dist/cli/ink-cli/containers/OverlayContainer.d.ts

@@ -26,6 +26,8 @@ interface OverlayContainerProps {
     agent: DextoAgent;
     inputService: InputService;
     buffer: TextBuffer;
+    /** Source agent config file path (if available) */
+    configFilePath: string | null;
     /** Callback to refresh static content (clear terminal and force re-render) */
     refreshStatic?: () => void;
     /** Callback to submit a prompt command through the normal streaming flow */

package/dist/cli/ink-cli/containers/OverlayContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAG9F,OAAO,KAAK,EAAE,UAAU,EAAmD,MAAM,aAAa,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AAuGzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGA07E5B,CAAC"}
+{"version":3,"file":"OverlayContainer.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/containers/OverlayContainer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAyE,MAAM,OAAO,CAAC;AAG9F,OAAO,KAAK,EAAE,UAAU,EAAmD,MAAM,aAAa,CAAC;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,EAGH,KAAK,eAAe,EACvB,MAAM,iCAAiC,CAAC;AAuGzC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,UAAU,qBAAqB;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,eAAe,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,EAAE,UAAU,CAAC;IACnB,mDAAmD;IACnD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,8EAA8E;IAC9E,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,4EAA4E;IAC5E,qBAAqB,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,sGAi+E5B,CAAC"}

package/dist/cli/ink-cli/containers/OverlayContainer.js

@@ -46,8 +46,7 @@ import { capture } from '../../../analytics/index.js';
  * Smart container for managing overlays
  * Handles all modal interactions (selectors, autocomplete, approval)
  */
-export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input, session, approval, setInput, setUi, setSession, setMessages, setApproval, setApprovalQueue, agent, inputService, buffer, refreshStatic, onSubmitPromptCommand, }, ref) {
-    const eventBus = agent.agentEventBus;
+export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input, session, approval, setInput, setUi, setSession, setMessages, setApproval, setApprovalQueue, agent, inputService, buffer, configFilePath, refreshStatic, onSubmitPromptCommand, }, ref) {
     // Refs to overlay components for input handling
     const approvalRef = useRef(null);
     const slashAutocompleteRef = useRef(null);
@@ -81,6 +80,21 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
     // State for selected plugin (for plugin-actions overlay)
     const [selectedPlugin, setSelectedPlugin] = useState(null);
     const marketplaceAddPromptRef = useRef(null);
+    const getConfigFilePathOrWarn = useCallback((action) => {
+        if (configFilePath) {
+            return configFilePath;
+        }
+        setMessages((prev) => [
+            ...prev,
+            {
+                id: generateMessageId('system'),
+                role: 'system',
+                content: `⚠️ Cannot ${action}: this agent is not file-backed (no config path).`,
+                timestamp: new Date(),
+            },
+        ]);
+        return null;
+    }, [configFilePath, setMessages]);
     // Expose handleInput method via ref - routes to appropriate overlay
     useImperativeHandle(ref, () => ({
         handleInput: (inputStr, key) => {
@@ -178,7 +192,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
     }, [setApproval, setApprovalQueue, setUi]);
     // Handle approval responses
     const handleApprove = useCallback((options) => {
-        if (!approval || !eventBus)
+        if (!approval)
             return;
         // Enable "accept all edits" mode if requested
         if (options.enableAcceptEditsMode) {
@@ -187,18 +201,14 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         // Auto-disable plan mode when plan_create or plan_review is approved
         // This signals the transition from planning phase to execution phase
         const toolName = approval.metadata.toolName;
-        const isPlanTool = toolName === 'plan_create' ||
-            toolName === 'plan_review' ||
-            toolName === 'custom--plan_create' ||
-            toolName === 'custom--plan_review';
-        if (isPlanTool) {
+        if (toolName === 'plan_create' || toolName === 'plan_review') {
             setUi((prev) => ({
                 ...prev,
                 planModeActive: false,
                 planModeInitialized: false,
             }));
         }
-        eventBus.emit('approval:response', {
+        agent.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.APPROVED,
             sessionId: approval.sessionId,
@@ -210,15 +220,15 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             },
         });
         completeApproval();
-    }, [approval, eventBus, completeApproval, setUi]);
+    }, [approval, agent, completeApproval, setUi]);
     const handleDeny = useCallback((feedback) => {
-        if (!approval || !eventBus)
+        if (!approval)
             return;
         // Include user feedback in the denial message if provided
         const message = feedback
             ? `User requested changes: ${feedback}`
             : 'User denied the tool execution';
-        eventBus.emit('approval:response', {
+        agent.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.DENIED,
             sessionId: approval.sessionId,
@@ -226,11 +236,11 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             message,
         });
         completeApproval();
-    }, [approval, eventBus, completeApproval]);
+    }, [approval, agent, completeApproval]);
     const handleCancelApproval = useCallback(() => {
-        if (!approval || !eventBus)
+        if (!approval)
             return;
-        eventBus.emit('approval:response', {
+        agent.emit('approval:response', {
             approvalId: approval.approvalId,
             status: ApprovalStatus.CANCELLED,
             sessionId: approval.sessionId,
@@ -238,7 +248,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             message: 'User cancelled the approval request',
         });
         completeApproval();
-    }, [approval, eventBus, completeApproval]);
+    }, [approval, agent, completeApproval]);
     // Helper: Check if error is due to missing API key
     const isApiKeyMissingError = (error) => {
         if (error instanceof DextoValidationError) {
@@ -897,7 +907,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 timestamp: new Date(),
             },
         ]);
-    }, [setUi, setInput, setMessages, agent, buffer]);
+    }, [setUi, setInput, setMessages, agent, buffer, getConfigFilePathOrWarn]);
     // Handle stream mode selection
     const handleStreamSelect = useCallback((enabled) => {
         setUi((prev) => ({ ...prev, activeOverlay: 'none', mcpWizardServerType: null }));
@@ -1000,7 +1010,11 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 // Import persistence utilities
                 const { updateMcpServerField } = await import('@dexto/agent-management');
                 // Persist to config file AFTER successful enable/disable
-                await updateMcpServerField(agent.getAgentFilePath(), server.name, 'enabled', newEnabled);
+                const agentPath = getConfigFilePathOrWarn('persist MCP server settings');
+                if (!agentPath) {
+                    return;
+                }
+                await updateMcpServerField(agentPath, server.name, 'enabled', newEnabled);
                 setMessages((prev) => [
                     ...prev,
                     {
@@ -1082,7 +1096,10 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 // Import persistence utilities
                 const { removeMcpServerFromConfig } = await import('@dexto/agent-management');
                 // Persist to config file using surgical removal
-                await removeMcpServerFromConfig(agent.getAgentFilePath(), server.name);
+                const agentPath = getConfigFilePathOrWarn('persist MCP server deletion');
+                if (agentPath) {
+                    await removeMcpServerFromConfig(agentPath, server.name);
+                }
                 // Also disconnect if connected
                 try {
                     await agent.removeMcpServer(server.name);
@@ -1325,8 +1342,12 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 ]);
                 // Refresh prompts to remove uninstalled plugin skills
                 try {
-                    const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-                    const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                    const agentPath = getConfigFilePathOrWarn('refresh prompts after plugin uninstall');
+                    if (!agentPath) {
+                        return;
+                    }
+                    const newConfig = await reloadAgentConfigFromFile(agentPath);
+                    const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                     await agent.refreshPrompts(enrichedConfig.prompts);
                 }
                 catch {
@@ -1347,7 +1368,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             setSelectedPlugin(null);
             setUi((prev) => ({ ...prev, isProcessing: false }));
         }
-    }, [setUi, setMessages, agent]);
+    }, [setUi, setMessages, agent, getConfigFilePathOrWarn]);
     // Handle marketplace browser actions
     const handleMarketplaceBrowserAction = useCallback(async (action) => {
         if (action.type === 'add-marketplace') {
@@ -1367,8 +1388,12 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
             // Refresh prompts to include new plugin skills
             try {
                 const { reloadAgentConfigFromFile, enrichAgentConfig } = await import('@dexto/agent-management');
-                const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-                const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                const agentPath = getConfigFilePathOrWarn('refresh prompts after plugin install');
+                if (!agentPath) {
+                    return;
+                }
+                const newConfig = await reloadAgentConfigFromFile(agentPath);
+                const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                 await agent.refreshPrompts(enrichedConfig.prompts);
             }
             catch (error) {
@@ -1376,7 +1401,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 // Log but don't show error to user
             }
         }
-    }, [setUi, setMessages, agent]);
+    }, [setUi, setMessages, agent, getConfigFilePathOrWarn]);
     // Handle marketplace add completion
     const handleMarketplaceAddComplete = useCallback((name, pluginCount) => {
         setUi((prev) => ({ ...prev, activeOverlay: 'marketplace-browser' }));
@@ -1591,26 +1616,34 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 await writeFile(filePath, fileContent, 'utf-8');
                 // Re-discover commands and refresh with enriched prompts
                 const { reloadAgentConfigFromFile, enrichAgentConfig } = await import('@dexto/agent-management');
-                const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-                const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                const agentPath = getConfigFilePathOrWarn('refresh prompts after creating shared prompt');
+                if (!agentPath) {
+                    return;
+                }
+                const newConfig = await reloadAgentConfigFromFile(agentPath);
+                const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                 await agent.refreshPrompts(enrichedConfig.prompts);
             }
             else {
                 // Create in agent's prompts directory
-                const agentDir = dirname(agent.getAgentFilePath());
+                const agentPath = getConfigFilePathOrWarn('create prompt in agent prompts directory');
+                if (!agentPath) {
+                    return;
+                }
+                const agentDir = dirname(agentPath);
                 const promptsDir = join(agentDir, 'prompts');
                 filePath = join(promptsDir, `${data.name}.md`);
                 await mkdir(promptsDir, { recursive: true });
                 await writeFile(filePath, fileContent, 'utf-8');
                 // Add file reference to agent config using surgical helper
                 const { addPromptToAgentConfig, reloadAgentConfigFromFile, enrichAgentConfig, } = await import('@dexto/agent-management');
-                await addPromptToAgentConfig(agent.getAgentFilePath(), {
+                await addPromptToAgentConfig(agentPath, {
                     type: 'file',
                     file: `\${{dexto.agent_dir}}/prompts/${data.name}.md`,
                 });
                 // Reload config from disk, enrich to include discovered commands, then refresh
-                const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-                const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+                const newConfig = await reloadAgentConfigFromFile(agentPath);
+                const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
                 await agent.refreshPrompts(enrichedConfig.prompts);
             }
             setMessages((prev) => [
@@ -1634,7 +1667,15 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 },
             ]);
         }
-    }, [ui.promptAddWizard?.scope, setUi, setInput, setMessages, buffer, agent]);
+    }, [
+        ui.promptAddWizard?.scope,
+        setUi,
+        setInput,
+        setMessages,
+        buffer,
+        agent,
+        getConfigFilePathOrWarn,
+    ]);
     // Handle prompt delete
     const handlePromptDelete = useCallback(async (deletable) => {
         const displayName = deletable.prompt.displayName || deletable.prompt.name;
@@ -1649,10 +1690,14 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
         ]);
         try {
             const { deletePromptByMetadata, reloadAgentConfigFromFile, enrichAgentConfig } = await import('@dexto/agent-management');
+            const agentPath = getConfigFilePathOrWarn('delete prompt');
+            if (!agentPath) {
+                return;
+            }
             // Use the higher-level delete function that handles file + config
             // Pass full metadata including originalId for inline prompt deletion
             const promptMetadata = deletable.prompt.metadata;
-            const result = await deletePromptByMetadata(agent.getAgentFilePath(), {
+            const result = await deletePromptByMetadata(agentPath, {
                 name: deletable.prompt.name,
                 metadata: {
                     filePath: deletable.filePath,
@@ -1663,8 +1708,8 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 throw new Error(result.error || 'Failed to delete prompt');
             }
             // Reload config from disk, enrich to include discovered commands, then refresh
-            const newConfig = await reloadAgentConfigFromFile(agent.getAgentFilePath());
-            const enrichedConfig = enrichAgentConfig(newConfig, agent.getAgentFilePath());
+            const newConfig = await reloadAgentConfigFromFile(agentPath);
+            const enrichedConfig = enrichAgentConfig(newConfig, agentPath);
             await agent.refreshPrompts(enrichedConfig.prompts);
             setMessages((prev) => [
                 ...prev,
@@ -1698,7 +1743,7 @@ export const OverlayContainer = forwardRef(function OverlayContainer({ ui, input
                 activeOverlay: 'prompt-list',
             }));
         }
-    }, [setUi, setMessages, agent]);
+    }, [setUi, setMessages, agent, getConfigFilePathOrWarn]);
     // Handle prompt add wizard close
     const handlePromptAddWizardClose = useCallback(() => {
         setUi((prev) => ({

package/dist/cli/ink-cli/hooks/useAgentEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAEH,KAAK,UAAU,EACf,KAAK,aAAa,EAErB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,UAAU,mBAAmB;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CAid5B"}
+{"version":3,"file":"useAgentEvents.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useAgentEvents.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAEH,KAAK,UAAU,EACf,KAAK,aAAa,EAErB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEtE,UAAU,mBAAmB;IACzB,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/D,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;IAC1E,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACzE,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,iFAAiF;IACjF,MAAM,EAAE,UAAU,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,EAC3B,KAAK,EACL,WAAW,EACX,kBAAkB,EAClB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,WAAW,EACX,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAChB,MAAM,GACT,EAAE,mBAAmB,GAAG,IAAI,CAgd5B"}

package/dist/cli/ink-cli/hooks/useAgentEvents.js

@@ -41,7 +41,6 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
     // Track if an external trigger is active (scheduler, A2A, etc.)
     const externalTriggerRef = useRef({ active: false, sessionId: null, messageId: null });
     useEffect(() => {
-        const bus = agent.agentEventBus;
         const controller = new AbortController();
         const { signal } = controller;
         // Increase listener limit for safety (added more for external trigger events)
@@ -50,7 +49,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
         // event ordering. Direct bus subscription here caused a race condition where
         // approval UI showed before text messages were added.
         // Handle model switch
-        bus.on('llm:switched', (payload) => {
+        agent.on('llm:switched', (payload) => {
             if (payload.newConfig?.model) {
                 setSession((prev) => ({
                     ...prev,
@@ -58,7 +57,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
                 }));
             }
         }, { signal });
-        bus.on('service:event', (payload) => {
+        agent.on('service:event', (payload) => {
             if (payload.service !== 'orchestration' || payload.event !== 'tasks-updated') {
                 return;
             }
@@ -85,7 +84,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
                 }));
             }
         }, { signal });
-        bus.on('tool:background', (payload) => {
+        agent.on('tool:background', (payload) => {
             if (payload.sessionId !== currentSessionId) {
                 return;
             }
@@ -102,7 +101,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
                 };
             }));
         }, { signal });
-        bus.on('tool:background-completed', (payload) => {
+        agent.on('tool:background-completed', (payload) => {
             if (payload.sessionId !== currentSessionId) {
                 return;
             }
@@ -120,7 +119,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
             }));
         }, { signal });
         // Handle conversation reset
-        bus.on('session:reset', () => {
+        agent.on('session:reset', () => {
             setMessages([]);
             setApproval(null);
             setApprovalQueue([]);
@@ -128,7 +127,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
             setUi((prev) => ({ ...prev, activeOverlay: 'none' }));
         }, { signal });
         // Handle session creation (e.g., from /new command)
-        bus.on('session:created', (payload) => {
+        agent.on('session:created', (payload) => {
             if (payload.switchTo) {
                 // Clear the terminal screen for a fresh start (only in TTY environments)
                 // \x1B[2J clears visible screen, \x1B[3J clears scrollback, \x1B[H moves cursor to top
@@ -181,7 +180,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
         // Handle context cleared (from /clear command)
         // Keep messages visible for user reference - only context sent to LLM is cleared
         // Just clean up any pending approvals/overlays/queued messages
-        bus.on('context:cleared', () => {
+        agent.on('context:cleared', () => {
             setApproval(null);
             setApprovalQueue([]);
             setQueuedMessages([]);
@@ -189,14 +188,14 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
         }, { signal });
         // Handle context compacting (from /compact command or auto-compaction)
         // Single source of truth - handles both manual /compact and auto-compaction during streaming
-        bus.on('context:compacting', (payload) => {
+        agent.on('context:compacting', (payload) => {
             if (payload.sessionId !== currentSessionId)
                 return;
             setUi((prev) => ({ ...prev, isCompacting: true }));
         }, { signal });
         // Handle context compacted
         // Single source of truth - shows notification for all compaction (manual and auto)
-        bus.on('context:compacted', (payload) => {
+        agent.on('context:compacted', (payload) => {
             if (payload.sessionId !== currentSessionId)
                 return;
             setUi((prev) => ({ ...prev, isCompacting: false }));
@@ -219,7 +218,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
             ]);
         }, { signal });
         // Handle message queued - fetch full queue state from agent
-        bus.on('message:queued', (payload) => {
+        agent.on('message:queued', (payload) => {
             if (!payload.sessionId)
                 return;
             // Fetch fresh queue state from agent to ensure consistency
@@ -233,7 +232,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
             });
         }, { signal });
         // Handle message removed from queue
-        bus.on('message:removed', (payload) => {
+        agent.on('message:removed', (payload) => {
             setQueuedMessages((prev) => prev.filter((m) => m.id !== payload.id));
         }, { signal });
         // Note: message:dequeued is handled in processStream (via iterator) for proper synchronization
@@ -244,7 +243,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
         // through processStream (which only handles user-initiated streams).
         // ============================================================================
         // Handle external trigger invocation (scheduler, A2A, API)
-        bus.on('run:invoke', (payload) => {
+        agent.on('run:invoke', (payload) => {
             // Only handle if this is for the current session
             if (payload.sessionId !== currentSessionId) {
                 return;
@@ -299,7 +298,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
             ]);
         }, { signal });
         // Handle streaming chunks for external triggers
-        bus.on('llm:chunk', (payload) => {
+        agent.on('llm:chunk', (payload) => {
             // Only handle if this is for an active external trigger
             if (!externalTriggerRef.current.active ||
                 payload.sessionId !== externalTriggerRef.current.sessionId) {
@@ -317,7 +316,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
             setUi((prev) => (prev.isThinking ? { ...prev, isThinking: false } : prev));
         }, { signal });
         // Handle LLM thinking for external triggers
-        bus.on('llm:thinking', (payload) => {
+        agent.on('llm:thinking', (payload) => {
             if (!externalTriggerRef.current.active ||
                 payload.sessionId !== externalTriggerRef.current.sessionId) {
                 return;
@@ -325,7 +324,7 @@ export function useAgentEvents({ agent, setMessages, setPendingMessages, setUi,
             setUi((prev) => ({ ...prev, isThinking: true }));
         }, { signal });
         // Handle run completion for external triggers
-        bus.on('run:complete', (payload) => {
+        agent.on('run:complete', (payload) => {
             // Only handle if this is for an active external trigger
             if (!externalTriggerRef.current.active ||
                 payload.sessionId !== externalTriggerRef.current.sessionId) {

package/dist/cli/ink-cli/hooks/useTokenCounter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTokenCounter.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useTokenCounter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,mBAAmB;IAChC,+CAA+C;IAC/C,KAAK,EAAE,UAAU,CAAC;IAClB,qEAAqE;IACrE,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IAC/B,yDAAyD;IACzD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qDAAqD;IACrD,sBAAsB,EAAE,MAAM,CAAC;IAC/B,yDAAyD;IACzD,YAAY,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qEAAqE;IACrE,SAAS,EAAE,MAAM,CAAC;CACrB;AAsBD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,mBAAmB,GAAG,kBAAkB,CA0F5F"}
+{"version":3,"file":"useTokenCounter.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/hooks/useTokenCounter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,WAAW,mBAAmB;IAChC,+CAA+C;IAC/C,KAAK,EAAE,UAAU,CAAC;IAClB,qEAAqE;IACrE,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IAC/B,yDAAyD;IACzD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qDAAqD;IACrD,sBAAsB,EAAE,MAAM,CAAC;IAC/B,yDAAyD;IACzD,YAAY,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qEAAqE;IACrE,SAAS,EAAE,MAAM,CAAC;CACrB;AAsBD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,mBAAmB,GAAG,kBAAkB,CA6F5F"}

package/dist/cli/ink-cli/hooks/useTokenCounter.js

@@ -61,7 +61,6 @@ export function useTokenCounter({ agent, isActive }) {
             currentCharCountRef.current = 0;
             return;
         }
-        const bus = agent.agentEventBus;
         const controller = new AbortController();
         const { signal } = controller;
         // Reset on new turn (isActive just became true)
@@ -70,14 +69,18 @@ export function useTokenCounter({ agent, isActive }) {
         setCumulativeOutputTokens(0);
         setCurrentSegmentEstimate(0);
         // Track streaming chunks - accumulate estimate for current segment
-        bus.on('llm:chunk', (payload) => {
+        agent.on('llm:chunk', (payload) => {
             if (payload.chunkType === 'text') {
                 currentCharCountRef.current += payload.content.length;
-                setCurrentSegmentEstimate(estimateTokens(currentCharCountRef.current));
+                const estimate = estimateTokens(currentCharCountRef.current);
+                // Avoid frequent re-renders for short responses where we don't show tokens anyway.
+                if (estimate >= 1000) {
+                    setCurrentSegmentEstimate(estimate);
+                }
             }
         }, { signal });
         // On response: update input (replace), accumulate output, reset estimate
-        bus.on('llm:response', (payload) => {
+        agent.on('llm:response', (payload) => {
             const usage = payload.tokenUsage;
             if (usage) {
                 // Replace input tokens (most recent call's context)

package/dist/cli/ink-cli/services/CommandService.d.ts

@@ -53,6 +53,6 @@ export declare class CommandService {
     /**
      * Executes a command and returns the result
      */
-    executeCommand(command: string, args: string[], agent: DextoAgent, sessionId?: string): Promise<CommandExecutionResult>;
+    executeCommand(command: string, args: string[], agent: DextoAgent, sessionId?: string, configFilePath?: string | null): Promise<CommandExecutionResult>;
 }
 //# sourceMappingURL=CommandService.d.ts.map

package/dist/cli/ink-cli/services/CommandService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandService.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/services/CommandService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,YAAY,CAQtE;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,aAAa,EAAE,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAEvE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,iBAAiB,CAShF;AAED;;GAEG;AACH,qBAAa,cAAc;IACvB;;OAEG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa;IAIxC;;OAEG;IACG,cAAc,CAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,UAAU,EACjB,SAAS,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,sBAAsB,CAAC;CAqBrC"}
+{"version":3,"file":"CommandService.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/services/CommandService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAG9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uDAAuD,CAAC;AAC3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,YAAY;IACzB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,aAAa,CAAC;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,YAAY,CAQtE;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAC9B,aAAa,EAAE,IAAI,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAEvE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,iBAAiB,CAShF;AAED;;GAEG;AACH,qBAAa,cAAc;IACvB;;OAEG;IACH,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa;IAIxC;;OAEG;IACG,cAAc,CAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,UAAU,EACjB,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,GAC/B,OAAO,CAAC,sBAAsB,CAAC;CAqBrC"}

package/dist/cli/ink-cli/services/CommandService.js

@@ -44,8 +44,8 @@ export class CommandService {
     /**
      * Executes a command and returns the result
      */
-    async executeCommand(command, args, agent, sessionId) {
-        const result = await executeCommand(command, args, agent, sessionId);
+    async executeCommand(command, args, agent, sessionId, configFilePath) {
+        const result = await executeCommand(command, args, agent, sessionId, configFilePath);
         // If result is a send message marker, return the text to send through normal flow
         if (isSendMessageMarker(result)) {
             return { type: 'sendMessage', messageToSend: result.text };

package/dist/cli/ink-cli/services/processStream.d.ts

@@ -53,8 +53,8 @@ export interface ProcessStreamOptions {
     autoApproveEditsRef: {
         current: boolean;
     };
-    /** Event bus for emitting auto-approval responses */
-    eventBus: import('@dexto/core').AgentEventBus;
+    /** Event emitter for emitting auto-approval responses */
+    eventBus: Pick<import('@dexto/core').AgentEventBus, 'emit'>;
     /** Sound notification service for playing sounds on events */
     soundService?: import('../utils/soundNotification.js').SoundNotificationService;
     /** Optional setter for todos (from service:event todo updates) */

package/dist/cli/ink-cli/services/processStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processStream.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/services/processStream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,aAAa,CAAC;AAGvE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAiCvE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,oFAAoF;IACpF,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,kEAAkE;IAClE,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,YAAY,CAAC,CAAC,CAAC;IAC3F,yDAAyD;IACzD,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC/F,4DAA4D;IAC5D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,uDAAuD;IACvD,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;CAC7E;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2FAA2F;IAC3F,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,2FAA2F;IAC3F,mBAAmB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1C,qDAAqD;IACrD,QAAQ,EAAE,OAAO,aAAa,EAAE,aAAa,CAAC;IAC9C,8DAA8D;IAC9D,YAAY,CAAC,EAAE,OAAO,+BAA+B,EAAE,wBAAwB,CAAC;IAChF,kEAAkE;IAClE,QAAQ,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;CAC3F;AA0BD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAC/B,QAAQ,EAAE,qBAAqB,CAAC,cAAc,CAAC,EAC/C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAsgCf"}
+{"version":3,"file":"processStream.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink-cli/services/processStream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,aAAa,CAAC;AAGvE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAwBvE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,oFAAoF;IACpF,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,kEAAkE;IAClE,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,YAAY,CAAC,CAAC,CAAC;IAC3F,yDAAyD;IACzD,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC/F,4DAA4D;IAC5D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,uDAAuD;IACvD,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;CAC7E;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2FAA2F;IAC3F,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,2FAA2F;IAC3F,mBAAmB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1C,yDAAyD;IACzD,QAAQ,EAAE,IAAI,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAC5D,8DAA8D;IAC9D,YAAY,CAAC,EAAE,OAAO,+BAA+B,EAAE,wBAAwB,CAAC;IAChF,kEAAkE;IAClE,QAAQ,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;CAC3F;AA0BD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAC/B,QAAQ,EAAE,qBAAqB,CAAC,cAAc,CAAC,EAC/C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAygCf"}