@evalops/maestro 0.10.37 → 0.10.39

package/dist/cli/rpc-mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-mode.d.ts","sourceRoot":"","sources":["../../src/cli/rpc-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AA2B/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAqC5D;;;;;GAKG;AACH,wBAAsB,UAAU,CAC/B,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,cAAc,GAC5B,OAAO,CAAC,IAAI,CAAC,CA8If"}
+{"version":3,"file":"rpc-mode.d.ts","sourceRoot":"","sources":["../../src/cli/rpc-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AA2B/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAqC5D;;;;;GAKG;AACH,wBAAsB,UAAU,CAC/B,KAAK,EAAE,KAAK,EACZ,cAAc,EAAE,cAAc,GAC5B,OAAO,CAAC,IAAI,CAAC,CAqKf"}

package/dist/cli/rpc-mode.js

@@ -63,8 +63,11 @@ export async function runRpcMode(agent, sessionManager) {
     });
     // Process incoming RPC commands line by line
     rl.on("line", async (line) => {
+        let requestId;
+        const withRequestId = (response) => requestId ? { id: requestId, ...response } : response;
         try {
             const input = JSON.parse(line);
+            requestId = typeof input.id === "string" ? input.id : undefined;
             if (input.type === "prompt" && input.message) {
                 await runUserPromptWithRecovery({
                     agent,
@@ -84,13 +87,13 @@ export async function runRpcMode(agent, sessionManager) {
                 agent.abort();
             }
             else if (input.type === "get_messages") {
-                console.log(JSON.stringify({
+                console.log(JSON.stringify(withRequestId({
                     type: "messages",
                     messages: agent.state.messages,
-                }));
+                })));
             }
             else if (input.type === "get_state") {
-                console.log(JSON.stringify({
+                console.log(JSON.stringify(withRequestId({
                     type: "state",
                     state: {
                         model: agent.state.model,
@@ -101,7 +104,7 @@ export async function runRpcMode(agent, sessionManager) {
                         session: agent.state.session,
                         queuedMessageCount: agent.getQueuedMessageCount(),
                     },
-                }));
+                })));
             }
             else if (input.type === "continue") {
                 await runWithPromptRecovery({
@@ -135,14 +138,14 @@ export async function runRpcMode(agent, sessionManager) {
                     },
                 });
                 if (!result.success) {
-                    console.log(JSON.stringify({
+                    console.log(JSON.stringify(withRequestId({
                         type: "error",
                         error: result.error,
-                    }));
+                    })));
                     return;
                 }
                 // Emit compaction event
-                const compactionEvent = {
+                const compactionEvent = withRequestId({
                     type: "compaction",
                     summary: result.summary ?? `Compacted ${result.compactedCount} messages`,
                     firstKeptEntryIndex: result.firstKeptEntryIndex ?? 0,
@@ -150,13 +153,20 @@ export async function runRpcMode(agent, sessionManager) {
                     auto: false,
                     customInstructions,
                     timestamp: new Date().toISOString(),
-                };
+                });
                 console.log(JSON.stringify(compactionEvent));
             }
+            else {
+                const commandType = typeof input.type === "string" && input.type ? input.type : "unknown";
+                console.log(JSON.stringify(withRequestId({
+                    type: "error",
+                    error: `Unknown RPC command: ${commandType}`,
+                })));
+            }
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            console.log(JSON.stringify({ type: "error", error: message }));
+            console.log(JSON.stringify(withRequestId({ type: "error", error: message })));
         }
     });
     // Keep process alive indefinitely - exits when stdin closes

package/dist/cli/rpc-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc-mode.js","sourceRoot":"","sources":["../../src/cli/rpc-mode.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * RPC Mode - JSON-over-stdio protocol for programmatic agent control.\n *\n * Moved from main.ts. Provides a line-based JSON protocol for IDE integrations,\n * language servers, and other tools that embed Maestro functionality.\n *\n * ## Protocol\n *\n * **Input (stdin)**: JSON objects, one per line\n * ```json\n * {\"type\": \"prompt\", \"message\": \"Hello\"}\n * {\"type\": \"abort\"}\n * {\"type\": \"compact\", \"customInstructions\": \"Focus on...\"}\n * ```\n *\n * **Output (stdout)**: Agent events as JSON objects, one per line\n *\n * @module cli/rpc-mode\n */\n\nimport type { Agent } from \"../agent/agent.js\";\nimport { buildCompactionHookContext } from \"../agent/compaction-hooks.js\";\nimport {\n\tcollectBackgroundTaskMessagesForCompaction,\n\tcollectMcpMessagesForCompaction,\n\tcollectPlanMessagesForCompaction,\n} from \"../agent/compaction-restoration.js\";\nimport { performCompaction } from \"../agent/compaction.js\";\nimport {\n\tbuildCompactionEvent,\n\trunWithPromptRecovery,\n} from \"../agent/prompt-recovery.js\";\nimport type {\n\tAgentEvent,\n\tAppMessage,\n\tAssistantMessage,\n} from \"../agent/types.js\";\nimport {\n\tcollectPersistedSessionStartHookMessages,\n\trunUserPromptWithRecovery,\n} from \"../agent/user-prompt-runtime.js\";\nimport {\n\tcreateRenderableMessage,\n\trenderMessageToPlainText,\n} from \"../conversation/render-model.js\";\nimport { mcpManager } from \"../mcp/index.js\";\nimport { withMcpPostKeepMessages } from \"../mcp/prompt-recovery.js\";\nimport type { SessionManager } from \"../session/manager.js\";\n\nasync function collectRpcPostKeepMessages(\n\tsessionManager: SessionManager,\n\tcwd: string,\n\tpreservedMessages: AppMessage[],\n): Promise<AppMessage[]> {\n\tconst [\n\t\tplanMessages,\n\t\tbackgroundTaskMessages,\n\t\tmcpMessages,\n\t\tsessionStartMessages,\n\t] = await Promise.all([\n\t\tPromise.resolve(collectPlanMessagesForCompaction(preservedMessages)),\n\t\tPromise.resolve(\n\t\t\tcollectBackgroundTaskMessagesForCompaction(preservedMessages),\n\t\t),\n\t\tPromise.resolve(\n\t\t\tcollectMcpMessagesForCompaction(\n\t\t\t\tpreservedMessages,\n\t\t\t\tmcpManager.getStatus().servers,\n\t\t\t),\n\t\t),\n\t\tcollectPersistedSessionStartHookMessages({\n\t\t\tsessionManager,\n\t\t\tcwd,\n\t\t\tsource: \"compact\",\n\t\t}),\n\t]);\n\treturn [\n\t\t...planMessages,\n\t\t...backgroundTaskMessages,\n\t\t...mcpMessages,\n\t\t...sessionStartMessages,\n\t];\n}\n\n/**\n * Run the CLI in RPC mode.\n *\n * The process runs indefinitely until stdin closes or it receives\n * a termination signal.\n */\nexport async function runRpcMode(\n\tagent: Agent,\n\tsessionManager: SessionManager,\n): Promise<void> {\n\t// Subscribe to all events and emit as JSON for client consumption\n\tagent.subscribe((event) => {\n\t\tconsole.log(JSON.stringify(event));\n\t});\n\n\t// Set up JSON-over-stdin readline interface\n\tconst readline = await import(\"node:readline\");\n\tconst rl = readline.createInterface({\n\t\tinput: process.stdin,\n\t\toutput: process.stdout,\n\t\tterminal: false,\n\t});\n\n\t// Process incoming RPC commands line by line\n\trl.on(\"line\", async (line: string) => {\n\t\ttry {\n\t\t\tconst input = JSON.parse(line);\n\n\t\t\tif (input.type === \"prompt\" && input.message) {\n\t\t\t\tawait runUserPromptWithRecovery({\n\t\t\t\t\tagent,\n\t\t\t\t\tsessionManager,\n\t\t\t\t\tcwd: process.cwd(),\n\t\t\t\t\tprompt: input.message,\n\t\t\t\t\texecute: () => agent.prompt(input.message),\n\t\t\t\t\tgetPostKeepMessages: withMcpPostKeepMessages(),\n\t\t\t\t\tcallbacks: {\n\t\t\t\t\t\tonCompacted: (result) => {\n\t\t\t\t\t\t\tconsole.log(\n\t\t\t\t\t\t\t\tJSON.stringify(buildCompactionEvent(result, { auto: true })),\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t});\n\t\t\t} else if (input.type === \"abort\") {\n\t\t\t\tagent.abort();\n\t\t\t} else if (input.type === \"get_messages\") {\n\t\t\t\tconsole.log(\n\t\t\t\t\tJSON.stringify({\n\t\t\t\t\t\ttype: \"messages\",\n\t\t\t\t\t\tmessages: agent.state.messages,\n\t\t\t\t\t}),\n\t\t\t\t);\n\t\t\t} else if (input.type === \"get_state\") {\n\t\t\t\tconsole.log(\n\t\t\t\t\tJSON.stringify({\n\t\t\t\t\t\ttype: \"state\",\n\t\t\t\t\t\tstate: {\n\t\t\t\t\t\t\tmodel: agent.state.model,\n\t\t\t\t\t\t\tmessages: agent.state.messages,\n\t\t\t\t\t\t\tisStreaming: agent.state.isStreaming,\n\t\t\t\t\t\t\terror: agent.state.error,\n\t\t\t\t\t\t\tthinkingLevel: agent.state.thinkingLevel,\n\t\t\t\t\t\t\tsession: agent.state.session,\n\t\t\t\t\t\t\tqueuedMessageCount: agent.getQueuedMessageCount(),\n\t\t\t\t\t\t},\n\t\t\t\t\t}),\n\t\t\t\t);\n\t\t\t} else if (input.type === \"continue\") {\n\t\t\t\tawait runWithPromptRecovery({\n\t\t\t\t\tagent,\n\t\t\t\t\tsessionManager,\n\t\t\t\t\thookContext: buildCompactionHookContext(\n\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t),\n\t\t\t\t\texecute: () => agent.continue(input.options),\n\t\t\t\t\tgetPostKeepMessages: (preservedMessages) =>\n\t\t\t\t\t\tcollectRpcPostKeepMessages(\n\t\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t\t\tpreservedMessages,\n\t\t\t\t\t\t),\n\t\t\t\t\tcallbacks: {\n\t\t\t\t\t\tonCompacted: (result) => {\n\t\t\t\t\t\t\tconsole.log(\n\t\t\t\t\t\t\t\tJSON.stringify(buildCompactionEvent(result, { auto: true })),\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t});\n\t\t\t} else if (input.type === \"compact\") {\n\t\t\t\tconst customInstructions = input.customInstructions as\n\t\t\t\t\t| string\n\t\t\t\t\t| undefined;\n\n\t\t\t\tconst result = await performCompaction({\n\t\t\t\t\tagent,\n\t\t\t\t\tsessionManager,\n\t\t\t\t\tauto: false,\n\t\t\t\t\ttrigger: \"manual\",\n\t\t\t\t\thookContext: buildCompactionHookContext(\n\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t),\n\t\t\t\t\tgetPostKeepMessages: (preservedMessages) =>\n\t\t\t\t\t\tcollectRpcPostKeepMessages(\n\t\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t\t\tpreservedMessages,\n\t\t\t\t\t\t),\n\t\t\t\t\tcustomInstructions,\n\t\t\t\t\trenderSummaryText: (summary: AssistantMessage) => {\n\t\t\t\t\t\tconst renderable = createRenderableMessage(summary as AppMessage);\n\t\t\t\t\t\treturn renderable\n\t\t\t\t\t\t\t? renderMessageToPlainText(renderable).trim()\n\t\t\t\t\t\t\t: \"\";\n\t\t\t\t\t},\n\t\t\t\t});\n\n\t\t\t\tif (!result.success) {\n\t\t\t\t\tconsole.log(\n\t\t\t\t\t\tJSON.stringify({\n\t\t\t\t\t\t\ttype: \"error\",\n\t\t\t\t\t\t\terror: result.error,\n\t\t\t\t\t\t}),\n\t\t\t\t\t);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\t// Emit compaction event\n\t\t\t\tconst compactionEvent: AgentEvent = {\n\t\t\t\t\ttype: \"compaction\",\n\t\t\t\t\tsummary:\n\t\t\t\t\t\tresult.summary ?? `Compacted ${result.compactedCount} messages`,\n\t\t\t\t\tfirstKeptEntryIndex: result.firstKeptEntryIndex ?? 0,\n\t\t\t\t\ttokensBefore: result.tokensBefore ?? 0,\n\t\t\t\t\tauto: false,\n\t\t\t\t\tcustomInstructions,\n\t\t\t\t\ttimestamp: new Date().toISOString(),\n\t\t\t\t};\n\t\t\t\tconsole.log(JSON.stringify(compactionEvent));\n\t\t\t}\n\t\t} catch (error: unknown) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tconsole.log(JSON.stringify({ type: \"error\", error: message }));\n\t\t}\n\t});\n\n\t// Keep process alive indefinitely - exits when stdin closes\n\treturn new Promise(() => {});\n}\n"]}
+{"version":3,"file":"rpc-mode.js","sourceRoot":"","sources":["../../src/cli/rpc-mode.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * RPC Mode - JSON-over-stdio protocol for programmatic agent control.\n *\n * Moved from main.ts. Provides a line-based JSON protocol for IDE integrations,\n * language servers, and other tools that embed Maestro functionality.\n *\n * ## Protocol\n *\n * **Input (stdin)**: JSON objects, one per line\n * ```json\n * {\"type\": \"prompt\", \"message\": \"Hello\"}\n * {\"type\": \"abort\"}\n * {\"type\": \"compact\", \"customInstructions\": \"Focus on...\"}\n * ```\n *\n * **Output (stdout)**: Agent events as JSON objects, one per line\n *\n * @module cli/rpc-mode\n */\n\nimport type { Agent } from \"../agent/agent.js\";\nimport { buildCompactionHookContext } from \"../agent/compaction-hooks.js\";\nimport {\n\tcollectBackgroundTaskMessagesForCompaction,\n\tcollectMcpMessagesForCompaction,\n\tcollectPlanMessagesForCompaction,\n} from \"../agent/compaction-restoration.js\";\nimport { performCompaction } from \"../agent/compaction.js\";\nimport {\n\tbuildCompactionEvent,\n\trunWithPromptRecovery,\n} from \"../agent/prompt-recovery.js\";\nimport type {\n\tAgentEvent,\n\tAppMessage,\n\tAssistantMessage,\n} from \"../agent/types.js\";\nimport {\n\tcollectPersistedSessionStartHookMessages,\n\trunUserPromptWithRecovery,\n} from \"../agent/user-prompt-runtime.js\";\nimport {\n\tcreateRenderableMessage,\n\trenderMessageToPlainText,\n} from \"../conversation/render-model.js\";\nimport { mcpManager } from \"../mcp/index.js\";\nimport { withMcpPostKeepMessages } from \"../mcp/prompt-recovery.js\";\nimport type { SessionManager } from \"../session/manager.js\";\n\nasync function collectRpcPostKeepMessages(\n\tsessionManager: SessionManager,\n\tcwd: string,\n\tpreservedMessages: AppMessage[],\n): Promise<AppMessage[]> {\n\tconst [\n\t\tplanMessages,\n\t\tbackgroundTaskMessages,\n\t\tmcpMessages,\n\t\tsessionStartMessages,\n\t] = await Promise.all([\n\t\tPromise.resolve(collectPlanMessagesForCompaction(preservedMessages)),\n\t\tPromise.resolve(\n\t\t\tcollectBackgroundTaskMessagesForCompaction(preservedMessages),\n\t\t),\n\t\tPromise.resolve(\n\t\t\tcollectMcpMessagesForCompaction(\n\t\t\t\tpreservedMessages,\n\t\t\t\tmcpManager.getStatus().servers,\n\t\t\t),\n\t\t),\n\t\tcollectPersistedSessionStartHookMessages({\n\t\t\tsessionManager,\n\t\t\tcwd,\n\t\t\tsource: \"compact\",\n\t\t}),\n\t]);\n\treturn [\n\t\t...planMessages,\n\t\t...backgroundTaskMessages,\n\t\t...mcpMessages,\n\t\t...sessionStartMessages,\n\t];\n}\n\n/**\n * Run the CLI in RPC mode.\n *\n * The process runs indefinitely until stdin closes or it receives\n * a termination signal.\n */\nexport async function runRpcMode(\n\tagent: Agent,\n\tsessionManager: SessionManager,\n): Promise<void> {\n\t// Subscribe to all events and emit as JSON for client consumption\n\tagent.subscribe((event) => {\n\t\tconsole.log(JSON.stringify(event));\n\t});\n\n\t// Set up JSON-over-stdin readline interface\n\tconst readline = await import(\"node:readline\");\n\tconst rl = readline.createInterface({\n\t\tinput: process.stdin,\n\t\toutput: process.stdout,\n\t\tterminal: false,\n\t});\n\n\t// Process incoming RPC commands line by line\n\trl.on(\"line\", async (line: string) => {\n\t\tlet requestId: string | undefined;\n\t\tconst withRequestId = <T extends Record<string, unknown>>(response: T) =>\n\t\t\trequestId ? { id: requestId, ...response } : response;\n\t\ttry {\n\t\t\tconst input = JSON.parse(line);\n\t\t\trequestId = typeof input.id === \"string\" ? input.id : undefined;\n\n\t\t\tif (input.type === \"prompt\" && input.message) {\n\t\t\t\tawait runUserPromptWithRecovery({\n\t\t\t\t\tagent,\n\t\t\t\t\tsessionManager,\n\t\t\t\t\tcwd: process.cwd(),\n\t\t\t\t\tprompt: input.message,\n\t\t\t\t\texecute: () => agent.prompt(input.message),\n\t\t\t\t\tgetPostKeepMessages: withMcpPostKeepMessages(),\n\t\t\t\t\tcallbacks: {\n\t\t\t\t\t\tonCompacted: (result) => {\n\t\t\t\t\t\t\tconsole.log(\n\t\t\t\t\t\t\t\tJSON.stringify(buildCompactionEvent(result, { auto: true })),\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t});\n\t\t\t} else if (input.type === \"abort\") {\n\t\t\t\tagent.abort();\n\t\t\t} else if (input.type === \"get_messages\") {\n\t\t\t\tconsole.log(\n\t\t\t\t\tJSON.stringify(\n\t\t\t\t\t\twithRequestId({\n\t\t\t\t\t\t\ttype: \"messages\",\n\t\t\t\t\t\t\tmessages: agent.state.messages,\n\t\t\t\t\t\t}),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t} else if (input.type === \"get_state\") {\n\t\t\t\tconsole.log(\n\t\t\t\t\tJSON.stringify(\n\t\t\t\t\t\twithRequestId({\n\t\t\t\t\t\t\ttype: \"state\",\n\t\t\t\t\t\t\tstate: {\n\t\t\t\t\t\t\t\tmodel: agent.state.model,\n\t\t\t\t\t\t\t\tmessages: agent.state.messages,\n\t\t\t\t\t\t\t\tisStreaming: agent.state.isStreaming,\n\t\t\t\t\t\t\t\terror: agent.state.error,\n\t\t\t\t\t\t\t\tthinkingLevel: agent.state.thinkingLevel,\n\t\t\t\t\t\t\t\tsession: agent.state.session,\n\t\t\t\t\t\t\t\tqueuedMessageCount: agent.getQueuedMessageCount(),\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t}),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t} else if (input.type === \"continue\") {\n\t\t\t\tawait runWithPromptRecovery({\n\t\t\t\t\tagent,\n\t\t\t\t\tsessionManager,\n\t\t\t\t\thookContext: buildCompactionHookContext(\n\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t),\n\t\t\t\t\texecute: () => agent.continue(input.options),\n\t\t\t\t\tgetPostKeepMessages: (preservedMessages) =>\n\t\t\t\t\t\tcollectRpcPostKeepMessages(\n\t\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t\t\tpreservedMessages,\n\t\t\t\t\t\t),\n\t\t\t\t\tcallbacks: {\n\t\t\t\t\t\tonCompacted: (result) => {\n\t\t\t\t\t\t\tconsole.log(\n\t\t\t\t\t\t\t\tJSON.stringify(buildCompactionEvent(result, { auto: true })),\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t},\n\t\t\t\t\t},\n\t\t\t\t});\n\t\t\t} else if (input.type === \"compact\") {\n\t\t\t\tconst customInstructions = input.customInstructions as\n\t\t\t\t\t| string\n\t\t\t\t\t| undefined;\n\n\t\t\t\tconst result = await performCompaction({\n\t\t\t\t\tagent,\n\t\t\t\t\tsessionManager,\n\t\t\t\t\tauto: false,\n\t\t\t\t\ttrigger: \"manual\",\n\t\t\t\t\thookContext: buildCompactionHookContext(\n\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t),\n\t\t\t\t\tgetPostKeepMessages: (preservedMessages) =>\n\t\t\t\t\t\tcollectRpcPostKeepMessages(\n\t\t\t\t\t\t\tsessionManager,\n\t\t\t\t\t\t\tprocess.cwd(),\n\t\t\t\t\t\t\tpreservedMessages,\n\t\t\t\t\t\t),\n\t\t\t\t\tcustomInstructions,\n\t\t\t\t\trenderSummaryText: (summary: AssistantMessage) => {\n\t\t\t\t\t\tconst renderable = createRenderableMessage(summary as AppMessage);\n\t\t\t\t\t\treturn renderable\n\t\t\t\t\t\t\t? renderMessageToPlainText(renderable).trim()\n\t\t\t\t\t\t\t: \"\";\n\t\t\t\t\t},\n\t\t\t\t});\n\n\t\t\t\tif (!result.success) {\n\t\t\t\t\tconsole.log(\n\t\t\t\t\t\tJSON.stringify(\n\t\t\t\t\t\t\twithRequestId({\n\t\t\t\t\t\t\t\ttype: \"error\",\n\t\t\t\t\t\t\t\terror: result.error,\n\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t),\n\t\t\t\t\t);\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\t// Emit compaction event\n\t\t\t\tconst compactionEvent: AgentEvent & { id?: string } = withRequestId({\n\t\t\t\t\ttype: \"compaction\" as const,\n\t\t\t\t\tsummary:\n\t\t\t\t\t\tresult.summary ?? `Compacted ${result.compactedCount} messages`,\n\t\t\t\t\tfirstKeptEntryIndex: result.firstKeptEntryIndex ?? 0,\n\t\t\t\t\ttokensBefore: result.tokensBefore ?? 0,\n\t\t\t\t\tauto: false,\n\t\t\t\t\tcustomInstructions,\n\t\t\t\t\ttimestamp: new Date().toISOString(),\n\t\t\t\t});\n\t\t\t\tconsole.log(JSON.stringify(compactionEvent));\n\t\t\t} else {\n\t\t\t\tconst commandType =\n\t\t\t\t\ttypeof input.type === \"string\" && input.type ? input.type : \"unknown\";\n\t\t\t\tconsole.log(\n\t\t\t\t\tJSON.stringify(\n\t\t\t\t\t\twithRequestId({\n\t\t\t\t\t\t\ttype: \"error\",\n\t\t\t\t\t\t\terror: `Unknown RPC command: ${commandType}`,\n\t\t\t\t\t\t}),\n\t\t\t\t\t),\n\t\t\t\t);\n\t\t\t}\n\t\t} catch (error: unknown) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tconsole.log(\n\t\t\t\tJSON.stringify(withRequestId({ type: \"error\", error: message })),\n\t\t\t);\n\t\t}\n\t});\n\n\t// Keep process alive indefinitely - exits when stdin closes\n\treturn new Promise(() => {});\n}\n"]}

package/dist/cli.js

@@ -49041,7 +49041,7 @@ var init_maestro_event_catalog = __esm2(() => {
     [
       "maestro.events.tool_call.attempted"
       /* ToolCallAttempted */
-    ]: entry("maestro.events.tool_call.attempted", "tool", "ToolCallAttempt", ["meter.maestro-tool-call-events"]),
+    ]: entry("maestro.events.tool_call.attempted", "tool", "ToolCallAttempt", ["meter.maestro-tool-call-events", "release.maestro-tool-attempt-gates"]),
     [
       "maestro.events.tool_call.completed"
       /* ToolCallCompleted */
@@ -49162,6 +49162,7 @@ var init_maestro_event_catalog = __esm2(() => {
       /* SessionClosed */
     ],
     tool: [
+      "maestro.events.tool_call.attempted",
       "maestro.events.tool_call.completed",
       "maestro.events.tool_call.failed"
       /* ToolCallFailed */
@@ -60509,80 +60510,80 @@ async function checkNetworkRestrictionsDetailed(url, network) {
     const parsed = new URL(url);
     const host = parsed.hostname.toLowerCase();
     const normalizedHost = host.replace(/^\[|\]$/g, "");
-    const resolvedIPs = [];
-    const isIP2 = parseIPv4(normalizedHost) !== null || parseIPv4MappedHex(normalizedHost) !== null || normalizedHost.includes(":");
-    if (!isIP2) {
-      try {
-        const addresses = await lookup(normalizedHost, { all: true });
-        resolvedIPs.push(...addresses.map(({ address }) => address));
-      } catch {
-        if (network.blockPrivateIPs || network.blockLocalhost) {
+    if (network.blockedHosts?.length) {
+      for (const blockedHost of network.blockedHosts) {
+        const lowerBlocked = blockedHost.toLowerCase();
+        if (host === lowerBlocked || host.endsWith(`.${lowerBlocked}`)) {
           return {
             allowed: false,
-            reason: `DNS resolution failed for "${host}" and network policy requires IP validation (blockPrivateIPs/blockLocalhost enabled). Access blocked.`,
+            reason: `Host "${host}" is blocked by enterprise policy.`,
             host,
             normalizedHost,
-            resolvedIPs
+            resolvedIPs: []
           };
         }
       }
-    } else {
-      resolvedIPs.push(normalizedHost);
     }
-    if (network.blockLocalhost) {
-      if (isLocalhostAlias(normalizedHost) || resolvedIPs.some(isLoopbackIP)) {
+    if (network.allowedHosts) {
+      if (network.allowedHosts.length === 0) {
         return {
           allowed: false,
-          reason: "Access to localhost is blocked by enterprise policy.",
+          reason: `Host "${host}" is not in the allowed hosts list.`,
           host,
           normalizedHost,
-          resolvedIPs
+          resolvedIPs: []
         };
       }
-    }
-    if (network.blockPrivateIPs) {
-      if (resolvedIPs.some(isPrivateIP)) {
+      const isAllowed = network.allowedHosts.some((allowedHost) => {
+        const lowerAllowed = allowedHost.toLowerCase();
+        return host === lowerAllowed || host.endsWith(`.${lowerAllowed}`);
+      });
+      if (!isAllowed) {
         return {
           allowed: false,
-          reason: "Access to private IP addresses is blocked by enterprise policy.",
+          reason: `Host "${host}" is not in the allowed hosts list.`,
           host,
           normalizedHost,
-          resolvedIPs
+          resolvedIPs: []
         };
       }
     }
-    if (network.blockedHosts?.length) {
-      for (const blockedHost of network.blockedHosts) {
-        const lowerBlocked = blockedHost.toLowerCase();
-        if (host === lowerBlocked || host.endsWith(`.${lowerBlocked}`)) {
+    const resolvedIPs = [];
+    const isIP2 = parseIPv4(normalizedHost) !== null || parseIPv4MappedHex(normalizedHost) !== null || normalizedHost.includes(":");
+    if (!isIP2) {
+      try {
+        const addresses = await lookup(normalizedHost, { all: true });
+        resolvedIPs.push(...addresses.map(({ address }) => address));
+      } catch {
+        if (network.blockPrivateIPs || network.blockLocalhost) {
           return {
             allowed: false,
-            reason: `Host "${host}" is blocked by enterprise policy.`,
+            reason: `DNS resolution failed for "${host}" and network policy requires IP validation (blockPrivateIPs/blockLocalhost enabled). Access blocked.`,
             host,
             normalizedHost,
             resolvedIPs
           };
         }
       }
+    } else {
+      resolvedIPs.push(normalizedHost);
     }
-    if (network.allowedHosts) {
-      if (network.allowedHosts.length === 0) {
+    if (network.blockLocalhost) {
+      if (isLocalhostAlias(normalizedHost) || resolvedIPs.some(isLoopbackIP)) {
         return {
           allowed: false,
-          reason: `Host "${host}" is not in the allowed hosts list.`,
+          reason: "Access to localhost is blocked by enterprise policy.",
           host,
           normalizedHost,
           resolvedIPs
         };
       }
-      const isAllowed = network.allowedHosts.some((allowedHost) => {
-        const lowerAllowed = allowedHost.toLowerCase();
-        return host === lowerAllowed || host.endsWith(`.${lowerAllowed}`);
-      });
-      if (!isAllowed) {
+    }
+    if (network.blockPrivateIPs) {
+      if (resolvedIPs.some(isPrivateIP)) {
         return {
           allowed: false,
-          reason: `Host "${host}" is not in the allowed hosts list.`,
+          reason: "Access to private IP addresses is blocked by enterprise policy.",
           host,
           normalizedHost,
           resolvedIPs
@@ -158628,6 +158629,14 @@ var init_extract_document = __esm2(() => {
     }
   });
 });
+function toolInstallAbortError(config2) {
+  return new Error(`${config2.name} installation aborted`);
+}
+function throwIfToolInstallAborted(config2, signal) {
+  if (signal?.aborted) {
+    throw toolInstallAbortError(config2);
+  }
+}
 function commandExists2(cmd) {
   try {
     const result2 = spawnSync9(cmd, ["--version"], { stdio: "pipe" });
@@ -158649,24 +158658,38 @@ function getToolPath(tool) {
   }
   return null;
 }
-async function fetchWithTimeout(url, init2) {
+async function fetchWithTimeout(url, init2, signal) {
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+  const onAbort = () => {
+    controller.abort(signal?.reason);
+  };
+  if (signal?.aborted) {
+    onAbort();
+  } else {
+    signal?.addEventListener("abort", onAbort, { once: true });
+  }
+  const clearFetchTimeout = () => clearTimeout(timeout);
+  const cleanup = () => {
+    clearFetchTimeout();
+    signal?.removeEventListener("abort", onAbort);
+  };
   try {
     const response = await fetch(url, { ...init2, signal: controller.signal });
     return {
       response,
-      clearTimeout: () => clearTimeout(timeout)
+      clearTimeout: clearFetchTimeout,
+      cleanup
     };
   } catch (error) {
-    clearTimeout(timeout);
+    cleanup();
     throw error;
   }
 }
-async function getLatestVersion(repo) {
-  const { response, clearTimeout: clearFetchTimeout } = await fetchWithTimeout(`https://api.github.com/repos/${repo}/releases/latest`, {
+async function getLatestVersion(repo, signal) {
+  const { response, cleanup: cleanupFetch } = await fetchWithTimeout(`https://api.github.com/repos/${repo}/releases/latest`, {
     headers: { "User-Agent": "composer-coding-agent" }
-  });
+  }, signal);
   try {
     if (!response.ok) {
       throw new Error(`GitHub API error: ${response.status}`);
@@ -158674,11 +158697,15 @@ async function getLatestVersion(repo) {
     const data = await response.json();
     return data.tag_name.replace(/^v/, "");
   } finally {
-    clearFetchTimeout();
+    cleanupFetch();
   }
 }
-async function downloadFile2(url, dest) {
-  const { response, clearTimeout: clearFetchTimeout } = await fetchWithTimeout(url);
+async function downloadFile2(url, dest, signal) {
+  const {
+    response,
+    clearTimeout: clearFetchTimeout,
+    cleanup: cleanupFetch
+  } = await fetchWithTimeout(url, void 0, signal);
   try {
     if (!response.ok) {
       throw new Error(`Failed to download: ${response.status}`);
@@ -158690,6 +158717,11 @@ async function downloadFile2(url, dest) {
     const stream = Readable2.fromWeb(response.body);
     const fileStream = createWriteStream3(dest);
     let idleTimeoutId = null;
+    const onAbort = () => {
+      const error = new Error("Tool download aborted");
+      stream.destroy(error);
+      fileStream.destroy(error);
+    };
     const clearIdleTimeout = () => {
       if (idleTimeoutId) {
         clearTimeout(idleTimeoutId);
@@ -158709,6 +158741,11 @@ async function downloadFile2(url, dest) {
       clearIdleTimeout();
     };
     resetIdleTimeout();
+    if (signal?.aborted) {
+      onAbort();
+    } else {
+      signal?.addEventListener("abort", onAbort, { once: true });
+    }
     stream.on("data", resetIdleTimeout);
     stream.on("end", onStreamEnd);
     stream.on("close", onStreamEnd);
@@ -158720,10 +158757,11 @@ async function downloadFile2(url, dest) {
       stream.off("end", onStreamEnd);
       stream.off("close", onStreamEnd);
       stream.off("error", onStreamEnd);
+      signal?.removeEventListener("abort", onAbort);
       clearIdleTimeout();
     }
   } finally {
-    clearFetchTimeout();
+    cleanupFetch();
   }
 }
 function runExtractor(command, args, description) {
@@ -158759,13 +158797,15 @@ function findBinary(root, binaryName) {
   }
   return null;
 }
-async function downloadTool(tool) {
+async function downloadTool(tool, signal) {
   const config2 = TOOLS[tool];
   if (!config2)
     throw new Error(`Unknown tool: ${tool}`);
+  throwIfToolInstallAborted(config2, signal);
   const plat = platform3();
   const architecture = arch2();
-  const version3 = await getLatestVersion(config2.repo);
+  const version3 = await getLatestVersion(config2.repo, signal);
+  throwIfToolInstallAborted(config2, signal);
   const assetName = config2.getAssetName(version3, plat, architecture);
   if (!assetName) {
     throw new Error(`Unsupported platform: ${plat}/${architecture}`);
@@ -158775,7 +158815,8 @@ async function downloadTool(tool) {
   const archivePath = join79(TOOLS_DIR, assetName);
   const binaryExt = plat === "win32" ? ".exe" : "";
   const binaryPath = join79(TOOLS_DIR, config2.binaryName + binaryExt);
-  await downloadFile2(downloadUrl, archivePath);
+  await downloadFile2(downloadUrl, archivePath, signal);
+  throwIfToolInstallAborted(config2, signal);
   const extractDir = mkdtempSync2(join79(TOOLS_DIR, "extract-"));
   try {
     if (assetName.endsWith(".tar.gz")) {
@@ -158799,24 +158840,28 @@ async function downloadTool(tool) {
   }
   return binaryPath;
 }
-async function ensureTool(tool, silent = false) {
+async function ensureTool(tool, silent = false, signal) {
+  const config2 = TOOLS[tool];
+  if (!config2)
+    return null;
+  throwIfToolInstallAborted(config2, signal);
   const existingPath = getToolPath(tool);
   if (existingPath) {
     return existingPath;
   }
-  const config2 = TOOLS[tool];
-  if (!config2)
-    return null;
   if (!silent) {
     console.log(chalk62.dim(`${config2.name} not found. Downloading...`));
   }
   try {
-    const path3 = await downloadTool(tool);
+    const path3 = await downloadTool(tool, signal);
     if (!silent) {
       console.log(chalk62.dim(`${config2.name} installed to ${path3}`));
     }
     return path3;
   } catch (e2) {
+    if (signal?.aborted) {
+      throw toolInstallAbortError(config2);
+    }
     if (!silent) {
       console.log(chalk62.yellow(`Failed to download ${config2.name}: ${e2 instanceof Error ? e2.message : e2}`));
     }
@@ -159121,7 +159166,7 @@ var init_find = __esm2(() => {
         throw new Error("Operation aborted");
       }
       const { pattern, path: searchDir, limit, includeHidden = true } = params;
-      const fdPath = await ensureTool("fd", true);
+      const fdPath = await ensureTool("fd", true, signal);
       if (!fdPath) {
         return respond.error("fd is not available and could not be downloaded").detail({
           command: "fd",
@@ -160325,6 +160370,84 @@ function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
+function ripgrepAbortError() {
+  return new Error("ripgrep search aborted before start");
+}
+function resetRipgrepExecutablePromise() {
+  ripgrepExecutablePromise = null;
+  ripgrepInstallController = null;
+}
+function getRipgrepExecutablePromise() {
+  if (!ripgrepExecutablePromise) {
+    const controller = new AbortController();
+    ripgrepInstallController = controller;
+    const promise = ensureTool("rg", true, controller.signal).then((executable) => {
+      if (ripgrepInstallController === controller) {
+        ripgrepInstallController = null;
+      }
+      if (ripgrepExecutablePromise === promise && !executable) {
+        ripgrepExecutablePromise = null;
+      }
+      return executable;
+    }, (error) => {
+      if (ripgrepInstallController === controller) {
+        ripgrepInstallController = null;
+      }
+      if (ripgrepExecutablePromise === promise) {
+        ripgrepExecutablePromise = null;
+      }
+      throw error;
+    });
+    ripgrepExecutablePromise = promise;
+  }
+  return ripgrepExecutablePromise;
+}
+function releaseRipgrepExecutableWaiter(signal) {
+  ripgrepExecutableWaiters = Math.max(0, ripgrepExecutableWaiters - 1);
+  if (signal?.aborted && ripgrepExecutableWaiters === 0) {
+    const controller = ripgrepInstallController;
+    resetRipgrepExecutablePromise();
+    controller?.abort(signal.reason);
+  }
+}
+async function waitForRipgrepExecutableWithAbort(promise, signal) {
+  throwIfRipgrepAborted(signal);
+  return await new Promise((resolve532, reject) => {
+    const onAbort = () => {
+      signal.removeEventListener("abort", onAbort);
+      reject(ripgrepAbortError());
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
+    promise.then(resolve532, reject).finally(() => {
+      signal.removeEventListener("abort", onAbort);
+    });
+  });
+}
+async function resolveRipgrepExecutable(signal) {
+  ripgrepExecutableWaiters += 1;
+  try {
+    const promise = getRipgrepExecutablePromise();
+    const executable = signal ? await waitForRipgrepExecutableWithAbort(promise, signal) : await promise;
+    if (!executable) {
+      throw new Error("ripgrep is not available and could not be downloaded");
+    }
+    return executable;
+  } finally {
+    releaseRipgrepExecutableWaiter(signal);
+  }
+}
+function throwIfRipgrepAborted(signal) {
+  if (signal?.aborted) {
+    throw ripgrepAbortError();
+  }
+}
+async function resolveRipgrepExecutableWithAbort(signal) {
+  throwIfRipgrepAborted(signal);
+  if (!signal) {
+    return await resolveRipgrepExecutable();
+  }
+  return await resolveRipgrepExecutable(signal);
+}
 function shellQuoteArg(value) {
   if (/^[A-Za-z0-9_/:=.,@%+-]+$/.test(value)) {
     return value;
@@ -160335,7 +160458,9 @@ function formatRipgrepCommand(args) {
   return ["rg", ...args].map(shellQuoteArg).join(" ");
 }
 async function runRipgrep(args, signal, cwd) {
-  const child = spawn17("rg", args, {
+  const executable = await resolveRipgrepExecutableWithAbort(signal);
+  throwIfRipgrepAborted(signal);
+  const child = spawn17(executable, args, {
     cwd: cwd ?? process.cwd(),
     stdio: ["ignore", "pipe", "pipe"],
     signal
@@ -160401,8 +160526,12 @@ function parseRipgrepJson(output) {
 var pathSchema;
 var globSchema;
 var MAX_RIPGREP_OUTPUT_BYTES = 2e6;
+var ripgrepExecutablePromise = null;
+var ripgrepInstallController = null;
+var ripgrepExecutableWaiters = 0;
 var init_ripgrep_utils = __esm2(() => {
   init_json();
+  init_tools_manager();
   pathSchema = Type25.Optional(Type25.Union([
     Type25.String({
       description: "Directory or file to search",
@@ -202353,8 +202482,11 @@ async function runRpcMode(agent, sessionManager) {
     terminal: false
   });
   rl.on("line", async (line) => {
+    let requestId;
+    const withRequestId = (response) => requestId ? { id: requestId, ...response } : response;
     try {
       const input = JSON.parse(line);
+      requestId = typeof input.id === "string" ? input.id : void 0;
       if (input.type === "prompt" && input.message) {
         await runUserPromptWithRecovery({
           agent,
@@ -202372,12 +202504,12 @@ async function runRpcMode(agent, sessionManager) {
       } else if (input.type === "abort") {
         agent.abort();
       } else if (input.type === "get_messages") {
-        console.log(JSON.stringify({
+        console.log(JSON.stringify(withRequestId({
           type: "messages",
           messages: agent.state.messages
-        }));
+        })));
       } else if (input.type === "get_state") {
-        console.log(JSON.stringify({
+        console.log(JSON.stringify(withRequestId({
           type: "state",
           state: {
             model: agent.state.model,
@@ -202388,7 +202520,7 @@ async function runRpcMode(agent, sessionManager) {
             session: agent.state.session,
             queuedMessageCount: agent.getQueuedMessageCount()
           }
-        }));
+        })));
       } else if (input.type === "continue") {
         await runWithPromptRecovery({
           agent,
@@ -202418,13 +202550,13 @@ async function runRpcMode(agent, sessionManager) {
           }
         });
         if (!result2.success) {
-          console.log(JSON.stringify({
+          console.log(JSON.stringify(withRequestId({
             type: "error",
             error: result2.error
-          }));
+          })));
           return;
         }
-        const compactionEvent = {
+        const compactionEvent = withRequestId({
           type: "compaction",
           summary: result2.summary ?? `Compacted ${result2.compactedCount} messages`,
           firstKeptEntryIndex: result2.firstKeptEntryIndex ?? 0,
@@ -202432,12 +202564,18 @@ async function runRpcMode(agent, sessionManager) {
           auto: false,
           customInstructions,
           timestamp: (/* @__PURE__ */ new Date()).toISOString()
-        };
+        });
         console.log(JSON.stringify(compactionEvent));
+      } else {
+        const commandType = typeof input.type === "string" && input.type ? input.type : "unknown";
+        console.log(JSON.stringify(withRequestId({
+          type: "error",
+          error: `Unknown RPC command: ${commandType}`
+        })));
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      console.log(JSON.stringify({ type: "error", error: message }));
+      console.log(JSON.stringify(withRequestId({ type: "error", error: message })));
     }
   });
   return new Promise(() => {

package/dist/node_modules/@evalops/contracts/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evalops/contracts",
-	"version": "0.10.37",
+	"version": "0.10.39",
 	"description": "Shared Maestro contracts for frontend/backend integration",
 	"type": "module",
 	"main": "./dist/index.js",

package/dist/node_modules/@evalops/tui/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evalops/tui",
-	"version": "0.10.37",
+	"version": "0.10.39",
 	"description": "Terminal UI library with differential rendering for Maestro",
 	"type": "module",
 	"main": "./dist/index.js",