@gotgenes/pi-subagents 7.0.0 → 7.2.0

package/src/runtime.ts

@@ -6,6 +6,9 @@
  * Follows the same pattern as pi-permission-system's ExtensionRuntime.
  */
 
+import { buildParentSnapshot, type ParentSnapshot } from "#src/lifecycle/parent-snapshot";
+import type { ModelInfo } from "#src/tools/spawn-config";
+import type { SessionContext } from "#src/types";
 import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
 import type { UICtx } from "#src/ui/agent-widget";
 
@@ -39,7 +42,7 @@ export interface RunConfig {
 export class SubagentRuntime {
   // ── Session state (was closure-scoped in index.ts) ───────────────────────
   /** Active Pi session context — set on session_start, cleared on session_shutdown. */
-  currentCtx: { pi: unknown; ctx: unknown } | undefined = undefined;
+  currentCtx: SessionContext | undefined = undefined;
   /**
    * Per-agent live activity state shared across the notification system,
    * widget, and tool handlers. The Map itself is never replaced.
@@ -54,8 +57,8 @@ export class SubagentRuntime {
   // ── Session-context methods ──────────────────────────────────────────────
 
   /** Store the active Pi session context (called from session_start). */
-  setSessionContext(pi: unknown, ctx: unknown): void {
-    this.currentCtx = { pi, ctx };
+  setSessionContext(ctx: SessionContext): void {
+    this.currentCtx = ctx;
   }
 
   /** Clear the session context (called from session_shutdown). */
@@ -63,6 +66,31 @@ export class SubagentRuntime {
     this.currentCtx = undefined;
   }
 
+  /**
+   * Build a parent snapshot from the current session context.
+   * Only valid during an active session (currentCtx is defined).
+   */
+  buildSnapshot(inheritContext: boolean): ParentSnapshot {
+
+    return buildParentSnapshot(this.currentCtx!, inheritContext);
+  }
+
+  /** Extract model info from the current session context. */
+  getModelInfo(): ModelInfo {
+    return {
+      parentModel: this.currentCtx?.model as ModelInfo["parentModel"],
+      modelRegistry: this.currentCtx?.modelRegistry,
+    };
+  }
+
+  /** Extract session identity from the current session context. */
+  getSessionInfo(): { parentSessionFile: string; parentSessionId: string } {
+    return {
+      parentSessionFile: this.currentCtx?.sessionManager.getSessionFile() ?? "",
+      parentSessionId: this.currentCtx?.sessionManager.getSessionId() ?? "",
+    };
+  }
+
   // ── Widget delegation methods ─────────────────────────────────────────────
 
   /** Delegate to widget.setUICtx — no-op when widget is null. */

package/src/service/service-adapter.ts

@@ -5,12 +5,10 @@
  * (stripping non-serializable fields), and session gating.
  */
 
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
-import { buildParentSnapshot } from "#src/lifecycle/parent-snapshot";
 import type { SubagentRecord, SubagentsService } from "#src/service/service";
 import type { ModelRegistry } from "#src/session/model-resolver";
-import type { AgentRecord } from "#src/types";
+import type { AgentRecord, SessionContext } from "#src/types";
 
 /** Narrow interface for the AgentManager — avoids coupling to the concrete class. */
 export interface AgentManagerLike {
@@ -23,23 +21,30 @@ export interface AgentManagerLike {
   queueSteer(id: string, message: string): boolean;
 }
 
+/**
+ * Narrow runtime interface consumed by the service adapter.
+ * `SubagentRuntime` satisfies this structurally; tests use plain stubs.
+ */
+export interface ServiceRuntimeLike {
+  readonly currentCtx: SessionContext | undefined;
+  buildSnapshot(inheritContext: boolean): ParentSnapshot;
+}
+
 /** Create a SubagentsService backed by the given dependencies. */
 export function createSubagentsService(
   manager: AgentManagerLike,
   resolveModel: (input: string, registry: ModelRegistry) => unknown,
-  getCtx: () => { pi: unknown; ctx: unknown } | undefined,
-  getModelRegistry: () => ModelRegistry | undefined,
+  runtime: ServiceRuntimeLike,
 ): SubagentsService {
   return {
     spawn(type: string, prompt: string, options?) {
-      const session = getCtx();
-      if (!session) {
+      if (!runtime.currentCtx) {
         throw new Error("No active session — cannot spawn agents outside a session.");
       }
 
       let model: unknown;
       if (options?.model) {
-        const registry = getModelRegistry();
+        const registry = runtime.currentCtx.modelRegistry;
         if (!registry) {
           throw new Error("No model registry available.");
         }
@@ -53,10 +58,7 @@ export function createSubagentsService(
       const description = options?.description ?? prompt.slice(0, 80);
       const isBackground = !(options?.foreground ?? false);
 
-      const snapshot = buildParentSnapshot(
-        session.ctx as ExtensionContext,
-        options?.inheritContext,
-      );
+      const snapshot = runtime.buildSnapshot(options?.inheritContext ?? false);
       return manager.spawn(snapshot, type, prompt, {
         description,
         model,

package/src/session/context.ts

@@ -3,7 +3,19 @@
  */
 
 import type { TextContent } from "@earendil-works/pi-ai";
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { SessionContext } from "#src/types";
+
+/**
+ * Minimal structural types for session branch entries consumed by buildParentContext.
+ * `getBranch()` returns `unknown[]` in SessionContext (ISP), so we cast to these
+ * local shapes instead of coupling to the SDK's SessionEntry type.
+ */
+type MessageEntry = {
+  type: "message";
+  message: { role: string; content: string | { type: string }[] };
+};
+type CompactionEntry = { type: "compaction"; summary?: string };
+type BranchEntry = MessageEntry | CompactionEntry | { type: string };
 
 /** Type predicate: narrow an unknown content block to TextContent. */
 function isTextContent(c: unknown): c is TextContent {
@@ -23,15 +35,16 @@ export function extractText(content: unknown[]): string {
  * Used when inherit_context is true to give the subagent visibility
  * into what has been discussed/done so far.
  */
-export function buildParentContext(ctx: ExtensionContext): string {
+export function buildParentContext(ctx: SessionContext): string {
   const entries = ctx.sessionManager.getBranch();
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- getBranch() may return undefined at runtime despite its type
   if (!entries || entries.length === 0) return "";
 
   const parts: string[] = [];
 
-  for (const entry of entries) {
-    if (entry.type === "message") {
+  for (const rawEntry of entries as BranchEntry[]) {
+    if (rawEntry.type === "message") {
+      const entry = rawEntry as MessageEntry;
       const msg = entry.message;
       if (msg.role === "user") {
         const text = typeof msg.content === "string"
@@ -39,12 +52,13 @@ export function buildParentContext(ctx: ExtensionContext): string {
           : extractText(msg.content);
         if (text.trim()) parts.push(`[User]: ${text.trim()}`);
       } else if (msg.role === "assistant") {
-        const text = extractText(msg.content);
+        const text = typeof msg.content === "string" ? msg.content : extractText(msg.content);
         if (text.trim()) parts.push(`[Assistant]: ${text.trim()}`);
       }
       // Skip toolResult messages — too verbose for context
-    } else if (entry.type === "compaction") {
+    } else if (rawEntry.type === "compaction") {
       // Include compaction summaries — they're already condensed
+      const entry = rawEntry as CompactionEntry;
       if (entry.summary) {
         parts.push(`[Summary]: ${entry.summary}`);
       }

package/src/types.ts

@@ -4,6 +4,7 @@
 
 import type { ThinkingLevel } from "@earendil-works/pi-ai";
 import type { AgentSessionEvent } from "@earendil-works/pi-coding-agent";
+import type { ModelRegistry } from "#src/session/model-resolver";
 
 
 export { AgentRecord } from "#src/lifecycle/agent-record";
@@ -77,6 +78,26 @@ export interface AgentInvocation {
   isolation?: IsolationMode;
 }
 
+/**
+ * Narrow shell-exec callback replacing `ExtensionAPI` in `detectEnv()`.
+ * Matches the shape of `pi.exec()` without carrying an SDK dependency.
+ */
+/**
+ * Narrow interface capturing the ExtensionContext fields SubagentRuntime needs.
+ * Avoids coupling runtime to the full SDK ExtensionContext surface (ISP).
+ */
+export interface SessionContext {
+  readonly cwd: string;
+  readonly model: unknown;
+  readonly modelRegistry: ModelRegistry | undefined;
+  getSystemPrompt(): string;
+  readonly sessionManager: {
+    getSessionFile(): string | undefined;
+    getSessionId(): string;
+    getBranch(): unknown[];
+  };
+}
+
 /**
  * Narrow shell-exec callback replacing `ExtensionAPI` in `detectEnv()`.
  * Matches the shape of `pi.exec()` without carrying an SDK dependency.