oira666_pi-subagent 0.2.5 → 0.2.7

package/index.ts

@@ -376,18 +376,20 @@ const RESUME_STATE_KEY = "__piSubagentResumeState";
 type SyntheticResumeState = {
   plan: ResumableSubagentCall | null;
   phase: "tool" | "final";
+  trigger: "resumePrompt" | "nextRequest";
 };
 
 function clearSyntheticResumeState(): void {
   const state = getSyntheticResumeState();
   state.plan = null;
   state.phase = "tool";
+  state.trigger = "resumePrompt";
 }
 
 function getSyntheticResumeState(): SyntheticResumeState {
   const g = globalThis as any;
   if (!g[RESUME_STATE_KEY]) {
-    g[RESUME_STATE_KEY] = { plan: null, phase: "tool" } satisfies SyntheticResumeState;
+    g[RESUME_STATE_KEY] = { plan: null, phase: "tool", trigger: "resumePrompt" } satisfies SyntheticResumeState;
   }
   return g[RESUME_STATE_KEY] as SyntheticResumeState;
 }
@@ -423,6 +425,35 @@ function formatModelFlag(model: any): string | undefined {
   return `${model.provider}/${model.id}`;
 }
 
+function findLastNonResumeModel(ctx: any): any | undefined {
+  const entries = (() => {
+    const leafId = ctx.sessionManager?.getLeafId?.();
+    if (leafId) {
+      const branch = ctx.sessionManager?.getBranch?.(leafId);
+      if (Array.isArray(branch)) return branch;
+    }
+    const all = ctx.sessionManager?.getEntries?.();
+    return Array.isArray(all) ? all : [];
+  })();
+
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    if (entry?.type !== "model_change") continue;
+    const provider = entry.provider;
+    const modelId = entry.modelId;
+    if (provider === RESUME_PROVIDER) continue;
+    if (typeof provider !== "string" || typeof modelId !== "string") continue;
+    const model = ctx.modelRegistry?.find?.(provider, modelId);
+    if (model) return model;
+  }
+  return undefined;
+}
+
+function getRestorableModel(ctx: any): any | undefined {
+  if (ctx.model?.provider && ctx.model.provider !== RESUME_PROVIDER) return ctx.model;
+  return findLastNonResumeModel(ctx);
+}
+
 // ---------------------------------------------------------------------------
 // Extension entry point
 // ---------------------------------------------------------------------------
@@ -449,7 +480,10 @@ export default function (pi: ExtensionAPI) {
       const state = getSyntheticResumeState();
       const plan = state.plan;
       const phase = state.phase;
-      if (plan && phase === "tool" && isSyntheticResumePrompt(context, plan.tasks.length)) {
+      const triggerMatches =
+        state.trigger === "nextRequest" ||
+        (plan ? isSyntheticResumePrompt(context, plan.tasks.length) : false);
+      if (plan && phase === "tool" && triggerMatches) {
         state.phase = "final";
         const toolCall = {
           type: "toolCall" as const,
@@ -579,6 +613,11 @@ export default function (pi: ExtensionAPI) {
         );
       }
 
+      const restorableModel = getRestorableModel(ctx);
+      if (ctx.model?.provider === RESUME_PROVIDER && restorableModel) {
+        await pi.setModel(restorableModel);
+      }
+
       const resumeDisabled = parseBooleanEnv(process.env[SUBAGENT_RESUME_DISABLE_ENV]) === true;
       if (resumeDisabled || (event.reason !== "resume" && event.reason !== "startup")) return;
 
@@ -599,7 +638,8 @@ export default function (pi: ExtensionAPI) {
       const resumeState = getSyntheticResumeState();
       resumeState.plan = plan;
       resumeState.phase = "tool";
-      modelToRestoreAfterResume = ctx.model;
+      resumeState.trigger = hasCliInitialPrompt(process.argv) ? "nextRequest" : "resumePrompt";
+      modelToRestoreAfterResume = restorableModel ?? ctx.model;
       resumeModelRegistry = ctx.modelRegistry;
       ensureSubagentToolActive(pi);
       const resumeModel = ctx.modelRegistry.find(RESUME_PROVIDER, RESUME_MODEL_ID);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oira666_pi-subagent",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Subagent extension for Pi coding agent. Delegate tasks to specialized agents.",
   "type": "module",
   "main": "index.ts",

package/runner.ts

@@ -48,11 +48,24 @@ const TERMINAL_STOP_REASONS = new Set(["end_turn", "stop", "max_tokens", "error"
 function isTerminalStopReason(reason: string | undefined): boolean {
   return reason !== undefined && TERMINAL_STOP_REASONS.has(reason);
 }
+
+function endedWithEmptySyntheticResume(messages: Message[]): boolean {
+  const lastAssistant = [...messages].reverse().find((message: any) => message?.role === "assistant") as any;
+  return (
+    lastAssistant?.provider === RESUME_PROVIDER &&
+    lastAssistant?.model === RESUME_MODEL_ID &&
+    lastAssistant?.stopReason === "stop" &&
+    Array.isArray(lastAssistant.content) &&
+    lastAssistant.content.length === 0
+  );
+}
 const SUBAGENT_DEPTH_ENV = "PI_SUBAGENT_DEPTH";
 const SUBAGENT_MAX_DEPTH_ENV = "PI_SUBAGENT_MAX_DEPTH";
 const SUBAGENT_STACK_ENV = "PI_SUBAGENT_STACK";
 const SUBAGENT_PREVENT_CYCLES_ENV = "PI_SUBAGENT_PREVENT_CYCLES";
 const SUBAGENT_FALLBACK_MODEL_ENV = "PI_SUBAGENT_FALLBACK_MODEL";
+const RESUME_PROVIDER = "pi-subagent-resume";
+const RESUME_MODEL_ID = "synthetic-tool-call";
 // PI_OFFLINE intentionally removed: setting it on child processes blocks all API
 // calls and renders subagents unable to do any LLM work. Children inherit the
 // parent's PI_OFFLINE value via process.env spread if needed.
@@ -730,6 +743,13 @@ export async function runAgentSubprocess(opts: RunAgentOptions): Promise<SingleR
       if (!result.stderr.trim()) result.stderr = "Subagent was aborted.";
     }
 
+    if (result.exitCode === 0 && endedWithEmptySyntheticResume(result.messages)) {
+      result.exitCode = 1;
+      result.stopReason = "error";
+      result.errorMessage = "Subagent resume failed before the real model continued.";
+      if (!result.stderr.trim()) result.stderr = result.errorMessage;
+    }
+
     if (result.exitCode === 0) {
       const nestedErrorSummary = getNestedSubagentErrorSummary(result.messages);
       if (nestedErrorSummary) {