@gotgenes/pi-subagents 16.6.0 → 17.0.0

package/src/tools/agent-tool.ts

@@ -12,22 +12,8 @@ import { buildDetails, buildTypeListText, textResult } from "#src/tools/helpers"
 import { renderAgentResult } from "#src/tools/result-renderer";
 import { type ModelInfo, resolveSpawnConfig } from "#src/tools/spawn-config";
 import type { ParentSessionInfo, Subagent } from "#src/types";
-import { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
-import { type UICtx } from "#src/ui/agent-widget";
 import { type AgentDetails, getDisplayName } from "#src/ui/display";
 
-// ---- Shared interfaces (also used by background-spawner and foreground-runner) ----
-
-/**
- * Narrow read/write interface for the agent-tool's agentActivity access.
- * The full Map satisfies this structurally — no wrapper needed.
- */
-export interface AgentActivityAccess {
-	get(id: string): AgentActivityTracker | undefined;
-	set(id: string, tracker: AgentActivityTracker): void;
-	delete(id: string): void;
-}
-
 // ---- Deps interfaces ----
 
 /** Narrow manager interface — only the methods the Agent tool calls. */
@@ -40,24 +26,11 @@ export interface AgentToolManager {
 
 /** Narrow runtime interface — the Agent tool's slice of SubagentRuntime. */
 export interface AgentToolRuntime {
-	readonly agentActivity: AgentActivityAccess;
 	buildSnapshot(inheritContext: boolean): ParentSnapshot;
 	getModelInfo(): ModelInfo;
 	getSessionInfo(): { parentSessionFile: string; parentSessionId: string };
 }
 
-/**
- * Narrow widget interface the Agent tool drives directly.
- * Superset of the runner/spawner widget deps plus `setUICtx`.
- * AgentWidget satisfies it structurally.
- */
-export interface AgentToolWidget {
-	setUICtx(ctx: UICtx): void;
-	ensureTimer(): void;
-	update(): void;
-	markFinished(id: string): void;
-}
-
 /** Narrow settings accessor — only the fields the Agent tool reads. */
 export type AgentToolSettings = {
 	readonly defaultMaxTurns: number | undefined;
@@ -73,7 +46,6 @@ export class AgentTool {
 	constructor(
 		private readonly manager: AgentToolManager,
 		private readonly runtime: AgentToolRuntime,
-		private readonly widget: AgentToolWidget,
 		private readonly settings: AgentToolSettings,
 		private readonly registry: AgentTypeRegistry,
 		private readonly agentDir: string,
@@ -87,11 +59,8 @@ export class AgentTool {
 		params: Record<string, unknown>,
 		signal: AbortSignal | undefined,
 		onUpdate: ((update: AgentToolResult<any>) => void) | undefined,
-		ctx: any,
+		_ctx: any,
 	) {
-		// Ensure we have UI context for widget rendering
-		this.widget.setUICtx(ctx.ui as UICtx);
-
 		// Reload custom agents so new .pi/agents/*.md files are picked up without restart
 		this.registry.reload();
 
@@ -140,8 +109,6 @@ export class AgentTool {
 		if (config.execution.runInBackground) {
 			return spawnBackground(
 				this.manager,
-				this.widget,
-				this.runtime.agentActivity,
 				{ config, snapshot, parentSession, settings: this.settings },
 			);
 		}
@@ -149,8 +116,6 @@ export class AgentTool {
 		// ---- Foreground execution — stream progress via onUpdate ----
 		return runForeground(
 			this.manager,
-			this.widget,
-			this.runtime.agentActivity,
 			{ config, snapshot, parentSession },
 			signal,
 			onUpdate,

package/src/tools/background-spawner.ts

@@ -1,11 +1,8 @@
 import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
 import type { AgentSpawnConfig } from "#src/lifecycle/subagent-manager";
-import type { AgentActivityAccess } from "#src/tools/agent-tool";
 import { textResult } from "#src/tools/helpers";
 import type { ResolvedSpawnConfig } from "#src/tools/spawn-config";
 import type { ParentSessionInfo, Subagent } from "#src/types";
-import { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
-import { subscribeUIObserver } from "#src/ui/ui-observer";
 
 /** Narrow manager interface for the background spawner. */
 export interface BackgroundManagerDeps {
@@ -13,12 +10,6 @@ export interface BackgroundManagerDeps {
   getRecord(id: string): Subagent | undefined;
 }
 
-/** Narrow widget interface for the background spawner. */
-export interface BackgroundWidgetDeps {
-  ensureTimer(): void;
-  update(): void;
-}
-
 /** All values the background spawner needs beyond the resolved config. */
 export interface BackgroundParams {
   config: ResolvedSpawnConfig;
@@ -29,17 +20,13 @@ export interface BackgroundParams {
 
 /**
  * Spawn a background agent and return the tool result immediately.
- * Owns: activity tracker creation, UI observer subscription, activity map
- * registration, widget update, and launch message formatting.
+ * Owns: launch message formatting.
  */
 export function spawnBackground(
   manager: BackgroundManagerDeps,
-  widget: BackgroundWidgetDeps,
-  agentActivity: AgentActivityAccess,
   params: BackgroundParams,
 ) {
   const { identity, execution, presentation } = params.config;
-  const bgState = new AgentActivityTracker(execution.effectiveMaxTurns);
 
   let id: string;
   try {
@@ -52,13 +39,6 @@ export function spawnBackground(
       thinkingLevel: execution.thinking,
       isBackground: true,
       invocation: execution.agentInvocation,
-      observer: {
-        onSessionCreated: (agent) => {
-          const sub = agent.subagentSession!;
-          bgState.setSession(sub);
-          subscribeUIObserver(sub, bgState);
-        },
-      },
     });
   } catch (err) {
     return textResult(err instanceof Error ? err.message : String(err));
@@ -66,10 +46,6 @@ export function spawnBackground(
 
   const record = manager.getRecord(id);
 
-  agentActivity.set(id, bgState);
-  widget.ensureTimer();
-  widget.update();
-
   const isQueued = record?.status === "queued";
   return textResult(
     `Agent ${isQueued ? "queued" : "started"} in background.\n` +

package/src/tools/foreground-runner.ts

@@ -1,7 +1,6 @@
 import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
 import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
 import type { AgentSpawnConfig } from "#src/lifecycle/subagent-manager";
-import type { AgentActivityAccess } from "#src/tools/agent-tool";
 import {
   buildDetails,
   formatLifetimeTokens,
@@ -10,14 +9,12 @@ import {
 } from "#src/tools/helpers";
 import type { ResolvedSpawnConfig } from "#src/tools/spawn-config";
 import type { ParentSessionInfo, Subagent } from "#src/types";
-import { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
 import {
   type AgentDetails,
   describeActivity,
   formatMs,
   SPINNER,
 } from "#src/ui/display";
-import { subscribeUIObserver } from "#src/ui/ui-observer";
 
 /** Narrow manager interface for the foreground runner. */
 export interface ForegroundManagerDeps {
@@ -29,12 +26,6 @@ export interface ForegroundManagerDeps {
   ): Promise<Subagent>;
 }
 
-/** Narrow widget interface for the foreground runner. */
-export interface ForegroundWidgetDeps {
-  ensureTimer(): void;
-  markFinished(id: string): void;
-}
-
 /** All values the foreground runner needs beyond the resolved config. */
 export interface ForegroundParams {
   config: ResolvedSpawnConfig;
@@ -44,13 +35,10 @@ export interface ForegroundParams {
 
 /**
  * Run an agent synchronously in the foreground, streaming spinner updates.
- * Owns: spinner interval, AgentActivityTracker creation, UI observer subscription,
- * streaming onUpdate callbacks, cleanup, and result formatting.
+ * Owns: spinner interval, streaming onUpdate callbacks, cleanup, and result formatting.
  */
 export async function runForeground(
   manager: ForegroundManagerDeps,
-  widget: ForegroundWidgetDeps,
-  agentActivity: AgentActivityAccess,
   params: ForegroundParams,
   signal: AbortSignal | undefined,
   onUpdate: ((update: AgentToolResult<any>) => void) | undefined,
@@ -58,10 +46,7 @@ export async function runForeground(
   const { identity, execution, presentation } = params.config;
   let spinnerFrame = 0;
   const startedAt = Date.now();
-  let fgId: string | undefined;
 
-  const fgState = new AgentActivityTracker(execution.effectiveMaxTurns);
-  let unsubUI: (() => void) | undefined;
   let recordRef: Subagent | undefined;
 
   const streamUpdate = () => {
@@ -113,31 +98,17 @@ export async function runForeground(
         parentSession: params.parentSession,
         observer: {
           onSessionCreated: (agent) => {
-            const sub = agent.subagentSession!;
-            fgState.setSession(sub);
             recordRef = agent;
-            unsubUI = subscribeUIObserver(sub, fgState, streamUpdate);
-            fgId = agent.id;
-            agentActivity.set(agent.id, fgState);
-            widget.ensureTimer();
           },
         },
       },
     );
   } catch (err) {
     clearInterval(spinnerInterval);
-    unsubUI?.();
     return textResult(err instanceof Error ? err.message : String(err));
   }
 
   clearInterval(spinnerInterval);
-  unsubUI?.();
-
-  // Clean up foreground agent from widget
-  if (fgId) {
-    agentActivity.delete(fgId);
-    widget.markFinished(fgId);
-  }
 
   const tokenText = formatLifetimeTokens(record);
   const details = buildDetails(presentation.detailBase, record, { tokens: tokenText });

package/src/types.ts

@@ -12,7 +12,7 @@ export type { AgentSessionEvent, ThinkingLevel };
 
 /**
  * Narrow session interface for event subscription.
- * Used by record-observer and ui-observer — only the subscribe method is needed.
+ * Used by record-observer — only the subscribe method is needed.
  */
 export interface SubscribableSession {
   subscribe(fn: (event: AgentSessionEvent) => void): () => void;

package/src/ui/agent-widget.ts

@@ -8,7 +8,8 @@
 
 import { AgentTypeRegistry } from "#src/config/agent-types";
 import type { Subagent } from "#src/lifecycle/subagent";
-import type { SubagentManager } from "#src/lifecycle/subagent-manager";
+import type { SubagentManager, SubagentManagerObserver } from "#src/lifecycle/subagent-manager";
+import type { CompactionInfo } from "#src/types";
 import { ERROR_STATUSES, type Theme } from "#src/ui/display";
 import { renderWidgetLines, type WidgetAgent } from "#src/ui/widget-renderer";
 
@@ -61,7 +62,7 @@ export type UICtx = {
 
 // ---- Widget manager ----
 
-export class AgentWidget {
+export class AgentWidget implements SubagentManagerObserver {
   private uiCtx: UICtx | undefined;
   private widgetFrame = 0;
   private widgetInterval: ReturnType<typeof setInterval> | undefined;
@@ -107,9 +108,36 @@ export class AgentWidget {
     this.update();
   }
 
+  // ---- SubagentManagerObserver: react to lifecycle, self-drive the timer ----
+
+  /** A subagent started running — ensure the update loop is live and render. */
+  onSubagentStarted(_record: Subagent) {
+    this.startLoop();
+  }
+
+  /** A background subagent was created (queued) — ensure the loop is live and render. */
+  onSubagentCreated(_record: Subagent) {
+    this.startLoop();
+  }
+
+  /** A subagent completed — render so the finished state is seeded and shown. */
+  onSubagentCompleted(_record: Subagent) {
+    this.update();
+  }
+
+  /** A subagent's session compacted — render to refresh the compaction count. */
+  onSubagentCompacted(_record: Subagent, _info: CompactionInfo) {
+    this.update();
+  }
+
+  /** Start the update timer (if not already running) and render immediately. */
+  private startLoop() {
+    this.ensureTimer();
+    this.update();
+  }
+
   /** Ensure the widget update timer is running. */
-  // fallow-ignore-next-line unused-class-member
-  ensureTimer() {
+  private ensureTimer() {
     this.widgetInterval ??= setInterval(() => this.update(), 80);
   }
 
@@ -120,14 +148,6 @@ export class AgentWidget {
     return age < maxAge;
   }
 
-  /** Record an agent as finished (call when agent completes). */
-  // fallow-ignore-next-line unused-class-member
-  markFinished(agentId: string) {
-    if (!this.finishedTurnAge.has(agentId)) {
-      this.finishedTurnAge.set(agentId, 0);
-    }
-  }
-
   /** Project a live Subagent record onto a pure-data WidgetAgent snapshot. */
   private toWidgetAgent(record: Subagent): WidgetAgent {
     return {
@@ -203,8 +223,8 @@ export class AgentWidget {
 
   /**
    * Seed linger tracking for any newly-observed finished agent.
-   * Replaces the external `markFinished` call NotificationManager used to make:
-   * the widget owns detection of completions it sees via `listAgents()`.
+   * The widget owns detection of completions it observes via `listAgents()`,
+   * so no external bookkeeping call is needed.
    * Idempotent — only seeds when an entry is absent, so repeated updates within
    * a turn neither reset nor advance the age.
    */

package/src/ui/agent-activity-tracker.ts

@@ -1,84 +0,0 @@
-/**
- * agent-activity-tracker.ts — Per-agent live activity state with explicit transition methods.
- *
- * Replaces the mutable `AgentActivity` interface that was written via output arguments
- * in `ui-observer.ts`. Callers use named transition methods; readers use read-only accessors.
- */
-
-import type { SessionLike } from "#src/lifecycle/usage";
-
-/** Per-agent live activity state with explicit transition methods and read-only accessors. */
-export class AgentActivityTracker {
-	private _activeTools = new Map<string, string>();
-	private _toolKeySeq = 0;
-	private _responseText = "";
-	private _session: SessionLike | undefined = undefined;
-	private _turnCount = 1;
-
-	constructor(private readonly _maxTurns?: number) {}
-
-	// ── Transition methods (write surface) ──────────────────────────────────
-
-	/** Record that a tool has started executing. */
-	onToolStart(toolName: string): void {
-		this._activeTools.set(toolName + "_" + (++this._toolKeySeq), toolName);
-	}
-
-	/** Remove a tool from active tools (called when tool execution ends). No-op when no matching tool is active. */
-	onToolDone(toolName: string): void {
-		for (const [key, name] of this._activeTools) {
-			if (name === toolName) {
-				this._activeTools.delete(key);
-				break;
-			}
-		}
-	}
-
-	/** Reset the current response text (called at the start of each assistant message). */
-	onMessageStart(): void {
-		this._responseText = "";
-	}
-
-	/** Append a text delta to the current response text. */
-	onMessageUpdate(delta: string): void {
-		this._responseText += delta;
-	}
-
-	/** Record that a turn has ended; increments turnCount. */
-	onTurnEnd(): void {
-		this._turnCount++;
-	}
-
-	/** Bind the session reference (called once when the agent session is created). */
-	setSession(session: SessionLike): void {
-		this._session = session;
-	}
-
-	// ── Read-only accessors ──────────────────────────────────────────────────
-
-	/** Currently-active tools: key → tool name. Multiple entries for concurrent same-name tools. */
-	get activeTools(): ReadonlyMap<string, string> {
-		return this._activeTools;
-	}
-
-	/** The agent's latest partial response text (reset at each message start). */
-	get responseText(): string {
-		return this._responseText;
-	}
-
-	/** The active SDK session, or undefined before the first session is created. */
-	get session(): SessionLike | undefined {
-		return this._session;
-	}
-
-	/** Current turn count (starts at 1). */
-	get turnCount(): number {
-		return this._turnCount;
-	}
-
-	/** Effective max turns for this agent, or undefined for unlimited. */
-	get maxTurns(): number | undefined {
-		return this._maxTurns;
-	}
-
-}

package/src/ui/ui-observer.ts

@@ -1,61 +0,0 @@
-/**
- * ui-observer.ts — Subscribes to session events and updates AgentActivityTracker state.
- *
- * Replaces the callback-based createActivityTracker pattern with a direct
- * session subscription for streaming UI state (active tools, response text,
- * turn count, lifetime usage).
- */
-
-import type { SubscribableSession } from "#src/types";
-import type { AgentActivityTracker } from "#src/ui/agent-activity-tracker";
-
-/**
- * Subscribe to session events and stream UI state into an AgentActivityTracker.
- *
- * Handles:
- * - `tool_execution_start` → `tracker.onToolStart(name)`
- * - `tool_execution_end` → `tracker.onToolEnd(name)`
- * - `message_start` → `tracker.onMessageStart()`
- * - `message_update` (text_delta) → `tracker.onMessageUpdate(delta)`
- * - `turn_end` → `tracker.onTurnEnd()`
- * - `message_end` (assistant, with usage) → `tracker.onUsageUpdate(usage)`
- *
- * Calls `onUpdate?.()` after each state mutation to trigger re-renders.
- *
- * @returns An unsubscribe function.
- */
-export function subscribeUIObserver(
-	session: SubscribableSession,
-	tracker: AgentActivityTracker,
-	onUpdate?: () => void,
-): () => void {
-	return session.subscribe((event) => {
-		if (event.type === "tool_execution_start") {
-			tracker.onToolStart(event.toolName);
-			onUpdate?.();
-		}
-
-		if (event.type === "tool_execution_end") {
-			tracker.onToolDone(event.toolName);
-			onUpdate?.();
-		}
-
-		if (event.type === "message_start") {
-			tracker.onMessageStart();
-		}
-
-		if (
-			event.type === "message_update" &&
-			event.assistantMessageEvent.type === "text_delta"
-		) {
-			tracker.onMessageUpdate(event.assistantMessageEvent.delta);
-			onUpdate?.();
-		}
-
-		if (event.type === "turn_end") {
-			tracker.onTurnEnd();
-			onUpdate?.();
-		}
-
-	});
-}