@gotgenes/pi-subagents 6.8.3 → 6.9.1

package/src/tools/helpers.ts

@@ -1,6 +1,51 @@
-import { formatTokens } from "../ui/agent-widget.js";
+import type { AgentConfigLookup } from "../agent-types.js";
+import { AgentActivityTracker } from "../ui/agent-activity-tracker.js";
+import { type AgentDetails, formatTokens } from "../ui/agent-widget.js";
 import { getLifetimeTotal, type LifetimeUsage } from "../usage.js";
 
+/** Parenthetical status note for completed agent result text. */
+export function getStatusNote(status: string): string {
+  switch (status) {
+    case "aborted":
+      return " (aborted \u2014 max turns exceeded, output may be incomplete)";
+    case "steered":
+      return " (wrapped up \u2014 reached turn limit)";
+    case "stopped":
+      return " (stopped by user)";
+    default:
+      return "";
+  }
+}
+
+/** Build AgentDetails from a base + record-specific fields. */
+export function buildDetails(
+  base: Pick<AgentDetails, "displayName" | "description" | "subagentType" | "modelName" | "tags">,
+  record: {
+    toolUses: number;
+    startedAt: number;
+    completedAt?: number;
+    status: string;
+    error?: string;
+    id?: string;
+    lifetimeUsage: LifetimeUsage;
+  },
+  activity?: AgentActivityTracker,
+  overrides?: Partial<AgentDetails>,
+): AgentDetails {
+  return {
+    ...base,
+    toolUses: record.toolUses,
+    tokens: formatLifetimeTokens(record),
+    turnCount: activity?.turnCount,
+    maxTurns: activity?.maxTurns,
+    durationMs: (record.completedAt ?? Date.now()) - record.startedAt,
+    status: record.status as AgentDetails["status"],
+    agentId: record.id,
+    error: record.error,
+    ...overrides,
+  };
+}
+
 /** Tool execute return value for a text response. */
 export function textResult(msg: string, details?: unknown) {
   return { content: [{ type: "text" as const, text: msg }], details: details as any };
@@ -12,6 +57,43 @@ export function formatLifetimeTokens(o: { lifetimeUsage: LifetimeUsage }): strin
   return t > 0 ? formatTokens(t) : "";
 }
 
+/**
+ * Narrow registry interface needed by buildTypeListText.
+ * Extends AgentConfigLookup with the two name-listing methods.
+ */
+export interface TypeListRegistry extends AgentConfigLookup {
+  getDefaultAgentNames(): string[];
+  getUserAgentNames(): string[];
+}
+
+/**
+ * Build the full agent-type list text for the Agent tool description.
+ * Extracted from index.ts so it can be called inside createAgentTool.
+ */
+export function buildTypeListText(registry: TypeListRegistry, agentDir: string): string {
+  const defaultNames = registry.getDefaultAgentNames();
+  const userNames = registry.getUserAgentNames();
+
+  const defaultDescs = defaultNames.map((name) => {
+    const cfg = registry.resolveAgentConfig(name);
+    const modelSuffix = cfg.model ? ` (${getModelLabelFromConfig(cfg.model)})` : "";
+    return `- ${name}: ${cfg.description}${modelSuffix}`;
+  });
+
+  const customDescs = userNames.map((name) => {
+    const cfg = registry.resolveAgentConfig(name);
+    return `- ${name}: ${cfg.description}`;
+  });
+
+  return [
+    "Default agents:",
+    ...defaultDescs,
+    ...(customDescs.length > 0 ? ["", "Custom agents:", ...customDescs] : []),
+    "",
+    `Custom agents can be defined in .pi/agents/<name>.md (project) or ${agentDir}/agents/<name>.md (global) — they are picked up automatically. Project-level agents override global ones. Creating a .md file with the same name as a default agent overrides it.`,
+  ].join("\n");
+}
+
 /** Derive a short model label from a model string. */
 export function getModelLabelFromConfig(model: string): string {
   // Strip provider prefix (e.g. "anthropic/claude-sonnet-4-6" → "claude-sonnet-4-6")

package/src/ui/agent-menu.ts

@@ -32,15 +32,22 @@ export interface AgentMenuSettings {
   applyGraceTurns(n: number): { message: string; level: "info" | "warning" };
 }
 
+/**
+ * Read-only interface for the agent-menu's agentActivity access.
+ * Only the conversation viewer needs to read a tracker by agent ID.
+ */
+export interface AgentActivityReader {
+  get(id: string): AgentActivityTracker | undefined;
+}
+
 export interface AgentMenuDeps {
   manager: AgentMenuManager;
   registry: AgentTypeRegistry;
-  agentActivity: Map<string, AgentActivityTracker>;
+  agentActivity: AgentActivityReader;
   /** Resolve model label for a given agent type + registry. */
   getModelLabel: (type: string, registry?: ModelRegistry) => string;
   /** Settings manager — owns in-memory values and persistence. */
   settings: AgentMenuSettings;
-  emitEvent: (name: string, data: unknown) => void;
   personalAgentsDir: string;
   projectAgentsDir: string;
 }