@ian-pascoe/pi-minimal-subagents 0.2.2 → 0.3.0

package/src/minimal-subagents-types.ts

@@ -1,9 +1,6 @@
 import type { AgentMessage, ThinkingLevel } from "@earendil-works/pi-agent-core";
 import type { Usage } from "@earendil-works/pi-ai";
 
-/** Stable identity for one prompt and its complete assistant/tool loop. */
-export type TurnId = string & { readonly __turnId: unique symbol };
-
 /** Controls how much committed caller conversation enters a new child session. */
 export type SessionContextMode = "inherit" | "compact" | "omit";
 /** Controls whether child resource discovery includes project instructions, skills, and prompts. */
@@ -81,8 +78,19 @@ export interface WaitTurnResult extends TurnResult {
   messages?: WaitMessageResult[];
 }
 
-/** Reports one terminal child turn returned by subagent_wait. */
-export type WaitResult = WaitMessageResult | WaitTurnResult;
+/** Reports an observational wait timeout with the current detailed child status. */
+export interface WaitTimeoutResult {
+  event: "timeout";
+  agent_id: string;
+  turn_id: string;
+  /** Requested timeout duration that expired. */
+  timeout_ms: number;
+  /** Detailed child status captured when the timeout callback won. */
+  agent: AgentDetail;
+}
+
+/** Reports one message, terminal turn, or timeout returned by subagent_wait. */
+export type WaitResult = WaitMessageResult | WaitTurnResult | WaitTimeoutResult;
 
 /** Provides bounded hierarchy, usage, and best-known Runtime Profile data for one persistent agent. */
 export interface AgentSummary extends RuntimeProfile {
@@ -94,7 +102,6 @@ export interface AgentSummary extends RuntimeProfile {
   latest_turn?: Pick<TurnResult, "turn_id" | "status">;
   tools: string[];
   elapsed_ms?: number;
-  latest_activity?: string;
   latest_activity_at?: string;
   task?: string;
   child_count: number;
@@ -108,13 +115,22 @@ export interface RecentAgentMessage {
   content: string;
 }
 
-/** Extends summary status with launch, dependency, and recent-message diagnostics. */
+/** Reports one labeled, bounded child activity item without image data. */
+export interface RecentAgentActivity {
+  label: string;
+  content: string;
+  truncated: boolean;
+}
+
+/** Extends summary status with launch, dependency, recent-message, and recent-work diagnostics. */
 export interface AgentDetail extends AgentSummary {
   session_file?: string;
   launch_contract: LaunchContract;
   capability_ceiling: string[];
   spawn_entry_id: string;
   recent_messages: RecentAgentMessage[];
+  /** The 12 most recent work items, each capped at 20 lines and 2 KiB. */
+  recent_activity: RecentAgentActivity[];
   latest_result?: TurnResult;
   missing_dependencies: string[];
   unavailable_reason?: string;
@@ -142,7 +158,6 @@ export interface DeleteResult {
   agent_id: string;
   recursive: boolean;
   deleted_agent_ids: string[];
-  tombstoned_agent_ids: string[];
   trashed_session_files: string[];
   failures: Array<{ agent_id: string; error: string }>;
 }
@@ -163,7 +178,6 @@ export interface CallerSnapshot {
   thinkingLevel: ThinkingLevel;
   ordinaryTools: string[];
   capabilityCeiling: string[];
-  availableTools: string[];
   spawnEntryId: string;
 }
 
@@ -188,6 +202,7 @@ export interface CoordinatorMessage {
     status?: TurnStatus;
     elapsed_ms?: number;
     usage?: Usage;
+    messages?: Array<{ delivery_id?: string; message_id?: string }>;
   };
 }
 
@@ -208,7 +223,10 @@ export interface ChildAgentRuntime {
   dispose(): void;
   /** Return the live Runtime Profile, or undefined when the SDK session has no model. */
   getRuntimeProfile(): RuntimeProfile | undefined;
+  /** Clone committed child transcript messages while excluding the streaming assistant tail. */
   snapshotCommittedMessages(): AgentMessage[];
+  /** Clone child transcript messages including the current streaming assistant tail. */
+  snapshotActivityMessages(): AgentMessage[];
   hasDeliveryEvidence(sourceAgentId: string, sourceTurnId: string, deliveryId?: string): boolean;
   getUsage(): Usage | undefined;
 }
@@ -248,6 +266,8 @@ export interface AgentSessionFactory {
 export interface RootConversationEndpoint {
   /** Queue one typed coordinator message into the root conversation. */
   queueCoordinatorMessage(message: CoordinatorMessage): Promise<void>;
+  /** Whether a coordinator message can start immediately instead of joining Pi's steer queue. */
+  isIdle(): boolean;
   hasDeliveryEvidence(sourceAgentId: string, sourceTurnId: string, deliveryId?: string): boolean;
 }
 
@@ -273,7 +293,6 @@ export interface PersistedAgent {
   missing_dependencies: string[];
   unavailable_reason?: string;
   recent_messages: RecentAgentMessage[];
-  deleted?: boolean;
 }
 
 /** Records which conversation path owns one successful terminal result. */

package/src/minimal-subagents-ui.ts

@@ -15,6 +15,7 @@ import {
   formatSubagentDuration,
   renderSubagentStatusLabel,
   renderSubagentStatusSymbol,
+  subagentStatusLadder,
 } from "./minimal-subagents-rendering.js";
 import type {
   AgentSummary,
@@ -65,9 +66,9 @@ function flattenAgentHierarchy(agents: readonly AgentSummary[]): FlattenedAgentS
 }
 
 function agentTerminalStatus(agent: AgentSummary): TurnStatus | "idle" | "unavailable" {
-  if (agent.availability === "unavailable") return "unavailable";
-  if (agent.state === "running") return "running";
-  return agent.latest_turn?.status ?? "idle";
+  const status = subagentStatusLadder(agent);
+  // SAFETY: the shared ladder emits exactly the unavailable/running/TurnStatus/idle vocabulary.
+  return status as TurnStatus | "idle" | "unavailable";
 }
 
 function terminalTimestamp(agent: AgentSummary): number {