ai-cli-mcp 2.13.0 → 2.14.0

package/src/cli-process-service.ts

@@ -17,6 +17,7 @@ import { homedir } from 'node:os';
 import { buildCliCommand, type BuildCliCommandOptions } from './cli-builder.js';
 import { findClaudeCli, findCodexCli, findForgeCli, findGeminiCli } from './cli-utils.js';
 import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput } from './parsers.js';
+import { buildProcessResult } from './process-result.js';
 import type { AgentType, ProcessListItem } from './process-service.js';
 
 interface StoredProcess {
@@ -183,7 +184,7 @@ export class CliProcessService {
       }
     }
 
-    const response: any = {
+    return buildProcessResult({
       pid,
       agent: refreshed.toolType,
       status: refreshed.status,
@@ -192,27 +193,12 @@ export class CliProcessService {
       workFolder: refreshed.workFolder,
       prompt: refreshed.prompt,
       model: refreshed.model,
-    };
-
-    if (agentOutput) {
-      if (!verbose && agentOutput.tools) {
-        const { tools, ...rest } = agentOutput;
-        response.agentOutput = rest;
-      } else {
-        response.agentOutput = agentOutput;
-      }
-      if (agentOutput.session_id) {
-        response.session_id = agentOutput.session_id;
-      }
-    } else {
-      response.stdout = stdout;
-      response.stderr = stderr;
-    }
-
-    return response;
+      stdout,
+      stderr,
+    }, agentOutput, verbose);
   }
 
-  async waitForProcesses(pids: number[], timeoutSeconds = 180): Promise<any[]> {
+  async waitForProcesses(pids: number[], timeoutSeconds = 180, verbose = false): Promise<any[]> {
     const start = Date.now();
     for (const pid of pids) {
       this.readProcess(pid);
@@ -221,7 +207,7 @@ export class CliProcessService {
     while (true) {
       const statuses = pids.map((pid) => this.refreshStatus(this.readProcess(pid)).status);
       if (statuses.every((status) => status !== 'running')) {
-        return Promise.all(pids.map((pid) => this.getProcessResult(pid, false)));
+        return Promise.all(pids.map((pid) => this.getProcessResult(pid, verbose)));
       }
 
       if (Date.now() - start >= timeoutSeconds * 1000) {

package/src/process-result.ts

@@ -0,0 +1,79 @@
+import type { AgentType, ProcessStatus } from './process-service.js';
+
+interface ProcessResultContext {
+  pid: number;
+  agent: AgentType;
+  status: ProcessStatus;
+  exitCode?: number;
+  startTime: string;
+  workFolder: string;
+  prompt: string;
+  model?: string;
+  stdout: string;
+  stderr: string;
+}
+
+function compactAgentOutput(agentOutput: any): any | null {
+  if (!agentOutput || typeof agentOutput !== 'object') {
+    return null;
+  }
+
+  const { tools: _tools, ...rest } = agentOutput;
+  const compact = Object.fromEntries(Object.entries(rest).filter(([, value]) => value !== undefined && value !== null));
+  return Object.keys(compact).length > 0 ? compact : null;
+}
+
+function hasMeaningfulParsedOutput(agentOutput: any): boolean {
+  if (!agentOutput || typeof agentOutput !== 'object') {
+    return false;
+  }
+
+  return Object.entries(agentOutput).some(([key, value]) => {
+    if (value === undefined || value === null) {
+      return false;
+    }
+
+    if (key === 'session_id') {
+      return false;
+    }
+
+    if (key === 'tools') {
+      return Array.isArray(value) ? value.length > 0 : true;
+    }
+
+    return true;
+  });
+}
+
+export function buildProcessResult(context: ProcessResultContext, agentOutput: any, verbose = false): any {
+  const response: any = {
+    pid: context.pid,
+    agent: context.agent,
+    status: context.status,
+    exitCode: context.exitCode ?? null,
+    model: context.model ?? null,
+  };
+
+  if (verbose) {
+    response.startTime = context.startTime;
+    response.workFolder = context.workFolder;
+    response.prompt = context.prompt;
+  }
+
+  if (agentOutput?.session_id) {
+    response.session_id = agentOutput.session_id;
+  }
+
+  const shapedAgentOutput = verbose ? agentOutput : compactAgentOutput(agentOutput);
+
+  if (hasMeaningfulParsedOutput(shapedAgentOutput)) {
+    response.agentOutput = shapedAgentOutput;
+  }
+
+  if (!response.agentOutput) {
+    response.stdout = context.stdout;
+    response.stderr = context.stderr;
+  }
+
+  return response;
+}

package/src/process-service.ts

@@ -1,6 +1,7 @@
 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 { buildProcessResult } from './process-result.js';
 
 export type AgentType = 'claude' | 'codex' | 'gemini' | 'forge';
 export type ProcessStatus = 'running' | 'completed' | 'failed';
@@ -149,7 +150,7 @@ export class ProcessService {
       }
     }
 
-    const response: any = {
+    return buildProcessResult({
       pid,
       agent: process.toolType,
       status: process.status,
@@ -158,28 +159,12 @@ export class ProcessService {
       workFolder: process.workFolder,
       prompt: process.prompt,
       model: process.model,
-    };
-
-    if (agentOutput) {
-      if (!verbose && agentOutput.tools) {
-        const { tools, ...rest } = agentOutput;
-        response.agentOutput = rest;
-      } else {
-        response.agentOutput = agentOutput;
-      }
-
-      if (agentOutput.session_id) {
-        response.session_id = agentOutput.session_id;
-      }
-    } else {
-      response.stdout = process.stdout;
-      response.stderr = process.stderr;
-    }
-
-    return response;
+      stdout: process.stdout,
+      stderr: process.stderr,
+    }, agentOutput, verbose);
   }
 
-  async waitForProcesses(pids: number[], timeoutSeconds = 180): Promise<any[]> {
+  async waitForProcesses(pids: number[], timeoutSeconds = 180, verbose = false): Promise<any[]> {
     for (const pid of pids) {
       if (!this.processManager.has(pid)) {
         throw new Error(`Process with PID ${pid} not found`);
@@ -211,7 +196,7 @@ export class ProcessService {
 
     try {
       await Promise.race([Promise.all(waitPromises), timeoutPromise]);
-      return pids.map((pid) => this.getProcessResult(pid, false));
+      return pids.map((pid) => this.getProcessResult(pid, verbose));
     } finally {
       if (timeoutHandle) {
         clearTimeout(timeoutHandle);