@nklisch/pi-enhanced 0.2.7 → 0.3.1

package/node_modules/@nklisch/pi-plugins/node_modules/@nklisch/pi-subagents/src/ui/subagents-settings.ts

@@ -59,7 +59,7 @@ export class SubagentsSettingsHandler {
 
     if (choice.startsWith("Max concurrency")) {
       const val = await ui.input(
-        "Max concurrent background agents",
+        "Max concurrent subagent runs",
         String(this.settings.maxConcurrent),
       );
       if (val) {

package/node_modules/@nklisch/pi-plugins/node_modules/@nklisch/pi-subagents/src/ui/widget-renderer.ts

@@ -7,6 +7,7 @@
 
 import { truncateToWidth } from "@earendil-works/pi-tui";
 import type { AgentConfigLookup } from "#src/config/agent-types";
+import type { SubagentTerminalReason } from "#src/lifecycle/subagent-state";
 import type { LifetimeUsage } from "#src/lifecycle/usage";
 import { getLifetimeTotal } from "#src/lifecycle/usage";
 import type { SubagentType, ThinkingLevel } from "#src/types";
@@ -29,12 +30,14 @@ export interface WidgetAgent {
 	readonly id: string;
 	readonly type: SubagentType;
 	readonly status: string;
+	readonly terminalReason?: SubagentTerminalReason;
 	readonly description: string;
 	readonly modelLabel: string;
 	readonly thinkingLevel: ThinkingLevel;
 	readonly toolUses: number;
 	readonly startedAt: number;
 	readonly completedAt?: number;
+	readonly activeRuntimeMs: number;
 	readonly error?: string;
 	readonly lifetimeUsage?: Readonly<LifetimeUsage>;
 	readonly compactionCount: number;
@@ -57,27 +60,23 @@ export function renderFinishedLine(
 ): string {
 	const name = getDisplayName(agent.type, registry);
 	const modeLabel = getPromptModeLabel(agent.type, registry);
-	const duration = formatMs((agent.completedAt ?? Date.now()) - agent.startedAt);
+	const duration = formatMs(agent.activeRuntimeMs);
 
 	let icon: string;
 	let statusText: string;
 	if (agent.status === "completed") {
 		icon = theme.fg("success", "✓");
 		statusText = "";
-	} else if (agent.status === "steered") {
-		icon = theme.fg("warning", "✓");
-		statusText = theme.fg("warning", " (turn limit)");
 	} else if (agent.status === "stopped") {
 		icon = theme.fg("dim", "■");
-		statusText = theme.fg("dim", " stopped");
+		statusText = theme.fg("dim", ` stopped${agent.terminalReason ? ` (${agent.terminalReason.replaceAll("_", " ")})` : ""}`);
 	} else if (agent.status === "error") {
 		icon = theme.fg("error", "✗");
 		const errMsg = agent.error ? `: ${agent.error.slice(0, 60)}` : "";
 		statusText = theme.fg("error", ` error${errMsg}`);
 	} else {
-		// aborted
-		icon = theme.fg("error", "✗");
-		statusText = theme.fg("warning", " aborted");
+		icon = theme.fg("dim", "•");
+		statusText = "";
 	}
 
 	const parts: string[] = [formatModelThinking(agent.modelLabel, agent.thinkingLevel)];
@@ -99,7 +98,7 @@ export function renderRunningLines(
 	const name = getDisplayName(agent.type, registry);
 	const modeLabel = getPromptModeLabel(agent.type, registry);
 	const modeTag = modeLabel ? ` ${theme.fg("dim", `(${modeLabel})`)}` : "";
-	const elapsed = formatMs(Date.now() - agent.startedAt);
+	const elapsed = formatMs(agent.activeRuntimeMs);
 
 	const tokens = getLifetimeTotal(agent.lifetimeUsage);
 	const tokenText = tokens > 0 ? formatSessionTokens(tokens, agent.contextPercent, theme, agent.compactionCount) : "";

package/node_modules/@nklisch/pi-plugins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nklisch/pi-plugins",
-  "version": "0.6.2",
+  "version": "0.8.1",
   "private": false,
   "description": "A small filesystem-first marketplace and plugin host for Pi.",
   "license": "MIT",
@@ -63,7 +63,7 @@
   ],
   "dependencies": {
     "@nklisch/pi-mcp-adapter": "2.21.0-nklisch.2",
-    "@nklisch/pi-subagents": "18.1.0-nklisch.4",
+    "@nklisch/pi-subagents": "18.2.0-nklisch.1",
     "jiti": "2.7.0"
   },
   "devDependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nklisch/pi-enhanced",
-  "version": "0.2.7",
+  "version": "0.3.1",
   "description": "Pi, enhanced — one install for nklisch's full harness: policy-gated command review, plugin marketplace, subagents, background tasks, research tools, search, model modes, and a curated UX set.",
   "author": {
     "name": "nklisch"

package/node_modules/@nklisch/pi-plugins/node_modules/@nklisch/pi-subagents/src/tools/background-spawner.ts

@@ -1,81 +0,0 @@
-import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
-import type { AgentSpawnConfig } from "#src/lifecycle/subagent-manager";
-import { textResult } from "#src/tools/helpers";
-import { formatModelThinking } from "#src/ui/display";
-import type { ResolvedSpawnConfig } from "#src/tools/spawn-config";
-import type { ParentSessionInfo, Subagent } from "#src/types";
-
-/** Narrow manager interface for the background spawner. */
-export interface BackgroundManagerDeps {
-  spawn(snapshot: ParentSnapshot, type: string, prompt: string, opts: AgentSpawnConfig): string;
-  getRecord(id: string): Subagent | undefined;
-}
-
-/** All values the background spawner needs beyond the resolved config. */
-export interface BackgroundParams {
-  config: ResolvedSpawnConfig;
-  snapshot: ParentSnapshot;
-  parentSession: ParentSessionInfo;
-  settings: { readonly maxConcurrent: number };
-}
-
-/**
- * Spawn a background agent and return the tool result immediately.
- * Owns: launch message formatting.
- */
-export function spawnBackground(
-  manager: BackgroundManagerDeps,
-  params: BackgroundParams,
-) {
-  const { identity, execution, presentation } = params.config;
-
-  let id: string;
-  try {
-    id = manager.spawn(params.snapshot, identity.subagentType, execution.prompt, {
-      parentSession: params.parentSession,
-      description: execution.description,
-      model: execution.model,
-      maxTurns: execution.effectiveMaxTurns,
-      inheritContext: execution.inheritContext,
-      thinkingLevel: execution.effectiveThinkingLevel,
-      isBackground: true,
-      origin: "tool",
-      invocation: execution.agentInvocation,
-    });
-  } catch (err) {
-    return textResult(err instanceof Error ? err.message : String(err));
-  }
-
-  const record = manager.getRecord(id);
-
-  const isQueued = record?.status === "queued";
-  return textResult(
-    `Agent ${isQueued ? "queued" : "started"} in background.\n` +
-      `Agent ID: ${id}\n` +
-      `Type: ${identity.displayName}\n` +
-      `Model: ${formatModelThinking(
-        record?.modelLabel ?? presentation.modelName,
-        record?.effectiveThinkingLevel ?? execution.effectiveThinkingLevel,
-      )}\n` +
-      `Runtime: 0.0s\n` +
-      `Description: ${execution.description}\n` +
-      (identity.fellBack ? `Fallback: requested ${identity.rawType}; using ${identity.subagentType}\n` : "") +
-      (record?.outputFile ? `Output file: ${record.outputFile}\n` : "") +
-      (isQueued
-        ? `Position: queued (max ${params.settings.maxConcurrent} concurrent)\n`
-        : "") +
-      `\nCompletion will automatically notify and wake you with a result preview. Continue other work; do not poll.\n` +
-      `Use steer_subagent to redirect this agent while it runs.\n` +
-      `Use get_subagent_result only for full output, verbose conversation, an explicit status check or synchronization point, or recovery after a missed notification.\n` +
-      `Do not duplicate this agent's work.`,
-    {
-      ...presentation.detailBase,
-      thinkingLevel: record?.effectiveThinkingLevel ?? execution.effectiveThinkingLevel,
-      toolUses: 0,
-      tokens: "",
-      durationMs: 0,
-      status: "background" as const,
-      agentId: id,
-    },
-  );
-}

package/node_modules/@nklisch/pi-plugins/node_modules/@nklisch/pi-subagents/src/tools/foreground-runner.ts

@@ -1,149 +0,0 @@
-import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
-import { runSafely } from "#src/debug";
-import type { ParentSnapshot } from "#src/lifecycle/parent-snapshot";
-import type { AgentSpawnConfig } from "#src/lifecycle/subagent-manager";
-import {
-  buildDetails,
-  formatLifetimeTokens,
-  getStatusNote,
-  textResult,
-} from "#src/tools/helpers";
-import type { ResolvedSpawnConfig } from "#src/tools/spawn-config";
-import type { ParentSessionInfo, Subagent } from "#src/types";
-import {
-  type AgentDetails,
-  describeActivity,
-  formatModelThinking,
-  formatMs,
-  SPINNER,
-} from "#src/ui/display";
-
-/** Narrow manager interface for the foreground runner. */
-export interface ForegroundManagerDeps {
-  spawnAndWait(
-    snapshot: ParentSnapshot,
-    type: string,
-    prompt: string,
-    opts: Omit<AgentSpawnConfig, "isBackground">,
-  ): Promise<Subagent>;
-}
-
-/** All values the foreground runner needs beyond the resolved config. */
-export interface ForegroundParams {
-  config: ResolvedSpawnConfig;
-  snapshot: ParentSnapshot;
-  parentSession: ParentSessionInfo;
-}
-
-/**
- * Run an agent synchronously in the foreground, streaming spinner updates.
- * Owns: spinner interval, streaming onUpdate callbacks, cleanup, and result formatting.
- */
-export async function runForeground(
-  manager: ForegroundManagerDeps,
-  params: ForegroundParams,
-  signal: AbortSignal | undefined,
-  onUpdate: ((update: AgentToolResult<any>) => void) | undefined,
-) {
-  const { identity, execution, presentation } = params.config;
-  let spinnerFrame = 0;
-  const startedAt = Date.now();
-
-  let recordRef: Subagent | undefined;
-
-  const streamUpdate = (): void => {
-    runSafely("foreground progress update", () => {
-      const toolUses = recordRef?.toolUses ?? 0;
-      const details: AgentDetails = {
-        ...presentation.detailBase,
-        toolUses,
-        tokens: recordRef ? formatLifetimeTokens(recordRef) : "",
-        // Read activity off the record; fall back to safe defaults before onSessionCreated fires
-        turnCount: recordRef?.turnCount ?? 1,
-        maxTurns: recordRef?.maxTurns ?? execution.effectiveMaxTurns,
-        durationMs: Date.now() - startedAt,
-        status: "running",
-        activity: describeActivity(
-          recordRef?.activeTools ?? new Map(),
-          recordRef?.responseText ?? "",
-        ),
-        spinnerFrame: spinnerFrame % SPINNER.length,
-      };
-      onUpdate?.({
-        content: [{ type: "text", text: `${toolUses} tool uses...` }],
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- Pi SDK ToolCallUpdate details type is not exported
-        details: details as any,
-      });
-    });
-  };
-
-  // Each update traverses the parent TUI tree; avoid doing that at animation
-  // speed while the foreground tool already owns the progress surface.
-  const spinnerInterval = setInterval(() => {
-    spinnerFrame++;
-    streamUpdate();
-  }, 500);
-
-  let record: Subagent;
-  try {
-    streamUpdate();
-
-    record = await manager.spawnAndWait(
-      params.snapshot,
-      identity.subagentType,
-      execution.prompt,
-      {
-        description: execution.description,
-        model: execution.model,
-        maxTurns: execution.effectiveMaxTurns,
-        inheritContext: execution.inheritContext,
-        thinkingLevel: execution.effectiveThinkingLevel,
-        origin: "tool",
-        invocation: execution.agentInvocation,
-        signal,
-        parentSession: params.parentSession,
-        observer: {
-          onSessionCreated: (agent) => {
-            recordRef = agent;
-          },
-        },
-      },
-    );
-  } catch (err) {
-    // Only the spawn boundary converts to an error-text result. Post-spawn
-    // formatting is internal code; its defects stay thrown tool errors so Pi
-    // reports isError rather than a success-shaped result.
-    return textResult(err instanceof Error ? err.message : String(err));
-  } finally {
-    clearInterval(spinnerInterval);
-  }
-
-  // Foreground delivery returns the complete outcome inline, so retention can
-  // use the shorter consumed-session window.
-  record.markConsumed();
-
-  const tokenText = formatLifetimeTokens(record);
-  const details = buildDetails(presentation.detailBase, record, { tokens: tokenText });
-
-  const fallbackNote = identity.fellBack
-    ? `Note: Unknown agent type "${identity.rawType}" — using ${identity.subagentType}.\n\n`
-    : "";
-
-  if (record.status === "error") {
-    const partial = record.result?.trim();
-    return textResult(
-      `${fallbackNote}Model: ${formatModelThinking(record.modelLabel, record.effectiveThinkingLevel)}\nRuntime: ${formatMs(details.durationMs)}\nAgent failed: ${record.error}` +
-        (partial ? `\n\nPartial output before the failure:\n${partial}` : ""),
-      details,
-    );
-  }
-
-  const durationMs = (record.completedAt ?? Date.now()) - record.startedAt;
-  const statsParts = [`${record.toolUses} tool uses`];
-  if (tokenText) statsParts.push(tokenText);
-  return textResult(
-    `${fallbackNote}Model: ${formatModelThinking(record.modelLabel, record.effectiveThinkingLevel)}\nRuntime: ${formatMs(durationMs)}\nAgent completed (${statsParts.join(", ")})${getStatusNote(record.status)}.\n\n` +
-      (record.result?.trim() ?? "No output."),
-    details,
-  );
-}

package/node_modules/@nklisch/pi-plugins/node_modules/@nklisch/pi-subagents/src/tools/get-result-report.ts

@@ -1,77 +0,0 @@
-/**
- * get-result-report.ts — Pure report assembly for get_subagent_result.
- *
- * All functions are stateless: they receive an AgentReport, returning
- * formatted strings. No SDK types, no timers, no side effects.
- * Consumed by GetResultTool.execute in get-result-tool.ts. Mirrors the
- * result-renderer.ts pattern used by the subagent tool's TUI renderer.
- */
-
-import type { SubagentStatus } from "#src/lifecycle/subagent";
-import type { ThinkingLevel } from "#src/types";
-import { formatModelThinking } from "#src/ui/display";
-
-/** The data a get_subagent_result report renders from — only what the formatter reads. */
-export interface AgentReport {
-	id: string;
-	displayName: string;
-	modelLabel: string;
-	thinkingLevel: ThinkingLevel;
-	status: SubagentStatus;
-	toolUses: number;
-	/** Pre-formatted lifetime token total; "" when zero. */
-	tokens: string;
-	contextPercent: number | null;
-	compactionCount: number;
-	/** Pre-formatted duration string. */
-	duration: string;
-	description: string;
-	result: string | undefined;
-	error: string | undefined;
-	stoppedWhileQueued: boolean;
-	/** Present only when verbose was requested and a conversation is available. */
-	conversation?: string;
-	/** Persisted transcript remains readable after the live session is released. */
-	transcriptPath?: string;
-}
-
-/** Assemble the stats parts: Tool uses / tokens? / Context? / Compactions? / Duration. */
-export function renderStatsParts(report: AgentReport): string[] {
-	const parts = [`Tool uses: ${report.toolUses}`];
-	if (report.tokens) parts.push(report.tokens);
-	if (report.contextPercent !== null) parts.push(`Context: ${Math.round(report.contextPercent)}%`);
-	if (report.compactionCount) parts.push(`Compactions: ${report.compactionCount}`);
-	parts.push(`Duration: ${report.duration}`);
-	return parts;
-}
-
-/** Select the per-status body: running note, error line, or trimmed result. */
-export function renderReportBody(report: AgentReport): string {
-	if (report.status === "queued")
-		return "Agent is queued and has not started. Use wait: true to synchronize, or rely on the automatic completion notification.";
-	if (report.status === "running")
-		return "Agent is still running. Use wait: true to synchronize, or rely on the automatic completion notification.";
-	if (report.stoppedWhileQueued)
-		return "Agent was stopped while queued and never started. No work was performed.";
-	if (report.status === "error") {
-		const partial = report.result?.trim();
-		return partial
-			? `Error: ${report.error}\n\nPartial output before the failure:\n${partial}`
-			: `Error: ${report.error}`;
-	}
-	return report.result?.trim() ?? "No output.";
-}
-
-/** Assemble the full get_subagent_result report text. */
-export function formatAgentReport(report: AgentReport): string {
-	let output =
-		`Agent: ${report.id}\n` +
-		`Type: ${report.displayName} | Model: ${formatModelThinking(report.modelLabel, report.thinkingLevel)} | Status: ${report.status} | ${renderStatsParts(report).join(" | ")}\n` +
-		`Description: ${report.description}\n\n`;
-	output += renderReportBody(report);
-	if (report.conversation) {
-		output += `\n\n--- Agent Conversation ---\n${report.conversation}`;
-	}
-	if (report.transcriptPath) output += `\n\nFull transcript: ${report.transcriptPath}`;
-	return output;
-}