@axhub/genie 0.2.6 → 0.2.7

package/server/index.js

@@ -97,10 +97,13 @@ import fetch from 'node-fetch';
 import mime from 'mime-types';
 
 import { getProjects, getSessions, getSessionMessages, renameProject, deleteSession, deleteProject, addProjectManually, extractProjectDirectory, clearProjectDirectoryCache, clearProviderSessionLookupCaches, getGeminiSessionMessages } from './projects.js';
-import { queryClaudeSDK, isClaudeSDKSessionActive, getActiveClaudeSDKSessions, resolveToolApproval } from './claude-sdk.js';
-import { queryCodex, isCodexSessionActive, getActiveCodexSessions } from './openai-codex.js';
-import { queryGemini, isGeminiSessionActive, getActiveGeminiSessions } from './gemini-cli.js';
-import { queryOpencode, isOpencodeSessionActive, getActiveOpencodeSessions } from './opencode-cli.js';
+import {
+  executeAgentPrompt,
+  getActiveAgentSessions,
+  isAgentSessionActive,
+  resolveAgentPermission,
+  setAgentSessionMode
+} from './acp-runtime/index.js';
 import gitRoutes from './routes/git.js';
 import authRoutes from './routes/auth.js';
 import mcpRoutes from './routes/mcp.js';
@@ -1112,31 +1115,24 @@ function handleChatConnection(ws) {
         try {
             data = JSON.parse(message);
 
-            if (data.type === 'claude-command') {
-                console.log('[DEBUG] User message:', data.command || '[Continue/Resume]');
-                console.log('📁 Project:', data.options?.projectPath || 'Unknown');
-                console.log('🔄 Session:', data.options?.sessionId ? 'Resume' : 'New');
+            const agentCommandTypes = ['claude-command', 'codex-command', 'gemini-command', 'opencode-command'];
 
-                // Use Claude Agents SDK
-                await queryClaudeSDK(data.command, data.options, new SessionEventMirrorWriter(baseWriter, 'claude'));
-            } else if (data.type === 'codex-command') {
-                console.log('[DEBUG] Codex message:', data.command || '[Continue/Resume]');
-                console.log('📁 Project:', data.options?.projectPath || data.options?.cwd || 'Unknown');
-                console.log('🔄 Session:', data.options?.sessionId ? 'Resume' : 'New');
-                console.log('🤖 Model:', data.options?.model || 'default');
-                await queryCodex(data.command, data.options, new SessionEventMirrorWriter(baseWriter, 'codex'));
-            } else if (data.type === 'gemini-command') {
-                console.log('[DEBUG] Gemini message:', data.command || '[Continue/Resume]');
+            if (agentCommandTypes.includes(data.type)) {
+                const agentKey = data.type.replace(/-command$/, '');
+                console.log(`[DEBUG] ${agentKey} message:`, data.command || '[Continue/Resume]');
                 console.log('📁 Project:', data.options?.projectPath || data.options?.cwd || 'Unknown');
                 console.log('🔄 Session:', data.options?.sessionId ? 'Resume' : 'New');
                 console.log('🤖 Model:', data.options?.model || 'default');
-                await queryGemini(data.command, data.options, new SessionEventMirrorWriter(baseWriter, 'gemini'));
-            } else if (data.type === 'opencode-command') {
-                console.log('[DEBUG] OpenCode message:', data.command || '[Continue/Resume]');
-                console.log('📁 Project:', data.options?.projectPath || data.options?.cwd || 'Unknown');
-                console.log('🔄 Session:', data.options?.sessionId ? 'Resume' : 'New');
-                console.log('🤖 Model:', data.options?.model || 'default');
-                await queryOpencode(data.command, data.options, new SessionEventMirrorWriter(baseWriter, 'opencode'));
+
+                await executeAgentPrompt({
+                    agentKey,
+                    command: data.command,
+                    options: {
+                        ...(data.options || {}),
+                        clientRequestId: data.clientRequestId || data.options?.clientRequestId || null
+                    },
+                    writer: new SessionEventMirrorWriter(baseWriter, agentKey)
+                });
             } else if (data.type === 'abort-session') {
                 console.log('[DEBUG] Abort session request:', data.sessionId);
                 const provider = typeof data.provider === 'string' && data.provider.trim()
@@ -1147,13 +1143,29 @@ function handleChatConnection(ws) {
                     sessionId: data.sessionId,
                     writer: getSessionWriter(provider)
                 });
-            } else if (data.type === 'claude-permission-response') {
-                // Relay UI approval decisions back into the SDK control flow.
-                // This does not persist permissions; it only resolves the in-flight request,
-                // introduced so the SDK can resume once the user clicks Allow/Deny.
+            } else if (data.type === 'set-session-mode') {
+                const provider = typeof data.provider === 'string' && data.provider.trim()
+                    ? data.provider.trim().toLowerCase()
+                    : 'claude';
+                const modeId = String(data.modeId || '').trim();
+                if (!data.sessionId || !modeId) {
+                    throw new Error('set-session-mode requires sessionId and modeId');
+                }
+
+                const changed = await setAgentSessionMode(provider, data.sessionId, modeId, {
+                    writer: getSessionWriter(provider)
+                });
+
+                if (!changed) {
+                    throw new Error(`Unable to set session mode for ${provider}:${data.sessionId}`);
+                }
+            } else if (data.type === 'permission-response' || data.type === 'claude-permission-response') {
                 if (data.requestId) {
-                    resolveToolApproval(data.requestId, {
+                    resolveAgentPermission(data.requestId, {
                         allow: Boolean(data.allow),
+                        optionId: data.optionId,
+                        outcome: data.outcome,
+                        cancelled: data.outcome?.outcome === 'cancelled' || Boolean(data.cancelled),
                         updatedInput: data.updatedInput,
                         message: data.message,
                         rememberEntry: data.rememberEntry
@@ -1164,17 +1176,7 @@ function handleChatConnection(ws) {
                 const provider = data.provider || 'claude';
                 const sessionId = data.sessionId;
                 const sessionWriter = getSessionWriter(provider);
-                let isActive;
-                if (provider === 'codex') {
-                    isActive = isCodexSessionActive(sessionId);
-                } else if (provider === 'gemini') {
-                    isActive = isGeminiSessionActive(sessionId);
-                } else if (provider === 'opencode') {
-                    isActive = isOpencodeSessionActive(sessionId);
-                } else {
-                    // Use Claude Agents SDK
-                    isActive = isClaudeSDKSessionActive(sessionId);
-                }
+                const isActive = isAgentSessionActive(provider, sessionId);
 
                 sessionWriter.send({
                     type: 'session-status',
@@ -1185,9 +1187,10 @@ function handleChatConnection(ws) {
             } else if (data.type === 'get-active-sessions') {
                 // Get all currently active sessions
                 const activeSessions = {
-                    claude: getActiveClaudeSDKSessions(),                    codex: getActiveCodexSessions(),
-                    gemini: getActiveGeminiSessions(),
-                    opencode: getActiveOpencodeSessions()
+                    claude: getActiveAgentSessions('claude'),
+                    codex: getActiveAgentSessions('codex'),
+                    gemini: getActiveAgentSessions('gemini'),
+                    opencode: getActiveAgentSessions('opencode')
                 };
                 baseWriter.send({
                     type: 'active-sessions',