@orion-agents/orion-code 0.1.8 → 0.2.0

package/dist/runtime/subagents/runtime-integration.js

@@ -1,13 +1,11 @@
 "use strict";
 /**
- * Turn-level integration: build the runtime-bound `subtask` tool for a root turn.
+ * Turn-level bridge for the modern subagent runtime.
  *
- * This is the bridge between {@link AgentChatController} and the subagent
- * runtime. It resolves the child tool set from the global runtime tools, builds
- * the production executeQuery, the budget ledger, the provider gate and the
- * Supervisor, and returns the `subtask` OrionCodeTool to merge into the root
- * turn's tool list. Returns null when subagents are off or the LLM is absent,
- * so the root loop is unchanged.
+ * The bridge is intentionally dependency-injected. If the product composition
+ * root has not supplied a durable parent fork anchor and production child
+ * runtime, the capability is unavailable instead of falling back to query()
+ * or a process-global tool catalog.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runSubtaskBatch = void 0;
@@ -16,171 +14,23 @@ exports.createSubagentToolForTurn = createSubagentToolForTurn;
 exports.deriveRootLlmConfig = deriveRootLlmConfig;
 const budget_1 = require("./budget");
 const provider_gate_1 = require("./provider-gate");
-const production_1 = require("./production");
 const supervisor_1 = require("./supervisor");
 Object.defineProperty(exports, "runSubtaskBatch", { enumerable: true, get: function () { return supervisor_1.runSubtaskBatch; } });
 const tool_1 = require("./tool");
-const presets_1 = require("./presets");
-const child_executor_guard_1 = require("./child-executor-guard");
-const web_research_adapter_1 = require("./web-research-adapter");
 /**
- * Lazy accessor for the runtime tool pool.
- *
- * Importing `../../tools` at module top-level creates a circular dependency:
- *   subagents barrel → runtime-integration → tools/index → web → config → subagents/types
- * When `tools/index` loads before `web.ts` finishes, `WEB_TOOLS` is still
- * `undefined` and `...WEB_TOOLS` throws "not iterable". Deferring the import
- * to call-time breaks the cycle because by then all modules have initialized.
- */
-function lazyRuntimeTools() {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const tools = require('../../tools');
-    return { executeTool: tools.executeTool, getRuntimeTools: tools.getRuntimeTools };
-}
-function parseSearchOutput(output, query, provider, limit) {
-    const results = [];
-    const seen = new Set();
-    const markdownLink = /\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)(?:\s*-\s*([^\n]+))?/giu;
-    for (const match of output.matchAll(markdownLink)) {
-        const url = match[2];
-        if (seen.has(url))
-            continue;
-        seen.add(url);
-        results.push({
-            query,
-            provider,
-            title: match[1].trim() || url,
-            url,
-            ...(match[3]?.trim() ? { snippet: match[3].trim() } : {}),
-            status: 'ok',
-        });
-        if (results.length >= limit)
-            break;
-    }
-    return results;
-}
-/**
- * Adapt only the first-class WebSearch/WebFetch tools. They remain outside the
- * child allowlist; this root-owned dependency is reached only after the
- * scheduler approves an external `subtask` request.
- */
-function createDedicatedWebResearchDeps(runtimeTools, cwd) {
-    const searchTool = runtimeTools.find(tool => tool.name === 'web_search');
-    const fetchTool = runtimeTools.find(tool => tool.name === 'web_fetch');
-    if (!searchTool || !fetchTool)
-        return undefined;
-    const context = (signal) => ({
-        cwd,
-        config: { name: 'orion-code-research', mode: 'root-approved-web-research' },
-        abortSignal: signal,
-    });
-    return {
-        search: async (query, limit, signal) => {
-            if (signal?.aborted)
-                throw new Error('web search cancelled by parent');
-            const result = await searchTool.execute({ query, limit }, context(signal));
-            if (!result.success)
-                throw new Error(result.error || 'web search failed');
-            const provider = typeof result.metadata?.provider === 'string'
-                ? result.metadata.provider
-                : typeof result.metadata?.source === 'string'
-                    ? result.metadata.source
-                    : 'web_search';
-            return parseSearchOutput(result.output, query, provider, limit);
-        },
-        fetch: async (url, prompt, signal) => {
-            if (signal?.aborted) {
-                return {
-                    url,
-                    status: 'error',
-                    failureReason: 'web fetch cancelled by parent or deadline',
-                };
-            }
-            const result = await fetchTool.execute({ url, prompt: prompt ?? 'extract relevant facts and citations' }, context(signal));
-            if (!result.success) {
-                const failureReason = result.error || 'web fetch failed';
-                return {
-                    url,
-                    status: /security|blocked|ssrf|internal network/iu.test(failureReason)
-                        ? 'blocked'
-                        : 'error',
-                    failureReason,
-                };
-            }
-            const finalUrlMatch = result.output.match(/\n\nFinal URL \(after redirects\):\s*(\S+)\s*$/u);
-            const content = finalUrlMatch
-                ? result.output.slice(0, finalUrlMatch.index).trimEnd()
-                : result.output;
-            return {
-                url,
-                status: 'ok',
-                content,
-                ...(finalUrlMatch ? { finalUrl: finalUrlMatch[1] } : {}),
-                bytes: Buffer.byteLength(content, 'utf8'),
-            };
-        },
-    };
-}
-/**
- * Build the `subtask` tool for a root turn, or null if disabled.
- *
- * Returns a bundle: the tool to merge into the root turn's tool list, plus an
- * accessor for the aggregate child usage so the root loop can fold child cost
- * into its loop stats and `/cost`. The bundle is null when subagents are off.
+ * Build the root `subtask` tool. Missing modern dependencies are a deliberate
+ * fail-closed result while the product composition root migrates its parent
+ * fork anchor.
  */
 function createSubagentBundleForTurn(inputs) {
-    const { config, cwd, rootLlmConfig, abortSignal, onSubtaskEvent } = inputs;
-    if (config.mode === 'off')
+    const { config, cwd, abortSignal, onSubtaskEvent } = inputs;
+    if (config.mode === 'off' || !inputs.rootLlmConfig.apiKey)
         return null;
-    if (!rootLlmConfig.apiKey)
+    if (!inputs.productionRuntime ||
+        (!inputs.parentFork && !inputs.parentForkSource) ||
+        !inputs.parentAuthority) {
         return null;
-    // Resolve child tools: all v0.2.20 roles share the read-only allowlist, so
-    // filter once for 'research'. Assert no forbidden tool slips in as a
-    // defense-in-depth check (the allowlist already excludes them, but this
-    // catches future regressions).
-    const { executeTool, getRuntimeTools } = lazyRuntimeTools();
-    const runtimeTools = getRuntimeTools();
-    const availableNames = runtimeTools.map(t => t.name);
-    const allowedNames = new Set((0, presets_1.filterToolsForRole)(availableNames, 'research', runtimeTools));
-    const childTools = runtimeTools.filter(t => allowedNames.has(t.name));
-    (0, presets_1.assertNoForbiddenTools)(childTools.map(t => t.name));
-    // Defense-in-depth: map tool name -> definition so the executor can re-verify
-    // isReadOnly() on every call. A tool that is not read-only must never execute
-    // in a child context, regardless of what the allowlist says at construction.
-    const childToolByName = new Map();
-    for (const t of childTools)
-        childToolByName.set(t.name, t);
-    // R3: the async-context scope holder lets the supervisor bind each child to
-    // its packet scope, so parallel children cannot overwrite one another while
-    // sharing the same guarded executor.
-    const scopeHolder = new child_executor_guard_1.ScopeHolder();
-    const unguardedExecutor = async (name, args, signal) => {
-        if (!allowedNames.has(name)) {
-            return JSON.stringify({
-                success: false,
-                error: `Tool ${name} is not available to subagents.`,
-            });
-        }
-        // Re-verify read-only at execution time: catches tools whose isReadOnly()
-        // returns false (mutating MCP actions, future regressions).
-        const tool = childToolByName.get(name);
-        if (!tool || tool.isReadOnly?.(args) !== true) {
-            return JSON.stringify({
-                success: false,
-                error: `Tool ${name} is not read-only and cannot run in a subagent.`,
-            });
-        }
-        const toolContext = {
-            cwd,
-            config: { name: 'orion-code-subagent', mode: 'subagent' },
-            abortSignal: signal,
-        };
-        return executeTool(name, args, signal, toolContext);
-    };
-    const childToolExecutor = (0, child_executor_guard_1.createChildToolExecutorGuard)(unguardedExecutor, {
-        rootCwd: cwd,
-        scopeHolder,
-    });
+    }
     const providerGate = new provider_gate_1.SubagentProviderGate({
         maxConcurrent: config.maxParallel,
         sharedGate: inputs.sharedGate,
@@ -191,24 +41,17 @@ function createSubagentBundleForTurn(inputs) {
         maxToolCallsPerTask: config.maxToolCallsPerTask,
         timeoutMs: config.timeoutMs,
     }));
-    // R6: turn-level task counter persists across `subtask` calls so multiple
-    // calls in one root turn cannot exceed `maxTasksPerTurn`.
     const turnTaskState = new budget_1.TurnTaskState();
-    const executeQuery = (0, production_1.createProductionExecuteQuery)({
-        rootConfig: rootLlmConfig,
-        providerGate,
-        maxTurnsPerTask: config.maxTurnsPerTask,
-        resilience: inputs.resilience,
-        beforeProviderRequest: inputs.beforeProviderRequest,
-    });
+    let closed = false;
     const supervisorDeps = {
         config,
         cwd,
         budget,
         providerGate,
-        executeQuery,
-        toolSet: { tools: childTools, toolExecutor: childToolExecutor },
-        scopeHolder,
+        executeChild: inputs.productionRuntime,
+        parentFork: inputs.parentFork,
+        parentForkSource: inputs.parentForkSource,
+        parentAuthority: inputs.parentAuthority,
         turnTaskState,
         hasPendingPermission: inputs.hasPendingPermission,
         onChildUsage: inputs.onChildUsage,
@@ -217,32 +60,29 @@ function createSubagentBundleForTurn(inputs) {
         modelLabel: inputs.modelLabel,
         onEvent: onSubtaskEvent,
         onSubtaskResult: inputs.onSubtaskResult,
-        runWebResearch: (() => {
-            const deps = inputs.webResearchDeps ?? createDedicatedWebResearchDeps(runtimeTools, cwd);
-            return deps
-                ? (request, parentSignal) => (0, web_research_adapter_1.runWebResearch)(request, deps, parentSignal)
-                : undefined;
-        })(),
+        runWebResearch: inputs.runWebResearch,
     };
-    const tool = (0, tool_1.createSubtaskTool)(supervisorDeps);
     return {
-        tool,
-        /** Read-only accessor for the reconciled aggregate child usage this turn. */
+        tool: (0, tool_1.createSubtaskTool)(supervisorDeps),
         getAggregateUsage: () => budget.aggregateUsage(),
-        /** Number of subtasks that ran (reconciled) this turn. */
         getSubtaskCount: () => budget.reconciledTaskCount(),
+        close: async (reason) => {
+            if (closed)
+                return;
+            closed = true;
+            try {
+                await inputs.productionRuntime.close(reason ?? 'parent_turn_settled');
+            }
+            finally {
+                inputs.parentForkSource?.close(reason ?? 'parent_turn_settled');
+            }
+        },
     };
 }
-/**
- * Backwards-compatible wrapper returning only the tool. Prefer
- * {@link createSubagentBundleForTurn} when the root loop needs to fold child
- * usage into its stats.
- */
 function createSubagentToolForTurn(inputs) {
-    const bundle = createSubagentBundleForTurn(inputs);
-    return bundle ? bundle.tool : null;
+    return createSubagentBundleForTurn(inputs)?.tool ?? null;
 }
-/** Derive the root LLM config slice from the runtime config. */
+/** Derive the root LLM config slice from the legacy runtime config. */
 function deriveRootLlmConfig(config) {
     const registry = config.modelRegistry;
     const profile = registry?.defaultProfile;
@@ -255,9 +95,6 @@ function deriveRootLlmConfig(config) {
             apiKey,
             baseUrl: provider.baseUrl,
             model: profile.model,
-            // LLMConfig has one base URL/key. A cross-provider fallback would send
-            // the fallback model to the default provider, so fail closed until child
-            // fallback becomes provider-aware.
             fallbackModel: registry?.fallbackProfile?.provider === profile.provider
                 ? registry.fallbackProfile.model
                 : undefined,

package/dist/runtime/subagents/runtime-integration.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-integration.js","sourceRoot":"","sources":["../../../src/runtime/subagents/runtime-integration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-integration.js","sourceRoot":"","sources":["../../../src/runtime/subagents/runtime-integration.ts"],"names":[],"mappings":"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"}

package/dist/runtime/subagents/supervisor.d.ts

@@ -8,12 +8,16 @@
  * The supervisor does NOT own LLM state, tool execution, permission policy or
  * transcript storage. It composes the policy gate, the budget ledger, the
  * provider gate and the runner, and emits renderer-independent lifecycle
- * events that the root loop forwards to terminal/Ink/TUI.
+ * events that the root loop forwards to terminal/TUI.
  */
 import { SubagentBudgetLedger, TurnTaskState } from './budget';
 import { type PolicyRejectReason } from './policy';
 import { SubagentProviderGate } from './provider-gate';
 import { type ExecuteChildQuery, type ChildToolSet } from './runner';
+import type { AuthoritySnapshotV1 } from '../step-snapshot';
+import type { ParentThreadForkRequestV1 } from '../subagent-thread-runtime';
+import type { ProductionSubagentExecutionPortV1 } from './runtime-contract';
+import type { ParentThreadStepForkSourcePortV1 } from './parent-step-fork';
 import type { ScopeHolder } from './child-executor-guard';
 import type { ResearchRequest } from './research-types';
 import type { WebResearchResult } from './web-research-adapter';
@@ -23,10 +27,18 @@ export interface SubagentSupervisorDeps {
     cwd: string;
     budget: SubagentBudgetLedger;
     providerGate: SubagentProviderGate;
-    /** Injectable query binding shared with the runner (tests mock this). */
-    executeQuery: ExecuteChildQuery;
-    /** Filtered, child-safe tool set (already passed through presets). */
-    toolSet: ChildToolSet;
+    /** Modern production boundary. Child execution owns Thread/Loop/Gateway. */
+    executeChild?: ProductionSubagentExecutionPortV1;
+    /** Durable parent fork anchor required by the modern production boundary. */
+    parentFork?: ParentThreadForkRequestV1;
+    /** Resolves the current active step only when a subtask batch actually executes. */
+    parentForkSource?: ParentThreadStepForkSourcePortV1;
+    /** Root authority that the child role policy may only narrow. */
+    parentAuthority?: AuthoritySnapshotV1;
+    /** @deprecated Test-only legacy runner seam; production must inject executeChild. */
+    executeQuery?: ExecuteChildQuery;
+    /** @deprecated Test-only legacy runner seam; production must inject executeChild. */
+    toolSet?: ChildToolSet;
     /**
      * R3: async-context scope holder. The supervisor binds each child run to
      * its packet's canonical scope so parallel children cannot overwrite or
@@ -80,7 +92,7 @@ export interface RunBatchOutcome {
     result: SubtaskBatchResult;
     /** Whether policy rejected the entire batch before any child ran. */
     rejected: boolean;
-    rejectReason?: PolicyRejectReason;
+    rejectReason?: PolicyRejectReason | 'production_runtime_unavailable';
 }
 /**
  * Run a batch of subtasks. Returns a {@link SubtaskBatchResult} whose results
@@ -89,5 +101,5 @@ export interface RunBatchOutcome {
  * Never throws: policy rejection, child failures, timeouts and cancels are
  * all normalized into result entries.
  */
-export declare function runSubtaskBatch(request: SubtaskRequest, deps: SubagentSupervisorDeps): Promise<RunBatchOutcome>;
+export declare function runSubtaskBatch(request: SubtaskRequest, inputDeps: SubagentSupervisorDeps): Promise<RunBatchOutcome>;
 //# sourceMappingURL=supervisor.d.ts.map

package/dist/runtime/subagents/supervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/supervisor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC/D,OAAO,EAA6C,KAAK,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,YAAY,EAElB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,kBAAkB,EAEvB,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,cAAc,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,oBAAoB,CAAC;IAC7B,YAAY,EAAE,oBAAoB,CAAC;IACnC,yEAAyE;IACzE,YAAY,EAAE,iBAAiB,CAAC;IAChC,sEAAsE;IACtE,OAAO,EAAE,YAAY,CAAC;IACtB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC;IACrC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,CACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,SAAS,EAAE,YAAY,EACpC,KAAK,EAAE,OAAO,SAAS,EAAE,YAAY,EACrC,UAAU,CAAC,EAAE,MAAM,KAChB,IAAI,CAAC;IACV,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,WAAW,CAAC;IAChC,iDAAiD;IACjD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oDAAoD;IACpD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC/C;;;;;OAKG;IACH,cAAc,CAAC,EAAE,CACf,OAAO,EAAE,eAAe,EACxB,iBAAiB,CAAC,EAAE,WAAW,KAC5B,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChC,oFAAoF;IACpF,eAAe,CAAC,EAAE,CAChB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,4BAA4B,KACpC,IAAI,CAAC;CACX;AAED,uEAAuE;AACvE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,eAAe,CAAC;IACzB,GAAG,CAAC,EAAE,iBAAiB,CAAC;CACzB;AAeD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,qEAAqE;IACrE,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,kBAAkB,CAAC;CACnC;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAAC,eAAe,CAAC,CA4I1B"}
+{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/supervisor.ts"],"names":[],"mappings":"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"}

package/dist/runtime/subagents/supervisor.js

@@ -9,7 +9,7 @@
  * The supervisor does NOT own LLM state, tool execution, permission policy or
  * transcript storage. It composes the policy gate, the budget ledger, the
  * provider gate and the runner, and emits renderer-independent lifecycle
- * events that the root loop forwards to terminal/Ink/TUI.
+ * events that the root loop forwards to terminal/TUI.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runSubtaskBatch = runSubtaskBatch;
@@ -34,7 +34,32 @@ function nextTaskId() {
  * Never throws: policy rejection, child failures, timeouts and cancels are
  * all normalized into result entries.
  */
-async function runSubtaskBatch(request, deps) {
+async function runSubtaskBatch(request, inputDeps) {
+    let resolvedParentFork = inputDeps.parentFork;
+    try {
+        resolvedParentFork ?? (resolvedParentFork = inputDeps.parentForkSource?.current());
+    }
+    catch {
+        resolvedParentFork = undefined;
+    }
+    const deps = resolvedParentFork
+        ? { ...inputDeps, parentFork: resolvedParentFork }
+        : inputDeps;
+    const modernReady = Boolean(deps.executeChild && deps.parentFork && deps.parentAuthority);
+    const legacyReady = Boolean(deps.executeQuery && deps.toolSet);
+    if ((deps.executeChild && !modernReady) || (!modernReady && !legacyReady)) {
+        const batchId = nextBatchId();
+        const results = request.tasks.map(packet => {
+            const result = buildRejectedResult(packet, 'production_runtime_unavailable');
+            finalizeTask(deps, batchId, result.id, packet, result);
+            return result;
+        });
+        return {
+            result: { batchId, results, aggregateUsage: (0, types_1.sumSubtaskUsage)([]) },
+            rejected: true,
+            rejectReason: 'production_runtime_unavailable',
+        };
+    }
     // Validate the authoritative ResearchRequest before policy/budget/provider
     // work. An external request without the dedicated root capability must fail
     // closed instead of silently degrading to local-only research.
@@ -93,6 +118,7 @@ async function runSubtaskBatch(request, deps) {
     const batchId = nextBatchId();
     const tasks = request.tasks;
     const taskIds = tasks.map(() => nextTaskId());
+    const executionBudgets = [];
     // Reserve a fair share per task: the per-task cap, but no more than an even
     // slice of the turn budget. This lets a 3-task batch fit when the turn limit
     // is smaller than 3x the per-task cap, while the per-task cap still binds at
@@ -118,6 +144,10 @@ async function runSubtaskBatch(request, deps) {
                 rejectReason: 'budget_exhausted',
             };
         }
+        executionBudgets[i] = {
+            maxModelRequests: reserved.modelRequests,
+            maxToolCalls: deps.config.maxToolCallsPerTask,
+        };
         emit(deps, {
             batchId,
             taskId: taskIds[i],
@@ -126,22 +156,26 @@ async function runSubtaskBatch(request, deps) {
             objective: tasks[i].objective,
         });
     }
-    const runnerDeps = (i) => ({
-        cwd: deps.cwd,
-        canonicalScopePaths: verdict.canonicalScope.get(i),
-        toolSet: deps.toolSet,
-        executeQuery: deps.executeQuery,
-        timeoutMs: deps.config.timeoutMs,
-        parentAbortSignal: deps.parentAbortSignal,
-        rootObjectiveSummary: deps.rootObjectiveSummary,
-        modelLabel: deps.modelLabel,
-    });
+    const runnerDeps = (i) => deps.executeQuery && deps.toolSet
+        ? {
+            cwd: deps.cwd,
+            canonicalScopePaths: verdict.canonicalScope.get(i),
+            toolSet: deps.toolSet,
+            executeQuery: deps.executeQuery,
+            executionBudget: executionBudgets[i],
+            timeoutMs: deps.config.timeoutMs,
+            parentAbortSignal: deps.parentAbortSignal,
+            rootObjectiveSummary: deps.rootObjectiveSummary,
+            modelLabel: deps.modelLabel,
+        }
+        : undefined;
     let outcomes;
+    const canonicalScopes = (i) => verdict.canonicalScope.get(i);
     if (request.execution === 'parallel') {
-        outcomes = await runParallel(tasks, taskIds, batchId, deps, runnerDeps);
+        outcomes = await runParallel(tasks, taskIds, batchId, deps, runnerDeps, canonicalScopes, executionBudgets);
     }
     else {
-        outcomes = await runSerial(tasks, taskIds, batchId, deps, runnerDeps);
+        outcomes = await runSerial(tasks, taskIds, batchId, deps, runnerDeps, canonicalScopes, executionBudgets);
     }
     // Reconcile budget for each task with its real usage.
     for (const outcome of outcomes) {
@@ -154,12 +188,12 @@ async function runSubtaskBatch(request, deps) {
         rejected: false,
     };
 }
-async function runParallel(tasks, taskIds, batchId, deps, runnerDeps) {
+async function runParallel(tasks, taskIds, batchId, deps, runnerDeps, canonicalScopes, executionBudgets) {
     // Launch each child; the provider gate bounds actual concurrency. Collect
     // by index so the final order matches the request order.
     // allSettled guarantees every task is accounted for even if a future
     // refactor breaks the "runOne never throws" contract.
-    const slots = tasks.map((task, i) => runOne(task, taskIds[i], batchId, i, deps, runnerDeps(i)));
+    const slots = tasks.map((task, i) => runOne(task, taskIds[i], batchId, i, deps, runnerDeps(i), canonicalScopes(i), executionBudgets[i]));
     const settled = await Promise.allSettled(slots);
     return settled.map((s, i) => {
         if (s.status === 'fulfilled')
@@ -189,7 +223,7 @@ async function runParallel(tasks, taskIds, batchId, deps, runnerDeps) {
         return { result, parentCancelled: false };
     });
 }
-async function runSerial(tasks, taskIds, batchId, deps, runnerDeps) {
+async function runSerial(tasks, taskIds, batchId, deps, runnerDeps, canonicalScopes, executionBudgets) {
     const outcomes = [];
     for (let i = 0; i < tasks.length; i++) {
         if (deps.parentAbortSignal?.aborted) {
@@ -206,25 +240,24 @@ async function runSerial(tasks, taskIds, batchId, deps, runnerDeps) {
             }
             break;
         }
-        const outcome = await runOne(tasks[i], taskIds[i], batchId, i, deps, runnerDeps(i));
+        const outcome = await runOne(tasks[i], taskIds[i], batchId, i, deps, runnerDeps(i), canonicalScopes(i), executionBudgets[i]);
         outcomes.push(outcome);
     }
     return outcomes;
 }
-async function runOne(task, taskId, batchId, _index, deps, runnerDeps) {
+async function runOne(task, taskId, batchId, _index, deps, runnerDeps, canonicalScopePaths, executionBudget) {
     // R4: pass the parent abort signal so a queued waiter is removed and
     // rejected when the user hits Ctrl+C, instead of hanging until a slot
     // frees. A rejected acquire yields a cancelled result, not a hung batch.
-    try {
-        await deps.providerGate.acquire(deps.parentAbortSignal);
-    }
-    catch {
-        // AcquireAbortedError: parent aborted while queued. Treat as cancelled.
-        // R7: finalize the cancelled result so trace/artifact/usage are recorded
-        // exactly once, same as any other terminal state.
-        const cancelled = cancelledResult(taskId, task);
-        finalizeTask(deps, batchId, taskId, task, cancelled);
-        return { result: cancelled, parentCancelled: true };
+    if (!deps.executeChild) {
+        try {
+            await deps.providerGate.acquire(deps.parentAbortSignal);
+        }
+        catch {
+            const cancelled = cancelledResult(taskId, task);
+            finalizeTask(deps, batchId, taskId, task, cancelled);
+            return { result: cancelled, parentCancelled: true };
+        }
     }
     try {
         const execute = async () => {
@@ -233,7 +266,23 @@ async function runOne(task, taskId, batchId, _index, deps, runnerDeps) {
             const webPromise = request && (request.mode === 'web' || request.mode === 'mixed')
                 ? deps.runWebResearch(request, deps.parentAbortSignal)
                 : undefined;
-            const outcome = await (0, runner_1.runSubtask)(task, runnerDeps, taskId);
+            const outcome = deps.executeChild
+                ? await deps.executeChild.execute({
+                    taskId,
+                    packet: task,
+                    canonicalScopePaths,
+                    parent: deps.parentFork,
+                    parentAuthority: deps.parentAuthority,
+                    budget: {
+                        maxModelRequests: executionBudget.maxModelRequests,
+                        maxToolCalls: executionBudget.maxToolCalls,
+                    },
+                    timeoutMs: deps.config.timeoutMs,
+                    abortSignal: deps.parentAbortSignal,
+                    rootObjectiveSummary: deps.rootObjectiveSummary,
+                    modelLabel: deps.modelLabel,
+                })
+                : await (0, runner_1.runSubtask)(task, requiredLegacyRunnerDeps(runnerDeps), taskId);
             let web;
             if (webPromise) {
                 try {
@@ -243,24 +292,24 @@ async function runOne(task, taskId, batchId, _index, deps, runnerDeps) {
                     web = failedWebResearchResult(error, Boolean(deps.parentAbortSignal?.aborted));
                 }
             }
-            // R7: single finalize path - terminal event + result callback + usage
-            // callback all happen here, exactly once, with errors isolated so a
-            // throwing sink cannot reject the batch or corrupt sibling aggregation.
             finalizeTask(deps, batchId, taskId, task, outcome.result, request ? { request, ...(web ? { web } : {}) } : undefined);
             return outcome;
         };
-        // R3: bind the full child async chain to its canonical packet scope.
-        // AsyncLocalStorage automatically restores the parent context when this
-        // run finishes, so no child can clear a sibling or root boundary.
-        if (deps.scopeHolder) {
-            return await deps.scopeHolder.runWithScope(runnerDeps.canonicalScopePaths ?? [], execute);
+        if (!deps.executeChild && deps.scopeHolder) {
+            return await deps.scopeHolder.runWithScope(canonicalScopePaths ?? [], execute);
         }
         return await execute();
     }
     finally {
-        deps.providerGate.release();
+        if (!deps.executeChild)
+            deps.providerGate.release();
     }
 }
+function requiredLegacyRunnerDeps(deps) {
+    if (!deps)
+        throw new Error('Legacy child runner dependencies are unavailable.');
+    return deps;
+}
 /**
  * R7: finalize exactly once per task. Emits the terminal lifecycle event,
  * persists the result (artifact), and reports observed usage to the root