@ian-pascoe/pi-minimal-subagents 0.8.0 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ian-pascoe/pi-minimal-subagents",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "private": false,
   "description": "Persistent nested subagents with bounded delegation for Pi",
   "keywords": [

package/src/minimal-subagents-coordinator.ts

@@ -570,7 +570,7 @@ export class MinimalSubagentsCoordinator {
       const runtime = this.runtimes.get(agent.agent_id);
       try {
         if (agent.active_turn_id) await this.cancelActiveTurn(agent);
-        runtime?.dispose();
+        await runtime?.dispose();
         this.runtimes.delete(agent.agent_id);
         if (agent.session_file) {
           await this.dependencies.sessions.trashSession(agent);
@@ -622,7 +622,7 @@ export class MinimalSubagentsCoordinator {
     await Promise.allSettled(
       abandonedRuntimes.map((runtime) => (runtime.isRunning ? runtime.abort() : Promise.resolve())),
     );
-    for (const runtime of abandonedRuntimes) runtime.dispose();
+    for (const runtime of abandonedRuntimes) await runtime.dispose();
     this.runtimes.clear();
     this.runtimeInitializations.clear();
     this.pendingAgentIds.clear();
@@ -892,7 +892,7 @@ export class MinimalSubagentsCoordinator {
     await Promise.allSettled(this.runtimeInitializations.values());
     await Promise.allSettled(this.backgroundOperations);
     await Promise.allSettled(this.recipientQueues.values());
-    for (const runtime of this.runtimes.values()) runtime.dispose();
+    for (const runtime of this.runtimes.values()) await runtime.dispose();
     this.runtimes.clear();
   }
 
@@ -910,7 +910,7 @@ export class MinimalSubagentsCoordinator {
       const runtime = await this.ensureRuntime(agent);
       if (this.agents.get(agentId) !== agent || agent.active_turn_id !== turnId) {
         if (!this.agents.has(agentId) || !this.acceptingOperations) {
-          runtime.dispose();
+          await runtime.dispose();
           this.runtimes.delete(agentId);
         }
         return;
@@ -943,13 +943,13 @@ export class MinimalSubagentsCoordinator {
     const openingForTurn = agent.active_turn_id !== undefined;
     const initialization = this.dependencies.sessions
       .openRuntime(agent)
-      .then((runtime) => {
+      .then(async (runtime) => {
         if (this.agents.get(agent.agent_id) !== agent) {
-          runtime.dispose();
+          await runtime.dispose();
           throw new Error(`Minimal subagents runtime replaced while opening ${agent.agent_id}`);
         }
         if (!runtime.sessionLeafId) {
-          runtime.dispose();
+          await runtime.dispose();
           throw new Error(
             `Minimal subagents session restoration: no selected session leaf for ${agent.agent_id}`,
           );

package/src/minimal-subagents-extension.ts

@@ -80,6 +80,7 @@ import { MinimalSubagentsUiController } from "./minimal-subagents-ui.js";
 import type {
   AgentSessionFactory,
   CallerSnapshot,
+  ChildSessionObserver,
   CoordinatorNotification,
   ForkSnapshot,
   PersistedAgent,
@@ -585,6 +586,19 @@ export class MinimalSubagentsLifecycleController {
       projectTrusted: context.isProjectTrusted(),
       maxSubagentDepth: minimalSubagentsConfig.maxSubagentDepth,
       onChildSessionActivity: () => activeCoordinator?.scheduleDeliveryReconciliation(),
+      observeSession: (session, agentId, resourceInputs) => {
+        let observer: ChildSessionObserver | undefined;
+        this.pi.events.emit("pi-minimal-subagents:observe-session", {
+          rootSessionId,
+          agentId,
+          session,
+          resourceInputs,
+          attach: (attached: ChildSessionObserver) => {
+            observer = attached;
+          },
+        });
+        return observer;
+      },
       getCoordinatorTools: (callerId) => {
         const coordinator = requireActiveCoordinator();
         return createCoordinatorToolDefinitions({

package/src/minimal-subagents-sessions.ts

@@ -17,6 +17,7 @@ import {
   SettingsManager,
   sessionEntryToContextMessages,
   type AgentSessionEvent,
+  type Extension,
   type SessionEntry,
   type ToolDefinition,
 } from "@earendil-works/pi-coding-agent";
@@ -53,6 +54,7 @@ import { addMinimalSubagentsUsage } from "./minimal-subagents-usage.js";
 import type {
   AgentSessionFactory,
   ChildAgentRuntime,
+  ChildSessionObserver,
   ChildAgentTranscriptSnapshot,
   CoordinatorMessage,
   PersistedAgent,
@@ -180,6 +182,15 @@ export interface PiAgentSessionFactoryOptions {
   sessionFileTrash?: SessionFileTrashCapability;
   getCoordinatorTools: (callerId: string) => ToolDefinition[];
   onChildSessionActivity?: () => void;
+  observeSession?: (
+    session: AgentSession,
+    agentId: string,
+    resourceInputs: {
+      agentDir: string;
+      extensions: readonly Pick<Extension, "path" | "resolvedPath" | "sourceInfo" | "hidden">[];
+      flagValues: ReadonlyMap<string, boolean | string>;
+    },
+  ) => ChildSessionObserver | undefined;
 }
 
 /** Build one child prompt using the active delegation depth rather than persisted launch state. */
@@ -494,7 +505,7 @@ function collectChildTurnOutcome(
       error: "No terminal assistant response",
     };
   }
-  if (finalAssistant.stopReason === "aborted") {
+  if (aborted || finalAssistant.stopReason === "aborted") {
     return {
       status: "cancelled",
       output: assistantText(finalAssistant),
@@ -554,6 +565,7 @@ class PiChildAgentRuntime implements ChildAgentRuntime {
     private readonly modelRuntime: ModelRuntime,
     private readonly modelById: ReadonlyMap<string, Model<any>>,
     onSessionActivity?: () => void,
+    private readonly observer?: ChildSessionObserver,
   ) {
     // Keep this child-only; AgentSession.setSteeringMode would overwrite the user's global setting.
     session.agent.steeringMode = "all";
@@ -613,12 +625,16 @@ class PiChildAgentRuntime implements ChildAgentRuntime {
 
   async abort(): Promise<void> {
     this.aborted = true;
-    await this.session.abort();
+    await Promise.all([this.observer?.abort(), this.session.abort()]);
   }
 
-  dispose(): void {
+  async dispose(): Promise<void> {
     this.unsubscribe();
-    this.session.dispose();
+    try {
+      await this.observer?.dispose();
+    } finally {
+      this.session.dispose();
+    }
   }
 
   getRuntimeProfile(): RuntimeProfile | undefined {
@@ -715,7 +731,20 @@ class PiChildAgentRuntime implements ChildAgentRuntime {
 
   private async captureTurn(operation: () => Promise<void>): Promise<RuntimeTurnOutcome> {
     this.aborted = false;
-    return captureChildTurnOutcome(this.session, operation, () => this.aborted);
+    this.observer?.beginTurn();
+    return captureChildTurnOutcome(
+      this.session,
+      async () => {
+        try {
+          await operation();
+          if (!this.aborted) await this.observer?.finishTurn();
+        } catch (error) {
+          await this.observer?.abort();
+          throw error;
+        }
+      },
+      () => this.aborted,
+    );
   }
 
   private async compactImportedContext(
@@ -1187,6 +1216,18 @@ export class PiAgentSessionFactory implements AgentSessionFactory {
       modelRuntime,
       this.modelById,
       this.options.onChildSessionActivity,
+      this.options.observeSession?.(session, agent.agent_id, {
+        agentDir: this.options.agentDir,
+        extensions: resourceLoader
+          .getExtensions()
+          .extensions.map(({ path, resolvedPath, sourceInfo, hidden }) => ({
+            path,
+            resolvedPath,
+            sourceInfo,
+            hidden,
+          })),
+        flagValues: new Map(resourceLoader.getExtensions().runtime.flagValues),
+      }),
     );
   }
 

package/src/minimal-subagents-types.ts

@@ -224,6 +224,14 @@ export interface CoordinatorMessage {
   };
 }
 
+/** Optional review work attached by the root and awaited by the existing child owner. */
+export interface ChildSessionObserver {
+  beginTurn(): void;
+  finishTurn(): Promise<void>;
+  abort(): Promise<void>;
+  dispose(): Promise<void>;
+}
+
 /** Process-local adapter around one SDK-created Pi child session. */
 export interface ChildAgentRuntime {
   readonly sessionLeafId: string | undefined;
@@ -238,7 +246,7 @@ export interface ChildAgentRuntime {
   /** Queue one typed coordinator message into the child session. */
   queueCoordinatorMessage(message: CoordinatorMessage): Promise<void>;
   abort(): Promise<void>;
-  dispose(): void;
+  dispose(): void | Promise<void>;
   /** Return the live Runtime Profile, or undefined when the SDK session has no model. */
   getRuntimeProfile(): RuntimeProfile | undefined;
   /** Return the effective ordinary tools after child extensions apply runtime adapters. */