@mystilleef/pi-subagent 0.4.0 → 0.6.0

package/src/{subagent-orchestrator.ts → orchestration/subagent-orchestrator.ts}

@@ -4,23 +4,21 @@ import type {
   ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import { type Static, Type } from "typebox";
-import { getCachedAgentDiscovery } from "./agent-cache.js";
-import {
-  type AgentConfig,
-  type AgentScope,
-  discoverAgents,
-  type ThinkingLevel,
-} from "./agents.js";
-import { generateSubagentInstanceName } from "./instance-name.js";
-import { runSingleAgent } from "./process.js";
+import { getCachedAgentDiscovery } from "../agent/agent-cache.js";
+import type {
+  AgentConfig,
+  AgentScope,
+  ThinkingLevel,
+} from "../agent/agents.js";
+import { runSingleAgent } from "../child/process.js";
+import { formatSubagentResultForParent } from "../output/summary.js";
 import {
   cancelProgressState,
   createProgressState,
   failProgressState,
   finalizeProgressState,
-  formatElapsed,
   getProgressState,
-} from "./progress.js";
+} from "../progress/progress.js";
 import {
   createSubagentError,
   getFeedbackSummaryText,
@@ -28,20 +26,20 @@ import {
   hasSubagentFailed,
   patchProgressFromDetails,
   sanitizeDetailsForDisplay,
-} from "./result-details.js";
+} from "../progress/result-details.js";
+import { generateSubagentInstanceName } from "../shared/instance-name.js";
+import type {
+  OnUpdateCallback,
+  SingleResult,
+  SubagentDetails,
+  SubagentToolResult,
+} from "../shared/types.js";
 import {
   listRunJobs,
   type RunJob,
   registerRunJob,
   removeRunJob,
 } from "./run-registry.js";
