@exreve/exk 1.0.29 → 1.0.31

package/dist/agentSession.js

@@ -320,26 +320,15 @@ export class AgentSessionManager {
                 existingSession.model = model;
             }
             // Update enabled modules and settings if provided
-            const newModules = handler.enabledModules;
-            if (newModules) {
-                existingSession.enabledModules = newModules;
-            }
-            const newModuleSettings = handler.moduleSettings;
-            if (newModuleSettings) {
-                existingSession.moduleSettings = newModuleSettings;
-            }
-            existingSession.userChoiceEnabled = handler.userChoiceEnabled || false;
             // Ensure abort controller is fresh for new queries
             existingSession.abortController = new AbortController();
-            // Update handler to keep onChoiceRequest callback fresh
+            // Update handler reference
             this.sessionHandlers.set(sessionId, handler);
             return;
         }
         // Store the handler for this session
         this.sessionHandlers.set(sessionId, handler);
         const abortController = new AbortController();
-        const enabledModules = handler.enabledModules || [];
-        const moduleSettings = handler.moduleSettings || {};
         // Restore claudeSessionId from disk (survives CLI restart)
         const persistedState = loadSessionState(sessionId);
         const restoredClaudeSessionId = persistedState?.claudeSessionId;
@@ -359,9 +348,6 @@ export class AgentSessionManager {
             claudeProcessGroupId: undefined,
             currentPromptId: undefined,
             model: sessionModel,
-            userChoiceEnabled: handler.userChoiceEnabled || false,
-            enabledModules,
-            moduleSettings
         });
         // Auto-regenerate CLAUDE.md for fresh project context
         await this.regenerateClaudeMd(projectPath);
@@ -519,9 +505,7 @@ export class AgentSessionManager {
                     apiKey: CLAUDE_CONFIG.apiKey,
                     model: CLAUDE_CONFIG.model,
                     tools: { type: 'preset', preset: 'claude_code' },
-                    disallowedTools: attachmentDir
-                        ? ['AskUserQuestion', 'analyze_image'] // Disable built-in analyze_image when we have our own
-                        : ['AskUserQuestion'],
+                    disallowedTools: ['AskUserQuestion', 'analyze_image'], // Disable built-in analyze_image (we provide our own via MCP)
                     settingSources: ['project'], // Enable CLAUDE.md loading
                     permissionMode: 'bypassPermissions',
                     allowDangerouslySkipPermissions: true,
@@ -1230,11 +1214,6 @@ export class AgentSessionManager {
             session.currentPromptId = undefined;
             // 8. Remove from emergency stop tracking
             this.emergencyStopInProgress.delete(sessionId);
-            // 9. Resolve any pending choice request with null (cancelled)
-            if (session.pendingChoice) {
-                session.pendingChoice.resolve({ choiceId: session.pendingChoice.request.choiceId, selectedValue: null });
-                session.pendingChoice = undefined;
-            }
             const message = currentPromptId
                 ? `Emergency stop: Cancelled prompt '${currentPromptId}' and cleared ${queueSize} queued prompts`
                 : `Emergency stop: Cleared ${queueSize} queued prompts`;
@@ -1258,84 +1237,9 @@ export class AgentSessionManager {
             console.log(`[buildMcpServer] No session found for ${sessionId}`);
             return undefined;
         }
-        const enabledModules = session.enabledModules || [];
-        console.log(`[buildMcpServer] Session ${sessionId}: enabledModules=${JSON.stringify(enabledModules)}, attachmentDir=${attachmentDir || 'none'}`);
-        if (enabledModules.length === 0 && !attachmentDir) {
-            console.log(`[buildMcpServer] No enabled modules and no attachments, skipping MCP server creation`);
-            return undefined;
-        }
-        const handler = this.sessionHandlers.get(sessionId);
+        console.log(`[buildMcpServer] Session ${sessionId}: attachmentDir=${attachmentDir || 'none'}`);
         return createModuleMcpServer({
-            enabledModules,
-            moduleSettings: session.moduleSettings || {},
             attachmentDir,
-            onChoiceRequest: handler?.onChoiceRequest
-                ? async (request) => {
-                    return new Promise((resolve) => {
-                        const sess = this.sessions.get(sessionId);
-                        if (sess) {
-                            sess.pendingChoice = { request, resolve };
-                            handler.onChoiceRequest(request);
-                        }
-                        else {
-                            resolve({ choiceId: request.choiceId, selectedValue: null });
-                        }
-                    });
-                }
-                : undefined
-        });
-    }
-    /**
-     * Handle user choice response from frontend
-     */
-    async handleChoiceResponse(sessionId, response) {
-        const session = this.sessions.get(sessionId);
-        if (!session) {
-            console.error(`[agentSession] Session ${sessionId} not found for choice response`);
-            return;
-        }
-        if (!session.pendingChoice) {
-            console.warn(`[agentSession] No pending choice for session ${sessionId}`);
-            return;
-        }
-        if (session.pendingChoice.request.choiceId !== response.choiceId) {
-            console.warn(`[agentSession] Choice ID mismatch: expected ${session.pendingChoice.request.choiceId}, got ${response.choiceId}`);
-            return;
-        }
-        // Resolve the pending choice promise
-        session.pendingChoice.resolve(response);
-        session.pendingChoice = undefined;
-    }
-    /**
-     * Request user choice during agent execution
-     */
-    async requestUserChoice(sessionId, request) {
-        const session = this.sessions.get(sessionId);
-        if (!session) {
-            throw new Error(`Session ${sessionId} not found`);
-        }
-        // Check if user choice is enabled for this session
-        if (!session.userChoiceEnabled) {
-            throw new Error('User choice is not enabled for this session');
-        }
-        // Create a promise that will be resolved when the user responds
-        return new Promise((resolve) => {
-            session.pendingChoice = { request, resolve };
-            // Emit the choice request through the onOutput callback
-            // This will be picked up by the CLI and sent to the frontend
-            const handler = this.sessionHandlers.get(sessionId);
-            if (handler?.onChoiceRequest) {
-                handler.onChoiceRequest(request);
-            }
-            // Set timeout if specified
-            if (request.timeout) {
-                setTimeout(() => {
-                    if (session.pendingChoice?.request.choiceId === request.choiceId) {
-                        session.pendingChoice.resolve({ choiceId: request.choiceId, selectedValue: null });
-                        session.pendingChoice = undefined;
-                    }
-                }, request.timeout);
-            }
         });
     }
 }

