ai-cli-mcp 2.17.0 → 2.19.0

package/src/peek.ts

@@ -1,4 +1,4 @@
-import type { PeekMessage } from './parsers.js';
+import type { PeekEvent, PeekMessage } from './parsers.js';
 import type { AgentType, ProcessStatus } from './process-service.js';
 
 export const DEFAULT_PEEK_TIME_SEC = 10;
@@ -13,7 +13,7 @@ export interface PeekProcessResult {
   pid: number;
   agent: PeekAgent;
   status: PeekStatus;
-  messages: PeekMessage[];
+  events: PeekEvent[];
   truncated: boolean;
   error: string | null;
 }
@@ -67,22 +67,29 @@ export function buildNotFoundPeekProcess(pid: number): PeekProcessResult {
     pid,
     agent: null,
     status: 'not_found',
-    messages: [],
+    events: [],
     truncated: false,
     error: 'process not found',
   };
 }
 
-export function appendPeekMessages(target: PeekProcessResult, messages: PeekMessage[]): void {
-  for (const message of messages) {
-    if (target.messages.length < PEEK_MESSAGE_CAP) {
-      target.messages.push(message);
+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-service.ts

@@ -1,8 +1,8 @@
 import { spawn, type ChildProcess } from 'node:child_process';
 import { buildCliCommand, type BuildCliCommandOptions } from './cli-builder.js';
-import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput, parseOpenCodeOutput, PeekMessageExtractor } from './parsers.js';
+import { parseClaudeOutput, parseCodexOutput, parseForgeOutput, parseGeminiOutput, parseOpenCodeOutput, PeekEventExtractor } from './parsers.js';
 import {
-  appendPeekMessages,
+  appendPeekEvents,
   buildNotFoundPeekProcess,
   observedDurationSec,
   validatePeekPids,
@@ -226,15 +226,15 @@ export class ProcessService {
     }
   }
 
-  async peekProcesses(pids: number[], peekTimeSec = 10): Promise<PeekResponse> {
+  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: PeekMessageExtractor;
-      stderrExtractor: PeekMessageExtractor;
+      stdoutExtractor: PeekEventExtractor;
+      stderrExtractor: PeekEventExtractor;
       onStdout: (data: Buffer | string) => void;
       onStderr: (data: Buffer | string) => void;
     }> = [];
@@ -250,19 +250,19 @@ export class ProcessService {
         pid,
         agent: entry.toolType,
         status: entry.status,
-        messages: [],
+        events: [],
         truncated: false,
         error: null,
       };
       processes.push(result);
 
-      const stdoutExtractor = new PeekMessageExtractor(entry.toolType);
-      const stderrExtractor = new PeekMessageExtractor(entry.toolType);
+      const stdoutExtractor = new PeekEventExtractor(entry.toolType, { includeToolCalls, source: 'stdout' });
+      const stderrExtractor = new PeekEventExtractor(entry.toolType, { includeToolCalls, source: 'stderr' });
       const onStdout = (data: Buffer | string) => {
-        appendPeekMessages(result, stdoutExtractor.push(data.toString(), new Date().toISOString()));
+        appendPeekEvents(result, stdoutExtractor.push(data.toString(), new Date().toISOString()));
       };
       const onStderr = (data: Buffer | string) => {
-        appendPeekMessages(result, stderrExtractor.push(data.toString(), new Date().toISOString()));
+        appendPeekEvents(result, stderrExtractor.push(data.toString(), new Date().toISOString()));
       };
 
       if (entry.status === 'running') {
@@ -294,8 +294,9 @@ export class ProcessService {
       for (const observer of observers) {
         observer.entry.process.stdout?.off('data', observer.onStdout);
         observer.entry.process.stderr?.off('data', observer.onStderr);
-        appendPeekMessages(observer.result, observer.stdoutExtractor.flush(flushTs));
-        appendPeekMessages(observer.result, observer.stderrExtractor.flush(flushTs));
+        const terminal = observer.entry.status !== 'running';
+        appendPeekEvents(observer.result, observer.stdoutExtractor.flush(flushTs, { terminal }));
+        appendPeekEvents(observer.result, observer.stderrExtractor.flush(flushTs, { terminal }));
         observer.result.status = observer.entry.status;
       }
     }