@axhub/genie 0.2.6 → 0.2.7

package/server/cli.js

@@ -740,6 +740,8 @@ function showStatus(options = {}) {
 
 // Show help
 function showHelp() {
+    const defaultProjectUrl = 'https://github.com/lintendo/AI-Web-UI';
+    const defaultIssuesUrl = `${defaultProjectUrl}/issues`;
     console.log(`
 ╔═══════════════════════════════════════════════════════════════╗
 ║              Axhub Genie - Command Line Tool               ║
@@ -805,10 +807,10 @@ Environment Variables:
   AXHUB_GENIE_NO_OPEN  Set to true to disable auto-opening the homepage
 
 Documentation:
-  ${packageJson.homepage || 'https://github.com/siteboon/claudecodeui'}
+  ${packageJson.homepage || defaultProjectUrl}
 
 Report Issues:
-  ${packageJson.bugs?.url || 'https://github.com/siteboon/claudecodeui/issues'}
+  ${packageJson.bugs?.url || defaultIssuesUrl}
 `);
 }
 

package/server/external-agent/service.js

@@ -1,10 +1,11 @@
 import { promises as fs } from 'fs';
 
 import { addProjectManually } from '../projects.js';
-import { queryClaudeSDK } from '../claude-sdk.js';
-import { queryCodex } from '../openai-codex.js';
-import { queryGemini } from '../gemini-cli.js';
-import { queryOpencode } from '../opencode-cli.js';
+import {
+  applyConversationEventToTimelineMessages,
+  CONVERSATION_EVENT_KINDS
+} from '../../shared/conversationEvents.js';
+import { executeAgentPrompt } from '../acp-runtime/index.js';
 import { detectProviderInstallationStatus } from '../routes/cli-auth.js';
 import {
   buildAgentCallbackPayload,
@@ -16,7 +17,6 @@ import {
 } from '../utils/agentCallback.js';
 import { normalizeExternalImages } from '../utils/agentImages.js';
 import { resolveWorkingDirectory } from '../utils/defaultWorkingDirectory.js';
-import { CODEX_MODELS, GEMINI_MODELS, OPENCODE_MODELS } from '../../shared/modelConstants.js';
 
 export const SUPPORTED_EXTERNAL_AGENT_PROVIDERS = ['claude', 'codex', 'gemini', 'opencode'];
 
@@ -274,7 +274,7 @@ function extractTerminalErrorMessage(payload) {
 export class CallbackCaptureWriter {
   constructor() {
     this.sessionId = null;
-    this.assistantMessages = [];
+    this.timelineMessages = [];
     this.tokenSummary = createEmptyTokenSummary();
     this.terminalState = null;
     this.terminalErrorMessage = null;
@@ -303,24 +303,34 @@ export class CallbackCaptureWriter {
       };
     }
 
-    if (payload.type === 'claude-response' && payload.data?.type === 'assistant') {
-      this.assistantMessages.push(payload.data);
-    }
+    if (payload.type === 'conversation-event' && payload.event) {
+      this.timelineMessages = applyConversationEventToTimelineMessages(
+        this.timelineMessages,
+        payload.event,
+        payload.event.provider || 'claude'
+      );
+
+      if (payload.event.kind === CONVERSATION_EVENT_KINDS.ERROR) {
+        this.terminalState = 'errored';
+        this.terminalErrorMessage = payload.event.payload?.message || this.terminalErrorMessage || 'Agent session failed';
+        return;
+      }
 
-    if (
-      payload.type === 'codex-response' &&
-      payload.data?.type === 'item_done' &&
-      payload.data?.itemType === 'agent_message' &&
-      typeof payload.data?.content === 'string' &&
-      payload.data.content.trim()
-    ) {
-      this.assistantMessages.push({
-        type: 'assistant',
-        message: {
-          role: 'assistant',
-          content: payload.data.content
+      if (payload.event.kind === CONVERSATION_EVENT_KINDS.SESSION_STATE_CHANGED) {
+        const nextState = String(payload.event.payload?.state || '').trim().toLowerCase();
+        if (nextState === 'completed') {
+          this.terminalState = 'completed';
+          this.terminalErrorMessage = null;
+        } else if (nextState === 'aborted') {
+          this.terminalState = 'aborted';
+          this.terminalErrorMessage = 'Session aborted';
+        } else if (nextState === 'errored') {
+          this.terminalState = 'errored';
+          this.terminalErrorMessage = payload.event.payload?.message || this.terminalErrorMessage || 'Agent session failed';
         }
-      });
+      }
+
+      return;
     }
 
     if (payload.type === 'session-aborted') {
@@ -359,7 +369,16 @@ export class CallbackCaptureWriter {
   }
 
   getAssistantMessages() {
-    return this.assistantMessages;
+    return this.timelineMessages
+      .filter((message) => message?.type === 'assistant' && !message?.isToolUse && !message?.isSystemNotice)
+      .map((message) => ({
+        type: 'assistant',
+        message: {
+          role: 'assistant',
+          content: message.content || ''
+        },
+        timestamp: message.timestamp || null
+      }));
   }
 
   getTotalTokens() {
@@ -418,52 +437,19 @@ async function ensureProjectPathExists(projectPath) {
 }
 
 async function runProviderSession({ provider, message, images, finalProjectPath, sessionId, model, writer }) {
-  if (provider === 'claude') {
-    await queryClaudeSDK(message, {
+  await executeAgentPrompt({
+    agentKey: provider,
+    command: message,
+    options: {
       projectPath: finalProjectPath,
       cwd: finalProjectPath,
       sessionId,
       model,
       permissionMode: 'bypassPermissions',
       images
-    }, writer);
-    return;
-  }
-
-  if (provider === 'codex') {
-    await queryCodex(message, {
-      projectPath: finalProjectPath,
-      cwd: finalProjectPath,
-      sessionId,
-      model: model || CODEX_MODELS.DEFAULT,
-      permissionMode: 'bypassPermissions',
-      images
-    }, writer);
-    return;
-  }
-
-  if (provider === 'gemini') {
-    await queryGemini(message, {
-      projectPath: finalProjectPath,
-      cwd: finalProjectPath,
-      sessionId,
-      resume: !!sessionId,
-      model: model || GEMINI_MODELS.DEFAULT,
-      permissionMode: 'bypassPermissions'
-    }, writer);
-    return;
-  }
-
-  if (provider === 'opencode') {
-    await queryOpencode(message, {
-      projectPath: finalProjectPath,
-      cwd: finalProjectPath,
-      sessionId,
-      resume: !!sessionId,
-      model: model || OPENCODE_MODELS.DEFAULT,
-      permissionMode: 'bypassPermissions'
-    }, writer);
-  }
+    },
+    writer
+  });
 }
 
 export async function runExternalAgentRequest({
@@ -483,6 +469,7 @@ export async function runExternalAgentRequest({
     const response = {
       success: true,
       openOnly: true,
+      runtime: 'acp',
       sessionId: normalized.normalizedSessionId,
       ...buildSessionNavigation(normalized.normalizedSessionId),
       isResumed: true,
@@ -491,6 +478,7 @@ export async function runExternalAgentRequest({
 
     transportWriter?.send?.({
       type: 'open-only',
+      runtime: 'acp',
       ...response
     });
 
@@ -550,6 +538,7 @@ export async function runExternalAgentRequest({
     const response = {
       success: true,
       sessionId: callbackSessionId,
+      runtime: 'acp',
       ...navigation,
       isResumed: !!normalized.normalizedSessionId,
       messages: callbackCaptureWriter.getAssistantMessages(),

package/server/gemini-cli.js

@@ -1,368 +1,31 @@
-import { spawn } from 'child_process';
-import crossSpawn from 'cross-spawn';
-import { resolveWorkingDirectory } from './utils/defaultWorkingDirectory.js';
-
-const spawnFunction = process.platform === 'win32' ? crossSpawn : spawn;
-
-const activeGeminiProcesses = new Map();
-
-function collectTextChunks(payload) {
-  if (!payload) return [];
-  if (typeof payload === 'string') return payload.trim() ? [payload] : [];
-
-  const chunks = [];
-
-  if (Array.isArray(payload)) {
-    payload.forEach(item => {
-      chunks.push(...collectTextChunks(item));
-    });
-    return chunks;
-  }
-
-  if (typeof payload !== 'object') {
-    return chunks;
-  }
-
-  const directKeys = ['text', 'response', 'content', 'message', 'delta'];
-  for (const key of directKeys) {
-    if (payload[key] !== undefined) {
-      chunks.push(...collectTextChunks(payload[key]));
-    }
-  }
-
-  if (Array.isArray(payload.parts)) {
-    payload.parts.forEach(part => {
-      chunks.push(...collectTextChunks(part));
-    });
-  }
-
-  if (payload.data && typeof payload.data === 'object') {
-    chunks.push(...collectTextChunks(payload.data));
-  }
-
-  return chunks;
-}
-
-function getEventRole(event) {
-  return (
-    event?.role ||
-    event?.author ||
-    event?.sender ||
-    event?.message?.role ||
-    event?.data?.role ||
-    event?.content?.role ||
-    null
-  );
-}
-
-function extractAssistantTextChunks(event, command) {
-  const role = String(getEventRole(event) || '').toLowerCase();
-  if (role === 'user') return [];
-
-  const eventType = String(event?.type || event?.event || event?.kind || '').toLowerCase();
-  const hasAssistantPayload = !!(event?.response || event?.candidates || event?.delta || event?.text || event?.content || event?.message);
-  if (eventType.includes('prompt') && !hasAssistantPayload) {
-    return [];
-  }
-
-  const normalizedPrompt = String(command || '').trim();
-  return collectTextChunks(event).filter((text) => {
-    const trimmed = String(text || '').trim();
-    if (!trimmed) return false;
-    if (normalizedPrompt && trimmed === normalizedPrompt) return false;
-    return true;
-  });
-}
-
-function parseGeminiJsonLine(line) {
-  const trimmed = line.trim();
-  if (!trimmed) return null;
-
-  const payload = trimmed.startsWith('data:') ? trimmed.slice(5).trim() : trimmed;
-  if (!payload) return null;
-
-  return JSON.parse(payload);
-}
-
-function emitTextChunks(ws, sessionId, chunks) {
-  chunks.forEach((text) => {
-    if (!text) return;
-    ws.send({
-      type: 'claude-response',
-      data: {
-        type: 'content_block_delta',
-        delta: {
-          type: 'text_delta',
-          text
-        }
-      },
-      provider: 'gemini',
-      sessionId
-    });
-  });
-}
-
-function formatGeminiProcessError(code, stderrOutput) {
-  const normalizedStderr = String(stderrOutput || '').trim();
-  if (normalizedStderr) {
-    const apiMessageMatch =
-      normalizedStderr.match(/"message":"([^"]+)"/) ||
-      normalizedStderr.match(/message:\s*"([^"]+)"/i) ||
-      normalizedStderr.match(/ApiError:\s*\{.*?"message":"([^"]+)"/i) ||
-      normalizedStderr.match(/Error when talking to Gemini API[\s\S]*?message":"([^"]+)"/i);
-
-    if (apiMessageMatch?.[1]) {
-      return apiMessageMatch[1];
-    }
-
-    const firstMeaningfulLine = normalizedStderr
-      .split('\n')
-      .map((line) => line.trim())
-      .find((line) => line && !line.startsWith('at '));
-
-    if (firstMeaningfulLine) {
-      return firstMeaningfulLine;
-    }
-
-    return normalizedStderr;
-  }
-
-  return `Gemini CLI exited with code ${code}`;
-}
-
-function extractGeminiEventError(event) {
-  if (!event || typeof event !== 'object') {
-    return null;
-  }
-
-  const candidates = [
-    event?.error?.message,
-    event?.error?.details,
-    event?.result?.error?.message,
-    event?.result?.error,
-    event?.data?.error?.message,
-    event?.data?.error,
-    event?.message
-  ];
-
-  for (const candidate of candidates) {
-    const normalized = String(candidate || '').trim();
-    if (normalized) {
-      return normalized;
-    }
-  }
-
-  return null;
-}
-
-async function queryGemini(command, options = {}, ws) {
-  return new Promise((resolve, reject) => {
-    const { sessionId, cwd, projectPath, resume, model, permissionMode } = options;
-    let capturedSessionId = sessionId;
-    let sentSessionCreated = false;
-    let stderrBuffer = '';
-    let fatalErrorSent = false;
-    let sawSuccessfulTerminalEvent = false;
-    let sawErroredTerminalEvent = false;
-
-    const args = ['-y', '@google/gemini-cli'];
-
-    if (sessionId && (resume || !command || !command.trim())) {
-      args.push('--resume', sessionId);
-    }
-
-    if (command && command.trim()) {
-      args.push('--prompt', command);
-      args.push('--output-format', 'stream-json');
-    }
-
-    if (model) {
-      args.push('--model', model);
-    }
-
-    if (permissionMode === 'bypassPermissions' || permissionMode === 'acceptEdits') {
-      args.push('--yolo');
-    }
-
-    const workingDir = resolveWorkingDirectory({ cwd, projectPath });
-
-    const geminiProcess = spawnFunction('npx', args, {
-      cwd: workingDir,
-      stdio: ['pipe', 'pipe', 'pipe'],
-      env: {
-        ...process.env,
-        GEMINI_NONINTERACTIVE: '1'
-      }
-    });
-
-    const processKey = capturedSessionId || Date.now().toString();
-    let processRegistryKey = processKey;
-    activeGeminiProcesses.set(processRegistryKey, geminiProcess);
-
-    const finalizeSessionId = () => capturedSessionId || sessionId || null;
-    const emitFatalError = (errorMessage) => {
-      if (fatalErrorSent || !errorMessage) {
-        return;
-      }
-
-      fatalErrorSent = true;
-      ws.send({
-        type: 'claude-error',
-        error: errorMessage,
-        provider: 'gemini',
-        sessionId: finalizeSessionId()
-      });
-    };
-
-    const handleJsonEvent = (event) => {
-      const incomingSessionId = event?.session_id || event?.sessionId || event?.data?.session_id || event?.data?.sessionId;
-      if (incomingSessionId && !capturedSessionId) {
-        capturedSessionId = incomingSessionId;
-        if (ws.setSessionId && typeof ws.setSessionId === 'function') {
-          ws.setSessionId(capturedSessionId);
-        }
-
-        if (processRegistryKey !== capturedSessionId) {
-          activeGeminiProcesses.delete(processRegistryKey);
-          activeGeminiProcesses.set(capturedSessionId, geminiProcess);
-          processRegistryKey = capturedSessionId;
-        }
-
-        if (!sessionId && !sentSessionCreated) {
-          sentSessionCreated = true;
-          ws.send({
-            type: 'session-created',
-            sessionId: capturedSessionId,
-            provider: 'gemini'
-          });
-        }
-      }
-
-      const type = event?.type || event?.event || event?.kind;
-      if (type === 'result' || type === 'done' || type === 'complete') {
-        const eventStatus = String(event?.status || event?.result?.status || '').trim().toLowerCase();
-        const eventError = extractGeminiEventError(event);
-        if (eventStatus === 'error' || eventError) {
-          sawErroredTerminalEvent = true;
-          emitFatalError(eventError || 'Gemini CLI request failed');
-          return;
-        }
-
-        sawSuccessfulTerminalEvent = true;
-        ws.send({
-          type: 'claude-response',
-          data: { type: 'content_block_stop' },
-          provider: 'gemini',
-          sessionId: finalizeSessionId()
-        });
-
-        ws.send({
-          type: 'gemini-result',
-          data: event,
-          sessionId: finalizeSessionId()
-        });
-        return;
-      }
-
-      const textChunks = extractAssistantTextChunks(event, command);
-      emitTextChunks(ws, finalizeSessionId(), textChunks);
-    };
-
-    let stdoutBuffer = '';
-    geminiProcess.stdout.on('data', (data) => {
-      stdoutBuffer += data.toString();
-      const lines = stdoutBuffer.split('\n');
-      stdoutBuffer = lines.pop() || '';
-
-      for (const line of lines) {
-        try {
-          const event = parseGeminiJsonLine(line);
-          if (!event) continue;
-          handleJsonEvent(event);
-        } catch {}
-      }
-    });
-
-    geminiProcess.stderr.on('data', (data) => {
-      const chunk = data.toString();
-      stderrBuffer += chunk;
-
-      const normalizedChunk = chunk.trim();
-      if (normalizedChunk) {
-        console.warn('Gemini CLI stderr:', normalizedChunk);
-      }
-    });
-
-    geminiProcess.on('close', (code) => {
-      if (stdoutBuffer.trim()) {
-        try {
-          const finalEvent = parseGeminiJsonLine(stdoutBuffer);
-          if (finalEvent) {
-            handleJsonEvent(finalEvent);
-          }
-        } catch {}
-      }
-
-      activeGeminiProcesses.delete(processRegistryKey);
-
-      if (code === 0 && !sawErroredTerminalEvent) {
-        if (!sawSuccessfulTerminalEvent) {
-          ws.send({
-            type: 'claude-response',
-            data: { type: 'content_block_stop' },
-            provider: 'gemini',
-            sessionId: finalizeSessionId()
-          });
-        }
-
-        ws.send({
-          type: 'claude-complete',
-          sessionId: finalizeSessionId(),
-          provider: 'gemini',
-          exitCode: code,
-          isNewSession: !sessionId && !!command
-        });
-        resolve();
-      } else {
-        const errorMessage = formatGeminiProcessError(code, stderrBuffer);
-        emitFatalError(errorMessage);
-        reject(new Error(errorMessage));
-      }
-    });
-
-    geminiProcess.on('error', (error) => {
-      activeGeminiProcesses.delete(processRegistryKey);
-
-      emitFatalError(error.message);
-
-      reject(error);
-    });
-
-    geminiProcess.stdin.end();
+import {
+  abortAgentSession,
+  executeAgentPrompt,
+  getActiveAgentSessions,
+  isAgentSessionActive
+} from './acp-runtime/index.js';
+import { GEMINI_MODELS } from '../shared/modelConstants.js';
+
+export async function queryGemini(command, options = {}, writer) {
+  return executeAgentPrompt({
+    agentKey: 'gemini',
+    command,
+    options: {
+      ...options,
+      model: options.model || GEMINI_MODELS.DEFAULT
+    },
+    writer
   });
 }
 
-function abortGeminiSession(sessionId) {
-  const process = activeGeminiProcesses.get(sessionId);
-  if (process) {
-    process.kill('SIGTERM');
-    activeGeminiProcesses.delete(sessionId);
-    return true;
-  }
-  return false;
+export async function abortGeminiSession(sessionId) {
+  return abortAgentSession('gemini', sessionId);
 }
 
-function isGeminiSessionActive(sessionId) {
-  return activeGeminiProcesses.has(sessionId);
+export function isGeminiSessionActive(sessionId) {
+  return isAgentSessionActive('gemini', sessionId);
 }
 
-function getActiveGeminiSessions() {
-  return Array.from(activeGeminiProcesses.keys());
+export function getActiveGeminiSessions() {
+  return getActiveAgentSessions('gemini');
 }
-
-export {
-  queryGemini,
-  abortGeminiSession,
-  isGeminiSessionActive,
-  getActiveGeminiSessions
-};