ai-cli-mcp 2.12.0 → 2.14.0

package/dist/__tests__/process-management.test.js

@@ -154,7 +154,8 @@ describe('Process Management Tests', () => {
                 params: {
                     name: 'get_result',
                     arguments: {
-                        pid: 12360
+                        pid: 12360,
+                        verbose: true
                     }
                 }
             });

package/dist/app/cli.js

@@ -24,9 +24,9 @@ Options:
   --cwd <path>                 Working directory
   --prompt <text>              Prompt text
   --prompt-file <path>         Path to a prompt file
-  --model <model>              Model name or alias (e.g. sonnet, claude-ultra, gpt-5.2-codex, codex-ultra, gemini-2.5-pro, gemini-ultra)
+  --model <model>              Model name or alias (e.g. sonnet, claude-ultra, gpt-5.2-codex, codex-ultra, gemini-2.5-pro, gemini-ultra, forge)
   --session-id <id>            Resume a previous session
-  --reasoning-effort <level>   Reasoning level for Claude/Codex
+  --reasoning-effort <level>   Reasoning level for Claude/Codex only
   --help, -h                   Show this help message
 
 Compatibility aliases:
@@ -38,17 +38,19 @@ Compatibility aliases:
 export const WAIT_HELP_TEXT = `Usage: ai-cli wait <pid...> [options]
 
 Wait for one or more tracked processes to finish.
+By default each result uses the compact shape; set --verbose to include full metadata and detailed parsed output.
 
 Options:
   --timeout <seconds>          Maximum wait time in seconds
+  --verbose                    Return full metadata and detailed parsed output
   --help, -h                   Show this help message
 `;
 export const RESULT_HELP_TEXT = `Usage: ai-cli result <pid> [options]
 
-Get the current result for a tracked process.
+Get the current output and status of a tracked process. By default this returns a compact result shape; set --verbose to include full metadata and detailed parsed output.
 
 Options:
-  --verbose                    Include verbose parsed output
+  --verbose                    Return full metadata and detailed parsed output
   --help, -h                   Show this help message
 `;
 export const KILL_HELP_TEXT = `Usage: ai-cli kill <pid>
@@ -104,7 +106,7 @@ const defaultDeps = {
     runProcess: (options) => getCliProcessService().startProcess(options),
     listProcesses: () => getCliProcessService().listProcesses(),
     getProcessResult: (pid, verbose) => getCliProcessService().getProcessResult(pid, verbose),
-    waitForProcesses: (pids, timeoutSeconds) => getCliProcessService().waitForProcesses(pids, timeoutSeconds),
+    waitForProcesses: (pids, timeoutSeconds, verbose) => getCliProcessService().waitForProcesses(pids, timeoutSeconds, verbose),
     killProcess: (pid) => getCliProcessService().killProcess(pid),
     cleanupProcesses: () => getCliProcessService().cleanupProcesses(),
     getDoctorStatus: () => getCliDoctorStatus(),
@@ -253,7 +255,7 @@ export async function runCli(argv, deps = {}) {
             stdout(CLI_HELP_TEXT);
             return 1;
         }
-        writeJson(stdout, await waitForProcesses(pids, timeout));
+        writeJson(stdout, await waitForProcesses(pids, timeout, 'verbose' in flags));
         return 0;
     }
     if (command === 'kill') {

package/dist/app/mcp.js

@@ -2,7 +2,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError, } from '@modelcontextprotocol/sdk/types.js';
 import { spawn } from 'node:child_process';
-import { debugLog, findClaudeCli, findCodexCli, findGeminiCli } from '../cli-utils.js';
+import { debugLog, findClaudeCli, findCodexCli, findForgeCli, findGeminiCli } from '../cli-utils.js';
 import { getModelParameterDescription, getSupportedModelsDescription } from '../model-catalog.js';
 import { ProcessService } from '../process-service.js';
 // Server version - update this when releasing new versions
@@ -58,6 +58,7 @@ export class ClaudeCodeServer {
     claudeCliPath;
     codexCliPath;
     geminiCliPath;
+    forgeCliPath;
     processService;
     sigintHandler;
     packageVersion;
@@ -65,15 +66,18 @@ export class ClaudeCodeServer {
         this.claudeCliPath = findClaudeCli();
         this.codexCliPath = findCodexCli();
         this.geminiCliPath = findGeminiCli();
+        this.forgeCliPath = findForgeCli();
         console.error(`[Setup] Using Claude CLI command/path: ${this.claudeCliPath}`);
         console.error(`[Setup] Using Codex CLI command/path: ${this.codexCliPath}`);
         console.error(`[Setup] Using Gemini CLI command/path: ${this.geminiCliPath}`);
+        console.error(`[Setup] Using Forge CLI command/path: ${this.forgeCliPath}`);
         this.packageVersion = SERVER_VERSION;
         this.processService = new ProcessService({
             cliPaths: {
                 claude: this.claudeCliPath,
                 codex: this.codexCliPath,
                 gemini: this.geminiCliPath,
+                forge: this.forgeCliPath,
             },
         });
         this.server = new Server({
@@ -97,7 +101,7 @@ export class ClaudeCodeServer {
             tools: [
                 {
                     name: 'run',
-                    description: `AI Agent Runner: Starts a Claude, Codex, or Gemini CLI process in the background and returns a PID immediately. Use list_processes and get_result to monitor progress.
+                    description: `AI Agent Runner: Starts a Claude, Codex, Gemini, or Forge CLI process in the background and returns a PID immediately. Use list_processes and get_result to monitor progress.
 
 • File ops: Create, read, (fuzzy) edit, move, copy, delete, list files, analyze/ocr images, file content analysis
 • Code: Generate / analyse / refactor / fix
@@ -141,11 +145,11 @@ ${getSupportedModelsDescription()}
                             },
                             reasoning_effort: {
                                 type: 'string',
-                                description: 'Reasoning control for Claude and Codex. Claude uses --effort with "low", "medium", "high". Codex uses model_reasoning_effort with "low", "medium", "high", "xhigh".',
+                                description: 'Reasoning control for Claude and Codex. Claude uses --effort with "low", "medium", "high". Codex uses model_reasoning_effort with "low", "medium", "high", "xhigh". Forge does not support reasoning_effort in this integration.',
                             },
                             session_id: {
                                 type: 'string',
-                                description: 'Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview.',
+                                description: 'Optional session ID to resume a previous session. Supported for: haiku, sonnet, opus, gemini-2.5-pro, gemini-2.5-flash, gemini-3.1-pro-preview, gemini-3-pro-preview, gemini-3-flash-preview, forge.',
                             },
                         },
                         required: ['workFolder'],
@@ -161,7 +165,7 @@ ${getSupportedModelsDescription()}
                 },
                 {
                     name: 'get_result',
-                    description: 'Get the current output and status of an AI agent process by PID. Returns the output from the agent including session_id (if applicable), along with process metadata.',
+                    description: 'Get the current output and status of an AI agent process by PID. Defaults to a compact result shape; set verbose to true for full metadata and detailed parsed output.',
                     inputSchema: {
                         type: 'object',
                         properties: {
@@ -171,7 +175,7 @@ ${getSupportedModelsDescription()}
                             },
                             verbose: {
                                 type: 'boolean',
-                                description: 'Optional: If true, returns detailed execution information including tool usage history. Defaults to false.',
+                                description: 'Optional: If true, returns the full result shape including metadata fields and detailed parsed output such as tool usage history. Defaults to false.',
                             }
                         },
                         required: ['pid'],
@@ -179,7 +183,7 @@ ${getSupportedModelsDescription()}
                 },
                 {
                     name: 'wait',
-                    description: 'Wait for multiple AI agent processes to complete and return their results. Blocks until all specified PIDs finish or timeout occurs.',
+                    description: 'Wait for multiple AI agent processes to complete and return their results. Defaults to compact result items; set verbose to true for full metadata and detailed parsed output.',
                     inputSchema: {
                         type: 'object',
                         properties: {
@@ -192,6 +196,10 @@ ${getSupportedModelsDescription()}
                                 type: 'number',
                                 description: 'Optional: Maximum time to wait in seconds. Defaults to 180 (3 minutes).',
                             },
+                            verbose: {
+                                type: 'boolean',
+                                description: 'Optional: If true, each result item uses the full result shape including metadata fields and detailed parsed output. Defaults to false.',
+                            },
                         },
                         required: ['pids'],
                     },
@@ -301,7 +309,7 @@ ${getSupportedModelsDescription()}
             throw new McpError(ErrorCode.InvalidParams, 'Missing or invalid required parameter: pids (must be a non-empty array of numbers)');
         }
         try {
-            const results = await this.processService.waitForProcesses(toolArguments.pids, typeof toolArguments.timeout === 'number' ? toolArguments.timeout : 180);
+            const results = await this.processService.waitForProcesses(toolArguments.pids, typeof toolArguments.timeout === 'number' ? toolArguments.timeout : 180, !!toolArguments.verbose);
             return {
                 content: [{
                         type: 'text',

package/dist/cli-builder.js

@@ -4,6 +4,9 @@ import { MODEL_ALIASES } from './model-catalog.js';
 export const ALLOWED_REASONING_EFFORTS = new Set(['low', 'medium', 'high', 'xhigh']);
 const CLAUDE_REASONING_EFFORTS = new Set(['low', 'medium', 'high']);
 function getAgentForModel(model) {
+    if (model === 'forge') {
+        return 'forge';
+    }
     if (model.startsWith('gpt-')) {
         return 'codex';
     }
@@ -38,6 +41,9 @@ export function getReasoningEffort(model, rawValue) {
         throw new Error(`Invalid reasoning_effort: ${rawValue}. Allowed values: low, medium, high, xhigh.`);
     }
     const agent = getAgentForModel(model);
+    if (agent === 'forge') {
+        throw new Error('reasoning_effort is not supported for forge.');
+    }
     if (agent === 'gemini') {
         throw new Error('reasoning_effort is only supported for Claude and Codex models.');
     }
@@ -134,6 +140,14 @@ export function buildCliCommand(options) {
         }
         args.push(prompt);
     }
+    else if (agent === 'forge') {
+        cliPath = options.cliPaths.forge;
+        args = ['-C', cwd];
+        if (options.session_id && typeof options.session_id === 'string') {
+            args.push('--conversation-id', options.session_id);
+        }
+        args.push('-p', prompt);
+    }
     else {
         cliPath = options.cliPaths.claude;
         args = ['--dangerously-skip-permissions', '--output-format', 'stream-json', '--verbose'];

package/dist/cli-parse.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { parseClaudeOutput, parseCodexOutput, parseGeminiOutput } from './parsers.js';
-const AGENTS = ['claude', 'codex', 'gemini'];
-const USAGE = `Usage: npm run -s cli.run.parse -- --agent <claude|codex|gemini>
+import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput } from './parsers.js';
+const AGENTS = ['claude', 'codex', 'gemini', 'forge'];
+const USAGE = `Usage: npm run -s cli.run.parse -- --agent <claude|codex|gemini|forge>
 
 Reads raw CLI output from stdin and outputs parsed JSON to stdout.
 
 Options:
-  --agent   Agent type: claude, codex, or gemini (required)
+  --agent   Agent type: claude, codex, gemini, or forge (required)
   --help    Show this help message
 
 Examples:
@@ -56,7 +56,7 @@ async function main() {
     }
     const agent = args.agent;
     if (!agent || !AGENTS.includes(agent)) {
-        process.stderr.write(`Error: --agent is required (claude, codex, or gemini)\n\n`);
+        process.stderr.write(`Error: --agent is required (claude, codex, gemini, or forge)\n\n`);
         process.stderr.write(USAGE);
         process.exit(1);
     }
@@ -76,6 +76,9 @@ async function main() {
         case 'gemini':
             parsed = parseGeminiOutput(input);
             break;
+        case 'forge':
+            parsed = parseForgeOutput(input);
+            break;
     }
     process.stdout.write(JSON.stringify(parsed, null, 2) + '\n');
 }

package/dist/cli-process-service.js

@@ -3,8 +3,9 @@ import { closeSync, existsSync, mkdirSync, openSync, readFileSync, readdirSync,
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { buildCliCommand } from './cli-builder.js';
-import { findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
-import { parseClaudeOutput, parseCodexOutput, parseGeminiOutput } from './parsers.js';
+import { findClaudeCli, findCodexCli, findForgeCli, findGeminiCli } from './cli-utils.js';
+import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput } from './parsers.js';
+import { buildProcessResult } from './process-result.js';
 function resolveDefaultStateDir() {
     return process.env.AI_CLI_STATE_DIR || join(homedir(), '.local', 'state', 'ai-cli');
 }
@@ -35,6 +36,7 @@ export class CliProcessService {
             claude: findClaudeCli(),
             codex: findCodexCli(),
             gemini: findGeminiCli(),
+            forge: findForgeCli(),
         };
         mkdirSync(this.stateDir, { recursive: true });
     }
@@ -127,8 +129,11 @@ export class CliProcessService {
             else if (refreshed.toolType === 'gemini') {
                 agentOutput = parseGeminiOutput(stdout);
             }
+            else if (refreshed.toolType === 'forge') {
+                agentOutput = parseForgeOutput(stdout);
+            }
         }
-        const response = {
+        return buildProcessResult({
             pid,
             agent: refreshed.toolType,
             status: refreshed.status,
@@ -137,26 +142,11 @@ 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, timeoutSeconds = 180) {
+    async waitForProcesses(pids, timeoutSeconds = 180, verbose = false) {
         const start = Date.now();
         for (const pid of pids) {
             this.readProcess(pid);
@@ -164,7 +154,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) {
                 throw new Error(`Timed out after ${timeoutSeconds} seconds waiting for processes`);

package/dist/cli-utils.js

@@ -128,6 +128,14 @@ function getCliBinaryConfig(name) {
             localInstallPath: join(homedir(), '.codex', 'local', 'codex'),
         };
     }
+    if (name === 'forge') {
+        return {
+            envVarName: 'FORGE_CLI_NAME',
+            customCliName: process.env.FORGE_CLI_NAME,
+            defaultCliName: 'forge',
+            localInstallPath: join(homedir(), '.forge', 'local', 'forge'),
+        };
+    }
     return {
         envVarName: 'GEMINI_CLI_NAME',
         customCliName: process.env.GEMINI_CLI_NAME,
@@ -143,6 +151,7 @@ export function getCliDoctorStatus() {
         claude: getCliBinaryStatus('claude'),
         codex: getCliBinaryStatus('codex'),
         gemini: getCliBinaryStatus('gemini'),
+        forge: getCliBinaryStatus('forge'),
     };
 }
 /**
@@ -163,6 +172,14 @@ export function findCodexCli() {
     const status = getCliBinaryStatus('codex');
     return getCliCommandOrThrow(status);
 }
+/**
+ * Determine the Forge CLI command/path.
+ */
+export function findForgeCli() {
+    debugLog('[Debug] Attempting to find Forge CLI...');
+    const status = getCliBinaryStatus('forge');
+    return getCliCommandOrThrow(status);
+}
 /**
  * Determine the Claude CLI command/path.
  * 1. Checks for CLAUDE_CLI_NAME environment variable:

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { spawn } from 'node:child_process';
 import { buildCliCommand } from './cli-builder.js';
-import { findClaudeCli, findCodexCli, findGeminiCli } from './cli-utils.js';
+import { findClaudeCli, findCodexCli, findForgeCli, findGeminiCli } from './cli-utils.js';
 /**
  * Minimal argv parser. No external dependencies.
  * Supports: --key value, --key=value
@@ -35,12 +35,12 @@ function parseArgs(argv) {
 const USAGE = `Usage: npm run -s cli.run -- --model <model> --workFolder <path> --prompt "..." [options]
 
 Options:
