@astralyn/pi 0.84.4 → 0.84.6

package/dist/extensions/subagent/schema.js

@@ -1,20 +1,15 @@
+import { StringEnum } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
-import { MAX_TASKS } from "./constants.js";
+import { MAX_CONCURRENCY, MAX_TASKS, SUBAGENT_AGENT_NAMES } from "./constants.js";
 // Strict constrained-sampling providers treat every property as required
 // and reject bare unions at the top level, so the schema is a flat
 // `type: "object"` whose optional fields are also nullable: callers omit
 // a field when the grammar allows it and send null when it does not.
-// The exactly-one-mode rule is enforced at runtime in `invocationMode`.
 function nullable(schema, description) {
     return Type.Optional(Type.Union([schema, Type.Null()], { description }));
 }
 export const TaskSchema = Type.Object({
-    agent: nullable(Type.String({ minLength: 1, maxLength: 80 }), "Agent profile from the list in the tool description; null or omit for general"),
-    description: Type.String({
-        minLength: 1,
-        maxLength: 80,
-        description: "Concise 3-8 word UI label",
-    }),
+    agent: nullable(StringEnum(SUBAGENT_AGENT_NAMES, { description: "Which built-in profile runs this task" }), "Built-in profile; null or omit for explorer (the default)"),
     prompt: Type.String({
         minLength: 1,
         maxLength: 50_000,
@@ -23,10 +18,10 @@ export const TaskSchema = Type.Object({
     cwd: nullable(Type.String({ minLength: 1, maxLength: 4_096 }), "Relative or absolute directory inside the parent working directory; null or omit to inherit it"),
 }, { additionalProperties: false });
 export const SubagentParamsSchema = Type.Object({
-    agent: nullable(Type.String({ minLength: 1, maxLength: 80 }), "Agent profile from the list in the tool description (single mode); null or omit otherwise (defaults to general)"),
-    description: nullable(Type.String({ minLength: 1, maxLength: 80 }), "Concise 3-8 word UI label; required for single mode, null or omit otherwise"),
-    prompt: nullable(Type.String({ minLength: 1, maxLength: 50_000 }), "Complete self-contained briefing; providing it selects single mode — null or omit when using tasks"),
-    cwd: nullable(Type.String({ minLength: 1, maxLength: 4_096 }), "Relative or absolute directory inside the parent working directory (single mode); null or omit otherwise"),
-    tasks: nullable(Type.Array(TaskSchema, { minItems: 1, maxItems: MAX_TASKS }), "Independent tasks run concurrently; providing it selects parallel mode — null or omit when using prompt"),
+    tasks: Type.Array(TaskSchema, {
+        minItems: 1,
+        maxItems: MAX_TASKS,
+        description: `Independent tasks run concurrently: at most ${MAX_CONCURRENCY} active at once, excess tasks queue, and results preserve input order`,
+    }),
 }, { additionalProperties: false });
 //# sourceMappingURL=schema.js.map

package/dist/extensions/subagent/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/extensions/subagent/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,IAAI,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,yEAAyE;AACzE,mEAAmE;AACnE,yEAAyE;AACzE,qEAAqE;AACrE,wEAAwE;AACxE,SAAS,QAAQ,CAAoB,MAAS,EAAE,WAAmB;IAClE,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CACpC;IACC,KAAK,EAAE,QAAQ,CACd,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,EAC5C,+EAA+E,CAC/E;IACD,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC;QACxB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,2BAA2B;KACxC,CAAC;IACF,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,MAAM;QACjB,WAAW,EAAE,iFAAiF;KAC9F,CAAC;IACF,GAAG,EAAE,QAAQ,CACZ,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAC/C,gGAAgG,CAChG;CACD,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAC9C;IACC,KAAK,EAAE,QAAQ,CACd,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,EAC5C,iHAAiH,CACjH;IACD,WAAW,EAAE,QAAQ,CACpB,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,EAC5C,6EAA6E,CAC7E;IACD,MAAM,EAAE,QAAQ,CACf,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAChD,oGAAoG,CACpG;IACD,GAAG,EAAE,QAAQ,CACZ,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAC/C,0GAA0G,CAC1G;IACD,KAAK,EAAE,QAAQ,CACd,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAC5D,yGAAyG,CACzG;CACD,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC","sourcesContent":["import { type Static, type TSchema, Type } from \"typebox\";\nimport { MAX_TASKS } from \"./constants.ts\";\n\n// Strict constrained-sampling providers treat every property as required\n// and reject bare unions at the top level, so the schema is a flat\n// `type: \"object\"` whose optional fields are also nullable: callers omit\n// a field when the grammar allows it and send null when it does not.\n// The exactly-one-mode rule is enforced at runtime in `invocationMode`.\nfunction nullable<T extends TSchema>(schema: T, description: string) {\n\treturn Type.Optional(Type.Union([schema, Type.Null()], { description }));\n}\n\nexport const TaskSchema = Type.Object(\n\t{\n\t\tagent: nullable(\n\t\t\tType.String({ minLength: 1, maxLength: 80 }),\n\t\t\t\"Agent profile from the list in the tool description; null or omit for general\",\n\t\t),\n\t\tdescription: Type.String({\n\t\t\tminLength: 1,\n\t\t\tmaxLength: 80,\n\t\t\tdescription: \"Concise 3-8 word UI label\",\n\t\t}),\n\t\tprompt: Type.String({\n\t\t\tminLength: 1,\n\t\t\tmaxLength: 50_000,\n\t\t\tdescription: \"Complete self-contained briefing; the worker cannot see the parent conversation\",\n\t\t}),\n\t\tcwd: nullable(\n\t\t\tType.String({ minLength: 1, maxLength: 4_096 }),\n\t\t\t\"Relative or absolute directory inside the parent working directory; null or omit to inherit it\",\n\t\t),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport const SubagentParamsSchema = Type.Object(\n\t{\n\t\tagent: nullable(\n\t\t\tType.String({ minLength: 1, maxLength: 80 }),\n\t\t\t\"Agent profile from the list in the tool description (single mode); null or omit otherwise (defaults to general)\",\n\t\t),\n\t\tdescription: nullable(\n\t\t\tType.String({ minLength: 1, maxLength: 80 }),\n\t\t\t\"Concise 3-8 word UI label; required for single mode, null or omit otherwise\",\n\t\t),\n\t\tprompt: nullable(\n\t\t\tType.String({ minLength: 1, maxLength: 50_000 }),\n\t\t\t\"Complete self-contained briefing; providing it selects single mode — null or omit when using tasks\",\n\t\t),\n\t\tcwd: nullable(\n\t\t\tType.String({ minLength: 1, maxLength: 4_096 }),\n\t\t\t\"Relative or absolute directory inside the parent working directory (single mode); null or omit otherwise\",\n\t\t),\n\t\ttasks: nullable(\n\t\t\tType.Array(TaskSchema, { minItems: 1, maxItems: MAX_TASKS }),\n\t\t\t\"Independent tasks run concurrently; providing it selects parallel mode — null or omit when using prompt\",\n\t\t),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport type SubagentParams = Static<typeof SubagentParamsSchema>;\nexport type SubagentTask = Static<typeof TaskSchema>;\n"]}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/extensions/subagent/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAA6B,IAAI,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAElF,yEAAyE;AACzE,mEAAmE;AACnE,yEAAyE;AACzE,qEAAqE;AACrE,SAAS,QAAQ,CAAoB,MAAS,EAAE,WAAmB;IAClE,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CACpC;IACC,KAAK,EAAE,QAAQ,CACd,UAAU,CAAC,oBAAoB,EAAE,EAAE,WAAW,EAAE,uCAAuC,EAAE,CAAC,EAC1F,2DAA2D,CAC3D;IACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QACnB,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,MAAM;QACjB,WAAW,EAAE,iFAAiF;KAC9F,CAAC;IACF,GAAG,EAAE,QAAQ,CACZ,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAC/C,gGAAgG,CAChG;CACD,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAC9C;IACC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;QAC7B,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE,+CAA+C,eAAe,uEAAuE;KAClJ,CAAC;CACF,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC","sourcesContent":["import { StringEnum } from \"@earendil-works/pi-ai\";\nimport { type Static, type TSchema, Type } from \"typebox\";\nimport { MAX_CONCURRENCY, MAX_TASKS, SUBAGENT_AGENT_NAMES } from \"./constants.ts\";\n\n// Strict constrained-sampling providers treat every property as required\n// and reject bare unions at the top level, so the schema is a flat\n// `type: \"object\"` whose optional fields are also nullable: callers omit\n// a field when the grammar allows it and send null when it does not.\nfunction nullable<T extends TSchema>(schema: T, description: string) {\n\treturn Type.Optional(Type.Union([schema, Type.Null()], { description }));\n}\n\nexport const TaskSchema = Type.Object(\n\t{\n\t\tagent: nullable(\n\t\t\tStringEnum(SUBAGENT_AGENT_NAMES, { description: \"Which built-in profile runs this task\" }),\n\t\t\t\"Built-in profile; null or omit for explorer (the default)\",\n\t\t),\n\t\tprompt: Type.String({\n\t\t\tminLength: 1,\n\t\t\tmaxLength: 50_000,\n\t\t\tdescription: \"Complete self-contained briefing; the worker cannot see the parent conversation\",\n\t\t}),\n\t\tcwd: nullable(\n\t\t\tType.String({ minLength: 1, maxLength: 4_096 }),\n\t\t\t\"Relative or absolute directory inside the parent working directory; null or omit to inherit it\",\n\t\t),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport const SubagentParamsSchema = Type.Object(\n\t{\n\t\ttasks: Type.Array(TaskSchema, {\n\t\t\tminItems: 1,\n\t\t\tmaxItems: MAX_TASKS,\n\t\t\tdescription: `Independent tasks run concurrently: at most ${MAX_CONCURRENCY} active at once, excess tasks queue, and results preserve input order`,\n\t\t}),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport type SubagentParams = Static<typeof SubagentParamsSchema>;\nexport type SubagentTask = Static<typeof TaskSchema>;\n"]}

