la-machina-engine 0.7.5 → 0.7.6

package/dist/index.cjs

@@ -3165,6 +3165,19 @@ async function agentLoop(options) {
     });
     if (compactResult.compacted) {
       messages = compactResult.messages;
+      const used = ctx.getTokensUsed();
+      const total = used.input + used.output;
+      const ratio = total / contextLimit;
+      const dropped = compactResult.result?.dropped ?? 0;
+      await options.inspect?.appendEvent({
+        type: "compaction_threshold",
+        turn: ctx.getTurnCount(),
+        ratio,
+        threshold: compactionConfig.threshold,
+        strategy: compactResult.result?.strategy ?? compactionConfig.strategy,
+        dropped,
+        ts: Date.now()
+      });
     }
     await fireProgress("streaming");
     const textBlocks = [];
@@ -3350,16 +3363,31 @@ async function agentLoop(options) {
       const firstTool = toolCallsToDispatch[0]?.name;
       await fireProgress("tool_dispatch", firstTool);
       const streamExec = new StreamingToolExecutor(executor);
+      let anyConcurrent = false;
       for (const call of toolCallsToDispatch) {
         const tool = options.registry?.get(call.name);
         const safe = tool?.isConcurrencySafe?.(call.input) ?? false;
+        if (safe) anyConcurrent = true;
         streamExec.addTool(call.id, call.name, call.input, safe);
       }
+      await options.inspect?.appendEvent({
+        type: "tool_batch",
+        turn: ctx.getTurnCount(),
+        toolNames: toolCallsToDispatch.map((c) => c.name),
+        concurrent: anyConcurrent && toolCallsToDispatch.length > 1,
+        ts: Date.now()
+      });
       try {
         for await (const { id, result } of streamExec.results()) {
           const missing = result.metadata?.capabilityMissing;
           if (typeof missing === "string") {
             ctx.recordCapabilityMissing(missing);
+            await options.inspect?.appendEvent({
+              type: "capability_stub",
+              turn: ctx.getTurnCount(),
+              toolName: missing,
+              ts: Date.now()
+            });
           }
           const call = toolCallsToDispatch.find((c) => c.id === id);
           let contentForTranscript;
@@ -4508,25 +4536,45 @@ If omitted, defaults to "${defaultAgent.name}".`;
         const lastAssistant = [...parentMsgs].reverse().find((m) => m.role === "assistant");
         const assistantContent = lastAssistant ? Array.isArray(lastAssistant.content) ? lastAssistant.content : [] : [];
         const forkedMsgs = buildForkedMessages(taskDescription, assistantContent);
-        const result2 = await runAgent({
-          agentId: spawn2.agentId,
-          description: taskDescription,
-          storage: options.storage,
-          client: options.client,
-          registry: options.childRegistry,
-          parentLogPath: options.parentLogPath,
-          system: options.system,
-          // inherit parent's system prompt
-          maxTurns: options.maxTurns,
-          contextLimit: options.contextLimit,
-          turnTimeoutMs: options.turnTimeoutMs,
-          flushPolicy: options.flushPolicy,
-          idleFlushMs: options.idleFlushMs,
-          // Fork: prepend parent messages + forked messages
-          prependMessages: [...parentMsgs, ...forkedMsgs],
-          ...options.gateBeforeTool !== void 0 ? { gateBeforeTool: options.gateBeforeTool } : {},
-          ...options.toolResultOffload !== void 0 ? { toolResultOffload: options.toolResultOffload } : {}
-        });
+        let result2;
+        try {
+          result2 = await runAgent({
+            agentId: spawn2.agentId,
+            description: taskDescription,
+            storage: options.storage,
+            client: options.client,
+            registry: options.childRegistry,
+            parentLogPath: options.parentLogPath,
+            system: options.system,
+            // inherit parent's system prompt
+            maxTurns: options.maxTurns,
+            contextLimit: options.contextLimit,
+            turnTimeoutMs: options.turnTimeoutMs,
+            flushPolicy: options.flushPolicy,
+            idleFlushMs: options.idleFlushMs,
+            // Fork: prepend parent messages + forked messages
+            prependMessages: [...parentMsgs, ...forkedMsgs],
+            ...options.gateBeforeTool !== void 0 ? { gateBeforeTool: options.gateBeforeTool } : {},
+            ...options.toolResultOffload !== void 0 ? { toolResultOffload: options.toolResultOffload } : {}
+          });
+          await options.inspect?.appendEvent({
+            type: "subagent_spawn_attempt",
+            agentId: spawn2.agentId,
+            subagentType: "fork",
+            success: true,
+            ts: Date.now()
+          });
+        } catch (err) {
+          await options.inspect?.appendEvent({
+            type: "subagent_spawn_attempt",
+            agentId: spawn2.agentId,
+            subagentType: "fork",
+            success: false,
+            error: err instanceof Error ? err.message : String(err),
+            ts: Date.now()
+          });
+          throw err;
+        }
         handlePausedResult(result2, spawn2.agentId, "fork");
         const t2 = result2;
         options.subagentRegistry.setStatus(spawn2.agentId, t2.isError ? "stopped" : "completed");
@@ -4580,7 +4628,7 @@ If omitted, defaults to "${defaultAgent.name}".`;
       const shouldRunAsync = run_in_background === true || options.coordinatorMode === true;
       if (shouldRunAsync) {
         options.subagentRegistry.setBackground(spawn.agentId);
-        const bgPromise = runAgent(runOpts).then((result2) => {
+        const bgPromise = runAgent(runOpts).then(async (result2) => {
           if (result2.kind !== "terminal") {
             options.subagentRegistry.setStatus(spawn.agentId, "stopped");
             options.subagentRegistry.setBackgroundResult(spawn.agentId, {
@@ -4589,6 +4637,14 @@ If omitted, defaults to "${defaultAgent.name}".`;
               isError: true,
               description: taskDescription
             });
+            await options.inspect?.appendEvent({
+              type: "subagent_spawn_attempt",
+              agentId: spawn.agentId,
+              subagentType: typeName ?? "unknown",
+              success: false,
+              error: "background subagent paused (pause not supported for async)",
+              ts: Date.now()
+            });
             return;
           }
           options.subagentRegistry.setStatus(
@@ -4601,7 +4657,15 @@ If omitted, defaults to "${defaultAgent.name}".`;
             isError: result2.isError,
             description: taskDescription
           });
-        }).catch((err) => {
+          await options.inspect?.appendEvent({
+            type: "subagent_spawn_attempt",
+            agentId: spawn.agentId,
+            subagentType: typeName ?? "unknown",
+            success: !result2.isError,
+            ...result2.isError ? { error: "child returned isError" } : {},
+            ts: Date.now()
+          });
+        }).catch(async (err) => {
           options.subagentRegistry.setStatus(spawn.agentId, "stopped");
           options.subagentRegistry.setBackgroundResult(spawn.agentId, {
             agentId: spawn.agentId,
@@ -4609,6 +4673,14 @@ If omitted, defaults to "${defaultAgent.name}".`;
             isError: true,
             description: taskDescription
           });
+          await options.inspect?.appendEvent({
+            type: "subagent_spawn_attempt",
+            agentId: spawn.agentId,
+            subagentType: typeName ?? "unknown",
+            success: false,
+            error: err instanceof Error ? err.message : String(err),
+            ts: Date.now()
+          });
         });
         options.subagentRegistry.setBackgroundPromise(spawn.agentId, bgPromise);
         return {
@@ -4624,7 +4696,27 @@ Use SendMessage with to: '${spawn.agentId}' to communicate with this agent.`,
           }
         };
       }
-      const result = await runAgent(runOpts);
+      let result;
+      try {
+        result = await runAgent(runOpts);
+        await options.inspect?.appendEvent({
+          type: "subagent_spawn_attempt",
+          agentId: spawn.agentId,
+          subagentType: typeName ?? "unknown",
+          success: true,
+          ts: Date.now()
+        });
+      } catch (err) {
+        await options.inspect?.appendEvent({
+          type: "subagent_spawn_attempt",
+          agentId: spawn.agentId,
+          subagentType: typeName ?? "unknown",
+          success: false,
+          error: err instanceof Error ? err.message : String(err),
+          ts: Date.now()
+        });
+        throw err;
+      }
       handlePausedResult(result, spawn.agentId, typeName);
       const t = result;
       options.subagentRegistry.setStatus(spawn.agentId, t.isError ? "stopped" : "completed");
@@ -6959,7 +7051,7 @@ init_contract();
 function mcpToolName(serverName, toolName) {
   return `mcp__${serverName}__${toolName}`;
 }
-function adaptMcpTool(client, serverName, def) {
+function adaptMcpTool(client, serverName, def, opts) {
   const registeredName = mcpToolName(serverName, def.name);
   return defineTool({
     name: registeredName,
@@ -6969,6 +7061,9 @@ function adaptMcpTool(client, serverName, def) {
     // bypassing Zod-to-JSON-Schema conversion (which would produce `{}`
     // for our `z.unknown()` Zod schema).
     anthropicSchemaOverride: def.inputSchema,
+    // Plan 027 — stdio servers spawn subprocesses; flag so the engine's
+    // capability-stub wrapper can swap them on Workers.
+    ...opts.transport === "stdio" ? { requiresNode: true } : {},
     execute: async (input) => {
       try {
         const result = await client.callTool(def.name, input);
@@ -7012,6 +7107,8 @@ var McpManager = class {
     this.logger = logger;
     this.servers = Object.entries(config.servers).map(([name, serverConfig]) => ({
       name,
+      // Plan 027 — capture transport for the stdio-handoff wiring.
+      transport: serverConfig.type,
       client: new McpClient({
         serverName: name,
         config: serverConfig,
@@ -7151,7 +7248,9 @@ var McpManager = class {
     try {
       await server.client.connect();
       const defs = server.client.listTools();
-      server.tools = defs.map((def) => adaptMcpTool(server.client, server.name, def));
+      server.tools = defs.map(
+        (def) => adaptMcpTool(server.client, server.name, def, { transport: server.transport })
+      );
       server.state = "connected";
       this.pendingConnected.push(server.name);
     } catch (err) {
@@ -10472,6 +10571,7 @@ var Engine = class {
       systemPrompt += "\n\n" + buildSchemaPrompt(options.outputSchema);
     }
     const gate = this.resolveGate();
+    const inspect = this.buildInspectWriter(storage.workspace, logPath);
     const registry = buildToolRegistry({
       config: this.config,
       storage,
@@ -10483,6 +10583,7 @@ var Engine = class {
       agents,
       mcpTools,
       memory,
+      inspect,
       ...this.config.hooks.propagateGateToSubagents === true && gate !== void 0 ? { subagentGate: gate } : {},
       ...skillSource !== void 0 ? { skillSource } : {},
       ...apiConfig !== void 0 ? { apiConfig } : {},
@@ -10491,7 +10592,6 @@ var Engine = class {
       ...this.internals.fetch !== void 0 ? { fetch: this.internals.fetch } : {}
     });
     applyRunToolFilter(registry, options);
-    const inspect = this.buildInspectWriter(storage.workspace, logPath);
     await inspect.writeStartSnapshot({
       systemPrompt,
       tools: this.snapshotTools(registry, mcpTools),
@@ -10588,10 +10688,16 @@ var Engine = class {
         // events / per-turn rows. Disabled-mode writer is a no-op.
         inspect
       });
-      const result = await this.finalizeResult(loopResult, writer, logPath, {
-        ...options.outputFormat !== void 0 ? { outputFormat: options.outputFormat } : {},
-        ...options.outputSchema !== void 0 ? { outputSchema: options.outputSchema } : {}
-      });
+      const result = await this.finalizeResult(
+        loopResult,
+        writer,
+        logPath,
+        {
+          ...options.outputFormat !== void 0 ? { outputFormat: options.outputFormat } : {},
+          ...options.outputSchema !== void 0 ? { outputSchema: options.outputSchema } : {}
+        },
+        inspect
+      );
       this.logRunEnd(log, runId, options.nodeId, result);
       await this.firePostRunHook(runId, options.nodeId, result, ctx, logPath);
       await this.writeInspectToolsSummary(inspect, storage.workspace, logPath);
@@ -10662,6 +10768,7 @@ var Engine = class {
       systemPrompt += "\n\n" + buildSchemaPrompt(options.outputSchema);
     }
     const gate = this.resolveGate();
+    const inspect = this.buildInspectWriter(storage.workspace, logPath);
     const registry = buildToolRegistry({
       config: this.config,
       storage,
@@ -10673,6 +10780,7 @@ var Engine = class {
       agents,
       mcpTools,
       memory,
+      inspect,
       ...this.config.hooks.propagateGateToSubagents === true && gate !== void 0 ? { subagentGate: gate } : {},
       ...skillSource !== void 0 ? { skillSource } : {},
       ...apiConfig !== void 0 ? { apiConfig } : {},
@@ -10680,7 +10788,6 @@ var Engine = class {
       ...knowledgeRuntime !== void 0 ? { knowledge: knowledgeRuntime } : {},
       ...this.internals.fetch !== void 0 ? { fetch: this.internals.fetch } : {}
     });
-    const inspect = this.buildInspectWriter(storage.workspace, logPath);
     await inspect.writeStartSnapshot({
       systemPrompt,
       tools: this.snapshotTools(registry, mcpTools),
@@ -10811,10 +10918,16 @@ ${inputJson}
         // existing inspect/ logs.
         inspect
       });
-      const result = await this.finalizeResult(loopResult, writer, logPath, {
-        ...options.outputFormat !== void 0 ? { outputFormat: options.outputFormat } : {},
-        ...options.outputSchema !== void 0 ? { outputSchema: options.outputSchema } : {}
-      });
+      const result = await this.finalizeResult(
+        loopResult,
+        writer,
+        logPath,
+        {
+          ...options.outputFormat !== void 0 ? { outputFormat: options.outputFormat } : {},
+          ...options.outputSchema !== void 0 ? { outputSchema: options.outputSchema } : {}
+        },
+        inspect
+      );
       this.logRunEnd(log, snapshot.runId, snapshot.nodeId, result);
       await this.firePostRunHook(snapshot.runId, snapshot.nodeId, result, ctx, logPath);
       await this.writeInspectToolsSummary(inspect, storage.workspace, logPath);
@@ -11465,7 +11578,7 @@ ${inputJson}
     };
     await dispatchHooks(this.config.hooks.postRun, event);
   }
-  async finalizeResult(loopResult, writer, _logPath, jsonOptions) {
+  async finalizeResult(loopResult, writer, _logPath, jsonOptions, inspect) {
     if (loopResult.status === "done") {
       await writer.setStatus("done");
       let data;
@@ -11474,10 +11587,27 @@ ${inputJson}
         if (parsed.ok) {
           if (jsonOptions.outputSchema) {
             const validated = validateOutput(parsed.value, jsonOptions.outputSchema);
-            data = validated.ok ? validated.data : void 0;
+            if (validated.ok) {
+              data = validated.data;
+            } else {
+              await inspect?.appendEvent({
+                type: "json_parse_failure",
+                turn: loopResult.turns,
+                validationError: validated.error,
+                ts: Date.now()
+              });
+              data = void 0;
+            }
           } else {
             data = parsed.value;
           }
+        } else {
+          await inspect?.appendEvent({
+            type: "json_parse_failure",
+            turn: loopResult.turns,
+            parseError: parsed.error ?? "unknown parse error",
+            ts: Date.now()
+          });
         }
       }
       return {
@@ -11955,7 +12085,10 @@ function buildToolRegistry(options) {
     agents,
     coordinatorMode: isCoordinatorMode(config),
     ...subagentGate !== void 0 ? { gateBeforeTool: subagentGate } : {},
-    ...options.toolResultOffload !== void 0 ? { toolResultOffload: options.toolResultOffload } : {}
+    ...options.toolResultOffload !== void 0 ? { toolResultOffload: options.toolResultOffload } : {},
+    // Plan 026 — Agent tool emits subagent_spawn_attempt to the
+    // parent's events.jsonl on each runAgent call (success and failure).
+    ...options.inspect !== void 0 ? { inspect: options.inspect } : {}
   });
   if (!disabled.has("Agent") && (wantAll || enabled.has("Agent"))) {
     registry.register(agentTool);
@@ -11971,8 +12104,9 @@ function buildToolRegistry(options) {
   for (const tool of mcpTools) {
     if (disabled.has(tool.name)) continue;
     if (wantAll || enabled.has(tool.name)) {
-      registry.register(tool);
-      childRegistry.register(tool);
+      const wrapped = withCapabilityCheck(tool, spawnAvailable);
+      registry.register(wrapped);
+      childRegistry.register(wrapped);
     }
   }
   if (!disabled.has("ToolSearch") && (wantAll || enabled.has("ToolSearch"))) {