@gotgenes/pi-subagents 13.1.0 → 13.2.1

package/src/service/service-adapter.ts

@@ -90,13 +90,7 @@ export class SubagentsServiceAdapter implements SubagentsService {
     if (record?.status !== "running") {
       return false;
     }
-    const session = record.session;
-    if (!session) {
-      // Session not ready yet — buffer on the agent for delivery once initialized
-      record.queueSteer(message);
-      return true;
-    }
-    await session.steer(message);
+    await record.steer(message);
     return true;
   }
 

package/src/tools/agent-tool.ts

@@ -108,7 +108,7 @@ export class AgentTool {
 					`Agent not found: "${params.resume}". It may have been cleaned up.`,
 				);
 			}
-			if (!existing.session) {
+			if (!existing.isSessionReady()) {
 				return textResult(
 					`Agent "${params.resume}" has no active session to resume.`,
 				);

package/src/tools/background-spawner.ts

@@ -53,9 +53,10 @@ export function spawnBackground(
       isBackground: true,
       invocation: execution.agentInvocation,
       observer: {
-        onSessionCreated: (_agent, session) => {
-          bgState.setSession(session);
-          subscribeUIObserver(session, bgState);
+        onSessionCreated: (agent) => {
+          const sub = agent.subagentSession!;
+          bgState.setSession(sub);
+          subscribeUIObserver(sub, bgState);
         },
       },
     });

package/src/tools/foreground-runner.ts

@@ -108,10 +108,11 @@ export async function runForeground(
         signal,
         parentSession: params.parentSession,
         observer: {
-          onSessionCreated: (agent, session) => {
-            fgState.setSession(session);
+          onSessionCreated: (agent) => {
+            const sub = agent.subagentSession!;
+            fgState.setSession(sub);
             recordRef = agent;
-            unsubUI = subscribeUIObserver(session, fgState, streamUpdate);
+            unsubUI = subscribeUIObserver(sub, fgState, streamUpdate);
             fgId = agent.id;
             agentActivity.set(agent.id, fgState);
             widget.ensureTimer();

package/src/tools/get-result-tool.ts

@@ -1,8 +1,6 @@
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
 import type { AgentConfigLookup } from "#src/config/agent-types";
-import { getSessionContextPercent } from "#src/lifecycle/usage";
-import { getAgentConversation } from "#src/session/conversation";
 import { formatLifetimeTokens, textResult } from "#src/tools/helpers";
 import type { Agent } from "#src/types";
 import { formatDuration, getDisplayName } from "#src/ui/display";
@@ -53,7 +51,7 @@ export class GetResultTool {
 		const displayName = getDisplayName(record.type, this.registry);
 		const duration = formatDuration(record.startedAt, record.completedAt);
 		const tokens = formatLifetimeTokens(record);
-		const contextPercent = getSessionContextPercent(record.session);
+		const contextPercent = record.getContextPercent();
 		const statsParts = [`Tool uses: ${record.toolUses}`];
 		if (tokens) statsParts.push(tokens);
 		if (contextPercent !== null) statsParts.push(`Context: ${Math.round(contextPercent)}%`);
@@ -80,11 +78,9 @@ export class GetResultTool {
 		}
 
 		// Verbose: include full conversation
-		if (params.verbose && record.session) {
-			const conversation = getAgentConversation(record.session);
-			if (conversation) {
-				output += `\n\n--- Agent Conversation ---\n${conversation}`;
-			}
+		const conversation = params.verbose ? record.getConversation() : undefined;
+		if (conversation) {
+			output += `\n\n--- Agent Conversation ---\n${conversation}`;
 		}
 
 		return textResult(output);

package/src/tools/steer-tool.ts

@@ -1,6 +1,5 @@
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "@sinclair/typebox";
-import { getSessionContextPercent } from "#src/lifecycle/usage";
 import { formatLifetimeTokens, textResult } from "#src/tools/helpers";
 import type { Agent } from "#src/types";
 
@@ -40,21 +39,16 @@ export class SteerTool {
 				`Agent "${params.agent_id}" is not running (status: ${record.status}). Cannot steer a non-running agent.`,
 			);
 		}
-		const session = record.session;
-		if (!session) {
-			// Session not ready yet — buffer on the agent for delivery once initialized
-			record.queueSteer(params.message);
-			this.events.emit("subagents:steered", { id: record.id, message: params.message });
-			return textResult(
-				`Steering message queued for agent ${record.id}. It will be delivered once the session initializes.`,
-			);
-		}
-
 		try {
-			await session.steer(params.message);
+			const delivered = await record.steer(params.message);
 			this.events.emit("subagents:steered", { id: record.id, message: params.message });
+			if (!delivered) {
+				return textResult(
+					`Steering message queued for agent ${record.id}. It will be delivered once the session initializes.`,
+				);
+			}
 			const tokens = formatLifetimeTokens(record);
-			const contextPercent = getSessionContextPercent(session);
+			const contextPercent = record.getContextPercent();
 			const stateParts: string[] = [];
 			if (tokens) stateParts.push(tokens);
 			stateParts.push(`${record.toolUses} tool ${record.toolUses === 1 ? "use" : "uses"}`);

package/src/ui/agent-menu.ts

@@ -252,8 +252,7 @@ export class AgentsMenuHandler {
   }
 
   private async viewAgentConversation(ui: MenuUI, record: Agent): Promise<void> {
-    const session = record.session;
-    if (!session) {
+    if (!record.isSessionReady()) {
       ui.notify(
         `Agent is ${record.status === "queued" ? "queued" : "expired"} — no session available.`,
         "info",
@@ -270,7 +269,6 @@ export class AgentsMenuHandler {
       (tui: any, theme: any, _keybindings: any, done: any) => {
         return new ConversationViewer({
           tui,
-          session,
           record,
           activity,
           theme,

package/src/ui/conversation-viewer.ts

@@ -5,10 +5,9 @@
  * Subscribes to session events for real-time streaming updates.
  */
 
-import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import { type Component, matchesKey, type TUI, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type { AgentConfigLookup } from "#src/config/agent-types";
-import { getLifetimeTotal, getSessionContextPercent } from "#src/lifecycle/usage";
+import { getLifetimeTotal } from "#src/lifecycle/usage";
 import type { Agent } from "#src/types";
 import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
 import { buildInvocationTags, formatDuration, formatSessionTokens, getDisplayName, getPromptModeLabel, type Theme } from "#src/ui/display";
@@ -24,7 +23,6 @@ export const VIEWPORT_HEIGHT_PCT = 70;
 
 export interface ConversationViewerOptions {
   tui: TUI;
-  session: AgentSession;
   record: Agent;
   activity: AgentActivityTracker | undefined;
   theme: Theme;
@@ -41,7 +39,6 @@ export class ConversationViewer implements Component {
   private closed = false;
 
   private tui: TUI;
-  private session: AgentSession;
   private record: Agent;
   private activity: AgentActivityTracker | undefined;
   private theme: Theme;
@@ -51,7 +48,6 @@ export class ConversationViewer implements Component {
 
   constructor({
     tui,
-    session,
     record,
     activity,
     theme,
@@ -60,14 +56,13 @@ export class ConversationViewer implements Component {
     wrapText,
   }: ConversationViewerOptions) {
     this.tui = tui;
-    this.session = session;
     this.record = record;
     this.activity = activity;
     this.theme = theme;
     this.done = done;
     this.registry = registry;
     this.wrapText = wrapText;
-    this.unsubscribe = session.subscribe(() => {
+    this.unsubscribe = record.subscribeToUpdates(() => {
       if (this.closed) return;
       this.tui.requestRender();
     });
@@ -142,7 +137,7 @@ export class ConversationViewer implements Component {
     if (toolUses > 0) headerParts.unshift(`${toolUses} tool${toolUses === 1 ? "" : "s"}`);
     const tokens = getLifetimeTotal(this.record.lifetimeUsage);
     if (tokens > 0) {
-      const percent = getSessionContextPercent(this.record.session);
+      const percent = this.record.getContextPercent();
       headerParts.push(formatSessionTokens(tokens, percent, th, this.record.compactionCount));
     }
 
@@ -220,7 +215,7 @@ export class ConversationViewer implements Component {
 
     const th = this.theme;
     const ctx = { theme: th, wrapText: this.wrapText };
-    const messages = this.session.messages;
+    const messages = this.record.messages;
 
     if (messages.length === 0) {
       return [th.fg("dim", "(waiting for first message...)")];
@@ -229,7 +224,7 @@ export class ConversationViewer implements Component {
     const lines: string[] = [];
     let needsSeparator = false;
     for (const msg of messages) {
-      const formatted = formatMessage(msg as unknown as { role: string; [key: string]: unknown }, width, ctx);
+      const formatted = formatMessage(msg as { role: string; [key: string]: unknown }, width, ctx);
       if (!formatted) continue;
       if (needsSeparator) lines.push(th.fg("dim", "───"));
       lines.push(...formatted);