maestro-flow 0.4.8 → 0.4.9

package/dashboard/dist-server/dashboard/src/server/agents/agy-adapter.js

@@ -0,0 +1,423 @@
+// ---------------------------------------------------------------------------
+// AgyAdapter — spawns the Antigravity (agy) CLI in non-interactive --print mode
+//
+// agy output strategy (transcript-first):
+//   In non-TTY mode (i.e. spawned by Node with piped stdio), agy writes
+//   **nothing** to stdout. The full conversation — user input, planner
+//   responses, tool calls, tool results — lands in
+//   ~/.gemini/antigravity-cli/brain/<conv>/.system_generated/logs/transcript.jsonl
+//
+//   We locate the conversation for the current workspace via
+//   ~/.gemini/antigravity-cli/cache/last_conversations.json[workdir]
+//   (agy updates this map every run), then replay transcript entries that
+//   landed after our spawn timestamp.
+//
+//   stdout is still wired up as a fallback in case a future agy build emits
+//   text there, but PLANNER_RESPONSE.content from the transcript is the
+//   authoritative assistant reply.
+// ---------------------------------------------------------------------------
+import { spawn } from 'node:child_process';
+import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { join, resolve } from 'node:path';
+import { homedir } from 'node:os';
+import { createInterface } from 'node:readline';
+import { BaseAgentAdapter } from './base-adapter.js';
+import { EntryNormalizer } from './entry-normalizer.js';
+import { loadEnvFile } from './env-file-loader.js';
+import { StreamMonitor, DEFAULT_STREAM_TIMEOUT_MS } from './stream-monitor.js';
+import { createStaleHandler } from './stale-handler.js';
+import { killProcessTree } from './process-tree-kill.js';
+import { cleanSpawnEnv } from './env-cleanup.js';
+// Tool result-bearing entry types (model emits content as the result text).
+const TOOL_RESULT_TYPES = new Set([
+    'LIST_DIRECTORY',
+    'VIEW_FILE',
+    'CODE_ACTION',
+    'GENERIC',
+    'GREP_SEARCH',
+    'SEARCH_WEB',
+    'RUN_COMMAND',
+    'READ_URL_CONTENT',
+]);
+// ---------------------------------------------------------------------------
+// Path resolution
+// ---------------------------------------------------------------------------
+const DEFAULT_AGY_BIN_CANDIDATES = () => {
+    const candidates = [];
+    if (process.platform === 'win32') {
+        candidates.push(join(process.env.LOCALAPPDATA ?? join(homedir(), 'AppData', 'Local'), 'agy', 'bin', 'agy.exe'));
+    }
+    else {
+        candidates.push(join(homedir(), '.local', 'bin', 'agy'));
+        candidates.push('/usr/local/bin/agy');
+    }
+    return candidates;
+};
+function resolveAgyBinary() {
+    for (const p of DEFAULT_AGY_BIN_CANDIDATES()) {
+        if (existsSync(p))
+            return p;
+    }
+    // Fall back to PATH resolution via shell.
+    return 'agy';
+}
+const AGY_BRAIN_DIR = join(homedir(), '.gemini', 'antigravity-cli', 'brain');
+const AGY_LAST_CONV_FILE = join(homedir(), '.gemini', 'antigravity-cli', 'cache', 'last_conversations.json');
+/** Case-insensitive path equality on Windows. */
+function samePath(a, b) {
+    const left = resolve(a);
+    const right = resolve(b);
+    return process.platform === 'win32'
+        ? left.toLowerCase() === right.toLowerCase()
+        : left === right;
+}
+// ---------------------------------------------------------------------------
+// Adapter implementation
+// ---------------------------------------------------------------------------
+export class AgyAdapter extends BaseAgentAdapter {
+    agentType = 'agy';
+    childProcesses = new Map();
+    readlineInterfaces = new Map();
+    streamMonitors = new Map();
+    stoppedEmitted = new Set();
+    spawnTimestamps = new Map();
+    textBuffers = new Map();
+    workDirs = new Map();
+    // --- Lifecycle hooks -----------------------------------------------------
+    async doSpawn(processId, config) {
+        // --print-timeout: convert ms → "<n>s" (agy uses Go duration format)
+        // Floor at 60s to give the agent room; ceiling at config.streamTimeoutMs.
+        const timeoutMs = config.streamTimeoutMs ?? DEFAULT_STREAM_TIMEOUT_MS;
+        const timeoutSec = Math.max(60, Math.floor(timeoutMs / 1000));
+        const args = ['--print-timeout', `${timeoutSec}s`];
+        // approvalMode='auto' (write mode) → bypass permission prompts.
+        // 'suggest' (analysis mode) keeps defaults.
+        if (config.approvalMode === 'auto') {
+            args.push('--dangerously-skip-permissions');
+        }
+        // includeDirs and resume are threaded through config.metadata by the runner
+        // (see src/agents/cli-agent-runner.ts:331). Pick them up here.
+        const metadata = (config.metadata ?? {});
+        // Windows symlink workaround: agy's project discovery creates a symlink
+        // at <cwd>/.antigravitycli/<uuid>.json → ~/.gemini/config/projects/<uuid>.json.
+        // Without Developer Mode or admin, that symlink call fails and agy
+        // silently degrades — no auth, no API call, empty transcript. The home
+        // directory already has a working symlink from agy's first interactive
+        // run, so launching from there and exposing the real workdir via
+        // --add-dir gives agy a valid project context.
+        const requestedWorkDir = resolve(config.workDir ?? process.cwd());
+        const homeProjectDir = resolve(homedir());
+        const launchCwd = process.platform === 'win32' && !samePath(requestedWorkDir, homeProjectDir)
+            ? homeProjectDir
+            : requestedWorkDir;
+        const includeDirs = new Set();
+        if (!samePath(launchCwd, requestedWorkDir)) {
+            includeDirs.add(requestedWorkDir);
+        }
+        if (metadata.includeDirs && metadata.includeDirs.length > 0) {
+            for (const dir of metadata.includeDirs) {
+                includeDirs.add(resolve(dir));
+            }
+        }
+        for (const dir of includeDirs) {
+            args.push('--add-dir', dir);
+        }
+        // Resume: agy supports -c (last) and --conversation <id>.
+        if (metadata.agyConversationId) {
+            args.push('--conversation', metadata.agyConversationId);
+        }
+        else if (metadata.agyResumeLast) {
+            args.push('-c');
+        }
+        // Prompt MUST use --prompt (or -p), NOT --print. agy's flag parser
+        // registers `--print` as boolean, so `--print "hi"` parses as
+        // `--print=true` + positional "hi", which hangs the run. `--prompt`
+        // and `-p` take the value as expected.
+        args.push('--prompt', config.prompt);
+        // Environment
+        const envFromFile = config.envFile ? loadEnvFile(config.envFile) : {};
+        const envOverrides = { ...envFromFile, ...config.env };
+        if (config.apiKey)
+            envOverrides.GEMINI_API_KEY = config.apiKey;
+        const childEnv = cleanSpawnEnv(envOverrides);
+        const bin = resolveAgyBinary();
+        const usesPath = bin === 'agy';
+        const spawnedAt = Date.now();
+        this.spawnTimestamps.set(processId, spawnedAt);
+        // last_conversations.json is keyed by the cwd agy was launched with —
+        // when we redirect to homedir, look up the conversation under that key.
+        this.workDirs.set(processId, launchCwd);
+        const child = spawn(bin, args, {
+            cwd: launchCwd,
+            env: childEnv,
+            // stdin must NOT be a pipe — agy --print waits for stdin EOF before
+            // processing the prompt argv, so leaving stdin open hangs the process.
+            // Using 'ignore' detaches stdin entirely (equivalent to closing it).
+            stdio: ['ignore', 'pipe', 'pipe'],
+            // Use shell only when falling back to PATH lookup; resolved absolute
+            // paths spawn directly so killProcessTree owns the whole tree.
+            shell: usesPath,
+            windowsHide: true,
+            detached: process.platform !== 'win32',
+        });
+        if (!child.stdout || !child.stderr) {
+            throw new Error('Failed to spawn agy: stdio streams not available');
+        }
+        // Stale-stream monitor — shared cascade with other adapters.
+        const monitor = new StreamMonitor(createStaleHandler({
+            processId,
+            child,
+            timeoutMs,
+            onStaleDetected: (message) => this.emitEntry(processId, EntryNormalizer.error(processId, message, 'stream_stale')),
+            isStopped: () => this.stoppedEmitted.has(processId),
+            emitStopped: (reason) => this.emitStopped(processId, reason),
+        }), timeoutMs);
+        this.streamMonitors.set(processId, monitor);
+        // stdout = plain-text assistant reply. We buffer chunks and re-emit each
+        // line as a (partial=false) assistant_message so the dashboard / TUI sees
+        // the response as it lands. A single combined message is emitted after
+        // exit to make the final transcript self-contained.
+        this.textBuffers.set(processId, '');
+        const rl = createInterface({ input: child.stdout });
+        rl.on('line', (line) => {
+            monitor.heartbeat();
+            const trimmed = line.trim();
+            if (trimmed.length === 0)
+                return;
+            const buf = this.textBuffers.get(processId) ?? '';
+            this.textBuffers.set(processId, buf.length === 0 ? trimmed : `${buf}\n${trimmed}`);
+            this.emitEntry(processId, EntryNormalizer.assistantMessage(processId, trimmed, true));
+        });
+        // stderr → error entries (skipped for transient progress noise).
+        child.stderr.on('data', (chunk) => {
+            const text = chunk.toString().trim();
+            if (text.length === 0)
+                return;
+            // agy prints progress lines like "Thinking..." to stderr — filter them.
+            if (/^(thinking|processing|loading|connecting)\b/i.test(text))
+                return;
+            this.emitEntry(processId, EntryNormalizer.error(processId, text, 'stderr'));
+        });
+        this.setupProcessListeners(child, processId);
+        this.childProcesses.set(processId, child);
+        this.readlineInterfaces.set(processId, rl);
+        return {
+            id: processId,
+            type: 'agy',
+            status: 'running',
+            config,
+            startedAt: new Date().toISOString(),
+            pid: child.pid,
+        };
+    }
+    async doStop(processId) {
+        const child = this.childProcesses.get(processId);
+        if (!child)
+            return;
+        const proc = this.getProcess(processId);
+        if (proc) {
+            proc.status = 'stopping';
+            this.emitEntry(processId, EntryNormalizer.statusChange(processId, 'stopping', 'User requested stop'));
+        }
+        killProcessTree(child.pid, 'SIGTERM');
+        const killTimer = setTimeout(() => {
+            if (!child.killed)
+                killProcessTree(child.pid, 'SIGKILL');
+        }, 5000);
+        child.once('exit', () => clearTimeout(killTimer));
+        this.cleanup(processId);
+    }
+    async doSendMessage(_processId, _content) {
+        // agy --print is single-shot; interactive mode would require -i (--prompt-interactive)
+        // which is out of scope for the headless delegate path.
+        throw new Error('agy does not support interactive messages in --print mode');
+    }
+    async doRespondApproval(_decision) {
+        // Approvals are gated client-side via --dangerously-skip-permissions.
+    }
+    // --- Transcript enrichment ----------------------------------------------
+    /**
+     * Locate the conversationId agy used for this workspace on this run.
+     *
+     * Strategy:
+     *  1. Read cache/last_conversations.json — agy writes the
+     *     workspace→conversationId map on every run. If the cache mtime is
+     *     after our spawn and the workdir key resolves, return that id.
+     *  2. Fall back to scanning brain/ directories for a transcript.jsonl
+     *     touched after our spawn (legacy heuristic; handles edge cases where
+     *     the cache write is delayed).
+     */
+    resolveConversationId(processId) {
+        const spawnedAt = this.spawnTimestamps.get(processId) ?? 0;
+        const workdir = this.workDirs.get(processId);
+        if (workdir && existsSync(AGY_LAST_CONV_FILE)) {
+            try {
+                const stat = statSync(AGY_LAST_CONV_FILE);
+                // Allow ±1s clock skew between Node's Date.now() and agy's file write.
+                if (stat.mtimeMs >= spawnedAt - 1000) {
+                    const data = JSON.parse(readFileSync(AGY_LAST_CONV_FILE, 'utf8'));
+                    if (data[workdir])
+                        return data[workdir];
+                }
+            }
+            catch {
+                // fall through to brain scan
+            }
+        }
+        if (!existsSync(AGY_BRAIN_DIR))
+            return undefined;
+        let latest = null;
+        try {
+            for (const entry of readdirSync(AGY_BRAIN_DIR, { withFileTypes: true })) {
+                if (!entry.isDirectory())
+                    continue;
+                const transcriptPath = join(AGY_BRAIN_DIR, entry.name, '.system_generated', 'logs', 'transcript.jsonl');
+                if (!existsSync(transcriptPath))
+                    continue;
+                const mtime = statSync(transcriptPath).mtimeMs;
+                if (mtime < spawnedAt - 1000)
+                    continue;
+                if (!latest || mtime > latest.mtime)
+                    latest = { id: entry.name, mtime };
+            }
+        }
+        catch {
+            return undefined;
+        }
+        return latest?.id;
+    }
+    /**
+     * After the agy process exits, locate the conversation transcript for our
+     * workspace and replay the entries that landed during our turn. The
+     * PLANNER_RESPONSE.content carries the model's actual reply text — that's
+     * the primary assistant_message source since stdout is empty in non-TTY
+     * mode. Tool calls and intermediate results become tool_use entries.
+     */
+    enrichFromTranscript(processId) {
+        const spawnedAt = this.spawnTimestamps.get(processId) ?? 0;
+        const conversationId = this.resolveConversationId(processId);
+        if (!conversationId)
+            return;
+        const transcriptPath = join(AGY_BRAIN_DIR, conversationId, '.system_generated', 'logs', 'transcript.jsonl');
+        if (!existsSync(transcriptPath))
+            return;
+        let content;
+        try {
+            content = readFileSync(transcriptPath, 'utf8');
+        }
+        catch {
+            return;
+        }
+        // Replay entries written after our spawn (with 1s skew tolerance).
+        const cutoff = new Date(spawnedAt - 1000).toISOString();
+        const ourEntries = [];
+        for (const line of content.split('\n')) {
+            if (line.trim().length === 0)
+                continue;
+            let entry;
+            try {
+                entry = JSON.parse(line);
+            }
+            catch {
+                continue;
+            }
+            if (entry.created_at && entry.created_at >= cutoff) {
+                ourEntries.push(entry);
+            }
+        }
+        let emittedAssistant = false;
+        for (const entry of ourEntries) {
+            if (entry.source === 'MODEL' && entry.type === 'PLANNER_RESPONSE') {
+                if (entry.thinking && entry.thinking.trim().length > 0) {
+                    this.emitEntry(processId, EntryNormalizer.thinking(processId, entry.thinking.trim()));
+                }
+                if (entry.content && entry.content.trim().length > 0) {
+                    this.emitEntry(processId, EntryNormalizer.assistantMessage(processId, entry.content.trim(), false));
+                    emittedAssistant = true;
+                }
+                if (entry.tool_calls && entry.tool_calls.length > 0) {
+                    for (const call of entry.tool_calls) {
+                        const name = call.name ?? 'unknown';
+                        const input = call.args ?? {};
+                        this.emitEntry(processId, EntryNormalizer.toolUse(processId, name, input, 'running'));
+                    }
+                }
+                continue;
+            }
+            if (entry.source === 'MODEL' && TOOL_RESULT_TYPES.has(entry.type)) {
+                const result = entry.content ?? '';
+                const status = entry.status === 'ERROR' ? 'failed' : 'completed';
+                this.emitEntry(processId, EntryNormalizer.toolUse(processId, entry.type.toLowerCase(), {}, status, result.slice(0, 4000)));
+                continue;
+            }
+            if (entry.source === 'SYSTEM' && entry.type === 'ERROR_MESSAGE') {
+                const msg = entry.error ?? entry.content ?? 'Unknown agy error';
+                this.emitEntry(processId, EntryNormalizer.error(processId, msg, 'agy_transcript_error'));
+            }
+        }
+        // Fallback: if the transcript produced no PLANNER_RESPONSE.content but
+        // stdout buffered something (future TTY support), surface that.
+        if (!emittedAssistant) {
+            const buffered = this.textBuffers.get(processId);
+            if (buffered && buffered.trim().length > 0) {
+                this.emitEntry(processId, EntryNormalizer.assistantMessage(processId, buffered.trim(), false));
+            }
+        }
+        // Record conversationId so a follow-up `maestro delegate --resume`
+        // can pass it via --conversation.
+        this.emitEntry(processId, EntryNormalizer.statusChange(processId, 'running', `agy.conversationId=${conversationId}`));
+    }
+    // --- Helpers -------------------------------------------------------------
+    setupProcessListeners(child, processId) {
+        child.on('exit', (code, signal) => {
+            const reason = signal ? `Terminated by signal: ${signal}` : `Exited with code: ${code ?? 'unknown'}`;
+            this.emitStopped(processId, reason);
+        });
+        child.on('close', (code, signal) => {
+            const reason = signal ? `Terminated by signal: ${signal}` : `Exited with code: ${code ?? 'unknown'}`;
+            this.emitStopped(processId, reason);
+        });
+        child.on('error', (err) => {
+            this.emitEntry(processId, EntryNormalizer.error(processId, err.message, 'spawn_error'));
+            const proc = this.getProcess(processId);
+            if (proc)
+                proc.status = 'error';
+        });
+    }
+    emitStopped(processId, reason) {
+        if (this.stoppedEmitted.has(processId))
+            return;
+        this.stoppedEmitted.add(processId);
+        // Enrich with transcript-derived entries BEFORE emitting the terminal
+        // status change so consumers see tool history before stop.
+        try {
+            this.enrichFromTranscript(processId);
+        }
+        catch {
+            // enrichment is best-effort and must never block the stop signal
+        }
+        this.emitEntry(processId, EntryNormalizer.statusChange(processId, 'stopped', reason));
+        const proc = this.getProcess(processId);
+        if (proc)
+            proc.status = 'stopped';
+        this.cleanup(processId);
+        this.removeProcess(processId);
+    }
+    cleanup(processId) {
+        const rl = this.readlineInterfaces.get(processId);
+        if (rl) {
+            rl.close();
+            this.readlineInterfaces.delete(processId);
+        }
+        const monitor = this.streamMonitors.get(processId);
+        if (monitor) {
+            monitor.dispose();
+            this.streamMonitors.delete(processId);
+        }
+        this.childProcesses.delete(processId);
+        this.spawnTimestamps.delete(processId);
+        this.textBuffers.delete(processId);
+        this.workDirs.delete(processId);
+    }
+}
+//# sourceMappingURL=agy-adapter.js.map

