@orion-agents/orion-code 0.1.0 → 0.1.2

package/dist/runtime/subagents/presets.js

@@ -20,12 +20,10 @@ exports.READ_ONLY_INVESTIGATION_TOOLS = [
     'glob',
     'grep',
     'batch_read',
-    // NOTE: mcp_call and mcp_list are intentionally EXCLUDED from the child
-    // allowlist. mcp_call is a generic escape hatch that can invoke any MCP
-    // action (including mutating ones) without going through the root's
-    // permission flow. mcp_list leaks server topology. Instead, first-class
-    // MCP tools (mcp__<server>__<tool>) with readOnlyHint === true are
-    // dynamically included by filterToolsForRole at runtime.
+    // MCP tools are intentionally excluded. `readOnlyHint` says whether a tool
+    // mutates remote state, but does not certify that its arguments are pathless
+    // or constrained to the packet scope. Dynamic MCP exposure can return only
+    // after the runtime has explicit path-scope capability metadata.
 ];
 /**
  * Tools a child must NEVER receive. Kept as an explicit deny-set so the
@@ -41,8 +39,8 @@ exports.SUBAGENT_FORBIDDEN_TOOLS = [
     'memory_forget',
     'orion-code',
     'subtask',
-    // Generic MCP escape hatches — children must use first-class MCP tools
-    // (mcp__<server>__<tool>) with readOnlyHint === true instead.
+    // Generic MCP escape hatches. First-class mcp__ tools are also rejected by
+    // filterToolsForRole/assertNoForbiddenTools until path-scope metadata exists.
     'mcp_call',
     'mcp_list',
     // Cross-session information leak: history_search reads transcripts from
@@ -73,7 +71,7 @@ exports.ROLE_PRESETS = {
         tools: exports.READ_ONLY_INVESTIGATION_TOOLS,
         systemPrompt: `You are a read-only research subagent for Orion Code. Your job is to gather repository facts, official documentation, or API behavior and return a structured conclusion.
 
-You may only read files, list/glob/grep, batch read-only steps, and use configured read-only MCP tools (e.g. web search/fetch). You may inspect git state only through read-only means available to you.
+You may only read files, list/glob/grep, and batch repository read-only steps exposed by the runtime. You may inspect git state only through read-only means available to you.
 
 Focus narrowly on the objective you were given. Do not attempt edits or commands.${JSON_OUTPUT_CONTRACT}`,
     },
@@ -82,14 +80,14 @@ Focus narrowly on the objective you were given. Do not attempt edits or commands
         tools: exports.READ_ONLY_INVESTIGATION_TOOLS,
         systemPrompt: `You are a read-only code review subagent for Orion Code. Your job is to review a diff, changeset, or code area for risks, regressions, and test gaps, and return a structured conclusion.
 
-You may read files, list/glob/grep, batch read-only steps, and use read-only MCP tools. You may NOT fix code, change review scope, execute shell, or commit.${JSON_OUTPUT_CONTRACT}`,
+You may read files, list/glob/grep, and batch repository read-only steps. You may NOT fix code, change review scope, execute shell, use MCP tools, or commit.${JSON_OUTPUT_CONTRACT}`,
     },
     'test-investigate': {
         role: 'test-investigate',
         tools: exports.READ_ONLY_INVESTIGATION_TOOLS,
         systemPrompt: `You are a read-only test investigation subagent for Orion Code. You analyze failing test logs, test code, and configuration to identify likely root causes, and return a structured conclusion.
 
-You may read files, list/glob/grep, batch read-only steps, and use read-only MCP tools. You may NOT execute tests, install dependencies, update snapshots, write fixtures, or publish. If a command would help diagnose the failure, suggest it in "commands" for the root Agent to run.${JSON_OUTPUT_CONTRACT}`,
+You may read files, list/glob/grep, and batch repository read-only steps. You may NOT execute tests, use MCP tools, install dependencies, update snapshots, write fixtures, or publish. If a command would help diagnose the failure, suggest it in "commands" for the root Agent to run.${JSON_OUTPUT_CONTRACT}`,
     },
 };
 /** Resolve the tool allowlist for a role. Falls back to the read-only set. */
