pi-subagents-lite 1.4.3 → 1.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-subagents-lite",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "Lightweight sub-agents for pi — spawn specialized agents with isolated sessions, tools, and models.",
   "keywords": [
     "pi-package",

package/src/agents/agent-runner.ts

@@ -27,7 +27,7 @@ import { buildAgentPrompt, type PromptExtras } from "../prompt/prompts.js";
 import { preloadSkills, loadSkillMeta, type SkillMeta } from "../prompt/skill-loader.js";
 import { type EnvInfo, type RunCallbacks, type RunTunables, SHORT_ID_LENGTH } from "../types.js";
 import type { SubagentType, SystemPromptMode } from "./types.js";
-import { getStore } from "../shell.js";
+import { getStore, enterSubagentSpawn, exitSubagentSpawn } from "../shell.js";
 import { DEFAULT_GRACE_TURNS, CUSTOM_PROMPT_PATH } from "../config/config-io.js";
 
 /** Normalize max turns. undefined or 0 = unlimited, otherwise minimum 1. */
@@ -516,6 +516,22 @@ export async function runAgent(
   type: SubagentType,
   prompt: string,
   options: RunOptions,
+): Promise<RunResult> {
+  // Bracket the whole subagent lifecycle so the extension factory can detect
+  // it's being re-loaded inside a subagent and avoid clobbering the parent shell.
+  enterSubagentSpawn();
+  try {
+    return await runAgentImpl(ctx, type, prompt, options);
+  } finally {
+    exitSubagentSpawn();
+  }
+}
+
+async function runAgentImpl(
+  ctx: ExtensionContext,
+  type: SubagentType,
+  prompt: string,
+  options: RunOptions,
 ): Promise<RunResult> {
   const store = getStore();
   const config = getConfig(type, store.agent.loadSkillsImplicitly, store.agent.loadExtensionsImplicitly);

package/src/index.ts

@@ -24,11 +24,15 @@
  */
 
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { setPiInstance } from "./shell.js";
+import { setPiInstance, isInsideSubagentSpawn } from "./shell.js";
 import { registerTools } from "./registration.js";
 import { setupEventListeners } from "./events.js";
 
 export default function (pi: ExtensionAPI) {
+  // Subagents re-load this extension under their own pi/runtime. Stay inert so
+  // we never overwrite the parent-owned shell (pi, sessionCtx, manager, ...).
+  // The completion nudge relies on those still pointing at the parent session.
+  if (isInsideSubagentSpawn()) return;
   setPiInstance(pi);
   registerTools(pi);
   setupEventListeners(pi);

package/src/shell.ts

@@ -99,3 +99,31 @@ export function setWidget(w: AgentWidget | null): void {
 export function setCoordinator(c: SpawnCoordinator | null): void {
   shell.coordinator = c;
 }
+
+// ============================================================================
+// Subagent spawn context
+// ============================================================================
+
+/**
+ * Nesting depth of in-flight subagent spawns.
+ *
+ * Subagents are created via runAgent(), which re-loads this extension fresh
+ * (new runtime, new pi/ctx). Without protection those re-loads clobber the
+ * parent-owned shell singletons below, so the nudge would later route to a
+ * dead subagent session instead of the parent. The factory checks this flag
+ * and stays inert while a subagent is spawning.
+ */
+let subagentSpawnDepth = 0;
+
+export function enterSubagentSpawn(): void {
+  subagentSpawnDepth++;
+}
+
+export function exitSubagentSpawn(): void {
+  if (subagentSpawnDepth > 0) subagentSpawnDepth--;
+}
+
+/** True while a subagent is being spawned (factory/session_start run in subagent context). */
+export function isInsideSubagentSpawn(): boolean {
+  return subagentSpawnDepth > 0;
+}

package/src/spawn/spawn-coordinator.ts

@@ -58,6 +58,9 @@ export class SpawnCoordinator {
   /** Agent IDs spawned as background — only these trigger a nudge on completion. */
   private backgroundAgentIds = new Set<string>();
 
+  /** Captured ExtensionContext per background agent, bound to the spawning session. */
+  private backgroundContexts = new Map<string, ExtensionContext>();
+
   /** Pending nudge agent IDs, batched within the delay window. */
   private pendingNudges = new Set<string>();
 
@@ -106,14 +109,12 @@ export class SpawnCoordinator {
       widget.ensureTimer();
     }
 
-    // Track background agents
+    // Track background agents + capture ctx for fallback notification
     if (intent.runInBackground) {
       this.backgroundAgentIds.add(agentId);
+      this.backgroundContexts.set(agentId, ctx);
     }
 
-    // pi is read from shell at nudge time, not stored here
-    // (avoids stale ctx after session replacement or reload)
-
     const record = this.manager.getRecord(agentId)!;
 
     if (!intent.runInBackground) {
@@ -181,6 +182,7 @@ export class SpawnCoordinator {
     this.pendingNudges.clear();
     this.liveViews.clear();
     this.backgroundAgentIds.clear();
+    this.backgroundContexts.clear();
     this.disposed = true;
   }
 
@@ -242,9 +244,21 @@ export class SpawnCoordinator {
         },
       );
     } catch (error) {
-      // pi may be stale after session replacement (newSession/fork/switchSession).
-      // PI invalidates the extension runner on session.dispose() and never
-      // clears the stale flag for non-reload replacements. Nothing we can do.
+      // sendMessage failed (shared runtime overwritten by subagent bindCore).
+      // Fall back to UI notification using the captured spawning-session context.
+      const spawnCtx = this.backgroundContexts.get(agentId);
+      if (spawnCtx?.ui?.notify) {
+        try {
+          spawnCtx.ui.notify(
+            `[Subagent "${record.display.type}" ${record.lifecycle.status}] Result available`,
+            "info",
+          );
+        } catch {
+          // ctx may also be stale if session was replaced
+        }
+      }
+    } finally {
+      this.backgroundContexts.delete(agentId);
     }
   }
 }