package/dist/app-child.js

@@ -1341,15 +1341,6 @@ async function runDaemon(foreground = false, email) {
                         socket.emit('session:error', { sessionId, error: 'Session not found or projectPath missing' });
                         return;
                     }
-                    // Check if user choice is enabled from the prompt data (sent by backend)
-                    // Backend now includes enabledModules in the session:prompt event
-                    const enabledModules = data.enabledModules || [];
-                    const moduleSettings = data.moduleSettings || {};
-                    const userChoiceEnabled = enabledModules.includes('user-choice') || false;
-                    if (foreground) {
-                        console.log(`[CLI] Enabled modules: ${enabledModules.join(', ') || 'none'}`);
-                        console.log(`[CLI] User choice enabled: ${userChoiceEnabled}`);
-                    }
                     // Store in activeSessions with promptId and model
                     activeSessions.set(sessionId, { projectPath, currentPromptId: promptId, model });
                     // Capture promptId in closure to prevent race conditions when multiple prompts arrive quickly
@@ -1363,9 +1354,6 @@ async function runDaemon(foreground = false, email) {
                     await agentSessionManager.createSession({
                         sessionId,
                         projectPath,
-                        userChoiceEnabled, // Pass user choice enabled setting from backend
-                        enabledModules, // Pass enabled modules for MCP server
-                        moduleSettings, // Pass module settings for MCP server
                         onOutput: (output) => {
                             // Serialize data to string if it's an object
                             const dataString = typeof output.data === 'string'
@@ -1393,16 +1381,6 @@ async function runDaemon(foreground = false, email) {
                             // The actual session:result is emitted from sendPrompt handler below
                             // This handler is kept for backward compatibility but may not be used
                         },
-                        onChoiceRequest: (request) => {
-                            // Emit choice request to frontend
-                            socket.emit('user:choice:request', {
-                                sessionId,
-                                choiceId: request.choiceId,
-                                question: request.question,
-                                options: request.options,
-                                timeout: request.timeout
-                            });
-                        }
                     });
                     // Send prompt - status updates will be emitted from agentSession when processing starts/completes
                     await agentSessionManager.sendPrompt(sessionId, prompt, enhancers || [], {
@@ -1555,25 +1533,6 @@ async function runDaemon(foreground = false, email) {
                     callback?.({ success: false, message: error.message });
                 }
             });
-            // Handle user choice response from frontend
-            socket.on('user:choice:response', async (data) => {
-                try {
-                    const { sessionId, choiceId, selectedValue } = data;
-                    if (foreground) {
-                        console.log(`[CLI] 📝 Received user choice response: choiceId=${choiceId}, selectedValue=${selectedValue}`);
-                    }
-                    // Forward the response to the agent session manager
-                    await agentSessionManager.handleChoiceResponse(sessionId, {
-                        choiceId,
-                        selectedValue
-                    });
-                }
-                catch (error) {
-                    if (foreground) {
-                        console.error(`✗ Error handling user choice response: ${error.message}`);
-                    }
-                }
-            });
             socket.on('connect', () => {
                 if (foreground) {
                     console.log(`✓ Connected to backend at ${config.apiUrl}`);

package/dist/index.js

@@ -1286,24 +1286,6 @@ async function runDaemon(foreground = false, email) {
                         socket.emit('session:error', { sessionId, error: 'Session not found or projectPath missing' });
                         return;
                     }
-                    // Check if user choice is enabled from the prompt data (sent by backend)
-                    // Backend now includes enabledModules in the session:prompt event
-                    const enabledModules = data.enabledModules || [];
-                    const moduleSettings = data.moduleSettings || {};
-                    const userChoiceEnabled = enabledModules.includes('user-choice') || false;
-                    if (foreground) {
-                        console.log(`[CLI] Enabled modules: ${enabledModules.join(', ') || 'none'}`);
-                        console.log(`[CLI] User choice enabled: ${userChoiceEnabled}`);
-                    }
-                    // Store in activeSessions with promptId and model
-                    activeSessions.set(sessionId, { projectPath, currentPromptId: promptId, model });
-                    if (!projectPath) {
-                        if (foreground) {
-                            console.error(`✗ Session not found: ${sessionId} (missing projectPath)`);
-                        }
-                        socket.emit('session:error', { sessionId, error: 'Session not found or projectPath missing' });
-                        return;
-                    }
                     // Store in activeSessions with promptId and model
                     activeSessions.set(sessionId, { projectPath, currentPromptId: promptId, model });
                     // Capture promptId in closure to prevent race conditions when multiple prompts arrive quickly
@@ -1317,9 +1299,6 @@ async function runDaemon(foreground = false, email) {
                     await agentSessionManager.createSession({
                         sessionId,
                         projectPath,
-                        userChoiceEnabled, // Pass user choice enabled setting from backend
-                        enabledModules, // Pass enabled modules for MCP server
-                        moduleSettings, // Pass module settings for MCP server
                         onOutput: (output) => {
                             // Serialize data to string if it's an object
                             const dataString = typeof output.data === 'string'
@@ -1347,16 +1326,6 @@ async function runDaemon(foreground = false, email) {
                             // The actual session:result is emitted from sendPrompt handler below
                             // This handler is kept for backward compatibility but may not be used
                         },
-                        onChoiceRequest: (request) => {
-                            // Emit choice request to frontend
-                            socket.emit('user:choice:request', {
-                                sessionId,
-                                choiceId: request.choiceId,
-                                question: request.question,
-                                options: request.options,
-                                timeout: request.timeout
-                            });
-                        }
                     });
                     // Send prompt - status updates will be emitted from agentSession when processing starts/completes
                     await agentSessionManager.sendPrompt(sessionId, prompt, enhancers || [], {
@@ -1509,25 +1478,6 @@ async function runDaemon(foreground = false, email) {
                     callback?.({ success: false, message: error.message });
                 }
             });
-            // Handle user choice response from frontend
-            socket.on('user:choice:response', async (data) => {
-                try {
-                    const { sessionId, choiceId, selectedValue } = data;
-                    if (foreground) {
-                        console.log(`[CLI] 📝 Received user choice response: choiceId=${choiceId}, selectedValue=${selectedValue}`);
-                    }
-                    // Forward the response to the agent session manager
-                    await agentSessionManager.handleChoiceResponse(sessionId, {
-                        choiceId,
-                        selectedValue
-                    });
-                }
-                catch (error) {
-                    if (foreground) {
-                        console.error(`✗ Error handling user choice response: ${error.message}`);
-                    }
-                }
-            });
             // Handle image save request - saves base64 images to tmp directory
             socket.on('image:save', async (data) => {
                 try {

package/dist/moduleMcpServer.js

@@ -1,9 +1,7 @@
 /**
  * Module MCP Server
  *
- * Exposes enabled modules as MCP tools to the agent.
- * This allows the agent to interact with modules like user-choice through standard tool calls.
- * Also provides built-in tools like analyze_image for vision capabilities.
+ * Provides built-in tools like analyze_image for vision capabilities.
  */
 import { createSdkMcpServer, tool } from '@anthropic-ai/claude-agent-sdk';
 import { z } from 'zod';
@@ -11,67 +9,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import { getOpenrouterApiKey } from './agentSession.js';
-/**
- * Create a tool for the user-choice module
- */
-function createUserChoiceTool(onChoiceRequest) {
-    const schema = {
-        question: z.string(),
-        options: z.array(z.object({ label: z.string(), value: z.string() })),
-        timeout: z.number().optional()
-    };
-    return tool('user_choice_request', 'Request user input when making decisions. Use this when you need the user to choose between options or provide input on a decision. This tool will present a modal to the user with your question and wait for their response.', schema, async (args, _extra) => {
-        if (!onChoiceRequest) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: 'Error: User choice is not enabled. Please use an alternative approach or ask the user directly.'
-                    }
-                ],
-                isError: true
-            };
-        }
-        const choiceId = `choice-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
-        try {
-            const response = await onChoiceRequest({
-                choiceId,
-                question: args.question,
-                options: args.options,
-                timeout: args.timeout
-            });
-            if (response.selectedValue === null) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: 'The user did not respond within the timeout period. Please proceed with a reasonable default or ask again.'
-                        }
-                    ]
-                };
-            }
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `The user selected: ${response.selectedValue}`
-                    }
-                ]
-            };
-        }
-        catch (error) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `Error requesting user choice: ${error instanceof Error ? error.message : String(error)}`
-                    }
-                ],
-                isError: true
-            };
-        }
-    });
-}
 /**
  * Convert a file to a data URI for vision API consumption
  */
@@ -141,26 +78,12 @@ function createAnalyzeImageTool(attachmentDir) {
     });
 }
 /**
- * Get available tools based on enabled modules
- */
-function getModuleTools(config) {
-    const tools = [];
-    // User choice module
-    if (config.enabledModules.includes('user-choice')) {
-        tools.push(createUserChoiceTool(config.onChoiceRequest));
-    }
-    // Always add analyze_image tool if attachmentDir is provided (i.e. there are attachments)
-    if (config.attachmentDir) {
-        tools.push(createAnalyzeImageTool(config.attachmentDir));
-    }
-    // Add more module tools here as they are implemented
-    return tools;
-}
-/**
- * Create the module MCP server
+ * Create the MCP server with built-in tools (always includes analyze_image)
  */
 export function createModuleMcpServer(config) {
-    const tools = getModuleTools(config);
+    const tools = [];
+    // Always add analyze_image tool (uses OpenRouter key from ai-config via backend)
+    tools.push(createAnalyzeImageTool(config.attachmentDir));
     const server = createSdkMcpServer({
         name: 'claude-voice-modules',
         version: '1.0.0',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exreve/exk",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "exk - Control Claude CLI with voice and programmable interfaces",
   "type": "module",
   "bin": {