openhorse 0.2.19 → 0.2.22

package/dist/runtime/subagents/runner.js

@@ -0,0 +1,172 @@
+"use strict";
+/**
+ * SubagentRunner: runs a single child agent to completion and parses its result.
+ *
+ * The runner is the boundary between the Supervisor and the shared `query()`
+ * loop. It is deliberately thin: it derives a child abort signal from the
+ * parent, applies a per-child timeout, invokes an injectable `executeQuery`,
+ * and normalizes the outcome through {@link parseSubtaskResult}.
+ *
+ * `executeQuery` is injected so the runner can be tested without a live LLM;
+ * the production binding wraps `query()` with a per-child LLMService.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runSubtask = runSubtask;
+const context_builder_1 = require("./context-builder");
+const result_parser_1 = require("./result-parser");
+const types_1 = require("./types");
+/**
+ * R5: bounded grace period to let a child query settle after it was aborted
+ * (timeout or parent cancel). The abort signal has fired; a cooperative
+ * executor stops promptly. An uncooperative executor is abandoned after this
+ * window so a stuck child cannot hold the provider slot indefinitely. The
+ * abandon is observable: the promise is caught and the (now unobserved)
+ * late resolution cannot flip the already-decided terminal status.
+ */
+const CHILD_SHUTDOWN_GRACE_MS = 2000;
+async function settleWithGrace(queryPromise, graceMs) {
+    let timer;
+    try {
+        await Promise.race([
+            queryPromise.catch(() => undefined),
+            new Promise(resolve => {
+                timer = setTimeout(() => resolve(), graceMs);
+                timer.unref?.();
+            }),
+        ]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+    }
+}
+/**
+ * Run one child subtask to a terminal state. Never throws: every failure mode
+ * (timeout, cancel, error, non-JSON output) is normalized into a SubtaskResult.
+ */
+async function runSubtask(packet, deps, taskId) {
+    const messages = (0, context_builder_1.buildChildMessages)({
+        cwd: deps.cwd,
+        packet,
+        canonicalScopePaths: deps.canonicalScopePaths,
+        rootObjectiveSummary: deps.rootObjectiveSummary,
+        modelLabel: deps.modelLabel,
+    });
+    const childController = new AbortController();
+    let parentAborted = false;
+    const onParentAbort = () => {
+        parentAborted = true;
+        childController.abort();
+    };
+    if (deps.parentAbortSignal) {
+        if (deps.parentAbortSignal.aborted) {
+            parentAborted = true;
+            childController.abort();
+        }
+        else {
+            deps.parentAbortSignal.addEventListener('abort', onParentAbort, { once: true });
+        }
+    }
+    let timeoutHandle;
+    let timedOut = false;
+    const timeoutPromise = new Promise(resolve => {
+        timeoutHandle = setTimeout(() => {
+            timedOut = true;
+            childController.abort();
+            resolve({ kind: 'timeout' });
+        }, deps.timeoutMs);
+    });
+    // R5: parent abort is a distinct terminal outcome that wins the race even
+    // if the query subsequently resolves. Without this, a query that resolves
+    // just after the abort fires would flip the result to 'completed'.
+    // N15: store reference to the second abort listener so it can be cleaned up
+    // in the finally block alongside the first.
+    let onParentAbortForRace;
+    const parentAbortPromise = new Promise(resolve => {
+        if (parentAborted) {
+            resolve({ kind: 'parent_abort' });
+            return;
+        }
+        if (deps.parentAbortSignal) {
+            const handler = () => resolve({ kind: 'parent_abort' });
+            onParentAbortForRace = handler;
+            deps.parentAbortSignal.addEventListener('abort', handler, { once: true });
+        }
+    });
+    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),
+    }));
+    let status;
+    let content = '';
+    let usage = types_1.EMPTY_SUBTASK_USAGE;
+    let parentCancelled = false;
+    try {
+        const outcome = await Promise.race([parentAbortPromise, queryPromise, timeoutPromise]);
+        if (outcome.kind === 'parent_abort') {
+            // Parent abort wins regardless of whether the query resolves later.
+            status = 'cancelled';
+            parentCancelled = true;
+        }
+        else if (outcome.kind === 'timeout') {
+            status = 'timed_out';
+        }
+        else if (outcome.kind === 'error') {
+            // If the parent aborted, treat as cancel; otherwise a failure.
+            if (parentAborted && !timedOut) {
+                status = 'cancelled';
+                parentCancelled = true;
+            }
+            else {
+                status = 'failed';
+                content = outcome.message;
+            }
+        }
+        else {
+            // R5: even on 'done', if the parent aborted before this resolved, the
+            // terminal state must remain cancelled - a late resolve cannot flip it.
+            if (parentAborted && !timedOut) {
+                status = 'cancelled';
+                parentCancelled = true;
+            }
+            else {
+                status = 'completed';
+                content = outcome.content.content;
+                usage = outcome.content.usage;
+            }
+        }
+    }
+    finally {
+        if (timeoutHandle)
+            clearTimeout(timeoutHandle);
+        if (deps.parentAbortSignal) {
+            deps.parentAbortSignal.removeEventListener('abort', onParentAbort);
+            if (onParentAbortForRace) {
+                deps.parentAbortSignal.removeEventListener('abort', onParentAbortForRace);
+            }
+        }
+    }
+    // R5: on timeout/abort the query promise may still be running in the
+    // background (model request or tool call in flight). The provider slot
+    // must not be released while the child can still issue requests, and we
+    // must not leave an unobserved promise that could fire late side effects.
+    // Wait a bounded grace period for the query to settle after the abort
+    // signal fired. An uncooperative executor that ignores the signal is
+    // logged via the result; the slot is still released after the grace so a
+    // stuck child cannot hang the whole turn forever.
+    if (status === 'timed_out' || status === 'cancelled') {
+        await settleWithGrace(queryPromise, CHILD_SHUTDOWN_GRACE_MS);
+    }
+    const result = (0, result_parser_1.parseSubtaskResult)({
+        id: taskId,
+        role: packet.role,
+        content,
+        status,
+        usage,
+    });
+    return { result, parentCancelled };
+}
+//# sourceMappingURL=runner.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,73 @@
+/**
+ * Turn-level integration: build the runtime-bound `subtask` tool for a root turn.
+ *
+ * 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` OpenHorseTool 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.
+ */
+import type { OpenHorseTool } from '../../framework/tool';
+import { runSubtaskBatch } from './supervisor';
+import type { RuntimeSubtaskEvent, SubagentConfig, SubtaskUsage } from './types';
+import type { LLMConfig } from '../../services/llm';
+import type { OpenHorseCLIConfig } from '../../services/config';
+export interface SubagentTurnInputs {
+    /** Resolved subagent config (from runtime.config.subagents). */
+    config: SubagentConfig;
+    /** Canonical project root. */
+    cwd: string;
+    /** Root LLM config derived from runtime config (apiKey, baseUrl, model, ...). */
+    rootLlmConfig: Pick<LLMConfig, 'apiKey' | 'baseUrl' | 'model' | 'fallbackModel'>;
+    /** Model label shown to children. */
+    modelLabel?: string;
+    /** Root objective summary forwarded to children. */
+    rootObjectiveSummary?: string;
+    /** Root turn abort signal; propagated to every child. */
+    abortSignal?: AbortSignal;
+    /** Lifecycle event sink (runtime event + trace). */
+    onSubtaskEvent?: (event: RuntimeSubtaskEvent) => void;
+    /** Called once per finished task with its structured result, for artifact persistence. */
+    onSubtaskResult?: (result: import('./types').SubtaskResult, batchId: string) => void;
+    /**
+     * R6: live permission state from the root runtime. Returns true when a
+     * permission request is awaiting user decision. When provided, the policy
+     * gate uses it instead of a hardcoded false, preventing background
+     * delegation while the user is deciding a permission.
+     */
+    hasPendingPermission?: () => boolean;
+    /**
+     * R6: called with each child's observed usage so the root loop can record
+     * it into its shared CostTracker. The observed values are never clamped;
+     * `/cost` and telemetry must reflect the truth.
+     */
+    onChildUsage?: (taskId: string, role: import('./types').SubagentRole, usage: import('./types').SubtaskUsage, modelLabel?: string) => void;
+}
+/**
+ * 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.
+ */
+export declare function createSubagentBundleForTurn(inputs: SubagentTurnInputs): SubagentTurnBundle | null;
+/**
+ * Backwards-compatible wrapper returning only the tool. Prefer
+ * {@link createSubagentBundleForTurn} when the root loop needs to fold child
+ * usage into its stats.
+ */
+export declare function createSubagentToolForTurn(inputs: SubagentTurnInputs): OpenHorseTool | null;
+/** A subtask turn bundle: the tool plus usage accessors for the root loop. */
+export interface SubagentTurnBundle {
+    tool: OpenHorseTool;
+    /** Reconciled aggregate usage across all children that ran this turn. */
+    getAggregateUsage: () => SubtaskUsage;
+    /** Best-effort count of subtasks that ran this turn. */
+    getSubtaskCount: () => number;
+}
+/** Derive the root LLM config slice from the runtime config. */
+export declare function deriveRootLlmConfig(config: OpenHorseCLIConfig): Pick<LLMConfig, 'apiKey' | 'baseUrl' | 'model' | 'fallbackModel'>;
+/** Re-exported for the root loop to read aggregate usage after a turn. */
+export { runSubtaskBatch };
+//# sourceMappingURL=runtime-integration.d.ts.map

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