@@ -102,37 +100,24 @@ function systemPromptForRole(role) {
 }
 /**
  * Filter an upstream tool list to a role's allowlist, removing any forbidden
- * tool and the recursive `subtask` capability. Also includes first-class MCP
- * tools (mcp__<server>__<tool>) that declare `readOnlyHint === true` via
- * their `isReadOnly()` method — these are safe for children because they
- * cannot invoke arbitrary MCP actions.
+ * tool, every dynamic first-class MCP tool, and the recursive `subtask`
+ * capability. `readOnlyHint` is not a path-containment capability, so it must
+ * not make an MCP tool child-visible.
  *
  * Returns the names the child may receive; the caller is responsible for
  * resolving them to tool definitions.
  */
-function filterToolsForRole(availableToolNames, role, runtimeTools) {
+function filterToolsForRole(availableToolNames, role, _runtimeTools) {
     const allowed = new Set(toolsForRole(role));
     const denied = new Set(exports.SUBAGENT_FORBIDDEN_TOOLS);
-    // Build a map of tool name → tool definition for annotation checks.
-    const toolMap = new Map();
-    if (runtimeTools) {
-        for (const t of runtimeTools) {
-            toolMap.set(t.name, t);
-        }
-    }
     return availableToolNames.filter(name => {
         // Explicitly denied tools are never allowed.
         if (denied.has(name))
             return false;
-        // First-class MCP tools (mcp__<server>__<tool>) are allowed only if
-        // they declare isReadOnly() === true. Unknown or missing annotation
-        // means denied — conservative default.
-        if (name.startsWith('mcp__')) {
-            const tool = toolMap.get(name);
-            if (!tool)
-                return false;
-            return tool.isReadOnly?.({}) === true;
-        }
+        // First-class MCP tools remain unavailable even with readOnlyHint=true:
+        // read-only does not prove project-root or packet-scope containment.
+        if (name.startsWith('mcp__'))
+            return false;
         // Static allowlist covers non-MCP tools.
         return allowed.has(name);
     });
@@ -140,7 +125,7 @@ function filterToolsForRole(availableToolNames, role, runtimeTools) {
 /** Assert a filtered tool list contains no forbidden tool. Used by the runner. */
 function assertNoForbiddenTools(toolNames) {
     const denied = new Set(exports.SUBAGENT_FORBIDDEN_TOOLS);
-    const found = toolNames.filter(name => denied.has(name));
+    const found = toolNames.filter(name => denied.has(name) || name.startsWith('mcp__'));
     if (found.length > 0) {
         throw new Error(`Subagent tool list contains forbidden tools: ${found.join(', ')}`);
     }

package/dist/runtime/subagents/presets.js.map

@@ -1 +1 @@
-{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../src/runtime/subagents/presets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../src/runtime/subagents/presets.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AA+FH,oCAEC;AAGD,kDAEC;AAWD,gDAmBC;AAGD,wDAMC;AAxID,sEAAsE;AACzD,QAAA,6BAA6B,GAAG;IAC3C,WAAW;IACX,YAAY;IACZ,MAAM;IACN,MAAM;IACN,YAAY;IACZ,2EAA2E;IAC3E,6EAA6E;IAC7E,2EAA2E;IAC3E,iEAAiE;CACzD,CAAC;AAEX;;;;GAIG;AACU,QAAA,wBAAwB,GAAG;IACtC,cAAc;IACd,WAAW;IACX,YAAY;IACZ,aAAa;IACb,eAAe;IACf,eAAe;IACf,YAAY;IACZ,SAAS;IACT,2EAA2E;IAC3E,8EAA8E;IAC9E,UAAU;IACV,UAAU;IACV,wEAAwE;IACxE,4DAA4D;IAC5D,gBAAgB;CACR,CAAC;AAUX,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;;;6DAiBgC,CAAC;AAEjD,QAAA,YAAY,GAAqC;IAC5D,QAAQ,EAAE;QACR,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,qCAA6B;QACpC,YAAY,EAAE;;;;mFAIiE,oBAAoB,EAAE;KACtG;IACD,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,qCAA6B;QACpC,YAAY,EAAE;;+JAE6I,oBAAoB,EAAE;KAClL;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,kBAAkB;QACxB,KAAK,EAAE,qCAA6B;QACpC,YAAY,EAAE;;2RAEyQ,oBAAoB,EAAE;KAC9S;CACF,CAAC;AAEF,8EAA8E;AAC9E,SAAgB,YAAY,CAAC,IAAkB;IAC7C,OAAO,oBAAY,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,qCAA6B,CAAC;AACpE,CAAC;AAED,4CAA4C;AAC5C,SAAgB,mBAAmB,CAAC,IAAkB;IACpD,OAAO,oBAAY,CAAC,IAAI,CAAC,EAAE,YAAY,IAAI,oBAAY,CAAC,QAAQ,CAAC,YAAY,CAAC;AAChF,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,kBAAkB,CAChC,kBAAqC,EACrC,IAAkB,EAClB,aAAwC;IAExC,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,gCAAwB,CAAC,CAAC;IAEzD,OAAO,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACtC,6CAA6C;QAC7C,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAC;QAEnC,wEAAwE;QACxE,qEAAqE;QACrE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YAAE,OAAO,KAAK,CAAC;QAE3C,yCAAyC;QACzC,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kFAAkF;AAClF,SAAgB,sBAAsB,CAAC,SAA4B;IACjE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,gCAAwB,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACrF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,gDAAgD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;AACH,CAAC"}

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

@@ -11,7 +11,7 @@
  * without a live provider; production wires them to `new LLMService(...)` and
  * `query()`.
  */
-import { LLMService, type LLMConfig } from '../../services/llm';
+import { LLMService, type LLMConfig, type ProviderRequestPreflight } from '../../services/llm';
 import type { ProviderResilienceCoordinator } from '../../services/provider-resilience';
 import { type QueryEvent, type QueryParams } from '../../framework/query';
 import type { ExecuteChildQuery } from './runner';
@@ -29,6 +29,8 @@ export interface SubagentLlmFactoryDeps {
     providerGate: SubagentProviderGate;
     /** Per-child turn cap. */
     maxTurnsPerTask: number;
+    /** Shared Goal token-budget preflight applied to every child provider attempt. */
+    beforeProviderRequest?: ProviderRequestPreflight;
 }
 /**
  * Create a per-child LLMService. Children share the provider account but not

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

@@ -1 +1 @@
-{"version":3,"file":"production.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/production.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAgB,MAAM,oBAAoB,CAAC;AAC9E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAExF,OAAO,EAAS,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAGlD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,WAAW,sBAAsB;IACrC,yDAAyD;IACzD,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,CAAC;IAC9E,4EAA4E;IAC5E,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,UAAU,CAAC;IAC9C,+EAA+E;IAC/E,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,mDAAmD;IACnD,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,aAAa,CAAC,UAAU,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,YAAY,EAAE,oBAAoB,CAAC;IACnC,0BAA0B;IAC1B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,GAC5E,SAAS,CAQX;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,sBAAsB,GAAG,iBAAiB,CA6E5F"}
+{"version":3,"file":"production.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/production.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EACL,UAAU,EACV,KAAK,SAAS,EAEd,KAAK,wBAAwB,EAC9B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAExF,OAAO,EAAS,KAAK,UAAU,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAGlD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,MAAM,WAAW,sBAAsB;IACrC,yDAAyD;IACzD,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,CAAC;IAC9E,4EAA4E;IAC5E,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,UAAU,CAAC;IAC9C,+EAA+E;IAC/E,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,mDAAmD;IACnD,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,aAAa,CAAC,UAAU,CAAC,CAAC;IAC9D,6EAA6E;IAC7E,YAAY,EAAE,oBAAoB,CAAC;IACnC,0BAA0B;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,kFAAkF;IAClF,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;CAClD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,GAC5E,SAAS,CAQX;AAED;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,sBAAsB,GAAG,iBAAiB,CA0H5F"}

package/dist/runtime/subagents/production.js

@@ -41,7 +41,8 @@ function createChildLlmConfig(rootConfig) {
  */
 function createProductionExecuteQuery(deps) {
     const createLlm = deps.createLlm ?? ((config) => new llm_1.LLMService(config));
-    const runQuery = deps.runQuery ?? ((params) => (0, query_1.query)(params));
+    const runQuery = deps.runQuery ??
+        ((params) => (0, query_1.query)(params));
     return async (messages, toolSet, abortSignal) => {
         const llm = createLlm(createChildLlmConfig(deps.rootConfig));
         // v0.2.26: inject the shared resilience coordinator so child requests
@@ -49,12 +50,22 @@ function createProductionExecuteQuery(deps) {
         if (deps.resilience) {
             llm.resilience = deps.resilience;
         }
+        let providerAttempts = 0;
+        const providerPreflight = async (context) => {
+            providerAttempts += 1;
+            return deps.beforeProviderRequest ? deps.beforeProviderRequest(context) : { available: true };
+        };
+        const restoreProviderPreflight = typeof llm.setProviderRequestPreflight === 'function'
+            ? llm.setProviderRequestPreflight(providerPreflight)
+            : undefined;
         let finalContent = '';
         const usage = { ...types_1.EMPTY_SUBTASK_USAGE };
+        const startedAt = Date.now();
         let modelRequests = 0;
         let observedModelRequests = 0;
         let providerCostComplete = true;
         let providerCostUsd = 0;
+        let completionUsageComplete = false;
         const unsubscribeUsage = typeof llm.subscribeUsage === 'function'
             ? llm.subscribeUsage(event => {
                 observedModelRequests++;
@@ -66,6 +77,13 @@ function createProductionExecuteQuery(deps) {
                     providerCostUsd += event.usage.costUsd;
             })
             : undefined;
+        const finalizeUsage = (usageComplete) => {
+            usage.modelRequests = Math.max(usage.modelRequests, modelRequests, observedModelRequests);
+            usage.durationMs = Math.max(0, Date.now() - startedAt);
+            usage.usageComplete = usageComplete;
+            if (observedModelRequests > 0 && providerCostComplete)
+                usage.costUsd = providerCostUsd;
+        };
         try {
             const params = {
                 messages: messages,
@@ -90,11 +108,23 @@ function createProductionExecuteQuery(deps) {
                         usage.promptTokens = loopUsage.promptTokens;
                         usage.completionTokens = loopUsage.completionTokens;
                     }
+                    const expectedSuccessfulRequests = Math.max(event.stats?.llmRequests ?? 0, loopUsage.modelRequests);
+                    const hasAggregateUsage = Boolean(event.usage &&
+                        Number.isFinite(event.usage.promptTokens) &&
+                        Number.isFinite(event.usage.completionTokens));
+                    const successfulUsageCovered = observedModelRequests >= expectedSuccessfulRequests || hasAggregateUsage;
+                    const unknownFailedAttempts = (event.stats?.providerRetryCount ?? 0) > 0 ||
+                        (event.stats?.providerFallbackCount ?? 0) > 0 ||
+                        (Boolean(unsubscribeUsage) && providerAttempts > observedModelRequests);
+                    completionUsageComplete = successfulUsageCovered && !unknownFailedAttempts;
                 }
                 else if (event.type === 'assistant_tool_calls') {
                     modelRequests += 1;
                     finalContent = event.content;
                 }
+                else if (event.type === 'tool_result') {
+                    usage.toolCalls += 1;
+                }
             }
         }
         catch (err) {
@@ -103,16 +133,16 @@ function createProductionExecuteQuery(deps) {
                 const retryAfter = extractRetryAfterMs(err);
                 deps.providerGate.enterCooldown(retryAfter);
             }
-            // Re-throw so the runner normalizes into failed/cancelled. The runner
-            // never lets this propagate to the root loop.
-            throw err;
+            // Preserve already-observed usage as a lower bound. The runner
+            // normalizes this into failed/cancelled without losing provider cost.
+            finalizeUsage(false);
+            throw new types_1.SubtaskExecutionError(err instanceof Error ? err.message : String(err), usage);
         }
         finally {
             unsubscribeUsage?.();
+            restoreProviderPreflight?.();
         }
-        usage.modelRequests = Math.max(usage.modelRequests, modelRequests, observedModelRequests);
-        if (observedModelRequests > 0 && providerCostComplete)
-            usage.costUsd = providerCostUsd;
+        finalizeUsage(completionUsageComplete);
         return { content: finalContent, usage };
     };
 }

package/dist/runtime/subagents/production.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EAEb,YAAY,EACb,MAAM,SAAS,CAAC;AA4BjB,0DAA0D;AAC1D,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,6BAA6B;IAC7B,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC3G;AAED,iFAAiF;AACjF,MAAM,MAAM,iBAAiB,GAAG,CAC9B,QAAQ,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC/C,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,iDAAiD;IACjD,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,uCAAuC;IACvC,OAAO,EAAE,YAAY,CAAC;IACtB,0EAA0E;IAC1E,YAAY,EAAE,iBAAiB,CAAC;IAChC,oCAAoC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,WAAW,CAAC;IAChC,0EAA0E;IAC1E,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,aAAa,CAAC;IACtB,wEAAwE;IACxE,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA6H5B"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAuB,YAAY,EAAE,MAAM,SAAS,CAAC;AA4B/F,0DAA0D;AAC1D,MAAM,WAAW,YAAY;IAC3B,oDAAoD;IACpD,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,6BAA6B;IAC7B,YAAY,EAAE,CACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,CAAC,EAAE,WAAW,KACtB,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB;AAED,iFAAiF;AACjF,MAAM,MAAM,iBAAiB,GAAG,CAC9B,QAAQ,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC/C,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,WAAW,KACrB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,iDAAiD;IACjD,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,uCAAuC;IACvC,OAAO,EAAE,YAAY,CAAC;IACtB,0EAA0E;IAC1E,YAAY,EAAE,iBAAiB,CAAC;IAChC,oCAAoC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,WAAW,CAAC;IAChC,0EAA0E;IAC1E,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,aAAa,CAAC;IACtB,wEAAwE;IACxE,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAqJ5B"}

package/dist/runtime/subagents/runner.js

@@ -93,16 +93,24 @@ async function runSubtask(packet, deps, taskId) {
             deps.parentAbortSignal.addEventListener('abort', handler, { once: true });
         }
     });
+    let settledQueryOutcome;
     const queryPromise = deps
         .executeQuery(messages, deps.toolSet, childController.signal)
         .then(content => ({ kind: 'done', content }))
         .catch(err => ({
         kind: 'error',
         message: err instanceof Error ? err.message : String(err),
-    }));
+        usage: err instanceof types_1.SubtaskExecutionError
+            ? err.usage
+            : { ...types_1.EMPTY_SUBTASK_USAGE, usageComplete: false },
+    }))
+        .then(outcome => {
+        settledQueryOutcome = outcome;
+        return outcome;
+    });
     let status;
     let content = '';
