ai-cli-mcp 2.11.0 → 2.13.0

package/src/cli-utils.ts

@@ -1,4 +1,4 @@
-import { existsSync } from 'node:fs';
+import { accessSync, constants } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import * as path from 'path';
@@ -13,90 +13,229 @@ export function debugLog(message?: any, ...optionalParams: any[]): void {
   }
 }
 
-/**
- * Determine the Gemini CLI command/path.
- * Similar to findClaudeCli but for Gemini
- */
-export function findGeminiCli(): string {
-  debugLog('[Debug] Attempting to find Gemini CLI...');
-
-  // Check for custom CLI name from environment variable
-  const customCliName = process.env.GEMINI_CLI_NAME;
-  if (customCliName) {
-    debugLog(`[Debug] Using custom Gemini CLI name from GEMINI_CLI_NAME: ${customCliName}`);
+export interface CliBinaryStatus {
+  configuredCommand: string;
+  resolvedPath: string | null;
+  available: boolean;
+  lookup: 'env' | 'local' | 'path';
+  error?: string;
+}
 
-    // If it's an absolute path, use it directly
-    if (path.isAbsolute(customCliName)) {
-      debugLog(`[Debug] GEMINI_CLI_NAME is an absolute path: ${customCliName}`);
-      return customCliName;
-    }
+function getPathDelimiter(): string {
+  return process.platform === 'win32' ? ';' : ':';
+}
 
-    // If it starts with ~ or ./, reject as relative paths are not allowed
-    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-      throw new Error(`Invalid GEMINI_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'gemini') or an absolute path (e.g., '/tmp/gemini-test')`);
-    }
+function getPathExtensions(): string[] {
+  if (process.platform !== 'win32') {
+    return [''];
   }
 
-  const cliName = customCliName || 'gemini';
+  const rawPathext = process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM';
+  return ['', ...rawPathext.split(';').filter(Boolean)];
+}
 
-  // Try local install path: ~/.gemini/local/gemini
-  const userPath = join(homedir(), '.gemini', 'local', 'gemini');
-  debugLog(`[Debug] Checking for Gemini CLI at local user path: ${userPath}`);
+function findExecutableOnPath(commandName: string): string | null {
+  const rawPath = process.env.PATH || '';
+  if (!rawPath) {
+    return null;
+  }
 
-  if (existsSync(userPath)) {
-    debugLog(`[Debug] Found Gemini CLI at local user path: ${userPath}. Using this path.`);
-    return userPath;
-  } else {
-    debugLog(`[Debug] Gemini CLI not found at local user path: ${userPath}.`);
+  const pathEntries = rawPath.split(getPathDelimiter()).filter(Boolean);
+  const extensions = getPathExtensions();
+
+  for (const entry of pathEntries) {
+    for (const extension of extensions) {
+      const candidate = join(entry, `${commandName}${extension}`);
+      if (isExecutableFile(candidate)) {
+        return candidate;
+      }
+    }
   }
 
-  // Fallback to CLI name (PATH lookup)
-  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-  console.warn(`[Warning] Gemini CLI not found at ~/.gemini/local/gemini. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-  return cliName;
+  return null;
 }
 
-/**
- * Determine the Codex CLI command/path.
- * Similar to findClaudeCli but for Codex
- */
-export function findCodexCli(): string {
-  debugLog('[Debug] Attempting to find Codex CLI...');
+function validateCustomCliName(envVarName: string, customCliName: string): string | null {
+  if (path.isAbsolute(customCliName)) {
+    return null;
+  }
+
+  if (
+    customCliName.startsWith('./') ||
+    customCliName.startsWith('../') ||
+    customCliName.includes('/')
+  ) {
+    return `Invalid ${envVarName}: Relative paths are not allowed. Use either a simple name (e.g., '${customCliName.split('/').pop() || 'cli'}') or an absolute path (e.g., '/tmp/${customCliName.split('/').pop() || 'cli'}-test')`;
+  }
 
-  // Check for custom CLI name from environment variable
-  const customCliName = process.env.CODEX_CLI_NAME;
-  if (customCliName) {
-    debugLog(`[Debug] Using custom Codex CLI name from CODEX_CLI_NAME: ${customCliName}`);
+  return null;
+}
 
-    // If it's an absolute path, use it directly
-    if (path.isAbsolute(customCliName)) {
-      debugLog(`[Debug] CODEX_CLI_NAME is an absolute path: ${customCliName}`);
-      return customCliName;
+function inspectCliBinary(options: {
+  envVarName: string;
+  customCliName: string | undefined;
+  defaultCliName: string;
+  localInstallPath: string;
+}): CliBinaryStatus {
+  const configuredCommand = options.customCliName || options.defaultCliName;
+
+  if (options.customCliName) {
+    const validationError = validateCustomCliName(options.envVarName, options.customCliName);
+    if (validationError) {
+      return {
+        configuredCommand,
+        resolvedPath: null,
+        available: false,
+        lookup: 'env',
+        error: validationError,
+      };
     }
 
-    // If it starts with ~ or ./, reject as relative paths are not allowed
-    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-      throw new Error(`Invalid CODEX_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'codex') or an absolute path (e.g., '/tmp/codex-test')`);
+    if (path.isAbsolute(options.customCliName)) {
+      return {
+        configuredCommand,
+        resolvedPath: options.customCliName,
+        available: isExecutableFile(options.customCliName),
+        lookup: 'env',
+      };
     }
+
+    const resolvedPath = findExecutableOnPath(configuredCommand);
+    return {
+      configuredCommand,
+      resolvedPath,
+      available: resolvedPath !== null,
+      lookup: 'env',
+    };
+  }
+
+  if (isExecutableFile(options.localInstallPath)) {
+    return {
+      configuredCommand,
+      resolvedPath: options.localInstallPath,
+      available: true,
+      lookup: 'local',
+    };
+  }
+
+  const resolvedPath = findExecutableOnPath(configuredCommand);
+  return {
+    configuredCommand,
+    resolvedPath,
+    available: resolvedPath !== null,
+    lookup: 'path',
+  };
+}
+
+function getCliCommandOrThrow(status: CliBinaryStatus): string {
+  if (status.error) {
+    throw new Error(status.error);
+  }
+
+  if (status.lookup === 'env' && !path.isAbsolute(status.configuredCommand)) {
+    return status.configuredCommand;
+  }
+
+  return status.resolvedPath || status.configuredCommand;
+}
+
+function isExecutableFile(filePath: string): boolean {
+  try {
+    accessSync(filePath, constants.X_OK);
+    return true;
+  } catch {
+    return false;
   }
+}
 
-  const cliName = customCliName || 'codex';
+type CliBinaryName = 'claude' | 'codex' | 'gemini' | 'forge';
+
+function getCliBinaryConfig(name: CliBinaryName): {
+  envVarName: string;
+  customCliName: string | undefined;
+  defaultCliName: string;
+  localInstallPath: string;
+} {
+  if (name === 'claude') {
+    return {
+      envVarName: 'CLAUDE_CLI_NAME',
+      customCliName: process.env.CLAUDE_CLI_NAME,
+      defaultCliName: 'claude',
+      localInstallPath: join(homedir(), '.claude', 'local', 'claude'),
+    };
+  }
 
-  // Try local install path: ~/.codex/local/codex
-  const userPath = join(homedir(), '.codex', 'local', 'codex');
-  debugLog(`[Debug] Checking for Codex CLI at local user path: ${userPath}`);
+  if (name === 'codex') {
+    return {
+      envVarName: 'CODEX_CLI_NAME',
+      customCliName: process.env.CODEX_CLI_NAME,
+      defaultCliName: 'codex',
+      localInstallPath: join(homedir(), '.codex', 'local', 'codex'),
+    };
+  }
 
-  if (existsSync(userPath)) {
-    debugLog(`[Debug] Found Codex CLI at local user path: ${userPath}. Using this path.`);
-    return userPath;
-  } else {
-    debugLog(`[Debug] Codex CLI not found at local user path: ${userPath}.`);
+  if (name === 'forge') {
+    return {
+      envVarName: 'FORGE_CLI_NAME',
+      customCliName: process.env.FORGE_CLI_NAME,
+      defaultCliName: 'forge',
+      localInstallPath: join(homedir(), '.forge', 'local', 'forge'),
+    };
   }
 
-  // Fallback to CLI name (PATH lookup)
-  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-  console.warn(`[Warning] Codex CLI not found at ~/.codex/local/codex. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-  return cliName;
+  return {
+    envVarName: 'GEMINI_CLI_NAME',
+    customCliName: process.env.GEMINI_CLI_NAME,
+    defaultCliName: 'gemini',
+    localInstallPath: join(homedir(), '.gemini', 'local', 'gemini'),
+  };
+}
+
+function getCliBinaryStatus(name: CliBinaryName): CliBinaryStatus {
+  return inspectCliBinary(getCliBinaryConfig(name));
+}
+
+export function getCliDoctorStatus(): {
+  claude: CliBinaryStatus;
+  codex: CliBinaryStatus;
+  gemini: CliBinaryStatus;
+  forge: CliBinaryStatus;
+} {
+  return {
+    claude: getCliBinaryStatus('claude'),
+    codex: getCliBinaryStatus('codex'),
+    gemini: getCliBinaryStatus('gemini'),
+    forge: getCliBinaryStatus('forge'),
+  };
+}
+
+/**
+ * Determine the Gemini CLI command/path.
+ * Similar to findClaudeCli but for Gemini
+ */
+export function findGeminiCli(): string {
+  debugLog('[Debug] Attempting to find Gemini CLI...');
+  const status = getCliBinaryStatus('gemini');
+  return getCliCommandOrThrow(status);
+}
+
+/**
+ * Determine the Codex CLI command/path.
+ * Similar to findClaudeCli but for Codex
+ */
+export function findCodexCli(): string {
+  debugLog('[Debug] Attempting to find Codex CLI...');
+  const status = getCliBinaryStatus('codex');
+  return getCliCommandOrThrow(status);
+}
+
+/**
+ * Determine the Forge CLI command/path.
+ */
+export function findForgeCli(): string {
+  debugLog('[Debug] Attempting to find Forge CLI...');
+  const status = getCliBinaryStatus('forge');
+  return getCliCommandOrThrow(status);
 }
 
 /**
@@ -110,39 +249,6 @@ export function findCodexCli(): string {
  */
 export function findClaudeCli(): string {
   debugLog('[Debug] Attempting to find Claude CLI...');
-
-  // Check for custom CLI name from environment variable
-  const customCliName = process.env.CLAUDE_CLI_NAME;
-  if (customCliName) {
-    debugLog(`[Debug] Using custom Claude CLI name from CLAUDE_CLI_NAME: ${customCliName}`);
-
-    // If it's an absolute path, use it directly
-    if (path.isAbsolute(customCliName)) {
-      debugLog(`[Debug] CLAUDE_CLI_NAME is an absolute path: ${customCliName}`);
-      return customCliName;
-    }
-
-    // If it starts with ~ or ./, reject as relative paths are not allowed
-    if (customCliName.startsWith('./') || customCliName.startsWith('../') || customCliName.includes('/')) {
-      throw new Error(`Invalid CLAUDE_CLI_NAME: Relative paths are not allowed. Use either a simple name (e.g., 'claude') or an absolute path (e.g., '/tmp/claude-test')`);
-    }
-  }
-
-  const cliName = customCliName || 'claude';
-
-  // Try local install path: ~/.claude/local/claude (using the original name for local installs)
-  const userPath = join(homedir(), '.claude', 'local', 'claude');
-  debugLog(`[Debug] Checking for Claude CLI at local user path: ${userPath}`);
-
-  if (existsSync(userPath)) {
-    debugLog(`[Debug] Found Claude CLI at local user path: ${userPath}. Using this path.`);
-    return userPath;
-  } else {
-    debugLog(`[Debug] Claude CLI not found at local user path: ${userPath}.`);
-  }
-
-  // 3. Fallback to CLI name (PATH lookup)
-  debugLog(`[Debug] Falling back to "${cliName}" command name, relying on spawn/PATH lookup.`);
-  console.warn(`[Warning] Claude CLI not found at ~/.claude/local/claude. Falling back to "${cliName}" in PATH. Ensure it is installed and accessible.`);
-  return cliName;
+  const status = getCliBinaryStatus('claude');
+  return getCliCommandOrThrow(status);
 }

package/src/cli.ts

@@ -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.
@@ -35,12 +35,12 @@ function parseArgs(argv: string[]): Record<string, string> {
 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:
@@ -73,6 +73,7 @@ async function main(): Promise<void> {
     claude: findClaudeCli(),
     codex: findCodexCli(),
     gemini: findGeminiCli(),
+    forge: findForgeCli(),
   };
 
   // Build command

package/src/model-catalog.ts

@@ -0,0 +1,64 @@
+export const CLAUDE_MODELS = ['sonnet', 'sonnet[1m]', 'opus', 'opusplan', 'haiku'] as const;
+export const CODEX_MODELS = [
+  'gpt-5.4',
+  'gpt-5.3-codex',
+  'gpt-5.2-codex',
+  'gpt-5.1-codex-mini',
+  'gpt-5.1-codex-max',
+  'gpt-5.2',
+  'gpt-5.1',
+  'gpt-5.1-codex',
+  'gpt-5-codex',
+  'gpt-5-codex-mini',
+  'gpt-5',
+] as const;
+export const GEMINI_MODELS = [
+  'gemini-2.5-pro',
+  'gemini-2.5-flash',
+  'gemini-3.1-pro-preview',
+  'gemini-3-pro-preview',
+  'gemini-3-flash-preview',
+] as const;
+export const FORGE_MODELS = ['forge'] as const;
+
+export const MODEL_ALIASES: Record<string, string> = {
+  'claude-ultra': 'opus',
+  'codex-ultra': 'gpt-5.4',
+  'gemini-ultra': 'gemini-3.1-pro-preview',
+};
+
+export const MODEL_ALIAS_DETAILS = [
+  { name: 'claude-ultra', resolvesTo: 'opus', agent: 'claude', defaultReasoningEffort: 'high' },
+  { name: 'codex-ultra', resolvesTo: 'gpt-5.4', agent: 'codex', defaultReasoningEffort: 'xhigh' },
+  { name: 'gemini-ultra', resolvesTo: 'gemini-3.1-pro-preview', agent: 'gemini' },
+] as const;
+
+export function getSupportedModelsDescription(): string {
+  return [
+    '"claude-ultra", "codex-ultra", "gemini-ultra"',
+    ...CLAUDE_MODELS.map((model) => `"${model}"`),
+    ...CODEX_MODELS.map((model) => `"${model}"`),
+    ...GEMINI_MODELS.map((model) => `"${model}"`),
+    ...FORGE_MODELS.map((model) => `"${model}"`),
+  ].join(', ');
+}
+
+export function getModelParameterDescription(): string {
+  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(): {
+  aliases: ReadonlyArray<(typeof MODEL_ALIAS_DETAILS)[number]>;
+  claude: ReadonlyArray<string>;
+  codex: ReadonlyArray<string>;
+  gemini: ReadonlyArray<string>;
+  forge: ReadonlyArray<string>;
+} {
+  return {
+    aliases: MODEL_ALIAS_DETAILS,
+    claude: CLAUDE_MODELS,
+    codex: CODEX_MODELS,
+    gemini: GEMINI_MODELS,
+    forge: FORGE_MODELS,
+  };
+}

package/src/parsers.ts

@@ -167,3 +167,64 @@ export function parseGeminiOutput(stdout: string): any {
     return null;
   }
 }
+
+/**
+ * Parse Forge output framed by Initialize/Continue/Finished markers.
+ */
+export function parseForgeOutput(stdout: string): any {
+  if (!stdout) return null;
+
+  const lines = stdout.split('\n');
+  const markerPattern = /^● \[[^\]]+\] (Initialize|Continue|Finished) (\S+)\s*$/;
+  let collecting = false;
+  let currentConversationId: string | null = null;
+  let currentBody: string[] = [];
+  let lastConversationId: string | null = null;
+  let lastMessage: string | null = 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,
+  };
+}