ai-cli-mcp 2.18.0 → 2.20.0

package/src/peek.ts

@@ -1,95 +0,0 @@
-import type { PeekEvent, PeekMessage } from './parsers.js';
-import type { AgentType, ProcessStatus } from './process-service.js';
-
-export const DEFAULT_PEEK_TIME_SEC = 10;
-export const MAX_PEEK_TIME_SEC = 60;
-export const MAX_PEEK_PIDS = 32;
-export const PEEK_MESSAGE_CAP = 50;
-
-export type PeekStatus = ProcessStatus | 'not_found';
-export type PeekAgent = AgentType | string | null;
-
-export interface PeekProcessResult {
-  pid: number;
-  agent: PeekAgent;
-  status: PeekStatus;
-  events: PeekEvent[];
-  truncated: boolean;
-  error: string | null;
-}
-
-export interface PeekResponse {
-  peek_started_at: string;
-  observed_duration_sec: number;
-  processes: PeekProcessResult[];
-}
-
-export function validatePeekPids(value: unknown): number[] {
-  if (!Array.isArray(value)) {
-    throw new Error('Missing or invalid required parameter: pids (must be an array of positive safe integers)');
-  }
-
-  const deduped: number[] = [];
-  const seen = new Set<number>();
-
-  for (const pid of value) {
-    if (typeof pid !== 'number' || !Number.isSafeInteger(pid) || pid <= 0) {
-      throw new Error('All pids must be positive safe integers');
-    }
-
-    if (!seen.has(pid)) {
-      seen.add(pid);
-      deduped.push(pid);
-    }
-  }
-
-  if (deduped.length === 0 || deduped.length > MAX_PEEK_PIDS) {
-    throw new Error(`pids must contain 1..${MAX_PEEK_PIDS} entries after dedupe`);
-  }
-
-  return deduped;
-}
-
-export function validatePeekTimeSec(value: unknown): number {
-  if (value === undefined || value === null) {
-    return DEFAULT_PEEK_TIME_SEC;
-  }
-
-  if (typeof value !== 'number' || !Number.isSafeInteger(value) || value <= 0 || value > MAX_PEEK_TIME_SEC) {
-    throw new Error(`peek_time_sec must be a positive integer no greater than ${MAX_PEEK_TIME_SEC}`);
-  }
-
-  return value;
-}
-
-export function buildNotFoundPeekProcess(pid: number): PeekProcessResult {
-  return {
-    pid,
-    agent: null,
-    status: 'not_found',
-    events: [],
-    truncated: false,
-    error: 'process not found',
-  };
-}
-
-export function appendPeekEvents(target: PeekProcessResult, events: PeekEvent[]): void {
-  for (const event of events) {
-    if (target.events.length < PEEK_MESSAGE_CAP) {
-      target.events.push(event);
-    } else {
-      target.truncated = true;
-    }
-  }
-}
-
-export function appendPeekMessages(target: PeekProcessResult, messages: PeekMessage[]): void {
-  appendPeekEvents(
-    target,
-    messages.map((message) => ({ kind: 'message' as const, ...message })),
-  );
-}
-
-export function observedDurationSec(startedAtMs: number, endedAtMs = Date.now()): number {
-  return Number(((endedAtMs - startedAtMs) / 1000).toFixed(2));
-}

package/src/process-result.ts