-    let usage = types_1.EMPTY_SUBTASK_USAGE;
+    let usage = { ...types_1.EMPTY_SUBTASK_USAGE, usageComplete: false };
     let parentCancelled = false;
     try {
         const outcome = await Promise.race([parentAbortPromise, queryPromise, timeoutPromise]);
@@ -115,6 +123,7 @@ async function runSubtask(packet, deps, taskId) {
             status = 'timed_out';
         }
         else if (outcome.kind === 'error') {
+            usage = outcome.usage;
             // If the parent aborted, treat as cancel; otherwise a failure.
             if (parentAborted && !timedOut) {
                 status = 'cancelled';
@@ -135,7 +144,10 @@ async function runSubtask(packet, deps, taskId) {
             else {
                 status = 'completed';
                 content = outcome.content.content;
-                usage = outcome.content.usage;
+                usage = {
+                    ...outcome.content.usage,
+                    usageComplete: outcome.content.usage.usageComplete === true,
+                };
             }
         }
     }
@@ -159,6 +171,15 @@ async function runSubtask(packet, deps, taskId) {
     // stuck child cannot hang the whole turn forever.
     if (status === 'timed_out' || status === 'cancelled') {
         await settleWithGrace(queryPromise, CHILD_SHUTDOWN_GRACE_MS);
+        if (settledQueryOutcome?.kind === 'done') {
+            usage = {
+                ...settledQueryOutcome.content.usage,
+                usageComplete: settledQueryOutcome.content.usage.usageComplete === true,
+            };
+        }
+        else if (settledQueryOutcome?.kind === 'error') {
+            usage = settledQueryOutcome.usage;
+        }
     }
     const result = (0, result_parser_1.parseSubtaskResult)({
         id: taskId,

package/dist/runtime/subagents/runner.js.map

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

package/dist/runtime/subagents/runtime-integration.d.ts

@@ -13,6 +13,7 @@ import { runSubtaskBatch } from './supervisor';
 import type { RuntimeSubtaskEvent, SubagentConfig, SubtaskUsage } from './types';
 import type { LLMConfig } from '../../services/llm';
 import type { ProviderResilienceCoordinator } from '../../services/provider-resilience';
+import type { ProviderRequestPreflight } from '../../services/llm';
 import type { OpenHorseCLIConfig } from '../../services/config';
 export interface SubagentTurnInputs {
     /** Resolved subagent config (from runtime.config.subagents). */
@@ -46,6 +47,8 @@ export interface SubagentTurnInputs {
     onChildUsage?: (taskId: string, role: import('./types').SubagentRole, usage: import('./types').SubtaskUsage, modelLabel?: string) => void;
     /** v0.2.26: shared resilience coordinator for child LLM requests. */
     resilience?: ProviderResilienceCoordinator;
+    /** Shared Goal token-budget preflight for every child provider attempt. */
+    beforeProviderRequest?: ProviderRequestPreflight;
 }
 /**
  * Build the `subtask` tool for a root turn, or null if disabled.

package/dist/runtime/subagents/runtime-integration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-integration.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/runtime-integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,sBAAsB,CAAC;AAIvE,OAAO,EAAE,eAAe,EAA+B,MAAM,cAAc,CAAC;AAI5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAiBhE,MAAM,WAAW,kBAAkB;IACjC,gEAAgE;IAChE,MAAM,EAAE,cAAc,CAAC;IACvB,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,iFAAiF;IACjF,aAAa,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,CAAC;IACjF,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oDAAoD;IACpD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,yDAAyD;IACzD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oDAAoD;IACpD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACtD,0FAA0F;IAC1F,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACrF;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC;IACrC;;;;OAIG;IACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1I,qEAAqE;IACrE,UAAU,CAAC,EAAE,6BAA6B,CAAC;CAC5C;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,GAAG,IAAI,CA6FjG;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,aAAa,GAAG,IAAI,CAG1F;AAED,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,aAAa,CAAC;IACpB,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,YAAY,CAAC;IACtC,wDAAwD;IACxD,eAAe,EAAE,MAAM,MAAM,CAAC;CAC/B;AAED,gEAAgE;AAChE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,CAOjI;AAED,0EAA0E;AAC1E,OAAO,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"runtime-integration.d.ts","sourceRoot":"","sources":["../../../src/runtime/subagents/runtime-integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,sBAAsB,CAAC;AAIvE,OAAO,EAAE,eAAe,EAA+B,MAAM,cAAc,CAAC;AAI5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAiBhE,MAAM,WAAW,kBAAkB;IACjC,gEAAgE;IAChE,MAAM,EAAE,cAAc,CAAC;IACvB,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,iFAAiF;IACjF,aAAa,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,CAAC;IACjF,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oDAAoD;IACpD,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,yDAAyD;IACzD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oDAAoD;IACpD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACtD,0FAA0F;IAC1F,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACrF;;;;;OAKG;IACH,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC;IACrC;;;;OAIG;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,qEAAqE;IACrE,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,2EAA2E;IAC3E,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;CAClD;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,GAAG,IAAI,CA8GjG;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,aAAa,GAAG,IAAI,CAG1F;AAED,8EAA8E;AAC9E,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,aAAa,CAAC;IACpB,yEAAyE;IACzE,iBAAiB,EAAE,MAAM,YAAY,CAAC;IACtC,wDAAwD;IACxD,eAAe,EAAE,MAAM,MAAM,CAAC;CAC/B;AAED,gEAAgE;AAChE,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,kBAAkB,GACzB,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC,CAOnE;AAED,0EAA0E;AAC1E,OAAO,EAAE,eAAe,EAAE,CAAC"}

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

@@ -65,21 +65,31 @@ function createSubagentBundleForTurn(inputs) {
     const childToolByName = new Map();
     for (const t of childTools)
         childToolByName.set(t.name, t);
-    // R3: scope holder lets the supervisor set the current packet's scope
-    // before each child runs, so the turn-level guard enforces per-packet
-    // containment without rebuilding the executor.
+    // 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.` });
+            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.` });
+            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 };
+        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, {
@@ -88,7 +98,7 @@ function createSubagentBundleForTurn(inputs) {
     });
     const providerGate = new provider_gate_1.SubagentProviderGate({
         maxConcurrent: config.maxParallel,
-        sharedGate: inputs.resilience ? inputs.sharedGate ?? undefined : undefined,
+        sharedGate: inputs.resilience ? (inputs.sharedGate ?? undefined) : undefined,
     });
     const budget = new budget_1.SubagentBudgetLedger((0, budget_1.budgetLimitsFromConfig)({
         maxModelRequestsPerTurn: config.maxModelRequestsPerTurn,
@@ -104,6 +114,7 @@ function createSubagentBundleForTurn(inputs) {
         providerGate,
         maxTurnsPerTask: config.maxTurnsPerTask,
         resilience: inputs.resilience,
+        beforeProviderRequest: inputs.beforeProviderRequest,
     });
     const supervisorDeps = {
         config,

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

@@ -26,10 +26,10 @@ export interface SubagentSupervisorDeps {
     /** Filtered, child-safe tool set (already passed through presets). */
     toolSet: ChildToolSet;
     /**
-     * R3: mutable scope holder. The supervisor sets the current packet's
-     * canonical scope before running it, so the turn-level executor guard can
-     * enforce per-packet containment. Optional: when absent, only root
-     * containment is enforced.
+     * R3: async-context scope holder. The supervisor binds each child run to
+     * its packet's canonical scope so parallel children cannot overwrite or
+     * clear one another's containment boundary. Optional: when absent, only
+     * root containment is enforced.
      */
     scopeHolder?: ScopeHolder;
     /**

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,EAAc,KAAK,iBAAiB,EAAE,KAAK,YAAY,EAA2B,MAAM,UAAU,CAAC;AAC1G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,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,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,SAAS,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1I,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,oFAAoF;IACpF,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpE;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,CAyG1B"}
+{"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;AAC1D,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,oFAAoF;IACpF,eAAe,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpE;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,CA+G1B"}

package/dist/runtime/subagents/supervisor.js

@@ -96,7 +96,10 @@ async function runSubtaskBatch(request, deps) {
             };
         }
         emit(deps, {
-            batchId, taskId: taskIds[i], role: tasks[i].role, state: 'queued',
+            batchId,
+            taskId: taskIds[i],
+            role: tasks[i].role,
+            state: 'queued',
             objective: tasks[i].objective,
         });
     }
@@ -150,7 +153,14 @@ async function runParallel(tasks, taskIds, batchId, deps, runnerDeps) {
             commands: [],
             verification: [],
             risks: ['runner threw unexpectedly'],
-            usage: { modelRequests: 0, toolCalls: 0, promptTokens: 0, completionTokens: 0, durationMs: 0 },
+            usage: {
+                modelRequests: 0,
+                toolCalls: 0,
+                promptTokens: 0,
+                completionTokens: 0,
+                durationMs: 0,
+                usageComplete: false,
+            },
         };
         finalizeTask(deps, batchId, taskIds[i], task, result);
         return { result, parentCancelled: false };
@@ -194,22 +204,25 @@ async function runOne(task, taskId, batchId, _index, deps, runnerDeps) {
         return { result: cancelled, parentCancelled: true };
     }
     try {
-        // R3: set the current packet's canonical scope so the executor guard
-        // enforces per-packet containment. Cleared in finally.
+        const execute = async () => {
+            emit(deps, { batchId, taskId, role: task.role, state: 'running', objective: task.objective });
+            const outcome = await (0, runner_1.runSubtask)(task, runnerDeps, taskId);
+            // 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);
+            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) {
-            deps.scopeHolder.setScope(runnerDeps.canonicalScopePaths ?? []);
+            return await deps.scopeHolder.runWithScope(runnerDeps.canonicalScopePaths ?? [], execute);
         }
-        emit(deps, { batchId, taskId, role: task.role, state: 'running', objective: task.objective });
-        const outcome = await (0, runner_1.runSubtask)(task, runnerDeps, taskId);
-        // 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);
-        return outcome;
+        return await execute();
     }
     finally {
         deps.providerGate.release();
-        deps.scopeHolder?.clear();
     }
 }
 /**
@@ -223,7 +236,9 @@ function finalizeTask(deps, batchId, taskId, task, result) {
     // Terminal lifecycle event - isolated.
     try {
         emit(deps, {
-            batchId, taskId, role: task.role,
+            batchId,
+            taskId,
+            role: task.role,
             state: toEventState(result.status),
             objective: task.objective,
             summary: result.summary,
@@ -251,11 +266,16 @@ function finalizeTask(deps, batchId, taskId, task, result) {
 }
 function toEventState(status) {
     switch (status) {
-        case 'completed': return 'completed';
-        case 'failed': return 'failed';
-        case 'cancelled': return 'cancelled';
-        case 'timed_out': return 'timed_out';
-        case 'rejected': return 'rejected';
+        case 'completed':
+            return 'completed';
+        case 'failed':
+            return 'failed';
+        case 'cancelled':
+            return 'cancelled';
+        case 'timed_out':
+            return 'timed_out';
+        case 'rejected':
+            return 'rejected';
     }
 }
 /** Build a rejected result (does not emit - finalizeTask handles that). */