@@ -0,0 +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,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;CAC3I;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,GAAG,IAAI,CAyFjG;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"}

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

@@ -0,0 +1,148 @@
+"use strict";
+/**
+ * Turn-level integration: build the runtime-bound `subtask` tool for a root turn.
+ *
+ * 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` OpenHorseTool 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runSubtaskBatch = void 0;
+exports.createSubagentBundleForTurn = createSubagentBundleForTurn;
+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");
+/**
+ * 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 };
+}
+/**
+ * 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.
+ */
+function createSubagentBundleForTurn(inputs) {
+    const { config, cwd, rootLlmConfig, abortSignal, onSubtaskEvent } = inputs;
+    if (config.mode === 'off')
+        return null;
+    if (!rootLlmConfig.apiKey)
+        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: 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.
+    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: 'openhorse-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 });
+    const budget = new budget_1.SubagentBudgetLedger((0, budget_1.budgetLimitsFromConfig)({
+        maxModelRequestsPerTurn: config.maxModelRequestsPerTurn,
+        maxModelRequestsPerTask: config.maxModelRequestsPerTask,
+        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,
+    });
+    const supervisorDeps = {
+        config,
+        cwd,
+        budget,
+        providerGate,
+        executeQuery,
+        toolSet: { tools: childTools, toolExecutor: childToolExecutor },
+        scopeHolder,
+        turnTaskState,
+        hasPendingPermission: inputs.hasPendingPermission,
+        onChildUsage: inputs.onChildUsage,
+        parentAbortSignal: abortSignal,
+        rootObjectiveSummary: inputs.rootObjectiveSummary,
+        modelLabel: inputs.modelLabel,
+        onEvent: onSubtaskEvent,
+        onSubtaskResult: inputs.onSubtaskResult,
+    };
+    const tool = (0, tool_1.createSubtaskTool)(supervisorDeps);
+    return {
+        tool,
+        /** Read-only accessor for the reconciled aggregate child usage this turn. */
+        getAggregateUsage: () => budget.aggregateUsage(),
+        /** Number of subtasks that ran (reconciled) this turn. */
+        getSubtaskCount: () => budget.reconciledTaskCount(),
+    };
+}
+/**
+ * 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;
+}
+/** Derive the root LLM config slice from the runtime config. */
+function deriveRootLlmConfig(config) {
+    return {
+        apiKey: config.apiKey,
+        baseUrl: config.apiBaseUrl,
+        model: config.model,
+        fallbackModel: config.fallbackModel,
+    };
+}
+//# sourceMappingURL=runtime-integration.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,79 @@
+/**
+ * SubagentSupervisor: orchestrates a batch of child subtasks.
+ *
+ * Owns the task/batch ID space, the state machine, the concurrency queue and
+ * ordered aggregation. It is the single place that decides when children start,
+ * how they are bounded, and how their results are folded back to the root.
+ *
+ * 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.
+ */
+import { SubagentBudgetLedger, TurnTaskState } from './budget';
+import { type PolicyRejectReason } from './policy';
+import { SubagentProviderGate } from './provider-gate';
+import { type ExecuteChildQuery, type ChildToolSet } from './runner';
+import type { ScopeHolder } from './child-executor-guard';
+import { type RuntimeSubtaskEvent, type SubagentConfig, type SubtaskBatchResult, type SubtaskRequest, type SubtaskResult } from './types';
+export interface SubagentSupervisorDeps {
+    config: SubagentConfig;
+    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;
+    /**
+     * 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.
+     */
+    scopeHolder?: ScopeHolder;
+    /**
+     * R6: turn-level task counter. Persists across `subtask` calls so multiple
+     * calls in one root turn cannot exceed `maxTasksPerTurn`. When absent, the
+     * supervisor falls back to a per-batch counter (weaker; logged).
+     */
+    turnTaskState?: TurnTaskState;
+    /**
+     * R6: live permission state from the root runtime. Returns true when a
+     * permission request is awaiting user decision. When absent, defaults to
+     * false (no pending permission) - the root loop should inject the real
+     * state to prevent background auto-approval bypass.
+     */
+    hasPendingPermission?: () => boolean;
+    /**
+     * R6: called with each child's observed usage (never clamped) so the root
+     * loop can record it into its shared CostTracker. Fires for every terminal
+     * state (completed/failed/cancelled/timed_out), so partial usage before a
+     * failure is still accounted.
+     */
+    onChildUsage?: (taskId: string, role: import('./types').SubagentRole, usage: import('./types').SubtaskUsage, modelLabel?: string) => void;
+    /** Parent turn abort signal; propagated to every child. */
+    parentAbortSignal?: AbortSignal;
+    /** Read-only context forwarded to each child. */
+    rootObjectiveSummary?: string;
+    modelLabel?: string;
+    /** Lifecycle event sink (runtime event + trace). */
+    onEvent?: (event: RuntimeSubtaskEvent) => void;
+    /** Called once per task with its final SubtaskResult (for artifact persistence). */
+    onSubtaskResult?: (result: SubtaskResult, batchId: string) => void;
+}
+export interface RunBatchOutcome {
+    result: SubtaskBatchResult;
+    /** Whether policy rejected the entire batch before any child ran. */
+    rejected: boolean;
+    rejectReason?: PolicyRejectReason;
+}
+/**
+ * Run a batch of subtasks. Returns a {@link SubtaskBatchResult} whose results
+ * are always in request order, regardless of completion order.
+ *
+ * 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>;
+//# sourceMappingURL=supervisor.d.ts.map

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

@@ -0,0 +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"}