package/dist/extensions/subagent/sdk-runner.d.ts

@@ -1,20 +1,22 @@
-import type { AgentSessionEvent } from "../../core/agent-session.ts";
 import type { ModelRuntime } from "../../core/model-runtime.ts";
-import type { ResolvedSubagentTask, SubagentRunDetails } from "./types.ts";
+import type { RunCancellation } from "./cancellation.ts";
+import type { SubagentRunEvent } from "./state.ts";
+import type { ResolvedSubagentTask } from "./types.ts";
 export interface SdkRunnerOptions {
     task: ResolvedSubagentTask;
-    run: SubagentRunDetails;
+    /** Cancellation scope covering this attempt (queued through session end). */
+    scope: RunCancellation;
+    /** Reducer input; the adapter never touches run state directly. */
+    dispatch: (event: SubagentRunEvent) => void;
     modelRuntime: ModelRuntime;
     agentDir: string;
     projectTrusted: boolean;
-    signal?: AbortSignal;
     onProgress?: () => void;
-    registerAbort?: (abort: () => Promise<void>) => () => void;
 }
-type AutoRetryEvent = Extract<AgentSessionEvent, {
-    type: "auto_retry_start" | "auto_retry_end";
-}>;
-export declare function applySubagentAutoRetryEvent(run: SubagentRunDetails, event: AutoRetryEvent): void;
-export declare function runSdkTask(options: SdkRunnerOptions): Promise<SubagentRunDetails>;
-export {};
+/**
+ * Runs one worker attempt as a pure adapter: it owns the worker session's
+ * lifecycle and translates AgentSessionEvents into SubagentRunEvents; every
+ * state transition happens in the reducer on the other side of dispatch.
+ */
+export declare function runSdkTask(options: SdkRunnerOptions): Promise<void>;
 //# sourceMappingURL=sdk-runner.d.ts.map