-  --model              Model name or alias (e.g. sonnet, opus, gpt-5.2-codex, gemini-2.5-pro)
+  --model              Model name or alias (e.g. sonnet, opus, gpt-5.2-codex, gemini-2.5-pro, forge)
   --workFolder         Working directory (absolute path)
   --prompt             Prompt string (mutually exclusive with --prompt_file)
   --prompt_file        Path to a file containing the prompt
   --session_id         Session ID to resume
-  --reasoning_effort   Claude/Codex: Claude=low|medium|high, Codex=low|medium|high|xhigh
+  --reasoning_effort   Claude/Codex only: Claude=low|medium|high, Codex=low|medium|high|xhigh
   --help               Show this help message
 
 Raw CLI output goes to stdout. Use cli.run.parse to parse the output:
@@ -68,6 +68,7 @@ async function main() {
         claude: findClaudeCli(),
         codex: findCodexCli(),
         gemini: findGeminiCli(),
+        forge: findForgeCli(),
     };
     // Build command
     let cmd;

package/dist/model-catalog.js

@@ -19,6 +19,7 @@ export const GEMINI_MODELS = [
     'gemini-3-pro-preview',
     'gemini-3-flash-preview',
 ];
+export const FORGE_MODELS = ['forge'];
 export const MODEL_ALIASES = {
     'claude-ultra': 'opus',
     'codex-ultra': 'gpt-5.4',
@@ -35,10 +36,11 @@ export function getSupportedModelsDescription() {
         ...CLAUDE_MODELS.map((model) => `"${model}"`),
         ...CODEX_MODELS.map((model) => `"${model}"`),
         ...GEMINI_MODELS.map((model) => `"${model}"`),
+        ...FORGE_MODELS.map((model) => `"${model}"`),
     ].join(', ');
 }
 export function getModelParameterDescription() {
-    return `The model to use. Aliases: "claude-ultra" (auto high effort), "codex-ultra" (auto xhigh reasoning), "gemini-ultra". Standard: ${[...CLAUDE_MODELS, ...CODEX_MODELS, ...GEMINI_MODELS].map((model) => `"${model}"`).join(', ')}.`;
+    return `The model to use. Aliases: "claude-ultra" (auto high effort), "codex-ultra" (auto xhigh reasoning), "gemini-ultra". Standard: ${[...CLAUDE_MODELS, ...CODEX_MODELS, ...GEMINI_MODELS, ...FORGE_MODELS].map((model) => `"${model}"`).join(', ')}. "forge" is a provider key, not a Forge model family selector.`;
 }
 export function getModelsPayload() {
     return {
@@ -46,5 +48,6 @@ export function getModelsPayload() {
         claude: CLAUDE_MODELS,
         codex: CODEX_MODELS,
         gemini: GEMINI_MODELS,
+        forge: FORGE_MODELS,
     };
 }

package/dist/parsers.js

@@ -163,3 +163,58 @@ export function parseGeminiOutput(stdout) {
         return null;
     }
 }
