@gotgenes/pi-subagents 6.7.0 → 6.8.1

package/src/notification.ts

@@ -31,7 +31,7 @@ export function formatTaskNotification(record: AgentRecord, resultMaxLen: number
   const status = getStatusLabel(record.status, record.error);
   const durationMs = record.completedAt ? record.completedAt - record.startedAt : 0;
   const totalTokens = getLifetimeTotal(record.lifetimeUsage);
-  const contextPercent = getSessionContextPercent(record.session);
+  const contextPercent = getSessionContextPercent(record.execution?.session);
   const ctxXml = contextPercent !== null ? `<context_percent>${Math.round(contextPercent)}</context_percent>` : "";
   const compactXml = record.compactionCount ? `<compactions>${record.compactionCount}</compactions>` : "";
 
@@ -41,11 +41,13 @@ export function formatTaskNotification(record: AgentRecord, resultMaxLen: number
       : record.result
     : "No output.";
 
+  const toolCallId = record.notification?.toolCallId;
+  const outputFile = record.execution?.outputFile;
   return [
     "<task-notification>",
     `<task-id>${record.id}</task-id>`,
-    record.toolCallId ? `<tool-use-id>${escapeXml(record.toolCallId)}</tool-use-id>` : null,
-    record.outputFile ? `<output-file>${escapeXml(record.outputFile)}</output-file>` : null,
+    toolCallId ? `<tool-use-id>${escapeXml(toolCallId)}</tool-use-id>` : null,
+    outputFile ? `<output-file>${escapeXml(outputFile)}</output-file>` : null,
     `<status>${escapeXml(status)}</status>`,
     `<summary>Agent "${escapeXml(record.description)}" ${record.status}</summary>`,
     `<result>${escapeXml(resultPreview)}</result>`,
@@ -73,7 +75,7 @@ export function buildNotificationDetails(
     maxTurns: activity?.maxTurns,
     totalTokens,
     durationMs: record.completedAt ? record.completedAt - record.startedAt : 0,
-    outputFile: record.outputFile,
+    outputFile: record.execution?.outputFile,
     error: record.error,
     resultPreview: record.result
       ? record.result.length > resultMaxLen
@@ -154,10 +156,11 @@ export function createNotificationSystem(deps: NotificationDeps): NotificationSy
   }
 
   function emitIndividualNudge(record: AgentRecord) {
-    if (record.resultConsumed) return;
+    if (record.notification?.resultConsumed) return;
 
     const notification = formatTaskNotification(record, 500);
-    const footer = record.outputFile ? `\nFull transcript available at: ${record.outputFile}` : "";
+    const outputFile = record.execution?.outputFile;
+    const footer = outputFile ? `\nFull transcript available at: ${outputFile}` : "";
 
     deps.sendMessage(
       {

package/src/record-observer.ts

@@ -7,7 +7,6 @@
 
 import type { CompactionInfo } from "./agent-manager.js";
 import type { AgentRecord } from "./agent-record.js";
-import { addUsage } from "./usage.js";
 
 /** Narrow session interface — only the subscribe method needed by the observer. */
 interface SubscribableSession {
@@ -22,9 +21,9 @@ export interface RecordObserverOptions {
  * Subscribe to session events and accumulate stats on the agent record.
  *
  * Handles:
- * - `tool_execution_end` → `record.toolUses++`
- * - `message_end` (assistant, with usage) → `addUsage(record.lifetimeUsage, …)`
- * - `compaction_end` (not aborted) → `record.compactionCount++`, call `onCompact`
+ * - `tool_execution_end` → `record.incrementToolUses()`
+ * - `message_end` (assistant, with usage) → `record.addUsage(…)`
+ * - `compaction_end` (not aborted) → `record.incrementCompactions()`, call `onCompact`
  *
  * @returns An unsubscribe function.
  */
@@ -35,13 +34,13 @@ export function subscribeRecordObserver(
 ): () => void {
   return session.subscribe((event: any) => {
     if (event.type === "tool_execution_end") {
-      record.toolUses++;
+      record.incrementToolUses();
     }
 
     if (event.type === "message_end" && event.message?.role === "assistant") {
       const u = event.message.usage;
       if (u) {
-        addUsage(record.lifetimeUsage, {
+        record.addUsage({
           input: u.input ?? 0,
           output: u.output ?? 0,
           cacheWrite: u.cacheWrite ?? 0,
@@ -50,7 +49,7 @@ export function subscribeRecordObserver(
     }
 
     if (event.type === "compaction_end" && !event.aborted && event.result) {
-      record.compactionCount++;
+      record.incrementCompactions();
       options?.onCompact?.(record, {
         reason: event.reason,
         tokensBefore: event.result.tokensBefore,

package/src/service-adapter.ts

@@ -17,6 +17,7 @@ export interface AgentManagerLike {
   abort(id: string): boolean;
   waitForAll(): Promise<void>;
   hasRunning(): boolean;
+  queueSteer(id: string, message: string): boolean;
 }
 
 /** Dependencies injected into the adapter factory. */
@@ -85,13 +86,12 @@ export function createSubagentsService(deps: AdapterDeps): SubagentsService {
       if (!record || record.status !== "running") {
         return false;
       }
-      if (!record.session) {
-        // Session not ready yet — queue for delivery once initialized
-        if (!record.pendingSteers) record.pendingSteers = [];
-        record.pendingSteers.push(message);
-        return true;
+      const session = record.execution?.session;
+      if (!session) {
+        // Session not ready yet — queue via manager for delivery once initialized
+        return manager.queueSteer(id, message);
       }
-      await record.session.steer(message);
+      await session.steer(message);
       return true;
     },
 
@@ -124,7 +124,8 @@ export function toSubagentRecord(record: AgentRecord): SubagentRecord {
   if (record.result !== undefined) out.result = record.result;
   if (record.error !== undefined) out.error = record.error;
   if (record.completedAt !== undefined) out.completedAt = record.completedAt;
-  if (record.worktreeResult !== undefined) out.worktreeResult = record.worktreeResult;
+  const worktreeResult = record.worktreeState?.cleanupResult;
+  if (worktreeResult !== undefined) out.worktreeResult = worktreeResult;
 
   return out;
 }

package/src/tools/agent-tool.ts

@@ -7,6 +7,7 @@ import { AgentTypeRegistry } from "../agent-types.js";
 import { resolveAgentInvocationConfig } from "../invocation-config.js";
 import { resolveInvocationModel } from "../model-resolver.js";
 
+import { NotificationState } from "../notification-state.js";
 import type { AgentInvocation, AgentRecord, SubagentType } from "../types.js";
 import { AgentActivityTracker } from "../ui/agent-activity-tracker.js";
 import {
@@ -381,7 +382,7 @@ Guidelines:
             `Agent not found: "${params.resume}". It may have been cleaned up.`,
           );
         }
-        if (!existing.session) {
+        if (!existing.execution?.session) {
           return textResult(
             `Agent "${params.resume}" has no active session to resume.`,
           );
@@ -430,7 +431,8 @@ Guidelines:
 
         const record = deps.manager.getRecord(id);
         if (record) {
-          record.toolCallId = toolCallId;
+          // Born complete: notification-state object owns toolCallId + resultConsumed.
+          record.notification = new NotificationState(toolCallId);
         }
 
         deps.agentActivity.set(id, bgState);
@@ -451,7 +453,7 @@ Guidelines:
             `Agent ID: ${id}\n` +
             `Type: ${displayName}\n` +
             `Description: ${params.description}\n` +
-            (record?.outputFile ? `Output file: ${record.outputFile}\n` : "") +
+            (record?.execution?.outputFile ? `Output file: ${record.execution.outputFile}\n` : "") +
             (isQueued
               ? `Position: queued (max ${deps.manager.getMaxConcurrent()} concurrent)\n`
               : "") +
@@ -525,7 +527,7 @@ Guidelines:
               fgState.setSession(session);
               unsubUI = subscribeUIObserver(session, fgState, streamUpdate);
               for (const a of deps.manager.listAgents()) {
-                if (a.session === session) {
+                if (a.execution?.session === session) {
                   fgId = a.id;
                   deps.agentActivity.set(a.id, fgState);
                   deps.widget.ensureTimer();

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

@@ -54,7 +54,9 @@ export function createGetResultTool(deps: GetResultDeps) {
       // (attached earlier at spawn time) and always runs before this await resumes.
       // Setting the flag here prevents a redundant follow-up notification.
       if (params.wait && record.status === "running" && record.promise) {
-        record.resultConsumed = true;
+        // Pre-mark consumed BEFORE awaiting — onComplete fires inside .then() and
+        // always runs before this await resumes. Prevents a redundant notification.
+        record.notification?.markConsumed();
         deps.cancelNudge(params.agent_id);
         await record.promise;
       }
@@ -62,7 +64,7 @@ export function createGetResultTool(deps: GetResultDeps) {
       const displayName = getDisplayName(record.type, deps.registry);
       const duration = formatDuration(record.startedAt, record.completedAt);
       const tokens = formatLifetimeTokens(record);
-      const contextPercent = getSessionContextPercent(record.session);
+      const contextPercent = getSessionContextPercent(record.execution?.session);
       const statsParts = [`Tool uses: ${record.toolUses}`];
       if (tokens) statsParts.push(tokens);
       if (contextPercent !== null) statsParts.push(`Context: ${Math.round(contextPercent)}%`);
@@ -84,13 +86,13 @@ export function createGetResultTool(deps: GetResultDeps) {
 
       // Mark result as consumed — suppresses the completion notification
       if (record.status !== "running" && record.status !== "queued") {
-        record.resultConsumed = true;
+        record.notification?.markConsumed();
         deps.cancelNudge(params.agent_id);
       }
 
       // Verbose: include full conversation
-      if (params.verbose && record.session) {
-        const conversation = deps.getConversation(record.session);
+      if (params.verbose && record.execution?.session) {
+        const conversation = deps.getConversation(record.execution.session);
         if (conversation) {
           output += `\n\n--- Agent Conversation ---\n${conversation}`;
         }

package/src/tools/steer-tool.ts

@@ -9,6 +9,8 @@ export interface SteerToolDeps {
   getRecord: (id: string) => AgentRecord | undefined;
   emitEvent: (name: string, data: unknown) => void;
   steerAgent: (session: AgentSession, message: string) => Promise<void>;
+  /** Buffer a steer for an agent whose session isn't ready yet. */
+  queueSteer: (id: string, message: string) => boolean;
 }
 
 /** Create the steer_subagent tool definition (without Pi SDK wrapper). */
@@ -46,10 +48,10 @@ export function createSteerTool(deps: SteerToolDeps) {
           `Agent "${params.agent_id}" is not running (status: ${record.status}). Cannot steer a non-running agent.`,
         );
       }
-      if (!record.session) {
-        // Session not ready yet — queue the steer for delivery once initialized
-        if (!record.pendingSteers) record.pendingSteers = [];
-        record.pendingSteers.push(params.message);
+      const session = record.execution?.session;
+      if (!session) {
+        // Session not ready yet — queue via manager for delivery once initialized
+        deps.queueSteer(record.id, params.message);
         deps.emitEvent("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.`,
@@ -57,10 +59,10 @@ export function createSteerTool(deps: SteerToolDeps) {
       }
 
       try {
-        await deps.steerAgent(record.session, params.message);
+        await deps.steerAgent(session, params.message);
         deps.emitEvent("subagents:steered", { id: record.id, message: params.message });
         const tokens = formatLifetimeTokens(record);
-        const contextPercent = getSessionContextPercent(record.session);
+        const contextPercent = getSessionContextPercent(session);
         const stateParts: string[] = [];
         if (tokens) stateParts.push(tokens);
         stateParts.push(`${record.toolUses} tool ${record.toolUses === 1 ? "use" : "uses"}`);

package/src/ui/agent-menu.ts

@@ -197,7 +197,8 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
   }
 
   async function viewAgentConversation(ctx: ExtensionContext, record: AgentRecord) {
-    if (!record.session) {
+    const session = record.execution?.session;
+    if (!session) {
       ctx.ui.notify(
         `Agent is ${record.status === "queued" ? "queued" : "expired"} — no session available.`,
         "info",
@@ -208,7 +209,6 @@ export function createAgentsMenuHandler(deps: AgentMenuDeps) {
     const { ConversationViewer, VIEWPORT_HEIGHT_PCT } = await import(
       "./conversation-viewer.js"
     );
-    const session = record.session;
     const activity = deps.agentActivity.get(record.id);
 
     await ctx.ui.custom<undefined>(

package/src/worktree-state.ts

@@ -0,0 +1,35 @@
+/**
+ * worktree-state.ts — WorktreeState: lifecycle-phase object for worktree-isolated agents.
+ *
+ * Constructed once when the worktree is set up (before the run begins).
+ * Only exists for agents with isolation: "worktree".
+ * cleanupResult is recorded once at completion or error — it is not set at construction.
+ */
+
+import type { WorktreeCleanupResult, WorktreeInfo } from "./worktree.js";
+
+export type { WorktreeCleanupResult, WorktreeInfo };
+
+export class WorktreeState {
+	/** Absolute path to the worktree directory. */
+	readonly path: string;
+	/** Branch name created for this worktree. */
+	readonly branch: string;
+
+	private _cleanupResult?: WorktreeCleanupResult;
+
+	constructor(info: WorktreeInfo) {
+		this.path = info.path;
+		this.branch = info.branch;
+	}
+
+	/** Result of the worktree cleanup — undefined until recordCleanup is called. */
+	get cleanupResult(): WorktreeCleanupResult | undefined {
+		return this._cleanupResult;
+	}
+
+	/** Record the cleanup result. Called once on agent completion or error. */
+	recordCleanup(result: WorktreeCleanupResult): void {
+		this._cleanupResult = result;
+	}
+}