package/dist/extensions/subagent/sdk-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-runner.d.ts","sourceRoot":"","sources":["../../../src/extensions/subagent/sdk-runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAiBhE,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAgB,MAAM,YAAY,CAAC;AAEzF,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,GAAG,EAAE,kBAAkB,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC;CAC3D;AAyDD,KAAK,cAAc,GAAG,OAAO,CAAC,iBAAiB,EAAE;IAAE,IAAI,EAAE,kBAAkB,GAAG,gBAAgB,CAAA;CAAE,CAAC,CAAC;AAElG,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,kBAAkB,EAAE,KAAK,EAAE,cAAc,GAAG,IAAI,CAWhG;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAqNvF"}
+{"version":3,"file":"sdk-runner.d.ts","sourceRoot":"","sources":["../../../src/extensions/subagent/sdk-runner.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAMhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,6EAA6E;IAC7E,KAAK,EAAE,eAAe,CAAC;IACvB,mEAAmE;IACnE,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC5C,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;CACxB;AAiGD;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmNzE"}

package/dist/extensions/subagent/sdk-runner.js

@@ -2,9 +2,7 @@ import { DefaultResourceLoader } from "../../core/resource-loader.js";
 import { createAgentSession } from "../../core/sdk.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { SettingsManager } from "../../core/settings-manager.js";
-import { activitySummary, addUsage, appendActivity, assistantText, boundText, finalAssistantText, resultSummary, setLiveText, } from "./activity.js";
-import { ERROR_TEXT_LIMIT, LIVE_TEXT_LIMIT, SINGLE_OUTPUT_LIMIT } from "./constants.js";
-import { beginSubagentRetry, clearSubagentRetry } from "./retry.js";
+import { finalAssistantText } from "./activity.js";
 function workerSystemPrompt(base, task) {
     return [
         base,
@@ -15,7 +13,7 @@ function workerSystemPrompt(base, task) {
         "Stay inside the assigned working directory and delegated scope.",
         "Do not ask the end user questions. If blocked, report the exact blocker and what would resolve it.",
         "Do not spawn subagents or invoke tools outside the configured tool list.",
-        "When referencing files in the final report, use absolute paths so the caller can locate them unambiguously.",
+        "When referencing files in the final report, use paths relative to the task's working directory so the caller can locate them unambiguously.",
         "Include code snippets only when the exact text is load-bearing (a bug you found, a signature the caller asked for); do not recap code you merely read.",
         "End with a concise report covering findings or changes, verification performed, blockers, and unresolved risks. The caller will relay it to the user, so include only the essentials.",
         task.agent.systemPrompt,
@@ -54,53 +52,63 @@ function createThrottledEmitter(onProgress) {
         },
     };
 }
-export function applySubagentAutoRetryEvent(run, event) {
-    if (event.type === "auto_retry_start") {
-        beginSubagentRetry(run, {
-            attempt: event.attempt,
-            maxAttempts: event.maxAttempts,
-            delayMs: event.delayMs,
-            error: event.errorMessage,
-        });
-        return;
-    }
-    clearSubagentRetry(run);
+// Neither resource loading nor session creation takes an abort signal, and
+// both can hang on network work; race both against the scope. The losing
+// chain keeps running, so its eventual result or rejection is always
+// consumed by a no-op handler.
+async function raceInitialization(chain, scope) {
+    return new Promise((resolve) => {
+        let settled = false;
+        const finish = (outcome) => {
+            if (settled)
+                return;
+            settled = true;
+            scope.signal.removeEventListener("abort", onAbort);
+            resolve(outcome);
+        };
+        const onAbort = () => {
+            finish({ kind: "aborted" });
+        };
+        if (scope.signal.aborted) {
+            onAbort();
+            void chain.then(() => undefined, () => undefined);
+            return;
+        }
+        scope.signal.addEventListener("abort", onAbort, { once: true });
+        void chain.then((outcome) => finish(outcome), (error) => finish({ kind: "error", error }));
+    });
 }
+/**
+ * Runs one worker attempt as a pure adapter: it owns the worker session's
+ * lifecycle and translates AgentSessionEvents into SubagentRunEvents; every
+ * state transition happens in the reducer on the other side of dispatch.
+ */
 export async function runSdkTask(options) {
-    const { task, run, modelRuntime, agentDir, projectTrusted, signal, onProgress } = options;
+    const { task, scope, dispatch, modelRuntime, agentDir, projectTrusted, onProgress } = options;
     const throttled = createThrottledEmitter(onProgress);
     let unsubscribe;
     let unregisterAbort;
     let session;
-    const activeActivities = new Map();
+    // Streaming updates carry no semantic weight; the settled messages are
+    // where usage is accounted, and worker sessions can replay them.
     const seenAssistantMessages = new Set();
-    const initializationAbortController = new AbortController();
-    const markAbort = async () => {
-        clearSubagentRetry(run);
-        run.status = "aborted";
-        run.error ??= "Subagent was aborted.";
-        initializationAbortController.abort();
+    const emitImmediate = () => onProgress?.();
+    const emitThrottled = throttled.emit;
+    unregisterAbort = scope.onAbort(async () => {
         if (session)
             await session.abort();
-    };
-    const isAborted = () => signal?.aborted === true || run.status === "aborted";
-    const abortListener = () => {
-        void markAbort().catch(() => undefined);
-    };
-    unregisterAbort = options.registerAbort?.(markAbort);
-    if (signal)
-        signal.addEventListener("abort", abortListener, { once: true });
+    });
     try {
-        if (isAborted()) {
-            clearSubagentRetry(run);
-            run.status = "aborted";
-            run.error = "Subagent was aborted before it started.";
-            return run;
+        if (scope.aborted) {
+            dispatch({
+                type: "settle",
+                verdict: "aborted",
+                report: "",
+                error: "Subagent was aborted before it started.",
+                endedAt: Date.now(),
+            });
+            return;
         }
-        clearSubagentRetry(run);
-        run.status = "running";
-        run.startedAt = Date.now();
-        onProgress?.();
         const settingsManager = SettingsManager.create(task.cwd, agentDir, { projectTrusted });
         const resourceLoader = new DefaultResourceLoader({
             cwd: task.cwd,
@@ -115,179 +123,179 @@ export async function runSdkTask(options) {
             noContextFiles: task.agent.omitContextFiles ?? false,
             systemPromptOverride: (base) => workerSystemPrompt(base, task),
         });
-        await resourceLoader.reload();
-        if (isAborted()) {
-            run.error ??= "Subagent was aborted during initialization.";
-            return run;
-        }
-        const createPromise = createAgentSession({
-            cwd: task.cwd,
-            agentDir,
-            modelRuntime,
-            model: task.model,
-            thinkingLevel: task.thinking,
-            tools: task.agent.tools,
-            resourceLoader,
-            sessionManager: SessionManager.inMemory(task.cwd),
-            settingsManager,
-        });
-        // createAgentSession takes no signal and can hang on network work. Race
-        // both parent-signal and registered shutdown cancellation against it;
-        // only the winning branch owns disposal of the resulting session.
-        const initializationSignal = initializationAbortController.signal;
-        let creationAbortListener;
-        const abortedOutcome = new Promise((resolve) => {
-            const resolveAborted = () => resolve({ kind: "aborted" });
-            if (initializationSignal.aborted) {
-                resolveAborted();
-                return;
-            }
-            creationAbortListener = resolveAborted;
-            initializationSignal.addEventListener("abort", resolveAborted, { once: true });
-        });
-        const outcome = await Promise.race([
-            createPromise.then((created) => ({ kind: "created", created })),
-            abortedOutcome,
-        ]).finally(() => {
-            if (creationAbortListener)
-                initializationSignal.removeEventListener("abort", creationAbortListener);
-        });
+        const initialization = (async () => {
+            await resourceLoader.reload();
+            if (scope.signal.aborted)
+                return { kind: "aborted" };
+            const created = await createAgentSession({
+                cwd: task.cwd,
+                agentDir,
+                modelRuntime,
+                model: task.model,
+                thinkingLevel: task.thinking,
+                tools: task.agent.tools,
+                resourceLoader,
+                sessionManager: SessionManager.inMemory(task.cwd),
+                settingsManager,
+            });
+            return { kind: "created", session: created.session };
+        })();
+        const outcome = await raceInitialization(initialization, scope);
+        if (outcome.kind === "error")
+            throw outcome.error;
         if (outcome.kind === "aborted") {
-            // The creation promise cannot be cancelled. Dispose its session if it
-            // eventually resolves, but keep background cleanup from surfacing an
-            // unhandled rejection after this run has already settled.
-            void createPromise.then((createdLate) => {
-                try {
-                    createdLate.session.dispose();
-                }
-                catch {
-                    // The aborted run has no remaining channel for cleanup errors.
+            // The initialization chain cannot be cancelled. Dispose the
+            // session if it eventually resolves, and swallow a late rejection
+            // after this run has already settled.
+            void initialization.then((late) => {
+                if (late.kind === "created") {
+                    try {
+                        late.session.dispose();
+                    }
+                    catch {
+                        // The aborted run has no remaining channel for cleanup errors.
+                    }
                 }
             }, () => { });
-            run.error ??= "Subagent was aborted during initialization.";
-            return run;
+            dispatch({
+                type: "settle",
+                verdict: "aborted",
+                report: "",
+                error: "Subagent was aborted during initialization.",
+                endedAt: Date.now(),
+            });
+            return;
         }
-        const created = outcome.created;
-        session = created.session;
-        if (isAborted()) {
-            run.error ??= "Subagent was aborted during initialization.";
+        session = outcome.session;
+        if (scope.aborted) {
             await session.abort();
-            return run;
+            dispatch({
+                type: "settle",
+                verdict: "aborted",
+                report: "",
+                error: "Subagent was aborted during initialization.",
+                endedAt: Date.now(),
+            });
+            return;
         }
-        const emitImmediate = () => onProgress?.();
-        const emitText = throttled.emit;
         unsubscribe = session.subscribe((event) => {
-            if (event.type === "auto_retry_start" || event.type === "auto_retry_end") {
-                applySubagentAutoRetryEvent(run, event);
+            if (event.type === "auto_retry_start") {
+                dispatch({
+                    type: "auto_retry_start",
+                    attempt: event.attempt,
+                    maxAttempts: event.maxAttempts,
+                    deadline: Date.now() + event.delayMs,
+                    error: event.errorMessage,
+                });
+                emitImmediate();
+                return;
+            }
+            if (event.type === "auto_retry_end") {
+                dispatch({ type: "auto_retry_end" });
                 emitImmediate();
                 return;
             }
             if (event.type === "turn_end") {
-                clearSubagentRetry(run);
-                run.usage.turns++;
-                run.currentActivity = undefined;
+                dispatch({ type: "turn_end" });
                 emitImmediate();
                 return;
             }
             if (event.type === "message_end" && event.message.role === "assistant") {
-                clearSubagentRetry(run);
                 if (!seenAssistantMessages.has(event.message)) {
                     seenAssistantMessages.add(event.message);
-                    addUsage(run.usage, event.message.usage);
+                    dispatch({ type: "assistant_message_settled", usage: event.message.usage });
                 }
-                run.liveText = setLiveText(assistantText(event.message));
-                emitText();
-                return;
-            }
-            if (event.type === "message_update") {
-                clearSubagentRetry(run);
-                if (event.message.role === "assistant")
-                    run.liveText = setLiveText(assistantText(event.message));
-                if (event.assistantMessageEvent.type === "thinking_delta")
-                    run.currentActivity = "Thinking…";
-                if (event.assistantMessageEvent.type === "text_delta")
-                    run.currentActivity = "Writing response…";
-                emitText();
+                else {
+                    dispatch({ type: "assistant_message_settled", usage: undefined });
+                }
+                emitImmediate();
                 return;
             }
             if (event.type === "tool_execution_start") {
-                clearSubagentRetry(run);
-                run.usage.toolUses++;
-                const activity = {
-                    id: event.toolCallId,
+                dispatch({
+                    type: "tool_started",
+                    toolCallId: event.toolCallId,
                     toolName: event.toolName,
-                    summary: activitySummary(event.toolName, event.args),
-                    status: "running",
+                    args: event.args,
                     startedAt: Date.now(),
-                };
-                activeActivities.set(event.toolCallId, activity);
-                appendActivity(run.activities, activity);
-                run.currentActivity = activity.summary;
+                });
                 emitImmediate();
                 return;
             }
             if (event.type === "tool_execution_update") {
-                clearSubagentRetry(run);
-                run.currentActivity = activitySummary(event.toolName, event.args);
-                emitText();
+                dispatch({
+                    type: "tool_updated",
+                    toolCallId: event.toolCallId,
+                    toolName: event.toolName,
+                    args: event.args,
+                });
+                emitThrottled();
                 return;
             }
             if (event.type === "tool_execution_end") {
-                clearSubagentRetry(run);
-                const activity = activeActivities.get(event.toolCallId);
-                if (activity) {
-                    activity.status = event.isError ? "failed" : "succeeded";
-                    activity.endedAt = Date.now();
-                    activity.resultSummary = resultSummary(event.result);
-                }
-                activeActivities.delete(event.toolCallId);
-                run.currentActivity = undefined;
+                dispatch({
+                    type: "tool_ended",
+                    toolCallId: event.toolCallId,
+                    result: event.result,
+                    isError: event.isError,
+                    endedAt: Date.now(),
+                });
                 emitImmediate();
             }
         });
         await session.prompt(task.prompt);
         const finalMessage = lastAssistantMessage(session);
-        run.finalOutput = finalAssistantText(session.messages);
+        const report = finalAssistantText(session.messages);
         const error = assistantError(finalMessage);
-        if (signal?.aborted || finalMessage?.stopReason === "aborted") {
-            run.status = "aborted";
-            run.error = boundText(error ?? "Subagent was aborted.", ERROR_TEXT_LIMIT);
+        if (scope.signal.aborted || finalMessage?.stopReason === "aborted") {
+            dispatch({
+                type: "settle",
+                verdict: "aborted",
+                report,
+                error: error ?? "Subagent was aborted.",
+                endedAt: Date.now(),
+            });
         }
         else if (finalMessage?.stopReason === "error" || error) {
-            run.status = "failed";
-            run.error = boundText(error ?? "Subagent failed.", ERROR_TEXT_LIMIT);
+            dispatch({
+                type: "settle",
+                verdict: "failed",
+                report,
+                error: error ?? "Subagent failed.",
+                endedAt: Date.now(),
+            });
         }
         else {
-            run.status = "completed";
+            dispatch({ type: "settle", verdict: "completed", report, error: undefined, endedAt: Date.now() });
         }
     }
     catch (error) {
-        if (signal?.aborted || run.status === "aborted") {
-            run.status = "aborted";
-            run.error = run.error ?? "Subagent was aborted.";
+        const report = session ? finalAssistantText(session.messages) : "";
+        if (scope.signal.aborted) {
+            dispatch({
+                type: "settle",
+                verdict: "aborted",
+                report,
+                error: "Subagent was aborted.",
+                endedAt: Date.now(),
+            });
         }
         else {
-            run.status = "failed";
-            run.error = boundText(error instanceof Error ? error.message : String(error), ERROR_TEXT_LIMIT);
+            dispatch({
+                type: "settle",
+                verdict: "failed",
+                report,
+                error: error instanceof Error ? error.message : String(error),
+                endedAt: Date.now(),
+            });
         }
-        if (session)
-            run.finalOutput = finalAssistantText(session.messages);
     }
     finally {
-        if (signal)
-            signal.removeEventListener("abort", abortListener);
         throttled.cancel();
         unregisterAbort?.();
         unsubscribe?.();
         session?.dispose();
-        run.liveText = boundText(run.liveText, LIVE_TEXT_LIMIT);
-        run.finalOutput = boundText(run.finalOutput, SINGLE_OUTPUT_LIMIT);
-        if (run.error)
-            run.error = boundText(run.error, ERROR_TEXT_LIMIT);
-        clearSubagentRetry(run);
-        run.endedAt = Date.now();
-        onProgress?.();
+        emitImmediate();
     }
-    return run;
 }
 //# sourceMappingURL=sdk-runner.js.map