@@ -1,88 +0,0 @@
-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;
-  });
-}
-
-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,
-    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);
-  const preserveRawFailureOutput = shouldPreserveRawFailureOutput(context);
-
-  if (hasMeaningfulParsedOutput(shapedAgentOutput) && (verbose || !preserveRawFailureOutput)) {
-    response.agentOutput = shapedAgentOutput;
-  }
-
-  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,367 +0,0 @@
-import { spawn, type ChildProcess } from 'node:child_process';
-import { buildCliCommand, type BuildCliCommandOptions } from './cli-builder.js';
-import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput, parseOpenCodeOutput, PeekEventExtractor } from './parsers.js';
-import {
-  appendPeekEvents,
-  buildNotFoundPeekProcess,
-  observedDurationSec,
-  validatePeekPids,
-  validatePeekTimeSec,
-  type PeekProcessResult,
-  type PeekResponse,
-} from './peek.js';
-import { buildProcessResult } from './process-result.js';
-
-export type AgentType = 'claude' | 'codex' | 'gemini' | 'forge' | 'opencode';
-export type ProcessStatus = 'running' | 'completed' | 'failed';
-
-interface TrackedProcess {
-  pid: number;
-  process: ChildProcess;
-  prompt: string;
-  workFolder: string;
-  model?: string;
-  toolType: AgentType;
-  startTime: string;
-  stdout: string;
-  stderr: string;
-  status: ProcessStatus;
-  exitCode?: number;
-}
-
-export interface ProcessListItem {
-  pid: number;
-  agent: AgentType;
-  status: ProcessStatus;
-}
-
-export interface StartProcessResult {
-  pid: number;
-  status: 'started';
-  agent: AgentType;
-  message: string;
-}
-
-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'];
-
-  constructor(options: ProcessServiceOptions) {
-    this.cliPaths = options.cliPaths;
-  }
-
-  startProcess(options: Omit<BuildCliCommandOptions, 'cliPaths'>): StartProcessResult {
-    const cmd = buildCliCommand({
-      ...options,
-      cliPaths: this.cliPaths,
-    });
-
-    const { cliPath, args: processArgs, cwd: effectiveCwd, agent, prompt } = cmd;
-    const childProcess = spawn(cliPath, processArgs, {
-      cwd: effectiveCwd,
-      stdio: ['ignore', 'pipe', 'pipe'],
-      detached: false,
-    });
-
-    const pid = childProcess.pid;
-    if (!pid) {
-      throw new Error(`Failed to start ${agent} CLI process`);
-    }
-
-    const processEntry: TrackedProcess = {
-      pid,
-      process: childProcess,
-      prompt,
-      workFolder: effectiveCwd,
-      model: options.model,
-      toolType: agent,
-      startTime: new Date().toISOString(),
-      stdout: '',
-      stderr: '',
-      status: 'running',
-    };
-
-    this.processManager.set(pid, processEntry);
-
-    childProcess.stdout.on('data', (data) => {
-      const entry = this.processManager.get(pid);
-      if (entry) {
-        entry.stdout += data.toString();
-      }
-    });
-
-    childProcess.stderr.on('data', (data) => {
-      const entry = this.processManager.get(pid);
-      if (entry) {
-        entry.stderr += data.toString();
-      }
-    });
-
-    childProcess.on('close', (code) => {
-      const entry = this.processManager.get(pid);
-      if (entry) {
-        entry.status = code === 0 ? 'completed' : 'failed';
-        entry.exitCode = code !== null ? code : undefined;
-      }
-    });
-
-    childProcess.on('error', (error) => {
-      const entry = this.processManager.get(pid);
-      if (entry) {
-        entry.status = 'failed';
-        entry.stderr += `\nProcess error: ${error.message}`;
-      }
-    });
-
-    return {
-      pid,
-      status: 'started',
-      agent,
-      message: `${agent} process started successfully`,
-    };
-  }
-
-  listProcesses(): ProcessListItem[] {
-    const processes: ProcessListItem[] = [];
-
-    for (const [pid, process] of this.processManager.entries()) {
-      processes.push({
-        pid,
-        agent: process.toolType,
-        status: process.status,
-      });
-    }
-
-    return processes;
-  }
-
-  getProcessResult(pid: number, verbose = false): any {
-    const process = this.processManager.get(pid);
-    if (!process) {
-      throw new Error(`Process with PID ${pid} not found`);
-    }
-
-    const agentOutput = parseAgentOutput(process.toolType, process.stdout, process.stderr);
-
-    return buildProcessResult({
-      pid,
-      agent: process.toolType,
-      status: process.status,
-      exitCode: process.exitCode,
-      startTime: process.startTime,
-      workFolder: process.workFolder,
-      prompt: process.prompt,
-      model: process.model,
-      stdout: process.stdout,
-      stderr: process.stderr,
-    }, agentOutput, verbose);
-  }
-
-  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`);
-      }
-    }
-
-    const waitPromises = pids.map((pid) => {
-      const processEntry = this.processManager.get(pid)!;
-
-      if (processEntry.status !== 'running') {
-        return Promise.resolve();
-      }
-
-      return new Promise<void>((resolve) => {
-        processEntry.process.once('close', () => {
-          resolve();
-        });
-      });
-    });
-
-    const timeoutMs = timeoutSeconds * 1000;
-    let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
-    const timeoutPromise = new Promise<void>((_, reject) => {
-      timeoutHandle = setTimeout(() => {
-        reject(new Error(`Timed out after ${timeoutSeconds} seconds waiting for processes`));
-      }, timeoutMs);
-      timeoutHandle.unref?.();
-    });
-
-    try {
-      await Promise.race([Promise.all(waitPromises), timeoutPromise]);
-      return pids.map((pid) => this.getProcessResult(pid, verbose));
-    } finally {
-      if (timeoutHandle) {
-        clearTimeout(timeoutHandle);
-      }
-    }
-  }
-
-  async peekProcesses(pids: number[], peekTimeSec = 10, includeToolCalls = false): Promise<PeekResponse> {
-    const targetPids = validatePeekPids(pids);
-    const targetPeekTimeSec = validatePeekTimeSec(peekTimeSec);
-    const processes: PeekProcessResult[] = [];
-    const observers: Array<{
-      entry: TrackedProcess;
-      result: PeekProcessResult;
-      stdoutExtractor: PeekEventExtractor;
-      stderrExtractor: PeekEventExtractor;
-      onStdout: (data: Buffer | string) => void;
-      onStderr: (data: Buffer | string) => void;
-    }> = [];
-
-    for (const pid of targetPids) {
-      const entry = this.processManager.get(pid);
-      if (!entry) {
-        processes.push(buildNotFoundPeekProcess(pid));
-        continue;
-      }
-
-      const result: PeekProcessResult = {
-        pid,
-        agent: entry.toolType,
-        status: entry.status,
-        events: [],
-        truncated: false,
-        error: null,
-      };
-      processes.push(result);
-
-      const stdoutExtractor = new PeekEventExtractor(entry.toolType, { includeToolCalls });
-      const stderrExtractor = new PeekEventExtractor(entry.toolType, { includeToolCalls });
-      const onStdout = (data: Buffer | string) => {
-        appendPeekEvents(result, stdoutExtractor.push(data.toString(), new Date().toISOString()));
-      };
-      const onStderr = (data: Buffer | string) => {
-        appendPeekEvents(result, stderrExtractor.push(data.toString(), new Date().toISOString()));
-      };
-
-      if (entry.status === 'running') {
-        entry.process.stdout?.on('data', onStdout);
-        entry.process.stderr?.on('data', onStderr);
-      }
-
-      observers.push({ entry, result, stdoutExtractor, stderrExtractor, onStdout, onStderr });
-    }
-
-    const startedAt = new Date();
-    const startedAtMs = Date.now();
-    const runningObservers = observers.filter((observer) => observer.entry.status === 'running');
-    const terminalPromise = Promise.all(runningObservers.map((observer) => this.waitForProcessTerminal(observer.entry)));
-    let timeoutHandle: ReturnType<typeof setTimeout> | undefined;
-    const timeoutPromise = new Promise<void>((resolve) => {
-      timeoutHandle = setTimeout(resolve, targetPeekTimeSec * 1000);
-      timeoutHandle.unref?.();
-    });
-
-    try {
-      await Promise.race([terminalPromise, timeoutPromise]);
-    } finally {
-      if (timeoutHandle) {
-        clearTimeout(timeoutHandle);
-      }
-
-      const flushTs = new Date().toISOString();
-      for (const observer of observers) {
-        observer.entry.process.stdout?.off('data', observer.onStdout);
-        observer.entry.process.stderr?.off('data', observer.onStderr);
-        appendPeekEvents(observer.result, observer.stdoutExtractor.flush(flushTs));
-        appendPeekEvents(observer.result, observer.stderrExtractor.flush(flushTs));
-        observer.result.status = observer.entry.status;
-      }
-    }
-
-    return {
-      peek_started_at: startedAt.toISOString(),
-      observed_duration_sec: observedDurationSec(startedAtMs),
-      processes,
-    };
-  }
-
-  private waitForProcessTerminal(processEntry: TrackedProcess): Promise<void> {
-    if (processEntry.status !== 'running') {
-      return Promise.resolve();
-    }
-
-    return new Promise<void>((resolve) => {
-      const done = () => {
-        processEntry.process.off('close', done);
-        processEntry.process.off('error', done);
-        resolve();
-      };
-      processEntry.process.once('close', done);
-      processEntry.process.once('error', done);
-    });
-  }
-
-  killProcess(pid: number): { pid: number; status: string; message: string } {
-    const processEntry = this.processManager.get(pid);
-    if (!processEntry) {
-      throw new Error(`Process with PID ${pid} not found`);
-    }
-
-    if (processEntry.status !== 'running') {
-      return {
-        pid,
-        status: processEntry.status,
-        message: 'Process already terminated',
-      };
-    }
-
-    processEntry.process.kill('SIGTERM');
-    processEntry.status = 'failed';
-    processEntry.stderr += '\nProcess terminated by user';
-
-    return {
-      pid,
-      status: 'terminated',
-      message: 'Process terminated successfully',
-    };
-  }
-
-  cleanupProcesses(): { removed: number; removedPids: number[]; message: string } {
-    const removedPids: number[] = [];
-
-    for (const [pid, process] of this.processManager.entries()) {
-      if (process.status === 'completed' || process.status === 'failed') {
-        removedPids.push(pid);
-        this.processManager.delete(pid);
-      }
-    }
-
-    return {
-      removed: removedPids.length,
-      removedPids,
-      message: `Cleaned up ${removedPids.length} finished process(es)`,
-    };
-  }
-}

package/src/server.ts

@@ -1,10 +0,0 @@
-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';
-
-import { runMcpServer } from './app/mcp.js';
-
-if (!process.env.VITEST) {
-  runMcpServer().catch(console.error);
-}

package/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "resolveJsonModule": true,
-    "outDir": "./dist",
-    "rootDir": "./src",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules"]
-}

package/vitest.config.e2e.ts

@@ -1,27 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    globals: true,
-    environment: 'node',
-    testTimeout: 30000, // Longer timeout for e2e tests
-    hookTimeout: 20000,
-    setupFiles: ['./src/__tests__/setup.ts'],
-    coverage: {
-      provider: 'v8',
-      reporter: ['text', 'json', 'html'],
-      exclude: [
-        'node_modules/**',
-        'dist/**',
-        '**/*.d.ts',
-        '**/*.test.ts',
-        '**/*.spec.ts',
-        'src/__tests__/utils/**',
-      ],
-    },
-    include: ['src/__tests__/e2e.test.ts', 'src/__tests__/edge-cases.test.ts'],
-    mockReset: true,
-    clearMocks: true,
-    restoreMocks: true,
-  },
-});

package/vitest.config.ts

@@ -1,22 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    globals: true,
-    environment: 'node',
-    coverage: {
-      provider: 'v8',
-      reporter: ['text', 'json', 'html'],
-      exclude: [
-        'node_modules/**',
-        'dist/**',
-        '**/*.d.ts',
-        '**/*.test.ts',
-        '**/*.spec.ts',
-      ],
-    },
-    mockReset: true,
-    clearMocks: true,
-    restoreMocks: true,
-  },
-});

package/vitest.config.unit.ts

@@ -1,28 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    globals: true,
-    environment: 'node',
-    coverage: {
-      provider: 'v8',
-      reporter: ['text', 'json', 'html'],
-      exclude: [
-        'node_modules/**',
-        'dist/**',
-        '**/*.d.ts',
-        '**/*.test.ts',
-        '**/*.spec.ts',
-      ],
-    },
-    exclude: [
-      'node_modules/**',
-      'dist/**',
-      'src/__tests__/e2e.test.ts',
-      'src/__tests__/edge-cases.test.ts',
-    ],
-    mockReset: true,
-    clearMocks: true,
-    restoreMocks: true,
-  },
-});