+/**
+ * Parse Forge output framed by Initialize/Continue/Finished markers.
+ */
+export function parseForgeOutput(stdout) {
+    if (!stdout)
+        return null;
+    const lines = stdout.split('\n');
+    const markerPattern = /^● \[[^\]]+\] (Initialize|Continue|Finished) (\S+)\s*$/;
+    let collecting = false;
+    let currentConversationId = null;
+    let currentBody = [];
+    let lastConversationId = null;
+    let lastMessage = null;
+    for (const line of lines) {
+        const match = line.match(markerPattern);
+        if (match) {
+            const [, action, conversationId] = match;
+            lastConversationId = conversationId;
+            if (action === 'Initialize' || action === 'Continue') {
+                collecting = true;
+                currentConversationId = conversationId;
+                currentBody = [];
+            }
+            else if (collecting && currentConversationId === conversationId) {
+                const message = currentBody.join('\n').trim();
+                if (message) {
+                    lastMessage = message;
+                }
+                collecting = false;
+                currentConversationId = null;
+                currentBody = [];
+            }
+            continue;
+        }
+        if (collecting) {
+            currentBody.push(line);
+        }
+    }
+    if (collecting) {
+        const message = currentBody.join('\n').trim();
+        if (message) {
+            lastMessage = message;
+        }
+        if (currentConversationId) {
+            lastConversationId = currentConversationId;
+        }
+    }
+    if (!lastMessage && !lastConversationId) {
+        return null;
+    }
+    return {
+        message: lastMessage,
+        session_id: lastConversationId,
+    };
+}

