@cortexkit/opencode-magic-context 0.32.3 → 0.32.4

package/dist/index.js

@@ -16455,6 +16455,9 @@ function modelBodyField(spec) {
 }
 
 // src/shared/model-suggestion-retry.ts
+function copyPromptArgs(args, body) {
+  return { ...args, body: { ...body } };
+}
 function extractMessage(error51) {
   if (typeof error51 === "string")
     return error51;
@@ -16568,40 +16571,41 @@ function shortErr(error51) {
   return extractMessage(error51);
 }
 async function attemptOnce(client, args, timeoutMs, signal, callContext, label) {
+  const originalBody = { ...args.body };
+  const attemptArgs = copyPromptArgs(args, originalBody);
   try {
-    await promptWithTimeout(client, args, timeoutMs, signal);
+    await promptWithTimeout(client, attemptArgs, timeoutMs, signal);
     return;
   } catch (error51) {
     if (isNonRetryable(error51, signal))
       throw error51;
     const suggestion = parseModelSuggestion(error51);
-    if (!suggestion || !args.body.model) {
+    if (!suggestion || !originalBody.model) {
       throw error51;
     }
     log(`[${callContext}] ${label}: model not found, retrying with suggestion`, {
       original: `${suggestion.providerID}/${suggestion.modelID}`,
       suggested: suggestion.suggestion
     });
-    await promptWithTimeout(client, {
-      ...args,
-      body: {
-        ...args.body,
-        model: {
-          providerID: suggestion.providerID,
-          modelID: suggestion.suggestion
-        }
+    await promptWithTimeout(client, copyPromptArgs(args, {
+      ...originalBody,
+      model: {
+        providerID: suggestion.providerID,
+        modelID: suggestion.suggestion
       }
-    }, timeoutMs, signal);
+    }), timeoutMs, signal);
   }
 }
 async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const timeoutMs = options.timeoutMs ?? 300000;
   const callContext = options.callContext ?? "subagent";
   const fallbacks = options.fallbackModels ?? [];
-  const explicitPrimaryLabel = args.body.model?.providerID && args.body.model.modelID ? `${args.body.model.providerID}/${args.body.model.modelID}` : "primary";
+  const baseBody = { ...args.body };
+  const baseArgs = copyPromptArgs(args, baseBody);
+  const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   let lastError = null;
   try {
-    await attemptOnce(client, args, timeoutMs, options.signal, callContext, explicitPrimaryLabel);
+    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel);
     return;
   } catch (error51) {
     lastError = error51;
@@ -16619,10 +16623,10 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       continue;
     }
     const label = `${parsed.providerID}/${parsed.modelID}`;
-    const attemptArgs = {
-      ...args,
-      body: { ...args.body, model: parsed }
-    };
+    const attemptArgs = copyPromptArgs(baseArgs, {
+      ...baseBody,
+      model: parsed
+    });
     try {
       await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label);
       log(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
@@ -16650,17 +16654,19 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
   const timeoutMs = options.timeoutMs ?? 300000;
   const callContext = options.callContext ?? "subagent";
   const fallbacks = options.fallbackModels ?? [];
-  const explicitPrimaryLabel = args.body.model?.providerID && args.body.model.modelID ? `${args.body.model.providerID}/${args.body.model.modelID}` : "primary";
+  const baseBody = { ...args.body };
+  const baseArgs = copyPromptArgs(args, baseBody);
+  const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   const totalAttempts = fallbacks.length + 1;
   let firstError = null;
   let lastError = null;
   try {
-    return await attemptAndValidate(client, args, timeoutMs, options.signal, callContext, {
+    return await attemptAndValidate(client, baseArgs, timeoutMs, options.signal, callContext, {
       label: explicitPrimaryLabel,
       attemptIndex: 0,
       isFallback: false,
       totalAttempts,
-      model: args.body.model
+      model: baseBody.model
     }, options);
   } catch (error51) {
     firstError = error51;
@@ -16679,10 +16685,10 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
       continue;
     }
     const label = `${parsed.providerID}/${parsed.modelID}`;
-    const attemptArgs = {
-      ...args,
-      body: { ...args.body, model: parsed }
-    };
+    const attemptArgs = copyPromptArgs(baseArgs, {
+      ...baseBody,
+      model: parsed
+    });
     const attempt = {
       label,
       attemptIndex: i + 1,

package/dist/shared/model-suggestion-retry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-suggestion-retry.d.ts","sourceRoot":"","sources":["../../src/shared/model-suggestion-retry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAM7D,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAOtD,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,WAAW,iBAAiB;IAC9B,+EAA+E;IAC/E,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,UAAU,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,aAAa,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,KAAK,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAED,MAAM,WAAW,kBAAkB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wFAAwF;IACxF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;;;;;;;;;OAcG;IACH,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAE,SAAQ,kBAAkB;IACxF;;;;OAIG;IACH,WAAW,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChF;;;OAGG;IACH,cAAc,EAAE,CACZ,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,iBAAiB,KACzB,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,0BAA0B,CAAC,OAAO,EAAE,UAAU;IAC3D,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE,iBAAiB,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACtB;AAiBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,GAAG,IAAI,CA4C/E;AAqKD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kCAAkC,CACpD,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,EAChB,OAAO,GAAE,kBAAuB,GACjC,OAAO,CAAC,IAAI,CAAC,CAgFf;AAiBD;;;;;;;;;;;GAWG;AACH,wBAAsB,kCAAkC,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,EAClF,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAC,GAC1D,OAAO,CAAC,0BAA0B,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAgG1D"}
+{"version":3,"file":"model-suggestion-retry.d.ts","sourceRoot":"","sources":["../../src/shared/model-suggestion-retry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAM7D,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAOtD,MAAM,MAAM,UAAU,GAAG;IACrB,KAAK,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAChD,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B,CAAC;AAWF,MAAM,WAAW,iBAAiB;IAC9B,+EAA+E;IAC/E,KAAK,EAAE,MAAM,CAAC;IACd,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,UAAU,EAAE,OAAO,CAAC;IACpB,iFAAiF;IACjF,aAAa,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,KAAK,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAED,MAAM,WAAW,kBAAkB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wFAAwF;IACxF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB;;;;;;;;;;;;;;OAcG;IACH,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAE,SAAQ,kBAAkB;IACxF;;;;OAIG;IACH,WAAW,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAChF;;;OAGG;IACH,cAAc,EAAE,CACZ,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,iBAAiB,KACzB,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,0BAA0B,CAAC,OAAO,EAAE,UAAU;IAC3D,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE,iBAAiB,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACtB;AAiBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,GAAG,IAAI,CA4C/E;AAuKD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,kCAAkC,CACpD,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,EAChB,OAAO,GAAE,kBAAuB,GACjC,OAAO,CAAC,IAAI,CAAC,CAqFf;AAiBD;;;;;;;;;;;GAWG;AACH,wBAAsB,kCAAkC,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,EAClF,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,2BAA2B,CAAC,OAAO,EAAE,UAAU,CAAC,GAC1D,OAAO,CAAC,0BAA0B,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAqG1D"}

package/dist/shared/subagent-runner.d.ts

@@ -156,6 +156,7 @@ export type SubagentProgressEvent = {
  *   reported as `ok: false, reason: "no_assistant"` so callers can try fallback
  *   models instead of accepting an unusable success.
  * - `reason`: failure category, one of:
+ *     - `"invalid_prompt"`: a known zero-tool child was given no system prompt
  *     - `"timeout"`: hit `timeoutMs` before the child finished
  *     - `"abort"`: caller's `signal` was triggered
  *     - `"model_failed"`: every configured model + fallback returned an error
@@ -188,9 +189,11 @@ export type SubagentRunResult = {
     meta?: Record<string, unknown>;
 } | {
     ok: false;
-    reason: "timeout" | "abort" | "model_failed" | "truncated" | "spawn_failed" | "non_zero_exit" | "no_assistant" | "parse_failed";
+    reason: "invalid_prompt" | "timeout" | "abort" | "model_failed" | "truncated" | "spawn_failed" | "non_zero_exit" | "no_assistant" | "parse_failed";
     error: string;
     durationMs: number;
+    /** True when the caller should retry the task rather than advance its schedule. */
+    transient?: boolean;
     meta?: Record<string, unknown>;
 };
 /**

package/dist/shared/subagent-runner.d.ts.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/opencode-magic-context",
-  "version": "0.32.3",
+  "version": "0.32.4",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",

package/src/shared/model-suggestion-retry.test.ts

@@ -6,7 +6,11 @@ import {
 } from "./model-suggestion-retry";
 
 type PromptCall = {
-    body: { model?: { providerID: string; modelID: string } };
+    body: {
+        model?: { providerID: string; modelID: string };
+        system?: string;
+        [key: string]: unknown;
+    };
     signal?: AbortSignal;
 };
 
@@ -338,6 +342,42 @@ describe("promptSyncWithValidatedOutputRetry", () => {
         expect(messages).toHaveBeenCalledTimes(1);
     });
 
+    test("preserves body.system when a failed Pi-shaped attempt mutates its body", async () => {
+        const prompt = mock(async (args: PromptCall) => {
+            if (prompt.mock.calls.length === 1) {
+                // Reproduce a facade/SDK that consumes the request body before
+                // rejecting the primary model. The fallback must not inherit
+                // that mutation and spawn without its task prompt.
+                delete args.body.system;
+                throw new Error("primary failed");
+            }
+            return {};
+        });
+        const client = createClient(prompt);
+        const systemPrompt = "CLASSIFY_SYSTEM_PROMPT";
+
+        await promptSyncWithValidatedOutputRetry(
+            client,
+            {
+                path: { id: "ses-classify" },
+                body: {
+                    agent: "dreamer-classifier",
+                    system: systemPrompt,
+                    parts: [{ type: "text", text: "classify" }],
+                },
+            },
+            {
+                fallbackModels: ["anthropic/claude-sonnet-4-6"],
+                fetchOutput: async () => "fallback-output",
+                validateOutput: (output: string) => output,
+            },
+        );
+
+        expect(prompt).toHaveBeenCalledTimes(2);
+        expect((prompt.mock.calls[0]?.[0] as PromptCall).body.system).toBeUndefined();
+        expect((prompt.mock.calls[1]?.[0] as PromptCall).body.system).toBe(systemPrompt);
+    });
+
     test("empty first model tries the next fallback", async () => {
         const prompt = mock(async () => ({}));
         const messages = mock(async () =>

package/src/shared/model-suggestion-retry.ts

@@ -23,6 +23,15 @@ export type PromptArgs = {
     [key: string]: unknown;
 };
 
+/**
+ * Keep a prompt body independent from SDK/client mutation. Some prompt facades
+ * normalize or consume request bodies while handling a failed attempt; fallback
+ * attempts must start from the original system prompt and request body every time.
+ */
+function copyPromptArgs(args: PromptArgs, body: PromptBody): PromptArgs {
+    return { ...args, body: { ...body } };
+}
+
 export interface PromptAttemptInfo {
     /** Human-readable model label used in logs ("primary" or "provider/model"). */
     label: string;
@@ -280,8 +289,13 @@ async function attemptOnce(
     callContext: string,
     label: string,
 ): Promise<void> {
+    // Keep this snapshot separate from the object passed to the client. A
+    // failed prompt facade may rewrite its request body before rejecting; the
+    // model-suggestion retry still needs the original system prompt.
+    const originalBody = { ...args.body };
+    const attemptArgs = copyPromptArgs(args, originalBody);
     try {
-        await promptWithTimeout(client, args, timeoutMs, signal);
+        await promptWithTimeout(client, attemptArgs, timeoutMs, signal);
         return;
     } catch (error) {
         // If non-retryable (abort, overflow, timeout), bubble up immediately.
@@ -289,7 +303,7 @@ async function attemptOnce(
         if (isNonRetryable(error, signal)) throw error;
 
         const suggestion = parseModelSuggestion(error);
-        if (!suggestion || !args.body.model) {
+        if (!suggestion || !originalBody.model) {
             // No suggestion available — caller's fallback loop will decide
             // whether to try the next chain entry.
             throw error;
@@ -302,16 +316,13 @@ async function attemptOnce(
 
         await promptWithTimeout(
             client,
-            {
-                ...args,
-                body: {
-                    ...args.body,
-                    model: {
-                        providerID: suggestion.providerID,
-                        modelID: suggestion.suggestion,
-                    },
+            copyPromptArgs(args, {
+                ...originalBody,
+                model: {
+                    providerID: suggestion.providerID,
+                    modelID: suggestion.suggestion,
                 },
-            },
+            }),
             timeoutMs,
             signal,
         );
@@ -340,12 +351,17 @@ export async function promptSyncWithModelSuggestionRetry(
     const timeoutMs = options.timeoutMs ?? 300_000;
     const callContext = options.callContext ?? "subagent";
     const fallbacks = options.fallbackModels ?? [];
+    // Snapshot the body before the first client call. The Pi facade and the
+    // OpenCode SDK both receive this same shape, and either may mutate it while
+    // handling a failed request. Fallbacks must never inherit that mutation.
+    const baseBody = { ...args.body };
+    const baseArgs = copyPromptArgs(args, baseBody);
 
     // Attempt 0 = whatever the agent or explicit body.model resolves to.
     // Subsequent attempts override body.model with each fallback in order.
     const explicitPrimaryLabel =
-        args.body.model?.providerID && args.body.model.modelID
-            ? `${args.body.model.providerID}/${args.body.model.modelID}`
+        baseBody.model?.providerID && baseBody.model.modelID
+            ? `${baseBody.model.providerID}/${baseBody.model.modelID}`
             : "primary";
 
     let lastError: unknown = null;
@@ -353,7 +369,7 @@ export async function promptSyncWithModelSuggestionRetry(
     try {
         await attemptOnce(
             client,
-            args,
+            baseArgs,
             timeoutMs,
             options.signal,
             callContext,
@@ -385,10 +401,10 @@ export async function promptSyncWithModelSuggestionRetry(
         }
 
         const label = `${parsed.providerID}/${parsed.modelID}`;
-        const attemptArgs: PromptArgs = {
-            ...args,
-            body: { ...args.body, model: parsed },
-        };
+        const attemptArgs = copyPromptArgs(baseArgs, {
+            ...baseBody,
+            model: parsed,
+        });
 
         try {
             await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label);
@@ -453,10 +469,15 @@ export async function promptSyncWithValidatedOutputRetry<TOutput, TValidated = T
     const timeoutMs = options.timeoutMs ?? 300_000;
     const callContext = options.callContext ?? "subagent";
     const fallbacks = options.fallbackModels ?? [];
+    // Snapshot the body before the first client call. The Pi facade and the
+    // OpenCode SDK both receive this same shape, and either may mutate it while
+    // handling a failed request. Fallbacks must never inherit that mutation.
+    const baseBody = { ...args.body };
+    const baseArgs = copyPromptArgs(args, baseBody);
 
     const explicitPrimaryLabel =
-        args.body.model?.providerID && args.body.model.modelID
-            ? `${args.body.model.providerID}/${args.body.model.modelID}`
+        baseBody.model?.providerID && baseBody.model.modelID
+            ? `${baseBody.model.providerID}/${baseBody.model.modelID}`
             : "primary";
     const totalAttempts = fallbacks.length + 1;
 
@@ -466,7 +487,7 @@ export async function promptSyncWithValidatedOutputRetry<TOutput, TValidated = T
     try {
         return await attemptAndValidate(
             client,
-            args,
+            baseArgs,
             timeoutMs,
             options.signal,
             callContext,
@@ -475,7 +496,7 @@ export async function promptSyncWithValidatedOutputRetry<TOutput, TValidated = T
                 attemptIndex: 0,
                 isFallback: false,
                 totalAttempts,
-                model: args.body.model,
+                model: baseBody.model,
             },
             options,
         );
@@ -501,10 +522,10 @@ export async function promptSyncWithValidatedOutputRetry<TOutput, TValidated = T
         }
 
         const label = `${parsed.providerID}/${parsed.modelID}`;
-        const attemptArgs: PromptArgs = {
-            ...args,
-            body: { ...args.body, model: parsed },
-        };
+        const attemptArgs = copyPromptArgs(baseArgs, {
+            ...baseBody,
+            model: parsed,
+        });
         const attempt: PromptAttemptInfo = {
             label,
             attemptIndex: i + 1,

package/src/shared/subagent-runner.ts

@@ -159,6 +159,7 @@ export type SubagentProgressEvent =
  *   reported as `ok: false, reason: "no_assistant"` so callers can try fallback
  *   models instead of accepting an unusable success.
  * - `reason`: failure category, one of:
+ *     - `"invalid_prompt"`: a known zero-tool child was given no system prompt
  *     - `"timeout"`: hit `timeoutMs` before the child finished
  *     - `"abort"`: caller's `signal` was triggered
  *     - `"model_failed"`: every configured model + fallback returned an error
@@ -194,6 +195,7 @@ export type SubagentRunResult =
     | {
           ok: false;
           reason:
+              | "invalid_prompt"
               | "timeout"
               | "abort"
               | "model_failed"
@@ -204,6 +206,8 @@ export type SubagentRunResult =
               | "parse_failed";
           error: string;
           durationMs: number;
+          /** True when the caller should retry the task rather than advance its schedule. */
+          transient?: boolean;
           meta?: Record<string, unknown>;
       };