ai-cli-mcp 2.14.1 → 2.15.0

package/src/parsers.ts

@@ -1,18 +1,15 @@
 import { debugLog } from './cli-utils.js';
 
-/**
- * Parse Codex NDJSON output to extract the last agent message and token count
- */
 export function parseCodexOutput(stdout: string): any {
   if (!stdout) return null;
-  
+
   try {
     const lines = stdout.trim().split('\n');
     let lastMessage = null;
     let tokenCount = null;
     let threadId = null;
     const tools: any[] = [];
-    
+
     for (const line of lines) {
       if (line.trim()) {
         try {
@@ -24,14 +21,13 @@ export function parseCodexOutput(stdout: string): any {
           } else if (parsed.msg?.type === 'agent_message') {
             lastMessage = parsed.msg.message;
           } else if (parsed.item?.type === 'reasoning') {
-            // Ignore reasoning-only items for message selection.
           } else if (parsed.msg?.type === 'token_count') {
             tokenCount = parsed.msg;
           } else if (parsed.type === 'item.completed' && parsed.item?.type === 'mcp_tool_call') {
             tools.push({
               server: parsed.item.server,
               tool: parsed.item.tool,
-              input: parsed.item.arguments, // Map arguments to input to match common patterns
+              input: parsed.item.arguments,
               output: parsed.item.result
             });
           } else if (parsed.type === 'item.completed' && parsed.item?.type === 'command_execution') {
@@ -43,12 +39,11 @@ export function parseCodexOutput(stdout: string): any {
             });
           }
         } catch (e) {
-          // Skip invalid JSON lines
           debugLog(`[Debug] Skipping invalid JSON line: ${line}`);
         }
       }
     }
-    
+
     if (lastMessage || tokenCount || threadId || tools.length > 0) {
       return {
         message: lastMessage,
@@ -60,28 +55,23 @@ export function parseCodexOutput(stdout: string): any {
   } catch (e) {
     debugLog(`[Debug] Failed to parse Codex NDJSON output: ${e}`);
   }
-  
+
   return null;
 }
 
-/**
- * Parse Claude Output (supports both JSON and stream-json/NDJSON)
- */
 export function parseClaudeOutput(stdout: string): any {
   if (!stdout) return null;
 
-  // First try parsing as a single JSON object (backward compatibility)
   try {
     return JSON.parse(stdout);
   } catch (e) {
-    // If not valid single JSON, proceed to parse as NDJSON
   }
 
   try {
     const lines = stdout.trim().split('\n');
     let lastMessage = null;
     let sessionId = null;
-    const toolsMap = new Map<string, any>(); // Map by tool_use id for matching results
+    const toolsMap = new Map<string, any>();
 
     for (const line of lines) {
       if (!line.trim()) continue;
@@ -89,36 +79,31 @@ export function parseClaudeOutput(stdout: string): any {
       try {
         const parsed = JSON.parse(line);
 
-        // Extract session ID from any message that has it
         if (parsed.session_id) {
           sessionId = parsed.session_id;
         }
 
-        // Extract final result message
         if (parsed.type === 'result' && parsed.result) {
           lastMessage = parsed.result;
         }
 
-        // Extract tool usage from assistant messages
         if (parsed.type === 'assistant' && parsed.message?.content) {
           for (const content of parsed.message.content) {
             if (content.type === 'tool_use') {
               toolsMap.set(content.id, {
                 tool: content.name,
                 input: content.input,
-                output: null // Will be filled when tool_result is found
+                output: null
               });
             }
           }
         }
 
-        // Match tool results from user messages
         if (parsed.type === 'user' && parsed.message?.content) {
           for (const content of parsed.message.content) {
             if (content.type === 'tool_result' && content.tool_use_id) {
               const tool = toolsMap.get(content.tool_use_id);
               if (tool) {
-                // Extract text from content array
                 if (Array.isArray(content.content)) {
                   const textContent = content.content.find((c: any) => c.type === 'text');
                   tool.output = textContent?.text || null;
@@ -135,12 +120,11 @@ export function parseClaudeOutput(stdout: string): any {
       }
     }
 
-    // Convert Map to array
     const tools = Array.from(toolsMap.values());
 
     if (lastMessage || sessionId || tools.length > 0) {
       return {
-        message: lastMessage, // This is the final result text
+        message: lastMessage,
         session_id: sessionId,
         tools: tools.length > 0 ? tools : undefined
       };
@@ -150,13 +134,10 @@ export function parseClaudeOutput(stdout: string): any {
     debugLog(`[Debug] Failed to parse Claude NDJSON output: ${e}`);
     return null;
   }
-  
+
   return null;
 }
 
-/**
- * Parse Gemini JSON output
- */
 export function parseGeminiOutput(stdout: string): any {
   if (!stdout) return null;
 
@@ -168,9 +149,6 @@ export function parseGeminiOutput(stdout: string): any {
   }
 }
 
-/**
- * Parse Forge output framed by Initialize/Continue/Finished markers.
- */
 export function parseForgeOutput(stdout: string): any {
   if (!stdout) return null;
 
@@ -228,3 +206,71 @@ export function parseForgeOutput(stdout: string): any {
     session_id: lastConversationId,
   };
 }
+
+export function parseOpenCodeOutput(stdout: string): any {
+  if (!stdout) {
+    return null;
+  }
+
+  let sessionId: string | null = null;
+  let currentStepBuffer = '';
+  let latestCompletedStep: {
+    message: string;
+    session_id?: string;
+    tokens?: any;
+    cost?: number;
+  } | null = null;
+  let hasStepFinish = false;
+  let hasParseableAssistantText = false;
+
+  for (const line of stdout.split('\n')) {
+    if (!line.trim()) {
+      continue;
+    }
+
+    let parsed: any;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      continue;
+    }
+
+    if (typeof parsed.sessionID === 'string' && parsed.sessionID) {
+      sessionId = parsed.sessionID;
+    }
+
+    if (parsed.type === 'step_start') {
+      currentStepBuffer = '';
+      continue;
+    }
+
+    if (parsed.type === 'text' && parsed.part?.type === 'text' && typeof parsed.part.text === 'string') {
+      currentStepBuffer += parsed.part.text;
+      hasParseableAssistantText = true;
+      continue;
+    }
+
+    if (parsed.type === 'step_finish') {
+      hasStepFinish = true;
+      latestCompletedStep = {
+        message: currentStepBuffer,
+        session_id: sessionId || undefined,
+        tokens: parsed.part?.tokens,
+        cost: parsed.part?.cost,
+      };
+    }
+  }
+
+  if (hasStepFinish && latestCompletedStep) {
+    return latestCompletedStep;
+  }
+
+  if (hasParseableAssistantText) {
+    return {
+      message: currentStepBuffer,
+      session_id: sessionId || undefined,
+    };
+  }
+
+  return null;
+}

package/src/process-result.ts

@@ -45,6 +45,10 @@ function hasMeaningfulParsedOutput(agentOutput: any): boolean {
   });
 }
 
+function shouldPreserveRawFailureOutput(context: ProcessResultContext): boolean {
+  return context.agent === 'opencode' && context.status === 'failed';
+}
+
 export function buildProcessResult(context: ProcessResultContext, agentOutput: any, verbose = false): any {
   const response: any = {
     pid: context.pid,
@@ -65,15 +69,20 @@ export function buildProcessResult(context: ProcessResultContext, agentOutput: a
   }
 
   const shapedAgentOutput = verbose ? agentOutput : compactAgentOutput(agentOutput);
+  const preserveRawFailureOutput = shouldPreserveRawFailureOutput(context);
 
-  if (hasMeaningfulParsedOutput(shapedAgentOutput)) {
+  if (hasMeaningfulParsedOutput(shapedAgentOutput) && (verbose || !preserveRawFailureOutput)) {
     response.agentOutput = shapedAgentOutput;
   }
 
-  if (!response.agentOutput) {
+  if (!response.agentOutput || preserveRawFailureOutput) {
     response.stdout = context.stdout;
     response.stderr = context.stderr;
   }
 
+  if (verbose && preserveRawFailureOutput && hasMeaningfulParsedOutput(shapedAgentOutput)) {
+    response.agentOutput = shapedAgentOutput;
+  }
+
   return response;
 }

package/src/process-service.ts

@@ -1,9 +1,9 @@
 import { spawn, type ChildProcess } from 'node:child_process';
 import { buildCliCommand, type BuildCliCommandOptions } from './cli-builder.js';
-import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput } from './parsers.js';
+import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput, parseOpenCodeOutput } from './parsers.js';
 import { buildProcessResult } from './process-result.js';
 
-export type AgentType = 'claude' | 'codex' | 'gemini' | 'forge';
+export type AgentType = 'claude' | 'codex' | 'gemini' | 'forge' | 'opencode';
 export type ProcessStatus = 'running' | 'completed' | 'failed';
 
 interface TrackedProcess {
@@ -37,6 +37,31 @@ interface ProcessServiceOptions {
   cliPaths: BuildCliCommandOptions['cliPaths'];
 }
 
+function parseAgentOutput(agent: AgentType, stdout: string, stderr: string): any {
+  if (agent === 'codex') {
+    return parseCodexOutput(`${stdout || ''}\n${stderr || ''}`);
+  }
+
+  if (!stdout) {
+    return null;
+  }
+
+  if (agent === 'claude') {
+    return parseClaudeOutput(stdout);
+  }
+  if (agent === 'gemini') {
+    return parseGeminiOutput(stdout);
+  }
+  if (agent === 'forge') {
+    return parseForgeOutput(stdout);
+  }
+  if (agent === 'opencode') {
+    return parseOpenCodeOutput(stdout);
+  }
+
+  return null;
+}
+
 export class ProcessService {
   private readonly processManager = new Map<number, TrackedProcess>();
   private readonly cliPaths: BuildCliCommandOptions['cliPaths'];
@@ -136,19 +161,7 @@ export class ProcessService {
       throw new Error(`Process with PID ${pid} not found`);
     }
 
-    let agentOutput: any = null;
-    if (process.toolType === 'codex') {
-      const combinedOutput = (process.stdout || '') + '\n' + (process.stderr || '');
-      agentOutput = parseCodexOutput(combinedOutput);
-    } else if (process.stdout) {
-      if (process.toolType === 'claude') {
-        agentOutput = parseClaudeOutput(process.stdout);
-      } else if (process.toolType === 'gemini') {
-        agentOutput = parseGeminiOutput(process.stdout);
-      } else if (process.toolType === 'forge') {
-        agentOutput = parseForgeOutput(process.stdout);
-      }
-    }
+    const agentOutput = parseAgentOutput(process.toolType, process.stdout, process.stderr);
 
     return buildProcessResult({
       pid,

package/src/server.ts

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
-export { debugLog, findClaudeCli, findCodexCli, findForgeCli, findGeminiCli } from './cli-utils.js';
+import { debugLog, findClaudeCli, findCodexCli, findForgeCli, findGeminiCli, findOpencodeCli } from './cli-utils.js';
+export { debugLog, findClaudeCli, findCodexCli, findForgeCli, findGeminiCli, findOpencodeCli } from './cli-utils.js';
 export { resolveModelAlias } from './cli-builder.js';
 export { ClaudeCodeServer, runMcpServer, spawnAsync } from './app/mcp.js';
 

package/vitest.config.unit.ts

@@ -17,13 +17,12 @@ export default defineConfig({
     },
     exclude: [
       'node_modules/**',
+      'dist/**',
       'src/__tests__/e2e.test.ts',
       'src/__tests__/edge-cases.test.ts',
-      'dist/__tests__/e2e.test.js',
-      'dist/__tests__/edge-cases.test.js',
     ],
     mockReset: true,
     clearMocks: true,
     restoreMocks: true,
   },
-});
+});