package/dashboard/dist-server/dashboard/src/server/agents/agy-adapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agy-adapter.js","sourceRoot":"","sources":["../../../../../src/server/agents/agy-adapter.ts"],"names":[],"mappings":"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"}

package/dashboard/dist-server/dashboard/src/server/agents/codex-cli-adapter.d.ts

@@ -14,6 +14,12 @@ export declare class CodexCliAdapter extends BaseAgentAdapter {
     protected doRespondApproval(_decision: ApprovalDecision): Promise<void>;
     private parseCodexMessage;
     private classifyItem;
+    /** Map codex item status/error fields to ToolUseEntry status. */
+    private codexStatusToToolStatus;
+    /** Parse codex function/tool `arguments` (JSON string) into an object; tolerate non-JSON. */
+    private parseArguments;
+    /** Heuristic: does this item.type look like a tool/shell call we should treat as a boundary? */
+    private isToolLikeType;
     private isCommandCall;
     private isFileCall;
     private inferFileAction;

package/dashboard/dist-server/dashboard/src/server/agents/codex-cli-adapter.js

@@ -320,6 +320,41 @@ export class CodexCliAdapter extends BaseAgentAdapter {
     classifyItem(item, processId) {
         const itemType = item.type ?? '';
         const itemName = (item.name ?? '').toLowerCase();
+        // Reasoning / thinking content — route to thinking, not assistant_message.
+        // Codex newer builds may surface model reasoning as items; without this
+        // branch, reasoning text would pollute the final assistant reply extraction.
+        if (itemType === 'reasoning' || itemType === 'agent_reasoning') {
+            const text = this.extractItemText(item);
+            if (text.length > 0) {
+                this.emitEntry(processId, EntryNormalizer.thinking(processId, text));
+            }
+            return;
+        }
+        // Codex shell tool: explicit `command_execution` item shape
+        // (id, command, aggregated_output, exit_code, status). Emit as command_exec
+        // boundary so extractLastReply can split segments correctly.
+        if (itemType === 'command_execution') {
+            const command = item.command ?? item.name ?? 'shell';
+            this.emitEntry(processId, EntryNormalizer.commandExec(processId, command, typeof item.exit_code === 'number' ? item.exit_code : undefined, item.aggregated_output ?? item.output ?? ''));
+            return;
+        }
+        // Codex MCP tool call: explicit `mcp_tool_call` item shape
+        // (server, tool, arguments, result, error, status). Emit as tool_use
+        // boundary so extractLastReply can split segments correctly.
+        if (itemType === 'mcp_tool_call') {
+            const name = `${item.server ?? 'mcp'}/${item.tool ?? itemName ?? '?'}`;
+            const input = this.parseArguments(item.arguments);
+            const status = this.codexStatusToToolStatus(item);
+            const resultText = item.error
+                ? String(item.error)
+                : item.result === undefined
+                    ? ''
+                    : typeof item.result === 'string'
+                        ? item.result
+                        : JSON.stringify(item.result);
+            this.emitEntry(processId, EntryNormalizer.toolUse(processId, name, input, status, resultText));
+            return;
+        }
         // Function call that looks like a command execution
         if (itemType === 'function_call_output' ||
             (itemType === 'function_call' && this.isCommandCall(itemName)) ||
@@ -336,6 +371,25 @@ export class CodexCliAdapter extends BaseAgentAdapter {
             this.emitEntry(processId, EntryNormalizer.fileChange(processId, filePath, action, item.diff));
             return;
         }
+        // Safety net: any item whose type smells like a tool/shell call but isn't
+        // handled above (e.g. future codex types like `web_search_call`,
+        // `local_shell_call`, `custom_tool_call`, `*_output`). Emit as boundary
+        // tool_use to prevent JSON.stringify pollution of assistant_message.
+        if (this.isToolLikeType(itemType)) {
+            const name = item.name ?? item.tool ?? itemType;
+            const output = typeof item.output === 'string'
+                ? item.output
+                : typeof item.aggregated_output === 'string'
+                    ? item.aggregated_output
+                    : item.result !== undefined
+                        ? typeof item.result === 'string'
+                            ? item.result
+                            : JSON.stringify(item.result)
+                        : '';
+            const status = this.codexStatusToToolStatus(item);
+            this.emitEntry(processId, EntryNormalizer.toolUse(processId, name, this.parseArguments(item.arguments), status, output));
+            return;
+        }
         // Default: treat as assistant message — accumulate within turn,
         // emit as partial now (for streaming display) and flush final on turn.completed
         const text = this.extractItemText(item);
@@ -350,6 +404,61 @@ export class CodexCliAdapter extends BaseAgentAdapter {
             this.emitEntry(processId, EntryNormalizer.assistantMessage(processId, text, true));
         }
     }
+    /** Map codex item status/error fields to ToolUseEntry status. */
+    codexStatusToToolStatus(item) {
+        if (item.error)
+            return 'failed';
+        switch (item.status) {
+            case 'error':
+            case 'failed':
+                return 'failed';
+            case 'pending':
+            case 'queued':
+                return 'pending';
+            case 'running':
+            case 'in_progress':
+                return 'running';
+            case 'success':
+            case 'completed':
+            case 'done':
+            default:
+                return 'completed';
+        }
+    }
+    /** Parse codex function/tool `arguments` (JSON string) into an object; tolerate non-JSON. */
+    parseArguments(raw) {
+        if (raw === undefined || raw === null)
+            return {};
+        if (typeof raw === 'object')
+            return raw;
+        if (typeof raw === 'string') {
+            const trimmed = raw.trim();
+            if (!trimmed)
+                return {};
+            try {
+                const parsed = JSON.parse(trimmed);
+                if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+                    return parsed;
+                }
+                return { value: parsed };
+            }
+            catch {
+                return { raw };
+            }
+        }
+        return { value: raw };
+    }
+    /** Heuristic: does this item.type look like a tool/shell call we should treat as a boundary? */
+    isToolLikeType(type) {
+        if (!type)
+            return false;
+        return (type.endsWith('_call') ||
+            type.endsWith('_call_output') ||
+            type.endsWith('_call_end') ||
+            type.endsWith('_execution') ||
+            type.endsWith('_output') ||
+            /tool|shell|exec|search|patch|file_change/.test(type));
+    }
     isCommandCall(name) {
         return /exec|shell|command|run|bash/.test(name);
     }