package/dist/process-result.js

@@ -0,0 +1,51 @@
+function compactAgentOutput(agentOutput) {
+    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) {
+    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, agentOutput, verbose = false) {
+    const response = {
+        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/dist/process-service.js

@@ -1,6 +1,7 @@
 import { spawn } from 'node:child_process';
 import { buildCliCommand } from './cli-builder.js';
-import { parseClaudeOutput, parseCodexOutput, parseGeminiOutput } from './parsers.js';
+import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput } from './parsers.js';
+import { buildProcessResult } from './process-result.js';
 export class ProcessService {
     processManager = new Map();
     cliPaths;
@@ -96,8 +97,11 @@ export class ProcessService {
             else if (process.toolType === 'gemini') {
                 agentOutput = parseGeminiOutput(process.stdout);
             }
+            else if (process.toolType === 'forge') {
+                agentOutput = parseForgeOutput(process.stdout);
+            }
         }
-        const response = {
+        return buildProcessResult({
             pid,
             agent: process.toolType,
             status: process.status,
@@ -106,26 +110,11 @@ 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, timeoutSeconds = 180) {
+    async waitForProcesses(pids, timeoutSeconds = 180, verbose = false) {
         for (const pid of pids) {
             if (!this.processManager.has(pid)) {
                 throw new Error(`Process with PID ${pid} not found`);
@@ -152,7 +141,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) {

package/dist/server.js

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

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "ai-cli-mcp",
-  "version": "2.12.0",
+  "version": "2.14.0",
   "mcpName": "io.github.mkXultra/ai-cli-mcp",
-  "description": "MCP server for AI CLI tools (Claude, Codex, and Gemini) with background process management",
+  "description": "MCP server for AI CLI tools (Claude, Codex, Gemini, and Forge) with background process management",
   "author": "mkXultra",
   "license": "MIT",
   "main": "dist/server.js",

package/server.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
   "name": "io.github.mkXultra/ai-cli-mcp",
-  "description": "MCP server for AI CLI tools (Claude, Codex, and Gemini) with background process management",
+  "description": "MCP server for AI CLI tools (Claude, Codex, Gemini, and Forge) with background process management",
   "repository": {
     "url": "https://github.com/mkXultra/ai-cli-mcp",
     "source": "github"