-import { formatSubagentResultForParent } from "./summary.js";
-import type {
-  OnUpdateCallback,
-  SingleResult,
-  SubagentDetails,
-  SubagentToolResult,
-} from "./types.js";
 
 const AgentScopeSchema = StringEnum(["user", "project", "both"] as const, {
   description:
@@ -100,18 +98,15 @@ function sanitizeResultDetails(
     includeDebugMessages && (options?.includeMessages ?? true);
   const { messages, termination, progress, stderr, usage, ...core } = result;
   const { contextWindowTokens, ...usageBase } = usage;
-
   const sanitized: Record<string, unknown> = {
     ...core,
     stderr: includeDebugMessages ? stderr : "",
     usage: { ...usageBase },
   };
-
   if (contextWindowTokens !== undefined) {
     (sanitized.usage as Record<string, unknown>).contextWindowTokens =
       contextWindowTokens;
   }
-
   if (progress !== undefined) {
     const { activityText, lastToolPreview, ...progBase } = progress;
     sanitized.progress = {
@@ -123,14 +118,12 @@ function sanitizeResultDetails(
       ...(lastToolPreview !== undefined && { lastToolPreview }),
     };
   }
-
   if (includeMessages) {
     sanitized.messages = options?.recentMessages
       ? [...options.recentMessages]
       : messages !== undefined
         ? [...messages]
         : undefined;
-
     if (includeDebugMessages && termination !== undefined) {
       const { cancelReason, terminationSignal, fallbackCause, ...termBase } =
         termination;
@@ -142,7 +135,6 @@ function sanitizeResultDetails(
       };
     }
   }
-
   return sanitized as unknown as SingleResult;
 }
 
@@ -175,30 +167,14 @@ function sendSubagentResultMessage(
   });
 }
 
-export function emitCompletionNotification(
-  ctx: ExtensionContext,
+export function emitCompletionAlert(
   state: ReturnType<typeof getProgressState>,
 ): void {
   if (!state) return;
   if (state.status === "cancelled") return;
-  if (!ctx.ui?.notify) return;
   const tty = (process.stdout as { isTTY?: boolean }).isTTY;
   if (!tty) return;
-  const icon = state.status === "error" ? "✗" : "✓";
-  const severity =
-    state.status === "error" ? ("error" as const) : ("info" as const);
-  const elapsed = formatElapsed(
-    state.durationMs ?? Date.now() - state.startTime,
-  );
-  const raw = state.errorText ?? state.finalOutput ?? "";
-  const preview = raw.trim().slice(0, 80);
-  const namePart = state.instanceName
-    ? `${state.agent} ${state.instanceName}`
-    : state.agent;
-  const toast = `${namePart} ${icon}  ${elapsed} — "${preview}"`;
-  // Terminal bell to draw attention when all jobs complete
   process.stdout.write("\x07");
-  ctx.ui.notify(toast, severity);
 }
 
 async function runSubagentWorker(
@@ -289,7 +265,7 @@ async function runSubagentWorker(
     if (listRunJobs().length === 0) {
       const state = getProgressState(requestId);
       if (state) {
-        emitCompletionNotification(ctx, state);
+        emitCompletionAlert(state);
       }
     }
   }
@@ -340,7 +316,7 @@ export async function startSubagentJob(
   hostSignal: AbortSignal | undefined,
 ): Promise<StartJobResult> {
   const agentScope: AgentScope = params.agentScope ?? "both";
-  const discovery = getCachedAgentDiscovery(ctx.cwd, agentScope);
+  const discovery = await getCachedAgentDiscovery(ctx.cwd, agentScope);
   const agents = discovery.agents;
   const debug = params.debug === true;
   const makeDetails = createDetailsBuilder(
@@ -361,7 +337,7 @@ export async function startSubagentJob(
     if (!confirmed) return { kind: "cancelled", makeDetails };
   }
   if (requested.source === "project") {
-    const userAgents = discoverAgents(ctx.cwd, "user");
+    const userAgents = await getCachedAgentDiscovery(ctx.cwd, "user");
     const hasUserCollision = userAgents.agents.some(
       (a) => a.name === requested.name,
     );

package/src/{normalize.ts → output/normalize.ts}

@@ -32,27 +32,6 @@ export function extractSemanticToolTarget(
   return "";
 }
 
-export function isTranscriptNoiseLine(line: string): boolean {
-  return /^(?:(?:hello|hi|hey)(?:[!,.?:;]+|\s|$)|reasoning:|raw log:|apolog(?:y|ies)|sorry\b)/i.test(
-    line,
-  );
-}
-
-export function isFailureDiagnosticLine(line: string): boolean {
-  return /^(?:at\s+|error:|failed:|failure:|exception:|traceback\b|caused by:)/i.test(
-    line,
-  );
-}
-
-export function filterOutputLines(output: string): string[] {
-  return output
-    .split(/\r?\n/)
-    .map((l) => l.trim())
-    .filter(
-      (l) => l && !isTranscriptNoiseLine(l) && !isFailureDiagnosticLine(l),
-    );
-}
-
 export function stripTerminalStatusPrefixes(value: string): string {
   return value.replace(/^(?:(?:success|failure):\s*)+/i, "");
 }

package/src/{summary.ts → output/summary.ts}

@@ -1,5 +1,5 @@
+import type { SingleResult } from "../shared/types.js";
 import { normalizeTerminalSentence } from "./normalize.js";
-import type { SingleResult } from "./types.js";
 
 export const FEEDBACK_UI_SUMMARY_MAX_CHARS = 120;
 
@@ -20,7 +20,9 @@ const FEEDBACK_UI_LABEL_PATTERN =
   /^\s*(outcome|project summary|result|summary|status|output|message|error|check):\s*/i;
 
 export function formatSubagentResultForParent(result: SingleResult): string {
-  return result.finalOutput;
+  return result.thinkingWarning
+    ? `[thinking] ${result.thinkingWarning}\n\n${result.finalOutput}`
+    : result.finalOutput;
 }
 
 export function summarizeFeedbackUiFinalOutput(finalOutput: string): string {

package/src/{ui.ts → output/ui.ts}

@@ -7,11 +7,7 @@ import {
   type MarkdownTheme,
   Text,
 } from "@earendil-works/pi-tui";
-import type { AgentScope } from "./agents.js";
-import {
-  extractSemanticToolTarget,
-  normalizeSummaryValue,
-} from "./normalize.js";
+import type { AgentScope } from "../agent/agents.js";
 import {
   formatContextPercent,
   formatElapsed,
@@ -21,9 +17,13 @@ import {
   STATUS_ICON,
   type SubagentProgressState,
   type ThemeBg,
-} from "./progress-state.js";
-import { hasSubagentFailed } from "./result-details.js";
-import type { SubagentDetails, UsageStats } from "./types.js";
+} from "../progress/progress-state.js";
+import { hasSubagentFailed } from "../progress/result-details.js";
+import type { SubagentDetails, UsageStats } from "../shared/types.js";
+import {
+  extractSemanticToolTarget,
+  normalizeSummaryValue,
+} from "./normalize.js";
 
 export type { ThemeBg };
 
@@ -103,32 +103,16 @@ export function formatUsageStats(
   return parts.join(" · ");
 }
 
-/**
- * Formats millisecond durations into human-readable time strings.
- */
-export function formatDuration(ms: number): string {
-  if (ms < 1000) return `${Math.floor(ms)}ms`;
-  if (ms < 60000) return `${(ms / 1000).toFixed(1)}s`;
-  const minutes = Math.floor(ms / 60000);
-  const seconds = Math.floor((ms % 60000) / 1000);
-  return `${minutes}m ${seconds.toString().padStart(2, "0")}s`;
-}
-
 /**
  * Formats the footer for subagent result cards, including model, context, turns, and cost.
  */
-export function formatResultFooter(
-  usage: UsageStats,
-  model?: string,
-  durationMs?: number,
-): string {
+export function formatResultFooter(usage: UsageStats, model?: string): string {
   const parts: string[] = [];
   if (model) parts.push(model);
-  if (usage.contextTokens && usage.contextTokens > 0)
-    parts.push(`ctx:${formatTokens(usage.contextTokens)}`);
   if (usage.turns)
     parts.push(`${usage.turns} turn${usage.turns > 1 ? "s" : ""}`);
-  if (typeof durationMs === "number") parts.push(formatDuration(durationMs));
+  if (usage.contextTokens && usage.contextTokens > 0)
+    parts.push(`ctx:${formatTokens(usage.contextTokens)}`);
   if (usage.cost) parts.push(`$${usage.cost.toFixed(4)}`);
   return parts.join(" · ");
 }
@@ -243,12 +227,20 @@ export function renderSubagentResult(
   const finalOutput = r.finalOutput ?? getFinalOutput(r.messages ?? []);
   const title = formatSubagentTitle(r.agent, r.instanceName, theme);
   const bodyText = stripOutcomeLineForResultUi(bodyOverride ?? finalOutput);
-  const usageStr = formatResultFooter(r.usage, r.model, r.durationMs);
+  const toolCount = r.progress?.toolCalls?.length ?? 0;
+  const toolLabel = `${toolCount} ${toolCount === 1 ? "tool" : "tools"}`;
+  const ctxPercent = formatContextPercent({
+    contextTokens: r.usage.contextTokens,
+    contextWindowTokens: r.usage.contextWindowTokens,
+  } as SubagentProgressState);
+  const metadata = `${toolLabel} · ${ctxPercent} ctx · ${formatElapsed(r.durationMs ?? 0)}`;
+  const usageStr = formatResultFooter(r.usage, r.model);
   return renderStatusCard(
     {
       status: resultStatus,
       title,
       variant: "full",
+      metadata,
       body: bodyText,
       footer: usageStr,
     },

package/src/{progress-state.ts → progress/progress-state.ts}

@@ -7,8 +7,8 @@ import {
   normalizeTerminalSentence,
   TOOL_PREVIEW_MAX_CHARS,
   truncateText,
-} from "./normalize.js";
-import type { SubagentDetails } from "./types.js";
+} from "../output/normalize.js";
+import type { SubagentDetails } from "../shared/types.js";
 
 export type ThemeBg = "toolPendingBg" | "toolSuccessBg" | "toolErrorBg";
 

package/src/{progress.ts → progress/progress.ts}

@@ -18,6 +18,7 @@
 
 import type { Component } from "@earendil-works/pi-tui";
 import { Box, Text } from "@earendil-works/pi-tui";
+import { formatSubagentTitle, type SubagentTheme } from "../output/ui.js";
 import {
   formatHeaderStats,
   getProgressState,
@@ -28,9 +29,8 @@ import {
   type SubagentProgressState,
   type ThemeBg,
 } from "./progress-state.js";
-import { formatSubagentTitle, type SubagentTheme } from "./ui.js";
 
-export { makeToolPreview } from "./normalize.js";
+export { makeToolPreview } from "../output/normalize.js";
 export {
   cancelProgressState,
   clearProgressState,

package/src/{result-details.ts → progress/result-details.ts}

@@ -1,19 +1,19 @@
-import { TOOL_RESULT_FAILED_MESSAGE } from "./process.js";
-import {
-  extractProgressFromDetails,
-  getProgressState,
-  patchProgressState,
-} from "./progress.js";
+import { TOOL_RESULT_FAILED_MESSAGE } from "../child/process.js";
 import {
   formatSubagentResultForParent,
   summarizeFeedbackUiFinalOutput,
-} from "./summary.js";
+} from "../output/summary.js";
 import type {
   SingleResult,
   SubagentDetails,
   SubagentToolResult,
-} from "./types.js";
-import { detectMessageError } from "./utils.js";
+} from "../shared/types.js";
+import { detectMessageError } from "../shared/utils.js";
+import {
+  extractProgressFromDetails,
+  getProgressState,
+  patchProgressState,
+} from "./progress.js";
 
 export function hasSubagentFailed(result: SingleResult): boolean {
   return (

package/src/shared/instance-name.ts

@@ -0,0 +1,117 @@
+const DEFAULT_ADJECTIVES = [
+  "able",
+  "agile",
+  "alert",
+  "amber",
+  "ample",
+  "apt",
+  "arctic",
+  "avid",
+  "bold",
+  "brave",
+  "bright",
+  "brisk",
+  "calm",
+  "clever",
+  "cosmic",
+  "crisp",
+  "daring",
+  "dawn",
+  "eager",
+  "early",
+  "fair",
+  "fast",
+  "fierce",
+  "fine",
+  "fresh",
+  "gentle",
+  "golden",
+  "grand",
+  "happy",
+  "honest",
+  "jolly",
+  "keen",
+  "kind",
+  "lively",
+  "lucky",
+  "merry",
+  "mighty",
+  "nimble",
+  "noble",
+  "novel",
+  "patient",
+  "proud",
+  "quick",
+  "quiet",
+  "rapid",
+  "ready",
+  "sharp",
+  "smart",
+  "solid",
+  "steady",
+  "swift",
+  "tidy",
+  "vivid",
+  "warm",
+  "wise",
+] as const;
+
+const DEFAULT_NOUNS = [
+  "badger",
+  "beacon",
+  "bison",
+  "brook",
+  "cedar",
+  "comet",
+  "coral",
+  "coyote",
+  "crane",
+  "dolphin",
+  "eagle",
+  "ember",
+  "falcon",
+  "finch",
+  "forest",
+  "fox",
+  "gecko",
+  "glade",
+  "harbor",
+  "hawk",
+  "heron",
+  "island",
+  "jaguar",
+  "koala",
+  "lagoon",
+  "lemur",
+  "lynx",
+  "maple",
+  "meadow",
+  "otter",
+  "panda",
+  "panther",
+  "pelican",
+  "phoenix",
+  "puma",
+  "raven",
+  "reef",
+  "river",
+  "salmon",
+  "sparrow",
+  "summit",
+  "tiger",
+  "valley",
+  "violet",
+  "walrus",
+  "willow",
+  "wolf",
+  "wren",
+  "yak",
+  "zephyr",
+] as const;
+
+export function generateSubagentInstanceName(): string {
+  const adj =
+    DEFAULT_ADJECTIVES[Math.floor(Math.random() * DEFAULT_ADJECTIVES.length)];
+  const noun = DEFAULT_NOUNS[Math.floor(Math.random() * DEFAULT_NOUNS.length)];
+  return `${adj}-${noun}`;
+}

package/src/{types.ts → shared/types.ts}

@@ -1,6 +1,6 @@
 import type { Message } from "@earendil-works/pi-ai";
-import type { AgentScope } from "./agents.js";
-import type { TerminationMetadata } from "./termination.js";
+import type { AgentScope } from "../agent/agents.js";
+import type { TerminationMetadata } from "../child/termination.js";
 
 export interface UsageStats {
   input: number;
@@ -40,6 +40,7 @@ export interface SingleResult {
   progress?: StreamingProgress;
   messages?: Message[];
   termination?: TerminationMetadata;
+  thinkingWarning?: string;
 }
 
 export interface SubagentDetails {

package/src/{utils.ts → shared/utils.ts}

@@ -5,7 +5,6 @@ import type { Message } from "@earendil-works/pi-ai";
 import {
   DefaultResourceLoader,
   getAgentDir,
-  withFileMutationQueue,
 } from "@earendil-works/pi-coding-agent";
 
 export const DEFAULT_MAX_OUTPUT_BYTES = 50_000;
@@ -66,11 +65,10 @@ export async function writePromptToTempFile(
   );
   const safeName = agentName.replace(/[^\w.-]+/g, "_");
   const filePath = path.join(tmpDir, `prompt-${safeName}.md`);
-  await withFileMutationQueue(filePath, async () => {
-    await fs.promises.writeFile(filePath, prompt, {
-      encoding: "utf-8",
-      mode: 0o600,
-    });
+  // mkdtemp guarantees a unique directory per call; no concurrent writer can hold this path.
+  await fs.promises.writeFile(filePath, prompt, {
+    encoding: "utf-8",
+    mode: 0o600,
   });
   return { dir: tmpDir, filePath };
 }

package/src/instance-name.ts

@@ -1,164 +0,0 @@
-const DEFAULT_ADJECTIVES = [
-  "able",
-  "agile",
-  "alert",
-  "amber",
-  "ample",
-  "apt",
-  "arctic",
-  "avid",
-  "bold",
-  "brave",
-  "bright",
-  "brisk",
-  "calm",
-  "clever",
-  "cosmic",
-  "crisp",
-  "daring",
-  "dawn",
-  "eager",
-  "early",
-  "fair",
-  "fast",
-  "fierce",
-  "fine",
-  "fresh",
-  "gentle",
-  "golden",
-  "grand",
-  "happy",
-  "honest",
-  "jolly",
-  "keen",
-  "kind",
-  "lively",
-  "lucky",
-  "merry",
-  "mighty",
-  "nimble",
-  "noble",
-  "novel",
-  "patient",
-  "proud",
-  "quick",
-  "quiet",
-  "rapid",
-  "ready",
-  "sharp",
-  "smart",
-  "solid",
-  "steady",
-  "swift",
-  "tidy",
-  "vivid",
-  "warm",
-  "wise",
-] as const;
-
-const DEFAULT_NOUNS = [
-  "badger",
-  "beacon",
-  "bison",
-  "brook",
-  "cedar",
-  "comet",
-  "coral",
-  "coyote",
-  "crane",
-  "dolphin",
-  "eagle",
-  "ember",
-  "falcon",
-  "finch",
-  "forest",
-  "fox",
-  "gecko",
-  "glade",
-  "harbor",
-  "hawk",
-  "heron",
-  "island",
-  "jaguar",
-  "koala",
-  "lagoon",
-  "lemur",
-  "lynx",
-  "maple",
-  "meadow",
-  "otter",
-  "panda",
-  "panther",
-  "pelican",
-  "phoenix",
-  "puma",
-  "raven",
-  "reef",
-  "river",
-  "salmon",
-  "sparrow",
-  "summit",
-  "tiger",
-  "valley",
-  "violet",
-  "walrus",
-  "willow",
-  "wolf",
-  "wren",
-  "yak",
-  "zephyr",
-] as const;
-
-const usedInstanceNames = new Set<string>();
-
-let adjectives: readonly string[] = DEFAULT_ADJECTIVES;
-let nouns: readonly string[] = DEFAULT_NOUNS;
-let randomSource: () => number = Math.random;
-
-function normalizeRandomIndex(limit: number): number {
-  const value = randomSource();
-  if (!Number.isFinite(value)) return 0;
-  return Math.min(limit - 1, Math.max(0, Math.floor(value * limit)));
-}
-
-function nameAt(index: number): string {
-  const adjective = adjectives[Math.floor(index / nouns.length)];
-  const noun = nouns[index % nouns.length];
-  return `${adjective}-${noun}`;
-}
-
-export function generateSubagentInstanceName(): string {
-  const capacity = adjectives.length * nouns.length;
-  if (usedInstanceNames.size >= capacity) {
-    throw new Error(
-      "No unused subagent instance names remain for this session.",
-    );
-  }
-  const start = normalizeRandomIndex(capacity);
-  for (let offset = 0; offset < capacity; offset += 1) {
-    const candidate = nameAt((start + offset) % capacity);
-    if (!usedInstanceNames.has(candidate)) {
-      usedInstanceNames.add(candidate);
-      return candidate;
-    }
-  }
-  throw new Error("No unused subagent instance names remain for this session.");
-}
-
-export function resetSubagentInstanceNamesForTest() {
-  usedInstanceNames.clear();
-  adjectives = DEFAULT_ADJECTIVES;
-  nouns = DEFAULT_NOUNS;
-  randomSource = Math.random;
-}
-
-export function configureSubagentInstanceNamesForTest(options: {
-  adjectives?: readonly string[];
-  nouns?: readonly string[];
-  randomSource?: () => number;
-}) {
-  usedInstanceNames.clear();
-  adjectives = options.adjectives ?? DEFAULT_ADJECTIVES;
-  nouns = options.nouns ?? DEFAULT_NOUNS;
-  randomSource = options.randomSource ?? Math.random;
-}