@marcoscale98/pi-extensible-workflows 5.14.1-fork.1 → 5.19.1-fork.1

package/dist/subagents/index.js

@@ -1,6 +1,6 @@
 // subagents/src/index.ts
-import { join as join10 } from "node:path";
-import { defineTool as defineTool2, getAgentDir as getAgentDir7 } from "@earendil-works/pi-coding-agent";
+import { join as join11 } from "node:path";
+import { defineTool as defineTool2, getAgentDir as getAgentDir8 } from "@earendil-works/pi-coding-agent";
 import { Value as Value3 } from "typebox/value";
 
 // src/types.ts
@@ -28,6 +28,7 @@ var ERROR_CODES = [
   "AGENT_FAILED",
   "AGENT_RESULT_COLLECTED",
   "RESULT_INVALID",
+  "TOOL_FAILED",
   "CANCELLED",
   "WORKER_UNRESPONSIVE",
   "WORKTREE_FAILED",
@@ -284,6 +285,16 @@ function resolveModelReference(value, aliases = {}, knownModels, settingsPath) {
   };
   return resolveReference(value, []);
 }
+function reachableTools(pi) {
+  const undeclared = pi.getAllTools?.().filter(({ exposure }) => exposure === "codemode" || exposure === "deferred").map(({ name }) => name) ?? [];
+  return [.../* @__PURE__ */ new Set([...pi.getActiveTools(), ...undeclared])];
+}
+var VIRTUAL_MODEL_PROVIDER = "workflow";
+function physicalModel(spec, aliases = {}, knownModels, settingsPath) {
+  if (spec.provider !== VIRTUAL_MODEL_PROVIDER || !modelAliasName(spec.model, aliases)) return spec;
+  const target = resolveModelReference(spec.model, aliases, knownModels, settingsPath);
+  return spec.thinking === void 0 ? target : { ...target, thinking: spec.thinking };
+}
 function modelCapability(value, aliases, knownModels, settingsPath) {
   const parsed = typeof value === "string" ? resolveModelReference(value, aliases, knownModels, settingsPath) : value;
   return `${parsed.provider}/${parsed.model}`;
@@ -328,6 +339,12 @@ function unmatchedResourcePatterns(patterns, resources) {
 function loadLaunchSnapshot(input) {
   return deepFreeze(structuredClone(input));
 }
+function validateSchema(schema, at = "schema") {
+  if (!object(schema) || Object.getPrototypeOf(schema) !== Object.prototype || !jsonValue(schema)) fail("INVALID_SCHEMA", `${at} must be a plain JSON-compatible Schema object`);
+  if (typeof schema.type !== "string" && !Array.isArray(schema.type) && schema.$ref === void 0 && schema.anyOf === void 0 && schema.oneOf === void 0 && schema.allOf === void 0 && schema.const === void 0 && schema.enum === void 0) fail("INVALID_SCHEMA", `${at} has no JSON Schema shape`);
+  if (schema.required !== void 0 && (!Array.isArray(schema.required) || schema.required.some((key) => typeof key !== "string"))) fail("INVALID_SCHEMA", `${at}.required must be an array of strings`);
+  if (schema.properties !== void 0 && !object(schema.properties)) fail("INVALID_SCHEMA", `${at}.properties must be an object`);
+}
 
 // src/paths.ts
 import { createHash } from "node:crypto";
@@ -345,6 +362,9 @@ function canonicalPath(path) {
     return absolute;
   }
 }
+function extensionIdentity(path) {
+  return path.startsWith("builtin:") ? path : canonicalPath(path);
+}
 function sameFilesystemPath(left, right) {
   return canonicalPath(left) === canonicalPath(right);
 }
@@ -372,6 +392,20 @@ function budgetUsage(value) {
   return { tokens: value?.tokens ?? 0, costUsd: value?.costUsd ?? 0, durationMs: value?.durationMs ?? 0, agentLaunches: value?.agentLaunches ?? 0 };
 }
 
+// src/validation.ts
+import * as acorn from "acorn";
+
+// src/roles.ts
+import { readFileSync as readFileSync3, readdirSync, statSync } from "node:fs";
+import { basename as basename3, dirname as dirname4, extname, join as join5, resolve as resolve4 } from "node:path";
+import { getAgentDir as getAgentDir2, parseFrontmatter } from "@earendil-works/pi-coding-agent";
+
+// src/registry.ts
+import { readFileSync as readFileSync2 } from "node:fs";
+import { basename as basename2, dirname as dirname3, isAbsolute, join as join4 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+import { Value } from "typebox/value";
+
 // src/io.ts
 import { execFile } from "node:child_process";
 import { randomUUID } from "node:crypto";
@@ -392,7 +426,7 @@ async function renameWithRetry(from, to) {
     } catch (error) {
       const delayMs = RENAME_RETRY_DELAYS_MS[attempt];
       if (!retryableRenameError(error) || delayMs === void 0) throw error;
-      await new Promise((resolve5) => setTimeout(resolve5, delayMs));
+      await new Promise((resolve6) => setTimeout(resolve6, delayMs));
     }
   }
 }
@@ -593,7 +627,7 @@ function decodeWorkflowExtensions(value) {
     }
     if (namespace === "trajectory") {
       if (!object(raw) || Object.keys(raw).some((key) => key !== "port" && key !== "themes") || raw.port !== void 0 && (typeof raw.port !== "number" || !Number.isSafeInteger(raw.port) || raw.port < 1 || raw.port > 65535) || raw.themes !== void 0 && typeof raw.themes !== "boolean") return void 0;
-      normalized.trajectory = { ...raw.port === void 0 ? {} : { port: raw.port }, ...raw.themes === void 0 ? {} : { themes: raw.themes } };
+      normalized.trajectory = { ...raw.port === void 0 ? {} : { port: raw.port } };
       continue;
     }
     if (!jsonValue(raw)) return void 0;
@@ -775,9 +809,9 @@ function decodeAgentAttempt(value) {
   const session = value.session === void 0 ? void 0 : decodeAgentSession(value.session);
   const setup = decodeAgentSetupSummary(value.setup);
   const error = value.error === void 0 ? void 0 : decodeAttemptError(value.error);
-  const accounting3 = decodeAgentAccounting(value.accounting);
-  if (!setup || !accounting3 || value.session !== void 0 && !session || value.error !== void 0 && !error) return void 0;
-  return { attempt: value.attempt, transport: value.transport, setup, accounting: accounting3, ...session === void 0 ? {} : { session }, ...error === void 0 ? {} : { error } };
+  const accounting2 = decodeAgentAccounting(value.accounting);
+  if (!setup || !accounting2 || value.session !== void 0 && !session || value.error !== void 0 && !error) return void 0;
+  return { attempt: value.attempt, transport: value.transport, setup, accounting: accounting2, ...session === void 0 ? {} : { session }, ...error === void 0 ? {} : { error } };
 }
 function decodeAgent(value) {
   if (!object(value) || typeof value.id !== "string" || typeof value.name !== "string" || typeof value.path !== "string" || !isAgentState(value.state) || !integer(value.attempts)) return void 0;
@@ -798,12 +832,12 @@ function decodeAgent(value) {
   const startedAt = optionalNumber(value.startedAt);
   const durationMs = optionalNumber(value.durationMs);
   const attemptDetails = value.attemptDetails === void 0 ? void 0 : decodeArray(value.attemptDetails, decodeAgentAttempt);
-  const accounting3 = value.accounting === void 0 ? void 0 : decodeAgentAccounting(value.accounting);
+  const accounting2 = value.accounting === void 0 ? void 0 : decodeAgentAccounting(value.accounting);
   const toolCalls = value.toolCalls === void 0 ? void 0 : decodeArray(value.toolCalls, decodeAgentToolCall);
-  const activity2 = value.activity === void 0 ? void 0 : decodeAgentActivity(value.activity);
+  const activity = value.activity === void 0 ? void 0 : decodeAgentActivity(value.activity);
   const lastEventAt = optionalNumber(value.lastEventAt);
   if (systemPrompt === INVALID_PERSISTED_VALUE || prompt === INVALID_PERSISTED_VALUE || label2 === INVALID_PERSISTED_VALUE || parentId === INVALID_PERSISTED_VALUE || resultPath2 === INVALID_PERSISTED_VALUE || parentBreadcrumb === INVALID_PERSISTED_VALUE || worktreeOwner === INVALID_PERSISTED_VALUE || role === INVALID_PERSISTED_VALUE || requestedModel === INVALID_PERSISTED_VALUE || startedAt === INVALID_PERSISTED_VALUE || durationMs === INVALID_PERSISTED_VALUE || lastEventAt === INVALID_PERSISTED_VALUE || handle === INVALID_PERSISTED_VALUE || continuity === INVALID_PERSISTED_VALUE || handle !== void 0 && !positiveInteger(value.turn)) return void 0;
-  if (!model || !tools || value.structuralPath !== void 0 && !structuralPath2 || value.attemptDetails !== void 0 && !attemptDetails || value.accounting !== void 0 && !accounting3 || value.toolCalls !== void 0 && !toolCalls || value.activity !== void 0 && !activity2) return void 0;
+  if (!model || !tools || value.structuralPath !== void 0 && !structuralPath2 || value.attemptDetails !== void 0 && !attemptDetails || value.accounting !== void 0 && !accounting2 || value.toolCalls !== void 0 && !toolCalls || value.activity !== void 0 && !activity) return void 0;
   return {
     ...systemPrompt === void 0 ? {} : { systemPrompt },
     ...prompt === void 0 ? {} : { prompt },
@@ -827,9 +861,9 @@ function decodeAgent(value) {
     ...startedAt === void 0 ? {} : { startedAt },
     ...durationMs === void 0 ? {} : { durationMs },
     ...attemptDetails === void 0 ? {} : { attemptDetails },
-    ...accounting3 === void 0 ? {} : { accounting: accounting3 },
+    ...accounting2 === void 0 ? {} : { accounting: accounting2 },
     ...toolCalls === void 0 ? {} : { toolCalls },
-    ...activity2 === void 0 ? {} : { activity: activity2 },
+    ...activity === void 0 ? {} : { activity },
     ...lastEventAt === void 0 ? {} : { lastEventAt }
   };
 }
@@ -873,9 +907,25 @@ function decodeShellActivity(value) {
 }
 function decodeRunEvent(value) {
   if (!object(value) || typeof value.type !== "string" || typeof value.message !== "string") return void 0;
-  const timestamp3 = optionalNumber(value.timestamp);
-  if (timestamp3 === INVALID_PERSISTED_VALUE) return void 0;
-  return { type: value.type, message: value.message, ...timestamp3 === void 0 ? {} : { timestamp: timestamp3 } };
+  const timestamp2 = optionalNumber(value.timestamp);
+  if (timestamp2 === INVALID_PERSISTED_VALUE) return void 0;
+  return { type: value.type, message: value.message, ...timestamp2 === void 0 ? {} : { timestamp: timestamp2 } };
+}
+function decodeScriptCall(value) {
+  if (!object(value) || value.kind !== "shell" && value.kind !== "tool" || typeof value.name !== "string" || typeof value.path !== "string" || !finiteNumber(value.startedAt)) return void 0;
+  const shell = value.kind === "shell";
+  if (shell && !jsonValue(value.input)) return void 0;
+  const inputBytes = shell ? optionalNumber(value.inputBytes) : void 0;
+  const phase = optionalString(value.phase);
+  const finishedAt = optionalNumber(value.finishedAt);
+  let error;
+  if (value.error !== void 0) {
+    if (shell) error = decodeWorkflowError(value.error);
+    else if (object(value.error) && typeof value.error.code === "string") error = { code: isWorkflowErrorCode(value.error.code) ? value.error.code : "INTERNAL_ERROR" };
+    if (!error) return void 0;
+  }
+  if (inputBytes === INVALID_PERSISTED_VALUE || phase === INVALID_PERSISTED_VALUE || finishedAt === INVALID_PERSISTED_VALUE) return void 0;
+  return { kind: value.kind, name: value.name, path: value.path, ...shell && jsonValue(value.input) ? { input: value.input } : {}, ...inputBytes === void 0 ? {} : { inputBytes }, ...phase === void 0 ? {} : { phase }, startedAt: value.startedAt, ...finishedAt === void 0 ? {} : { finishedAt }, ...error === void 0 ? {} : { error } };
 }
 function decodeDelivery(value) {
   if (!object(value)) return void 0;
@@ -906,6 +956,8 @@ function decodePersistedRun(value, allowLegacyAgentSessions = false) {
   const budgetEvents = value.budgetEvents === void 0 ? void 0 : decodeArray(value.budgetEvents, decodeBudgetEvent);
   const events = value.events === void 0 ? void 0 : decodeArray(value.events, decodeRunEvent);
   const delivery = value.delivery === void 0 ? void 0 : decodeDelivery(value.delivery);
+  const scriptCalls = value.scriptCalls === void 0 ? void 0 : decodeArray(value.scriptCalls, decodeScriptCall);
+  if (value.scriptCalls !== void 0 && !scriptCalls) return void 0;
   if (!agentSessions || !agents || parentRunId === INVALID_PERSISTED_VALUE || value.retry !== void 0 && !retry || phase === INVALID_PERSISTED_VALUE || value.phaseHistory !== void 0 && !phaseHistory || phaseHistoryIndex === INVALID_PERSISTED_VALUE || activeShells === INVALID_PERSISTED_VALUE || activeShellStartedAt === INVALID_PERSISTED_VALUE || value.activeShellsByPhase !== void 0 && !activeShellsByPhase || value.error !== void 0 && !error || failedAt === INVALID_PERSISTED_VALUE || value.budget !== void 0 && !budget || budgetVersion === INVALID_PERSISTED_VALUE || value.budgetVersion !== void 0 && !integer(budgetVersion) || value.usage !== void 0 && !usage || value.budgetEvents !== void 0 && !budgetEvents || value.events !== void 0 && !events || value.delivery !== void 0 && !delivery) return void 0;
   if (value.agentSessions === void 0 && !allowLegacyAgentSessions) return void 0;
   return {
@@ -924,6 +976,7 @@ function decodePersistedRun(value, allowLegacyAgentSessions = false) {
     ...activeShells === void 0 ? {} : { activeShells },
     ...activeShellStartedAt === void 0 ? {} : { activeShellStartedAt },
     ...activeShellsByPhase === void 0 ? {} : { activeShellsByPhase },
+    ...scriptCalls === void 0 ? {} : { scriptCalls },
     ...error === void 0 ? {} : { error },
     ...failedAt === void 0 ? {} : { failedAt },
     ...budget === void 0 ? {} : { budget },
@@ -1920,20 +1973,236 @@ var RunStore = class _RunStore {
   }
 };
 
-// src/validation.ts
-import { mkdirSync, readFileSync as readFileSync2, readdirSync, statSync } from "node:fs";
+// src/settings.ts
+import { mkdirSync, readFileSync } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { basename as basename3, dirname as dirname3, extname, join as join4, resolve as resolve3 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
-import * as acorn from "acorn";
-import { getAgentDir, parseFrontmatter } from "@earendil-works/pi-coding-agent";
+import { dirname as dirname2, join as join3, resolve as resolve3 } from "node:path";
+import { fileURLToPath } from "node:url";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
+var ROLE_DIRECTORY = "pi-extensible-workflows";
+var DEFAULT_SETTINGS = Object.freeze({ concurrency: 8, backgroundWidget: true });
+function workflowSettingsPath(agentDir = getAgentDir()) {
+  return join3(agentDir, ROLE_DIRECTORY, "settings.json");
+}
+function normalizedResourcePath(value, settingsPath) {
+  if (value === "*" || value.startsWith("builtin:")) return value;
+  let expanded = value === "~" ? homedir3() : value.startsWith("~/") || value.startsWith("~\\") ? join3(homedir3(), value.slice(2)) : value;
+  if (expanded.startsWith("file://")) expanded = fileURLToPath(expanded);
+  const resolved = resolve3(dirname2(settingsPath), expanded);
+  if (expanded === "**" || expanded.startsWith("**/") || expanded.startsWith("**\\")) return expanded;
+  if (resourcePatternHasMagic(expanded)) {
+    const magicIndex = resolved.search(/[*?\x5b\x5d{}()]/);
+    const separatorIndex = Math.max(resolved.lastIndexOf("/", magicIndex), resolved.lastIndexOf("\\", magicIndex));
+    const rootBoundary = separatorIndex === 0 || separatorIndex === 2 && /^[A-Za-z]:[\\/]/.test(resolved);
+    const prefix = rootBoundary ? resolved.slice(0, separatorIndex + 1) : separatorIndex >= 0 ? resolved.slice(0, separatorIndex) : resolved;
+    const suffix = rootBoundary ? resolved.slice(separatorIndex + 1) : separatorIndex >= 0 ? resolved.slice(separatorIndex) : "";
+    return `${canonicalPath(prefix)}${suffix}`;
+  }
+  return canonicalPath(resolved);
+}
+function validateSelectorList(value, path, kind, errorCode2 = "INVALID_SETTINGS", normalizeExtensions = true) {
+  if (value === void 0) return void 0;
+  if (!Array.isArray(value)) fail(errorCode2, `${path}.${kind} must be an array`);
+  const normalized = [];
+  for (const [index, entry] of value.entries()) {
+    if (typeof entry !== "string" || !entry.trim()) fail(errorCode2, `${path}.${kind}[${String(index)}] must be a non-empty string`);
+    let selector = entry.trim();
+    if (kind === "extensions" && normalizeExtensions) {
+      const negated = selector.startsWith("!");
+      const body = negated ? selector.slice(1) : selector;
+      if (!body) fail(errorCode2, `${path}.${kind}[${String(index)}] must be a valid minimatch pattern: Empty minimatch pattern ${JSON.stringify(selector)}`);
+      try {
+        selector = `${negated ? "!" : ""}${normalizedResourcePath(body, path)}`;
+      } catch (error) {
+        fail(errorCode2, `${path}.${kind}[${String(index)}] must be a valid path: ${errorText(error)}`);
+      }
+    }
+    try {
+      validateResourcePattern(selector);
+    } catch (error) {
+      fail(errorCode2, `${path}.${kind}[${String(index)}] must be a valid minimatch pattern: ${errorText(error)}`);
+    }
+    normalized.push(selector);
+  }
+  return Object.freeze(normalized);
+}
+function validateWorktreePostCreateCommand(value, settingsPath) {
+  if (value === void 0) return void 0;
+  if (!Array.isArray(value) || value.length === 0) fail("INVALID_SETTINGS", `${settingsPath}.worktreePostCreateCommand must be a non-empty array`);
+  return Object.freeze(value.map((entry, index) => {
+    if (typeof entry !== "string" || !entry.trim()) fail("INVALID_SETTINGS", `${settingsPath}.worktreePostCreateCommand[${String(index)}] must be a non-empty string`);
+    return entry;
+  }));
+}
+function selectorsFromSettings(settings) {
+  return {
+    ...settings.skills === void 0 ? {} : { skills: settings.skills },
+    ...settings.extensions === void 0 ? {} : { extensions: settings.extensions },
+    ...settings.tools === void 0 ? {} : { tools: settings.tools }
+  };
+}
+function selectorSet(value) {
+  return { skills: [...value?.skills ?? []], extensions: [...value?.extensions ?? []], ...value?.tools === void 0 ? {} : { tools: [...value.tools] } };
+}
+function validateContextFileScopes(value, rolePath) {
+  if (value === void 0) return void 0;
+  if (!Array.isArray(value) || !value.every(isContextFileScope)) fail("INVALID_METADATA", `${rolePath}.contextFiles must be an array containing only global, project, or cwd`);
+  return [...value];
+}
+function validateWorkflowExtensionSettings(value, settingsPath, errorCode2 = "INVALID_SETTINGS") {
+  if (value === void 0) return void 0;
+  const base = `${settingsPath}.extensionSettings`;
+  if (!object(value)) fail(errorCode2, `${base} must be an object`);
+  const normalized = {};
+  for (const [namespace, raw] of Object.entries(value)) {
+    if (!validWorkflowExtensionNamespace(namespace)) fail(errorCode2, `${base} contains an invalid namespace: ${namespace}`);
+    if (namespace === "herdr") {
+      if (!object(raw)) fail(errorCode2, `${base}.herdr must be an object`);
+      if (Object.keys(raw).some((key) => key !== "enableFullyInspectableMode")) fail(errorCode2, `${base}.herdr contains an unsupported setting`);
+      if (raw.enableFullyInspectableMode !== void 0 && typeof raw.enableFullyInspectableMode !== "boolean") fail(errorCode2, `${base}.herdr.enableFullyInspectableMode must be a boolean`);
+      normalized.herdr = Object.freeze({ ...raw.enableFullyInspectableMode === void 0 ? {} : { enableFullyInspectableMode: raw.enableFullyInspectableMode } });
+      continue;
+    }
+    if (namespace === "trajectory") {
+      if (!object(raw)) fail(errorCode2, `${base}.trajectory must be an object`);
+      if (Object.keys(raw).some((key) => key !== "port")) fail(errorCode2, `${base}.trajectory contains an unsupported setting`);
+      if (raw.port !== void 0 && (!positiveInteger(raw.port) || raw.port > 65535)) fail(errorCode2, `${base}.trajectory.port must be an integer from 1 to 65535`);
+      normalized.trajectory = Object.freeze({ ...raw.port === void 0 ? {} : { port: raw.port } });
+      continue;
+    }
+    if (!jsonValue(raw)) fail(errorCode2, `${base}.${namespace} must be JSON-compatible`);
+    normalized[namespace] = structuredClone(raw);
+  }
+  return deepFreeze(normalized);
+}
+function positiveRetentionInteger(value) {
+  return positiveInteger(value) && Number.isSafeInteger(value);
+}
+function validateRetention(value, settingsPath) {
+  if (value === void 0) return void 0;
+  const base = `${settingsPath}.retention`;
+  if (!object(value)) fail("INVALID_SETTINGS", `${base} must be an object`);
+  const unknown = Object.keys(value).find((key) => key !== "olderThanDays" && key !== "maxTerminalRuns");
+  if (unknown) fail("INVALID_SETTINGS", `Unknown retention setting at ${base}: ${unknown}`);
+  if (value.olderThanDays !== void 0 && !positiveRetentionInteger(value.olderThanDays)) fail("INVALID_SETTINGS", `${base}.olderThanDays must be a positive integer`);
+  if (value.maxTerminalRuns !== void 0 && !positiveRetentionInteger(value.maxTerminalRuns)) fail("INVALID_SETTINGS", `${base}.maxTerminalRuns must be a positive integer`);
+  return Object.freeze({ ...value.olderThanDays === void 0 ? {} : { olderThanDays: value.olderThanDays }, ...value.maxTerminalRuns === void 0 ? {} : { maxTerminalRuns: value.maxTerminalRuns } });
+}
+function parseSettings(path, partial) {
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(path, "utf8"));
+  } catch (error) {
+    if (isNodeError(error, "ENOENT")) return partial ? Object.freeze({}) : DEFAULT_SETTINGS;
+    fail("CONFIG_ERROR", `Invalid workflow settings JSON at ${path}: ${errorText(error)}`);
+  }
+  if (!object(parsed)) fail("INVALID_SETTINGS", `Workflow settings at ${path} must be an object`);
+  const allowed = /* @__PURE__ */ new Set(["concurrency", "modelAliases", "skills", "extensions", "extensionSettings", "tools", "retention", "worktreePostCreateCommand", ...partial ? [] : ["backgroundWidget", "codemodeTools"]]);
+  const unknown = Object.keys(parsed).find((key) => !allowed.has(key));
+  if (Object.prototype.hasOwnProperty.call(parsed, "disabledAgentResources")) fail("INVALID_SETTINGS", `disabledAgentResources is no longer supported; use skills, extensions, and tools selectors (settings: ${path})`);
+  if (unknown) fail("INVALID_SETTINGS", `Unknown workflow setting at ${path}: ${unknown}`);
+  const concurrency = parsed.concurrency === void 0 ? partial ? void 0 : DEFAULT_SETTINGS.concurrency : parsed.concurrency;
+  if (concurrency !== void 0 && (!positiveInteger(concurrency) || concurrency > 16)) fail("INVALID_SETTINGS", `${path}.concurrency must be an integer from 1 to 16`);
+  const backgroundWidget = parsed.backgroundWidget === void 0 ? partial ? void 0 : DEFAULT_SETTINGS.backgroundWidget : parsed.backgroundWidget;
+  if (backgroundWidget !== void 0 && typeof backgroundWidget !== "boolean") fail("INVALID_SETTINGS", `${path}.backgroundWidget must be a boolean`);
+  const codemodeTools = parsed.codemodeTools;
+  if (codemodeTools !== void 0 && codemodeTools !== "all" && codemodeTools !== "read-only" && codemodeTools !== "none") fail("INVALID_SETTINGS", `${path}.codemodeTools must be "all", "read-only", or "none"`);
+  const modelAliases = parsed.modelAliases === void 0 ? void 0 : validateModelAliases(parsed.modelAliases, path);
+  const skills = validateSelectorList(parsed.skills, path, "skills");
+  const tools = validateSelectorList(parsed.tools, path, "tools");
+  const extensions = validateSelectorList(parsed.extensions, path, "extensions");
+  const extensionSettings = parsed.extensionSettings === void 0 ? void 0 : validateWorkflowExtensionSettings(parsed.extensionSettings, path, "INVALID_SETTINGS");
+  const retention = validateRetention(parsed.retention, path);
+  const worktreePostCreateCommand = validateWorktreePostCreateCommand(parsed.worktreePostCreateCommand, path);
+  return Object.freeze({
+    ...concurrency === void 0 ? {} : { concurrency },
+    ...backgroundWidget === void 0 ? {} : { backgroundWidget },
+    ...codemodeTools === void 0 ? {} : { codemodeTools },
+    ...modelAliases === void 0 ? {} : { modelAliases },
+    ...skills === void 0 ? {} : { skills },
+    ...extensions === void 0 ? {} : { extensions },
+    ...extensionSettings === void 0 ? {} : { extensionSettings },
+    ...tools === void 0 ? {} : { tools },
+    ...retention === void 0 ? {} : { retention },
+    ...worktreePostCreateCommand === void 0 ? {} : { worktreePostCreateCommand }
+  });
+}
+function loadSettings(path = workflowSettingsPath()) {
+  return parseSettings(path, false);
+}
+var READ_ONLY_WORKFLOW_TOOLS = /* @__PURE__ */ new Set(["workflow_status", "workflow_catalog", "subagents_inspect"]);
+function workflowToolExposure(name, codemodeTools) {
+  const readOnly = READ_ONLY_WORKFLOW_TOOLS.has(name);
+  return { ...codemodeTools === "none" || codemodeTools === "read-only" && !readOnly ? { exposure: "model-only" } : {}, ...readOnly ? { annotations: { readOnlyHint: true } } : {} };
+}
+function loadCodemodeToolsSetting(agentDir) {
+  try {
+    return loadSettings(workflowSettingsPath(agentDir)).codemodeTools;
+  } catch {
+    return void 0;
+  }
+}
+function loadSettingsOverrides(path) {
+  return parseSettings(path, true);
+}
+function resolveWorkflowSettings(cwd, projectTrusted, globalSettingsPath = workflowSettingsPath()) {
+  const projectSettingsPath = workflowProjectSettingsPath(cwd);
+  const global = loadSettings(globalSettingsPath);
+  const project = projectTrusted ? loadSettingsOverrides(projectSettingsPath) : Object.freeze({});
+  const projectHas = (key) => Object.prototype.hasOwnProperty.call(project, key);
+  const sourceFor = (key) => projectHas(key) ? projectSettingsPath : globalSettingsPath;
+  const globalSelectors = selectorsFromSettings(global);
+  const projectSelectors = selectorsFromSettings(project);
+  const effectiveSelectors = selectorSet({
+    skills: [...globalSelectors.skills ?? [], ...projectSelectors.skills ?? []],
+    extensions: [...globalSelectors.extensions ?? [], ...projectSelectors.extensions ?? []],
+    ...globalSelectors.tools === void 0 && projectSelectors.tools === void 0 ? {} : { tools: [...globalSelectors.tools ?? [], ...projectSelectors.tools ?? []] }
+  });
+  const hasExtensionSelectors = global.extensions !== void 0 || project.extensions !== void 0;
+  const extensionSettings = projectHas("extensionSettings") ? project.extensionSettings : global.extensionSettings;
+  const sources = {
+    concurrency: projectHas("concurrency") ? projectSettingsPath : globalSettingsPath,
+    modelAliases: projectHas("modelAliases") ? projectSettingsPath : globalSettingsPath,
+    skills: sourceFor("skills"),
+    extensions: sourceFor("extensions"),
+    tools: sourceFor("tools"),
+    ...extensionSettings === void 0 ? {} : { extensionSettings: projectHas("extensionSettings") ? projectSettingsPath : globalSettingsPath },
+    ...project.retention === void 0 && global.retention === void 0 ? {} : { retention: project.retention === void 0 ? globalSettingsPath : projectSettingsPath },
+    ...projectHas("worktreePostCreateCommand") || global.worktreePostCreateCommand !== void 0 ? { worktreePostCreateCommand: projectHas("worktreePostCreateCommand") ? projectSettingsPath : globalSettingsPath } : {}
+  };
+  const effective = Object.freeze({
+    concurrency: project.concurrency ?? global.concurrency,
+    backgroundWidget: global.backgroundWidget ?? true,
+    ...projectHas("modelAliases") ? { modelAliases: project.modelAliases } : global.modelAliases === void 0 ? {} : { modelAliases: global.modelAliases },
+    ...effectiveSelectors.skills.length ? { skills: effectiveSelectors.skills } : global.skills !== void 0 || project.skills !== void 0 ? { skills: effectiveSelectors.skills } : {},
+    ...hasExtensionSelectors ? { extensions: effectiveSelectors.extensions } : {},
+    ...extensionSettings === void 0 ? {} : { extensionSettings },
+    ...effectiveSelectors.tools?.length ? { tools: effectiveSelectors.tools } : global.tools !== void 0 || project.tools !== void 0 ? { tools: effectiveSelectors.tools } : {},
+    ...(project.retention ?? global.retention) === void 0 ? {} : { retention: project.retention ?? global.retention },
+    ...projectHas("worktreePostCreateCommand") ? { worktreePostCreateCommand: project.worktreePostCreateCommand } : global.worktreePostCreateCommand === void 0 ? {} : { worktreePostCreateCommand: global.worktreePostCreateCommand }
+  });
+  return { globalSettingsPath, projectSettingsPath, projectTrusted, global, project, effective, sources };
+}
+function validateModelAliasAvailability(aliases, names, availableModels, knownModels, settingsPath) {
+  for (const name of names) {
+    try {
+      const target = modelCapability(name, aliases, knownModels, settingsPath);
+      if (!availableModels.has(target)) unknownModel(name, target, settingsPath);
+    } catch (error) {
+      throw annotateModelAliasError(error, name);
+    }
+  }
+}
+function resolveAgentResourcePolicy(cwd, projectTrusted, globalSettingsPath = workflowSettingsPath()) {
+  const resolved = resolveWorkflowSettings(cwd, projectTrusted, globalSettingsPath);
+  const global = selectorSet(selectorsFromSettings(resolved.global));
+  const project = selectorSet(selectorsFromSettings(resolved.project));
+  const effective = selectorSet(selectorsFromSettings(resolved.effective));
+  return { globalSettingsPath: resolved.globalSettingsPath, projectSettingsPath: resolved.projectSettingsPath, projectTrusted, global, project, effective, unmatchedSkills: [], unmatchedExtensions: [], unmatchedTools: [], selectorSources: { global: selectorsFromSettings(resolved.global), project: selectorsFromSettings(resolved.project) } };
+}
 
 // src/registry.ts
-import { readFileSync } from "node:fs";
-import { basename as basename2, dirname as dirname2, isAbsolute, join as join3 } from "node:path";
-import { fileURLToPath } from "node:url";
-import { Value } from "typebox/value";
-var RESERVED_GLOBALS = /* @__PURE__ */ new Set(["agent", "shell", "prompt", "checkpoint", "parallel", "pipeline", "phase", "withWorktree", "log", "args", "Promise", "JSON", "Math", "Date", "eval", "Function", "WebAssembly", "process", "require", "module", "exports", "console", "fetch", "XMLHttpRequest", "WebSocket", "performance", "crypto", "setTimeout", "setInterval", "setImmediate", "queueMicrotask", "Intl", "SharedArrayBuffer", "Atomics", "globalThis", "global", "undefined", "NaN", "Infinity", "extensions", "workflow_catalog"]);
+var RESERVED_GLOBALS = /* @__PURE__ */ new Set(["agent", "shell", "tools", "prompt", "checkpoint", "parallel", "pipeline", "phase", "withWorktree", "log", "args", "Promise", "JSON", "Math", "Date", "eval", "Function", "WebAssembly", "process", "require", "module", "exports", "console", "fetch", "XMLHttpRequest", "WebSocket", "performance", "crypto", "setTimeout", "setInterval", "setImmediate", "queueMicrotask", "Intl", "SharedArrayBuffer", "Atomics", "globalThis", "global", "undefined", "NaN", "Infinity", "extensions", "workflow_catalog"]);
 var IDENTIFIER = /^[A-Za-z_$][\w$]*$/;
 var SEMVER = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;
 var PACKAGE_NAME = /^(?:@[a-z0-9][a-z0-9._-]*\/)?[a-z0-9][a-z0-9._-]*$/;
@@ -1941,10 +2210,10 @@ function normalizeRoleDirectory(value) {
   try {
     if (value instanceof URL) {
       if (value.protocol !== "file:") fail("INVALID_METADATA", "Workflow role directories require file URLs or absolute filesystem paths");
-      return fileURLToPath(value);
+      return fileURLToPath2(value);
     }
     if (typeof value === "string") {
-      if (value.startsWith("file:")) return fileURLToPath(value);
+      if (value.startsWith("file:")) return fileURLToPath2(value);
       if (isAbsolute(value)) return value;
     }
   } catch (error) {
@@ -1954,12 +2223,12 @@ function normalizeRoleDirectory(value) {
 }
 function isBuiltinRoleDirectory(path) {
   const canonical = canonicalPath(path);
-  const starterDirectory = dirname2(canonical);
+  const starterDirectory = dirname3(canonical);
   if (basename2(canonical) !== "roles" || basename2(starterDirectory) !== "starter") return false;
-  const distributionDirectory = dirname2(starterDirectory);
-  const packageRoot2 = basename2(distributionDirectory) === "dist" ? dirname2(distributionDirectory) : distributionDirectory;
+  const distributionDirectory = dirname3(starterDirectory);
+  const packageRoot2 = basename2(distributionDirectory) === "dist" ? dirname3(distributionDirectory) : distributionDirectory;
   try {
-    const metadata = JSON.parse(readFileSync(join3(packageRoot2, "package.json"), "utf8"));
+    const metadata = JSON.parse(readFileSync2(join4(packageRoot2, "package.json"), "utf8"));
     return object(metadata) && isCorePackageName(metadata.name);
   } catch {
     return false;
@@ -2240,213 +2509,9 @@ function registeredWorkflowRoleDirectoryRegistrations() {
   return typeof registrations === "function" ? registrations() : [];
 }
 
-// src/validation.ts
-var DEFAULT_SETTINGS = Object.freeze({ concurrency: 8, backgroundWidget: true });
-function workflowSettingsPath(agentDir = getAgentDir()) {
-  return join4(agentDir, ROLE_DIRECTORY, "settings.json");
-}
-function normalizedResourcePath(value, settingsPath) {
-  if (value === "*") return value;
-  let expanded = value === "~" ? homedir3() : value.startsWith("~/") || value.startsWith("~\\") ? join4(homedir3(), value.slice(2)) : value;
-  if (expanded.startsWith("file://")) expanded = fileURLToPath2(expanded);
-  const resolved = resolve3(dirname3(settingsPath), expanded);
-  if (expanded === "**" || expanded.startsWith("**/") || expanded.startsWith("**\\")) return expanded;
-  if (resourcePatternHasMagic(expanded)) {
-    const magicIndex = resolved.search(/[*?\x5b\x5d{}()]/);
-    const separatorIndex = Math.max(resolved.lastIndexOf("/", magicIndex), resolved.lastIndexOf("\\", magicIndex));
-    const rootBoundary = separatorIndex === 0 || separatorIndex === 2 && /^[A-Za-z]:[\\/]/.test(resolved);
-    const prefix = rootBoundary ? resolved.slice(0, separatorIndex + 1) : separatorIndex >= 0 ? resolved.slice(0, separatorIndex) : resolved;
-    const suffix = rootBoundary ? resolved.slice(separatorIndex + 1) : separatorIndex >= 0 ? resolved.slice(separatorIndex) : "";
-    return `${canonicalPath(prefix)}${suffix}`;
-  }
-  return canonicalPath(resolved);
-}
-function validateSelectorList(value, path, kind, errorCode2 = "INVALID_SETTINGS", normalizeExtensions = true) {
-  if (value === void 0) return void 0;
-  if (!Array.isArray(value)) fail(errorCode2, `${path}.${kind} must be an array`);
-  const normalized = [];
-  for (const [index, entry] of value.entries()) {
-    if (typeof entry !== "string" || !entry.trim()) fail(errorCode2, `${path}.${kind}[${String(index)}] must be a non-empty string`);
-    let selector = entry.trim();
-    if (kind === "extensions" && normalizeExtensions) {
-      const negated = selector.startsWith("!");
-      const body = negated ? selector.slice(1) : selector;
-      if (!body) fail(errorCode2, `${path}.${kind}[${String(index)}] must be a valid minimatch pattern: Empty minimatch pattern ${JSON.stringify(selector)}`);
-      try {
-        selector = `${negated ? "!" : ""}${normalizedResourcePath(body, path)}`;
-      } catch (error) {
-        fail(errorCode2, `${path}.${kind}[${String(index)}] must be a valid path: ${errorText(error)}`);
-      }
-    }
-    try {
-      validateResourcePattern(selector);
-    } catch (error) {
-      fail(errorCode2, `${path}.${kind}[${String(index)}] must be a valid minimatch pattern: ${errorText(error)}`);
-    }
-    normalized.push(selector);
-  }
-  return Object.freeze(normalized);
-}
-function validateWorktreePostCreateCommand(value, settingsPath) {
-  if (value === void 0) return void 0;
-  if (!Array.isArray(value) || value.length === 0) fail("INVALID_SETTINGS", `${settingsPath}.worktreePostCreateCommand must be a non-empty array`);
-  return Object.freeze(value.map((entry, index) => {
-    if (typeof entry !== "string" || !entry.trim()) fail("INVALID_SETTINGS", `${settingsPath}.worktreePostCreateCommand[${String(index)}] must be a non-empty string`);
-    return entry;
-  }));
-}
-function selectorsFromSettings(settings) {
-  return {
-    ...settings.skills === void 0 ? {} : { skills: settings.skills },
-    ...settings.extensions === void 0 ? {} : { extensions: settings.extensions },
-    ...settings.tools === void 0 ? {} : { tools: settings.tools }
-  };
-}
-function selectorSet(value) {
-  return { skills: [...value?.skills ?? []], extensions: [...value?.extensions ?? []], ...value?.tools === void 0 ? {} : { tools: [...value.tools] } };
-}
-function validateContextFileScopes(value, rolePath) {
-  if (value === void 0) return void 0;
-  if (!Array.isArray(value) || !value.every(isContextFileScope)) fail("INVALID_METADATA", `${rolePath}.contextFiles must be an array containing only global, project, or cwd`);
-  return [...value];
-}
-function validateWorkflowExtensionSettings(value, settingsPath, errorCode2 = "INVALID_SETTINGS", applyDefaults = true) {
-  if (value === void 0) return void 0;
-  const base = `${settingsPath}.extensionSettings`;
-  if (!object(value)) fail(errorCode2, `${base} must be an object`);
-  const normalized = {};
-  for (const [namespace, raw] of Object.entries(value)) {
-    if (!validWorkflowExtensionNamespace(namespace)) fail(errorCode2, `${base} contains an invalid namespace: ${namespace}`);
-    if (namespace === "herdr") {
-      if (!object(raw)) fail(errorCode2, `${base}.herdr must be an object`);
-      if (Object.keys(raw).some((key) => key !== "enableFullyInspectableMode")) fail(errorCode2, `${base}.herdr contains an unsupported setting`);
-      if (raw.enableFullyInspectableMode !== void 0 && typeof raw.enableFullyInspectableMode !== "boolean") fail(errorCode2, `${base}.herdr.enableFullyInspectableMode must be a boolean`);
-      normalized.herdr = Object.freeze({ ...raw.enableFullyInspectableMode === void 0 ? {} : { enableFullyInspectableMode: raw.enableFullyInspectableMode } });
-      continue;
-    }
-    if (namespace === "trajectory") {
-      if (!object(raw)) fail(errorCode2, `${base}.trajectory must be an object`);
-      if (Object.keys(raw).some((key) => key !== "port" && key !== "themes")) fail(errorCode2, `${base}.trajectory contains an unsupported setting`);
-      if (raw.port !== void 0 && (!positiveInteger(raw.port) || raw.port > 65535)) fail(errorCode2, `${base}.trajectory.port must be an integer from 1 to 65535`);
-      if (raw.themes !== void 0 && typeof raw.themes !== "boolean") fail(errorCode2, `${base}.trajectory.themes must be a boolean`);
-      normalized.trajectory = Object.freeze({ ...raw.port === void 0 ? {} : { port: raw.port }, ...raw.themes === void 0 ? applyDefaults ? { themes: false } : {} : { themes: raw.themes } });
-      continue;
-    }
-    if (!jsonValue(raw)) fail(errorCode2, `${base}.${namespace} must be JSON-compatible`);
-    normalized[namespace] = structuredClone(raw);
-  }
-  return deepFreeze(normalized);
-}
-function positiveRetentionInteger(value) {
-  return positiveInteger(value) && Number.isSafeInteger(value);
-}
-function validateRetention(value, settingsPath) {
-  if (value === void 0) return void 0;
-  const base = `${settingsPath}.retention`;
-  if (!object(value)) fail("INVALID_SETTINGS", `${base} must be an object`);
-  const unknown = Object.keys(value).find((key) => key !== "olderThanDays" && key !== "maxTerminalRuns");
-  if (unknown) fail("INVALID_SETTINGS", `Unknown retention setting at ${base}: ${unknown}`);
-  if (value.olderThanDays !== void 0 && !positiveRetentionInteger(value.olderThanDays)) fail("INVALID_SETTINGS", `${base}.olderThanDays must be a positive integer`);
-  if (value.maxTerminalRuns !== void 0 && !positiveRetentionInteger(value.maxTerminalRuns)) fail("INVALID_SETTINGS", `${base}.maxTerminalRuns must be a positive integer`);
-  return Object.freeze({ ...value.olderThanDays === void 0 ? {} : { olderThanDays: value.olderThanDays }, ...value.maxTerminalRuns === void 0 ? {} : { maxTerminalRuns: value.maxTerminalRuns } });
-}
-function parseSettings(path, partial) {
-  let parsed;
-  try {
-    parsed = JSON.parse(readFileSync2(path, "utf8"));
-  } catch (error) {
-    if (isNodeError(error, "ENOENT")) return partial ? Object.freeze({}) : DEFAULT_SETTINGS;
-    fail("CONFIG_ERROR", `Invalid workflow settings JSON at ${path}: ${errorText(error)}`);
-  }
-  if (!object(parsed)) fail("INVALID_SETTINGS", `Workflow settings at ${path} must be an object`);
-  const allowed = /* @__PURE__ */ new Set(["concurrency", "modelAliases", "skills", "extensions", "extensionSettings", "tools", "retention", "worktreePostCreateCommand", ...partial ? [] : ["backgroundWidget"]]);
-  const unknown = Object.keys(parsed).find((key) => !allowed.has(key));
-  if (Object.prototype.hasOwnProperty.call(parsed, "disabledAgentResources")) fail("INVALID_SETTINGS", `disabledAgentResources is no longer supported; use skills, extensions, and tools selectors (settings: ${path})`);
-  if (unknown) fail("INVALID_SETTINGS", `Unknown workflow setting at ${path}: ${unknown}`);
-  const concurrency = parsed.concurrency === void 0 ? partial ? void 0 : DEFAULT_SETTINGS.concurrency : parsed.concurrency;
-  if (concurrency !== void 0 && (!positiveInteger(concurrency) || concurrency > 16)) fail("INVALID_SETTINGS", `${path}.concurrency must be an integer from 1 to 16`);
-  const backgroundWidget = parsed.backgroundWidget === void 0 ? partial ? void 0 : DEFAULT_SETTINGS.backgroundWidget : parsed.backgroundWidget;
-  if (backgroundWidget !== void 0 && typeof backgroundWidget !== "boolean") fail("INVALID_SETTINGS", `${path}.backgroundWidget must be a boolean`);
-  const modelAliases = parsed.modelAliases === void 0 ? void 0 : validateModelAliases(parsed.modelAliases, path);
-  const skills = validateSelectorList(parsed.skills, path, "skills");
-  const tools = validateSelectorList(parsed.tools, path, "tools");
-  const extensions = validateSelectorList(parsed.extensions, path, "extensions");
-  const extensionSettings = parsed.extensionSettings === void 0 ? void 0 : validateWorkflowExtensionSettings(parsed.extensionSettings, path, "INVALID_SETTINGS", !partial);
-  const retention = validateRetention(parsed.retention, path);
-  const worktreePostCreateCommand = validateWorktreePostCreateCommand(parsed.worktreePostCreateCommand, path);
-  return Object.freeze({
-    ...concurrency === void 0 ? {} : { concurrency },
-    ...backgroundWidget === void 0 ? {} : { backgroundWidget },
-    ...modelAliases === void 0 ? {} : { modelAliases },
-    ...skills === void 0 ? {} : { skills },
-    ...extensions === void 0 ? {} : { extensions },
-    ...extensionSettings === void 0 ? {} : { extensionSettings },
-    ...tools === void 0 ? {} : { tools },
-    ...retention === void 0 ? {} : { retention },
-    ...worktreePostCreateCommand === void 0 ? {} : { worktreePostCreateCommand }
-  });
-}
-function loadSettings(path = workflowSettingsPath()) {
-  return parseSettings(path, false);
-}
-function loadSettingsOverrides(path) {
-  return parseSettings(path, true);
-}
-function resolveWorkflowSettings(cwd, projectTrusted, globalSettingsPath = workflowSettingsPath()) {
-  const projectSettingsPath = workflowProjectSettingsPath(cwd);
-  const global = loadSettings(globalSettingsPath);
-  const project = projectTrusted ? loadSettingsOverrides(projectSettingsPath) : Object.freeze({});
-  const projectHas = (key) => Object.prototype.hasOwnProperty.call(project, key);
-  const sourceFor = (key) => projectHas(key) ? projectSettingsPath : globalSettingsPath;
-  const globalSelectors = selectorsFromSettings(global);
-  const projectSelectors = selectorsFromSettings(project);
-  const effectiveSelectors = selectorSet({
-    skills: [...globalSelectors.skills ?? [], ...projectSelectors.skills ?? []],
-    extensions: [...globalSelectors.extensions ?? [], ...projectSelectors.extensions ?? []],
-    ...globalSelectors.tools === void 0 && projectSelectors.tools === void 0 ? {} : { tools: [...globalSelectors.tools ?? [], ...projectSelectors.tools ?? []] }
-  });
-  const hasExtensionSelectors = global.extensions !== void 0 || project.extensions !== void 0;
-  const extensionSettings = projectHas("extensionSettings") ? project.extensionSettings : global.extensionSettings;
-  const sources = {
-    concurrency: projectHas("concurrency") ? projectSettingsPath : globalSettingsPath,
-    modelAliases: projectHas("modelAliases") ? projectSettingsPath : globalSettingsPath,
-    skills: sourceFor("skills"),
-    extensions: sourceFor("extensions"),
-    tools: sourceFor("tools"),
-    ...extensionSettings === void 0 ? {} : { extensionSettings: projectHas("extensionSettings") ? projectSettingsPath : globalSettingsPath },
-    ...project.retention === void 0 && global.retention === void 0 ? {} : { retention: project.retention === void 0 ? globalSettingsPath : projectSettingsPath },
-    ...projectHas("worktreePostCreateCommand") || global.worktreePostCreateCommand !== void 0 ? { worktreePostCreateCommand: projectHas("worktreePostCreateCommand") ? projectSettingsPath : globalSettingsPath } : {}
-  };
-  const effective = Object.freeze({
-    concurrency: project.concurrency ?? global.concurrency,
-    backgroundWidget: global.backgroundWidget ?? true,
-    ...projectHas("modelAliases") ? { modelAliases: project.modelAliases } : global.modelAliases === void 0 ? {} : { modelAliases: global.modelAliases },
-    ...effectiveSelectors.skills.length ? { skills: effectiveSelectors.skills } : global.skills !== void 0 || project.skills !== void 0 ? { skills: effectiveSelectors.skills } : {},
-    ...hasExtensionSelectors ? { extensions: effectiveSelectors.extensions } : {},
-    ...extensionSettings === void 0 ? {} : { extensionSettings },
-    ...effectiveSelectors.tools?.length ? { tools: effectiveSelectors.tools } : global.tools !== void 0 || project.tools !== void 0 ? { tools: effectiveSelectors.tools } : {},
-    ...(project.retention ?? global.retention) === void 0 ? {} : { retention: project.retention ?? global.retention },
-    ...projectHas("worktreePostCreateCommand") ? { worktreePostCreateCommand: project.worktreePostCreateCommand } : global.worktreePostCreateCommand === void 0 ? {} : { worktreePostCreateCommand: global.worktreePostCreateCommand }
-  });
-  return { globalSettingsPath, projectSettingsPath, projectTrusted, global, project, effective, sources };
-}
-function validateModelAliasAvailability(aliases, names, availableModels, knownModels, settingsPath) {
-  for (const name of names) {
-    try {
-      const target = modelCapability(name, aliases, knownModels, settingsPath);
-      if (!availableModels.has(target)) unknownModel(name, target, settingsPath);
-    } catch (error) {
-      throw annotateModelAliasError(error, name);
-    }
-  }
-}
-function resolveAgentResourcePolicy(cwd, projectTrusted, globalSettingsPath = workflowSettingsPath()) {
-  const resolved = resolveWorkflowSettings(cwd, projectTrusted, globalSettingsPath);
-  const global = selectorSet(selectorsFromSettings(resolved.global));
-  const project = selectorSet(selectorsFromSettings(resolved.project));
-  const effective = selectorSet(selectorsFromSettings(resolved.effective));
-  return { globalSettingsPath: resolved.globalSettingsPath, projectSettingsPath: resolved.projectSettingsPath, projectTrusted, global, project, effective, unmatchedSkills: [], unmatchedExtensions: [], unmatchedTools: [], selectorSources: { global: selectorsFromSettings(resolved.global), project: selectorsFromSettings(resolved.project) } };
-}
+// src/roles.ts
+var ROLE_DIRECTORY2 = "pi-extensible-workflows";
+var roleDefinitionPaths = /* @__PURE__ */ new WeakMap();
 function parseRoleMarkdown(content, strict = false, rolePath) {
   if (!strict) {
     if (!content.startsWith("---\n")) return { prompt: content };
@@ -2473,7 +2538,7 @@ function parseRoleMarkdown(content, strict = false, rolePath) {
       }
     }
     const rolePathValue2 = rolePath ?? "<role>";
-    const normalizedExtensionSettings2 = validateWorkflowExtensionSettings(extensionSettings2, rolePathValue2, "INVALID_METADATA", false);
+    const normalizedExtensionSettings2 = validateWorkflowExtensionSettings(extensionSettings2, rolePathValue2, "INVALID_METADATA");
     const definition2 = { prompt: content.slice(end + 4).replace(/^\n/, "") };
     if (meta.model) {
       const model2 = unquote(meta.model);
@@ -2513,7 +2578,7 @@ function parseRoleMarkdown(content, strict = false, rolePath) {
   const normalizedTools = validateSelectorList(tools, rolePathValue, "tools", "INVALID_METADATA");
   const normalizedSkills = validateSelectorList(skills, rolePathValue, "skills", "INVALID_METADATA");
   const normalizedExtensions = validateSelectorList(extensions, rolePathValue, "extensions", "INVALID_METADATA");
-  const normalizedExtensionSettings = validateWorkflowExtensionSettings(extensionSettings, rolePathValue, "INVALID_METADATA", false);
+  const normalizedExtensionSettings = validateWorkflowExtensionSettings(extensionSettings, rolePathValue, "INVALID_METADATA");
   const normalizedDescription = typeof description === "string" ? description.trim() : void 0;
   const normalizedModel = typeof model === "string" ? model.trim() : void 0;
   if (normalizedModel !== void 0) assertModelThinking(normalizedModel, "Role model");
@@ -2528,12 +2593,11 @@ function parseRoleMarkdown(content, strict = false, rolePath) {
   if (normalizedContextFiles !== void 0) definition.contextFiles = normalizedContextFiles;
   return definition;
 }
-var ROLE_DIRECTORY = "pi-extensible-workflows";
-function workflowRoleDirectories(agentDir = getAgentDir()) {
-  return [join4(agentDir, ROLE_DIRECTORY, "roles")];
+function workflowRoleDirectories(agentDir = getAgentDir2()) {
+  return [join5(agentDir, ROLE_DIRECTORY2, "roles")];
 }
 function projectRoleDirectories(root) {
-  return [join4(root, ROLE_DIRECTORY, "roles")];
+  return [join5(root, ROLE_DIRECTORY2, "roles")];
 }
 function roleDirectorySources(dirs) {
   const seen = /* @__PURE__ */ new Set();
@@ -2552,7 +2616,7 @@ function isRoleFile(dir, entry) {
   if (entry.isFile()) return true;
   if (!entry.isSymbolicLink()) return false;
   try {
-    return statSync(join4(dir, entry.name)).isFile();
+    return statSync(join5(dir, entry.name)).isFile();
   } catch (error) {
     if (isNodeError(error, "ENOENT")) return false;
     throw error;
@@ -2568,11 +2632,11 @@ function scanRoleFiles(dirs, extension2) {
       if (!extension2 && isNodeError(error, "ENOENT")) continue;
       fail("INVALID_METADATA", `${roleDirectoryLabel(source, extension2)} role directory "${source.path}" could not be scanned: ${errorText(error)}`);
     }
-    for (const entry of entries) if (isRoleFile(source.path, entry)) files.push({ name: basename3(entry.name, ".md"), path: join4(source.path, entry.name), source });
+    for (const entry of entries) if (isRoleFile(source.path, entry)) files.push({ name: basename3(entry.name, ".md"), path: join5(source.path, entry.name), source });
   }
   return files.sort((left, right) => left.name.localeCompare(right.name) || left.path.localeCompare(right.path));
 }
-function readRoleDefinitions(dirs, extension2 = false) {
+function roleEntries(dirs, extension2) {
   const files = scanRoleFiles(dirs, extension2);
   const starterFiles = files.filter(({ source }) => source.builtin === true);
   const regularFiles = files.filter(({ source }) => source.builtin !== true);
@@ -2583,7 +2647,9 @@ function readRoleDefinitions(dirs, extension2 = false) {
   }
   const read = (roleFiles) => Object.fromEntries(roleFiles.map(({ name, path, source }) => {
     try {
-      return [name, parseRoleMarkdown(readFileSync2(path, "utf8"), true, path)];
+      const definition = parseRoleMarkdown(readFileSync3(path, "utf8"), true, path);
+      roleDefinitionPaths.set(definition, path);
+      return [name, { name, path, source, definition }];
     } catch (error) {
       if (extension2) fail("INVALID_METADATA", `${roleDirectoryLabel(source)} role directory "${source.path}" contains invalid role "${name}" at "${path}": ${errorText(error)}`);
       throw error;
@@ -2591,15 +2657,114 @@ function readRoleDefinitions(dirs, extension2 = false) {
   }));
   return extension2 ? { ...read(starterFiles), ...read(regularFiles) } : read(files);
 }
-function loadAgentDefinitions(cwd, agentDir = getAgentDir(), projectTrusted = true, extensionRoleDirectories = registeredWorkflowRoleDirectoryRegistrations()) {
-  return deepFreeze({ ...readRoleDefinitions(extensionRoleDirectories, true), ...readRoleDefinitions(workflowRoleDirectories(agentDir)), ...projectTrusted ? readRoleDefinitions(projectRoleDirectories(join4(cwd, ".pi"))) : {} });
+function discoveryInput(input) {
+  return { cwd: input.cwd, agentDir: input.agentDir ?? getAgentDir2(), projectTrusted: input.projectTrusted ?? true, extensionRoleDirectories: input.extensionRoleDirectories ?? registeredWorkflowRoleDirectoryRegistrations() };
+}
+function discoveredRoleEntries(input) {
+  const resolved = discoveryInput(input);
+  return {
+    ...roleEntries(resolved.extensionRoleDirectories, true),
+    ...roleEntries(workflowRoleDirectories(resolved.agentDir), false),
+    ...resolved.projectTrusted ? roleEntries(projectRoleDirectories(join5(resolved.cwd, ".pi")), false) : {}
+  };
 }
-function validateSchema(schema, at = "schema") {
-  if (!object(schema) || Object.getPrototypeOf(schema) !== Object.prototype || !jsonValue(schema)) fail("INVALID_SCHEMA", `${at} must be a plain JSON-compatible Schema object`);
-  if (typeof schema.type !== "string" && !Array.isArray(schema.type) && schema.$ref === void 0 && schema.anyOf === void 0 && schema.oneOf === void 0 && schema.allOf === void 0 && schema.const === void 0 && schema.enum === void 0) fail("INVALID_SCHEMA", `${at} has no JSON Schema shape`);
-  if (schema.required !== void 0 && (!Array.isArray(schema.required) || schema.required.some((key) => typeof key !== "string"))) fail("INVALID_SCHEMA", `${at}.required must be an array of strings`);
-  if (schema.properties !== void 0 && !object(schema.properties)) fail("INVALID_SCHEMA", `${at}.properties must be an object`);
+function discoverRoles(input) {
+  return deepFreeze(Object.fromEntries(Object.entries(discoveredRoleEntries(input)).map(([name, entry]) => [name, entry.definition])));
+}
+function loadAgentDefinitions(cwd, agentDir = getAgentDir2(), projectTrusted = true, extensionRoleDirectories = registeredWorkflowRoleDirectoryRegistrations()) {
+  return discoverRoles({ cwd, agentDir, projectTrusted, extensionRoleDirectories });
+}
+function canonicalExtensionSelector(selector, base = process.cwd()) {
+  const negated = selector.startsWith("!");
+  const body = negated ? selector.slice(1) : selector;
+  if (body === "*" || body === "**" || body.startsWith("**/") || body.startsWith("builtin:")) return selector;
+  const resolved = resolve4(base, body);
+  if (resourcePatternHasMagic(body)) return `${negated ? "!" : ""}${resolved}`;
+  return `${negated ? "!" : ""}${canonicalPath(resolved)}`;
+}
+function selectorsFromSettings2(settings) {
+  return { ...settings.skills === void 0 ? {} : { skills: settings.skills }, ...settings.extensions === void 0 ? {} : { extensions: settings.extensions }, ...settings.tools === void 0 ? {} : { tools: settings.tools } };
+}
+function rootToolNames(value) {
+  return value === void 0 ? void 0 : value instanceof Set ? [...value] : [...value];
+}
+function roleDefinitionFor(name, options) {
+  if (name === void 0) return {};
+  if (options.definition !== void 0) {
+    const path = roleDefinitionPaths.get(options.definition);
+    return { definition: options.definition, ...path === void 0 ? {} : { path } };
+  }
+  if (options.definitions?.[name] !== void 0) {
+    const definition = options.definitions[name];
+    const path = roleDefinitionPaths.get(definition);
+    return { definition, ...path === void 0 ? {} : { path } };
+  }
+  const entries = discoveredRoleEntries(options);
+  const entry = entries[name];
+  if (!entry) fail("UNKNOWN_AGENT_TYPE", `Unknown agent role: ${name}`);
+  return entry;
+}
+function resolveRole(name, options) {
+  const { definition, path } = roleDefinitionFor(name, options);
+  const settings = options.selectorSources === void 0 ? resolveWorkflowSettings(options.cwd, options.projectTrusted ?? true, options.settingsPath ?? workflowSettingsPath(options.agentDir ?? getAgentDir2())) : void 0;
+  const baseSources = options.selectorSources ?? { global: selectorsFromSettings2(settings?.global ?? {}), project: selectorsFromSettings2(settings?.project ?? {}) };
+  const canonicalSources = (sources) => ({
+    ...sources,
+    global: { ...sources.global, ...sources.global.extensions === void 0 ? {} : { extensions: sources.global.extensions.map((selector) => canonicalExtensionSelector(selector, options.cwd)) } },
+    project: { ...sources.project, ...sources.project.extensions === void 0 ? {} : { extensions: sources.project.extensions.map((selector) => canonicalExtensionSelector(selector, options.cwd)) } },
+    ...sources.role === void 0 ? {} : { role: { ...sources.role, ...sources.role.extensions === void 0 ? {} : { extensions: sources.role.extensions.map((selector) => canonicalExtensionSelector(selector, options.cwd)) } } },
+    ...sources.call === void 0 ? {} : { call: { ...sources.call, ...sources.call.extensions === void 0 ? {} : { extensions: sources.call.extensions.map((selector) => canonicalExtensionSelector(selector, options.cwd)) } } }
+  });
+  const roleLayer = definition?.skills !== void 0 || definition?.extensions !== void 0 || definition?.tools !== void 0 ? { ...definition.skills === void 0 ? {} : { skills: definition.skills }, ...definition.extensions === void 0 ? {} : { extensions: definition.extensions.map((selector) => canonicalExtensionSelector(selector, path ? dirname4(path) : options.cwd)) }, ...definition.tools === void 0 ? {} : { tools: definition.tools } } : baseSources.role;
+  const callLayer = options.skills !== void 0 || options.extensions !== void 0 || options.tools !== void 0 ? { ...options.skills === void 0 ? {} : { skills: options.skills }, ...options.extensions === void 0 ? {} : { extensions: options.extensions.map((selector) => canonicalExtensionSelector(selector, options.cwd)) }, ...options.tools === void 0 ? {} : { tools: options.tools } } : baseSources.call;
+  const selectorSources = canonicalSources({ global: baseSources.global, project: baseSources.project, ...roleLayer === void 0 ? {} : { role: roleLayer }, ...callLayer === void 0 ? {} : { call: callLayer } });
+  const callSelectors = selectorSources.call;
+  const roleSelectors = selectorSources.role;
+  const selectorLayers = {
+    skills: [selectorSources.global.skills, selectorSources.project.skills, roleSelectors?.skills, callSelectors?.skills],
+    extensions: [selectorSources.global.extensions, selectorSources.project.extensions, roleSelectors?.extensions, callSelectors?.extensions],
+    tools: [selectorSources.global.tools, selectorSources.project.tools, roleSelectors?.tools, callSelectors?.tools]
+  };
+  const resources = options.resources ?? {};
+  const candidateTools = options.inheritedTools ?? rootToolNames(options.rootTools) ?? resources.tools;
+  const tools = options.effectiveTools ?? (candidateTools === void 0 ? void 0 : selectResourcesByLayers(selectorLayers.tools, candidateTools));
+  const rootTools = rootToolNames(options.rootTools);
+  if (rootTools !== void 0) {
+    const outsideEffectiveTool = options.effectiveTools?.find((tool) => !candidateTools?.includes(tool));
+    if (outsideEffectiveTool) fail("UNKNOWN_TOOL", `Tool is outside the launching session boundary: ${outsideEffectiveTool}`);
+    const outsideCallTool = (options.tools ?? []).find((tool) => !tool.startsWith("!") && !resourcePatternHasMagic(tool) && !candidateTools?.includes(tool));
+    if (outsideCallTool) fail("UNKNOWN_TOOL", `Tool is outside the launching session boundary: ${outsideCallTool}`);
+    const outsideRootTool = tools?.find((tool) => !rootTools.includes(tool));
+    if (outsideRootTool) fail("UNKNOWN_TOOL", `Tool is outside the launching session boundary: ${outsideRootTool}`);
+  }
+  const selectedSkills = resources.skills === void 0 ? void 0 : selectResourcesByLayers(selectorLayers.skills, resources.skills);
+  const extensionResources = resources.extensions?.map((extension2) => extensionIdentity(extension2));
+  const selectedExtensions = extensionResources === void 0 ? void 0 : selectResourcesByLayers(selectorLayers.extensions, extensionResources);
+  const unmatchedSkills = resources.skills === void 0 ? void 0 : unmatchedResourcePatterns(selectorLayers.skills.flatMap((layer) => layer ?? []), resources.skills);
+  const unmatchedExtensions = extensionResources === void 0 ? void 0 : unmatchedResourcePatterns(selectorLayers.extensions.flatMap((layer) => layer ?? []), extensionResources);
+  const unmatchedTools = candidateTools === void 0 ? void 0 : unmatchedResourcePatterns(selectorLayers.tools.flatMap((layer) => layer ?? []), candidateTools);
+  const aliases = options.modelAliases ?? settings?.effective.modelAliases ?? {};
+  const requestedModel = options.model ?? (definition?.model && definition.thinking && !definition.model.includes(":") ? `${definition.model}:${definition.thinking}` : definition?.model);
+  const blockedAlias = requestedModel?.split(":", 1)[0];
+  if (requestedModel !== void 0 && blockedAlias && options.blockedAliases?.has(blockedAlias) && !modelAliasName(requestedModel, aliases)) {
+    const target = options.blockedAliasTargets?.[blockedAlias];
+    fail("UNKNOWN_MODEL", `Unknown model alias ${requestedModel}${target ? ` resolved to ${target}` : ""}${options.settingsPath ? ` (settings: ${options.settingsPath})` : ""}`);
+  }
+  let model = options.modelOverride;
+  if (model === void 0 && requestedModel !== void 0) {
+    assertModelThinking(requestedModel);
+    model = resolveModelReference(requestedModel, aliases, options.knownModels ?? options.availableModels, options.settingsPath ?? settings?.sources.modelAliases);
+  }
+  if (model === void 0) model = options.rootModel;
+  const availableModels = options.knownModels ?? options.availableModels ?? (options.rootModel === void 0 ? void 0 : /* @__PURE__ */ new Set([modelCapability(options.rootModel)]));
+  if (model !== void 0 && availableModels !== void 0 && !availableModels.has(modelCapability(model))) fail("UNKNOWN_MODEL", `Unknown model${requestedModel ? ` ${requestedModel} resolved to ${modelCapability(model)}` : ""}${options.settingsPath ? ` (settings: ${options.settingsPath})` : ""}`);
+  const prompt = definition?.prompt ?? "";
+  const overrideSystemPrompt = definition?.overrideSystemPrompt === true;
+  const contextFiles = options.contextFiles ?? definition?.contextFiles;
+  return { ...name === void 0 ? {} : { name }, ...definition === void 0 ? {} : { definition }, ...model === void 0 ? {} : { model }, ...modelAliasName(requestedModel ?? "", aliases) && requestedModel ? { requestedModel } : {}, ...tools === void 0 ? {} : { tools }, prompt, overrideSystemPrompt, systemPrompt: { mode: overrideSystemPrompt ? "override" : "append", text: prompt }, ...contextFiles === void 0 ? {} : { contextFiles: [...contextFiles] }, ...definition?.extensionSettings === void 0 ? {} : { extensionSettings: definition.extensionSettings }, selectorSources, selectorLayers, ...selectedSkills === void 0 ? {} : { selectedSkills }, ...selectedExtensions === void 0 ? {} : { selectedExtensions }, ...unmatchedSkills === void 0 ? {} : { unmatchedSkills }, ...unmatchedExtensions === void 0 ? {} : { unmatchedExtensions }, ...unmatchedTools === void 0 ? {} : { unmatchedTools } };
 }
+
+// src/validation.ts
 var AGENT_OPTION_KEYS = /* @__PURE__ */ new Set(["label", "model", "tools", "skills", "extensions", "contextFiles", "role", "outputSchema", "retries", "timeoutMs"]);
 function validateAgentOption(key, value, aliases, knownModels, settingsPath) {
   switch (key) {
@@ -2876,6 +3041,30 @@ const functions = Object.freeze(Object.fromEntries(Object.entries(config.functio
   Object.defineProperty(result, "toJSON", { value() { throw workError("INVALID_METADATA", "Workflow function result is a Promise; await it before serialization"); } });
   return result;
 }])));
+// tools.<id>(args) runs a Pi session tool through the host. Any identifier resolves, so a resumed run
+// replays journaled calls even when the tool is gone; the host rejects identifiers it cannot call.
+// A call is the n-th call with the same arguments in its scope, so replay does not depend on the
+// order in which concurrent calls start.
+const NOT_TOOLS = new Set(["then", "toJSON", "toString", "valueOf", "constructor"]);
+const sortedJson = value => Array.isArray(value) ? value.map(sortedJson) : value && typeof value === "object" ? Object.fromEntries(Object.keys(value).sort().map(key => [key, sortedJson(value[key])])) : value;
+const toolOccurrences = new Map();
+const toolCall = id => (...values) => {
+  if (worktreeOwners.getStore()) throw workError("INVALID_METADATA", "tools." + id + " is unavailable inside withWorktree: session tools resolve paths against the session working directory");
+  if (values.length > 1 || values[0] !== undefined && (!values[0] || typeof values[0] !== "object" || Array.isArray(values[0]))) throw workError("INVALID_METADATA", "tools." + id + " takes one arguments object");
+  const args = values[0] === undefined ? {} : values[0];
+  const structuralPath = inheritedAgentPath.getStore() || [];
+  const key = JSON.stringify([structuralPath, id, sortedJson(args)]);
+  const occurrence = (toolOccurrences.get(key) || 0) + 1;
+  toolOccurrences.set(key, occurrence);
+  return guardedResult(rpc("tool", [id, args, { structuralPath: [...structuralPath], occurrence }]), "tool");
+};
+const tools = new Proxy(Object.create(null), {
+  get: (_target, key) => typeof key === "string" && !NOT_TOOLS.has(key) ? toolCall(key) : undefined,
+  // Probing would branch on the session that resumed the run; the launch already checks named tools.
+  has: () => { throw workError("INVALID_METADATA", "Workflow scripts cannot probe tools with 'in'; call tools.<name>(...) directly, and the launch checks that the tool exists"); },
+  set: () => false,
+  defineProperty: () => false,
+});
 const recordEntries = (value, kind) => {
   if (!value || typeof value !== "object" || Array.isArray(value)) throw workError("INVALID_METADATA", kind + " must be a record");
   return Object.entries(value);
@@ -2936,7 +3125,7 @@ const pipeline = async (operationName, items, stages) => {
   return Object.fromEntries(results.map(result => [result.name, result.value]));
 };
 const safeMath = Object.fromEntries(Object.getOwnPropertyNames(Math).filter(name => name !== "random").map(name => [name, Math[name]]));
-const sandbox = { agent, shell, withWorktree: rejectWorktree, prompt, checkpoint, parallel, pipeline, phase, log, args: config.args, Promise, JSON, Math: Object.freeze(safeMath) };
+const sandbox = { agent, shell, withWorktree: rejectWorktree, prompt, checkpoint, parallel, pipeline, phase, log, tools, args: config.args, Promise, JSON, Math: Object.freeze(safeMath) };
 for (const [name, fn] of Object.entries(functions)) Object.defineProperty(sandbox, name, { value: fn, writable: false, configurable: false });
 for (const name of ["Date","eval","Function","WebAssembly","process","require","module","exports","console","fetch","XMLHttpRequest","WebSocket","performance","crypto","setTimeout","setInterval","setImmediate","queueMicrotask","Intl","SharedArrayBuffer","Atomics"]) sandbox[name] = undefined;
 const context = vm.createContext(sandbox, { codeGeneration: { strings: false, wasm: false } });
@@ -2949,17 +3138,17 @@ Promise.resolve().then(() => new vm.Script("(async(__pi_extensible_workflows_age
 
 // src/host.ts
 import { Type as Type3 } from "@earendil-works/pi-ai";
-import { copyToClipboard, getAgentDir as getAgentDir4, ModelSelectorComponent } from "@earendil-works/pi-coding-agent";
+import { copyToClipboard, getAgentDir as getAgentDir5, ModelSelectorComponent } from "@earendil-works/pi-coding-agent";
 
 // src/agent-execution.ts
-import { existsSync, realpathSync as realpathSync2, readFileSync as readFileSync3 } from "node:fs";
+import { existsSync, realpathSync as realpathSync2, readFileSync as readFileSync4 } from "node:fs";
 import { copyFile } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
-import { basename as basename4, dirname as dirname4, join as join5, resolve as resolve4 } from "node:path";
+import { basename as basename4, dirname as dirname5, join as join6, resolve as resolve5 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 import { Type } from "@earendil-works/pi-ai";
 import { Compile } from "typebox/compile";
-import { createAgentSession, DefaultPackageManager, DefaultResourceLoader, defineTool, getAgentDir as getAgentDir2, ModelRuntime, SessionManager, SettingsManager } from "@earendil-works/pi-coding-agent";
+import { createAgentSession, createCodemodeExtension, createMcpExtension, createToolSearchExtension, DefaultPackageManager, DefaultResourceLoader, defineTool, getAgentDir as getAgentDir3, ModelRuntime, SessionManager, SettingsManager } from "@earendil-works/pi-coding-agent";
 
 // src/pi-runtime-adapter.ts
 var TURN_START_EVENTS = /* @__PURE__ */ new Set(["turn_start", "turn_started", "turnStarted"]);
@@ -3007,16 +3196,16 @@ function normalizeState(value) {
   const candidate = record(value);
   const model = record(candidate?.model);
   const provider = stringValue(model?.provider);
-  const modelName = stringValue(model?.model);
+  const modelName2 = stringValue(model?.model);
   const rawTools = candidate?.tools;
   const tools = Array.isArray(rawTools) ? rawTools.filter((tool) => typeof tool === "string") : void 0;
-  if (!candidate || !model || provider === void 0 || modelName === void 0 || tools === void 0 || !Array.isArray(rawTools) || tools.length !== rawTools.length) return void 0;
+  if (!candidate || !model || provider === void 0 || modelName2 === void 0 || tools === void 0 || !Array.isArray(rawTools) || tools.length !== rawTools.length) return void 0;
   const thinking = candidate.thinking === void 0 ? model.thinking : candidate.thinking;
   if (thinking !== void 0 && !isThinkingLevel(thinking)) return void 0;
   const systemPrompt = candidate.systemPrompt;
   if (systemPrompt !== void 0 && typeof systemPrompt !== "string") return void 0;
   return {
-    model: { provider, model: modelName, ...thinking === void 0 ? {} : { thinking } },
+    model: { provider, model: modelName2, ...thinking === void 0 ? {} : { thinking } },
     ...thinking === void 0 ? {} : { thinking },
     tools: [...tools],
     ...systemPrompt === void 0 ? {} : { systemPrompt }
@@ -3116,14 +3305,14 @@ function createRuntimeHandoffAdapter(handoff) {
 function createPiRuntimeSessionAdapter(session, handoff, clock = Date.now) {
   const neutralHandoff = createRuntimeHandoffAdapter(handoff);
   const toolCalls = /* @__PURE__ */ new Map();
-  let activity2;
+  let activity;
   let streamText = "";
   let lastEventAt;
   let lastReportedEventAt;
   let disposed = false;
   let toolCallsView = [];
   const progressAt = (persist, stateOverride, toolCallsValue3, activityValue2, eventAtValue) => ({ usage: runtimeUsage(session), toolCalls: toolCallsValue3, state: stateOverride ?? stateFromSession(session), ...activityValue2 === void 0 ? {} : { activity: activityValue2 }, ...eventAtValue === void 0 ? {} : { lastEventAt: eventAtValue }, persist });
-  const snapshot = (persist) => progressAt(persist, void 0, [...toolCalls.values()], activity2, lastEventAt);
+  const snapshot = (persist) => progressAt(persist, void 0, [...toolCalls.values()], activity, lastEventAt);
   return {
     handoff: neutralHandoff,
     observe(event) {
@@ -3134,7 +3323,7 @@ function createPiRuntimeSessionAdapter(session, handoff, clock = Date.now) {
       const eventState = event.state === void 0 ? void 0 : runtimeState(event.state);
       let report = false;
       let persist = false;
-      const previousActivity = activity2;
+      const previousActivity = activity;
       let eventToolCalls = toolCallsView;
       if (event.type === "state_changed") {
         report = true;
@@ -3142,7 +3331,7 @@ function createPiRuntimeSessionAdapter(session, handoff, clock = Date.now) {
       }
       if (event.type === "message_start" && event.message?.role === "assistant") {
         streamText = "";
-        activity2 = { kind: "text", text: "" };
+        activity = { kind: "text", text: "" };
         report = true;
       }
       if (event.type === "message_update") {
@@ -3150,14 +3339,14 @@ function createPiRuntimeSessionAdapter(session, handoff, clock = Date.now) {
         if (updateType === "thinking_start" || updateType === "text_start") streamText = "";
         const delta = event.assistantMessageEvent?.delta;
         if ((updateType === "thinking_delta" || updateType === "text_delta") && delta) streamText = `${streamText}${delta}`.replace(/\s+/g, " ").slice(-MAX_ACTIVITY_TEXT_CHARS);
-        if (updateType && ["thinking_start", "thinking_delta", "thinking_end"].includes(updateType)) activity2 = { kind: "reasoning", text: streamText };
-        else if (updateType && ["text_start", "text_delta", "text_end", "toolcall_start", "toolcall_delta", "toolcall_end"].includes(updateType)) activity2 = { kind: "text", text: streamText };
-        report = previousActivity?.kind !== activity2?.kind;
+        if (updateType && ["thinking_start", "thinking_delta", "thinking_end"].includes(updateType)) activity = { kind: "reasoning", text: streamText };
+        else if (updateType && ["text_start", "text_delta", "text_end", "toolcall_start", "toolcall_delta", "toolcall_end"].includes(updateType)) activity = { kind: "text", text: streamText };
+        report = previousActivity?.kind !== activity?.kind;
       }
       if (event.type === "message_end") {
         streamText = "";
-        activity2 = void 0;
-        report = !sameActivity(previousActivity, activity2);
+        activity = void 0;
+        report = !sameActivity(previousActivity, activity);
         if (event.message?.role === "assistant") {
           persist = true;
           report = true;
@@ -3166,24 +3355,24 @@ function createPiRuntimeSessionAdapter(session, handoff, clock = Date.now) {
       if (event.type === "tool_execution_start" && event.toolCallId && event.toolName) {
         toolCalls.set(event.toolCallId, { id: event.toolCallId, name: event.toolName, state: "running" });
         toolCallsView = [...toolCalls.values()];
-        activity2 = { kind: "tool", text: event.toolName };
+        activity = { kind: "tool", text: event.toolName };
         report = true;
       }
       if (event.type === "tool_execution_update" && event.toolName) {
-        activity2 = { kind: "tool", text: event.toolName };
-        report = !sameActivity(previousActivity, activity2);
+        activity = { kind: "tool", text: event.toolName };
+        report = !sameActivity(previousActivity, activity);
       }
       let removeToolCallId;
       if (event.type === "tool_execution_end" && event.toolCallId && event.toolName) {
         toolCalls.set(event.toolCallId, { id: event.toolCallId, name: event.toolName, state: event.isError ? "failed" : "completed" });
         eventToolCalls = [...toolCalls.values()];
-        if (activity2?.kind === "tool" && activity2.text === event.toolName) activity2 = void 0;
+        if (activity?.kind === "tool" && activity.text === event.toolName) activity = void 0;
         report = true;
         removeToolCallId = event.toolCallId;
       }
       if (removeToolCallId === void 0) eventToolCalls = toolCallsView;
       if (!report && (lastReportedEventAt === void 0 || eventAt - lastReportedEventAt >= 1e3)) report = true;
-      const eventActivity = activity2;
+      const eventActivity = activity;
       let materialized;
       const result = { event, get progress() {
         return materialized ??= progressAt(persist, eventState, eventToolCalls, eventActivity, eventAt);
@@ -3200,7 +3389,7 @@ function createPiRuntimeSessionAdapter(session, handoff, clock = Date.now) {
       disposed = true;
       toolCalls.clear();
       toolCallsView = [];
-      activity2 = void 0;
+      activity = void 0;
     }
   };
 }
@@ -3234,8 +3423,8 @@ function createLiveSessionHandoff() {
   let request;
   const waitForBoundary = () => {
     if (!turnActive) return Promise.resolve();
-    boundary ??= new Promise((resolve5) => {
-      resolveBoundary = resolve5;
+    boundary ??= new Promise((resolve6) => {
+      resolveBoundary = resolve6;
     });
     return boundary;
   };
@@ -3267,11 +3456,11 @@ function createLiveSessionHandoff() {
       if (request) return request;
       if (isReleased()) return;
       state = "handoff-pending";
-      takeover = new Promise((resolve5) => {
-        resolveTakeover = resolve5;
+      takeover = new Promise((resolve6) => {
+        resolveTakeover = resolve6;
       });
-      resume = new Promise((resolve5) => {
-        resolveResume = resolve5;
+      resume = new Promise((resolve6) => {
+        resolveResume = resolve6;
       });
       request = (async () => {
         await waitForBoundary();
@@ -3798,36 +3987,37 @@ function parseModel(value, fallback, aliases = {}, knownModels, settingsPath) {
 function accounting(stats) {
   return { input: stats.tokens.input, output: stats.tokens.output, cacheRead: stats.tokens.cacheRead, cacheWrite: stats.tokens.cacheWrite, cost: stats.cost };
 }
-var extensionDirectory = dirname4(fileURLToPath3(import.meta.url));
-var workflowPackageRoot = basename4(dirname4(extensionDirectory)) === "dist" ? resolve4(extensionDirectory, "../..") : resolve4(extensionDirectory, "..");
-var WORKFLOW_HOST_ENTRIES = /* @__PURE__ */ new Set([
-  canonicalPath(resolve4(workflowPackageRoot, "src/index.ts")),
-  canonicalPath(resolve4(workflowPackageRoot, "dist/src/index.js")),
-  canonicalPath(resolve4(workflowPackageRoot, "starter/index.ts")),
-  canonicalPath(resolve4(workflowPackageRoot, "dist/starter/index.js")),
-  canonicalPath(resolve4(workflowPackageRoot, "subagents/index.ts")),
-  canonicalPath(resolve4(workflowPackageRoot, "dist/subagents/index.js"))
-]);
-function canonicalExtensionSelector(selector, base = process.cwd()) {
-  const negated = selector.startsWith("!");
-  const body = negated ? selector.slice(1) : selector;
-  if (body === "*" || body === "**" || body.startsWith("**/")) return selector;
-  const resolved = resolve4(base, body);
-  if (resourcePatternHasMagic(body)) return `${negated ? "!" : ""}${resolved}`;
-  return `${negated ? "!" : ""}${canonicalPath(resolved)}`;
+var WORKFLOW_HOST_ENTRY_PATHS = ["src/index.ts", "dist/src/index.js", "starter/index.ts", "dist/starter/index.js", "subagents/index.ts", "dist/subagents/index.js"];
+function isWorkflowHostEntry(path) {
+  const entryPath = canonicalPath(path);
+  let packageRoot2 = dirname5(entryPath);
+  while (packageRoot2 !== dirname5(packageRoot2)) {
+    const packageMetadataPath = join6(packageRoot2, "package.json");
+    if (existsSync(packageMetadataPath)) {
+      try {
+        const metadata = JSON.parse(readFileSync4(packageMetadataPath, "utf8"));
+        if (typeof metadata !== "object" || metadata === null || !("name" in metadata) || !isCorePackageName(metadata.name)) return false;
+        return WORKFLOW_HOST_ENTRY_PATHS.some((entry) => canonicalPath(join6(packageRoot2, entry)) === entryPath);
+      } catch {
+        return false;
+      }
+    }
+    packageRoot2 = dirname5(packageRoot2);
+  }
+  return false;
 }
 var WORKFLOW_DIRECTORY = "pi-extensible-workflows";
 function workflowSystemPromptPath(cwd, agentDir, projectTrusted) {
-  const projectPath = join5(cwd, ".pi", WORKFLOW_DIRECTORY, "SYSTEM.md");
+  const projectPath = join6(cwd, ".pi", WORKFLOW_DIRECTORY, "SYSTEM.md");
   if (projectTrusted && existsSync(projectPath)) return projectPath;
-  const globalPaths = [join5(homedir4(), ".pi", WORKFLOW_DIRECTORY, "SYSTEM.md"), join5(agentDir, WORKFLOW_DIRECTORY, "SYSTEM.md")];
+  const globalPaths = [join6(homedir4(), ".pi", WORKFLOW_DIRECTORY, "SYSTEM.md"), join6(agentDir, WORKFLOW_DIRECTORY, "SYSTEM.md")];
   return globalPaths.find((path) => existsSync(path));
 }
 function filterContextFiles(base, scopes, cwd, agentDir) {
   const globalPath = canonicalPath(agentDir);
   const cwdPath = canonicalPath(cwd);
   return base.filter(({ path }) => {
-    const resolvedPath = canonicalPath(dirname4(path));
+    const resolvedPath = canonicalPath(dirname5(path));
     return scopes.some((scope) => scope === "global" ? resolvedPath === globalPath : scope === "cwd" ? resolvedPath === cwdPath : resolvedPath !== globalPath && resolvedPath !== cwdPath);
   });
 }
@@ -3848,33 +4038,40 @@ function loadPiPackageDirectory() {
     }
   }).catch((error) => ({ error: `could not load @earendil-works/pi-coding-agent package metadata: ${errorText(error)}` }));
 }
-var nativePromptTemplateModule;
-async function loadNativePromptTemplateModule() {
+var nativeCoreModules = /* @__PURE__ */ new Map();
+async function loadNativeCoreModule(file, label2) {
   const packageDirectory = await loadPiPackageDirectory();
-  let promptTemplatePath;
+  let modulePath;
   if (packageDirectory.directory) {
-    const candidate = resolve4(packageDirectory.directory, "dist/core/prompt-templates.js");
-    if (existsSync(candidate)) promptTemplatePath = candidate;
+    const candidate = resolve5(packageDirectory.directory, "dist/core", file);
+    if (existsSync(candidate)) modulePath = candidate;
   }
-  promptTemplatePath ??= resolve4(dirname4(fileURLToPath3(import.meta.resolve("@earendil-works/pi-coding-agent"))), "core/prompt-templates.js");
+  modulePath ??= resolve5(dirname5(fileURLToPath3(import.meta.resolve("@earendil-works/pi-coding-agent"))), "core", file);
   const packageDirectoryError = packageDirectory.error ? ` Package directory lookup failed: ${packageDirectory.error}` : "";
-  return nativePromptTemplateModule ??= import(promptTemplatePath).then((module) => module).catch((error) => {
-    throw new Error(`Could not load Pi prompt templates.${packageDirectoryError}`, { cause: error });
-  });
+  let loaded = nativeCoreModules.get(file);
+  if (!loaded) {
+    loaded = import(modulePath).catch((error) => {
+      throw new Error(`Could not load Pi ${label2}.${packageDirectoryError}`, { cause: error });
+    });
+    nativeCoreModules.set(file, loaded);
+  }
+  return loaded;
 }
 async function expandPromptTemplateForInspection(text, templates) {
-  return (await loadNativePromptTemplateModule()).expandPromptTemplate(text, templates);
+  return (await loadNativeCoreModule("prompt-templates.js", "prompt templates")).expandPromptTemplate(text, templates);
+}
+async function buildSystemPromptForInspection(options) {
+  return (await loadNativeCoreModule("system-prompt.js", "system prompt builder")).buildSystemPrompt(options);
 }
 async function preparePiPrompt(native, text) {
   const session = native;
   const diagnostics = [];
   const runner = session._extensionRunner;
-  const baseSystemPrompt = typeof session._baseSystemPrompt === "string" ? session._baseSystemPrompt : session.systemPrompt ?? "";
+  const baseSystemPrompt = session.systemPrompt ?? "";
   const baseOptions = session._baseSystemPromptOptions;
   const expandSkillCommand = session._expandSkillCommand;
   const templates = session.promptTemplates;
   if (!runner) diagnostics.push({ type: "error", message: "Pi prompt inspection seam is unavailable: extension runner is missing", source: "Pi session" });
-  if (typeof session._baseSystemPrompt !== "string") diagnostics.push({ type: "error", message: "Pi prompt inspection seam is unavailable: base system prompt is missing", source: "Pi session" });
   if (baseOptions === void 0) diagnostics.push({ type: "error", message: "Pi prompt inspection seam is unavailable: base system prompt options are missing", source: "Pi session" });
   if (typeof expandSkillCommand !== "function") diagnostics.push({ type: "error", message: "Pi prompt inspection seam is unavailable: skill expansion is missing", source: "Pi session" });
   if (!Array.isArray(templates)) diagnostics.push({ type: "error", message: "Pi prompt inspection seam is unavailable: prompt templates are missing", source: "Pi session" });
@@ -3899,68 +4096,86 @@ async function preparePiPrompt(native, text) {
         diagnostics.push({ type: "error", message: `Pi prompt template expansion is unavailable: ${errorText(error)}`, source: "Pi session" });
       }
     }
-    const result = !inputHandled && runner && baseOptions !== void 0 ? await runner.emitBeforeAgentStart(expandedPrompt, void 0, baseSystemPrompt, baseOptions) : void 0;
+    const result = !inputHandled && runner && baseOptions !== void 0 ? await runner.emitBeforeAgentStart(expandedPrompt, void 0, baseOptions) : void 0;
     const prepared = result;
-    return { prompt: text, expandedPrompt, systemPrompt: typeof prepared?.systemPrompt === "string" ? prepared.systemPrompt : baseSystemPrompt, systemPromptOptions: baseOptions, messages: prepared?.messages ?? [], inputHandled, diagnostics };
+    const systemPromptOptions = prepared?.systemPromptOptions ?? baseOptions;
+    const systemPrompt = prepared?.systemPromptOptions === void 0 ? baseSystemPrompt : await buildSystemPromptForInspection(prepared.systemPromptOptions);
+    return { prompt: text, expandedPrompt, systemPrompt, systemPromptOptions, messages: prepared?.messages ?? [], inputHandled, diagnostics };
   } finally {
     unsubscribe?.();
   }
 }
 function flushExtensionProviders(resourceLoader, modelRuntime) {
-  const { runtime: runtime2 } = resourceLoader.getExtensions();
+  const { runtime } = resourceLoader.getExtensions();
   const failures = [];
-  for (const { name, config } of runtime2.pendingProviderRegistrations) {
+  for (const { name, config } of runtime.pendingProviderRegistrations) {
     try {
       modelRuntime.registerProvider(name, config);
     } catch (error) {
       failures.push(`${name}: ${errorText(error)}`);
     }
   }
-  runtime2.pendingProviderRegistrations = [];
-  for (const { provider } of runtime2.pendingNativeProviderRegistrations) {
+  runtime.pendingProviderRegistrations = [];
+  for (const { provider } of runtime.pendingNativeProviderRegistrations) {
     try {
       modelRuntime.registerNativeProvider(provider);
     } catch (error) {
       failures.push(`${provider.id || "native provider"}: ${errorText(error)}`);
     }
   }
-  runtime2.pendingNativeProviderRegistrations = [];
+  runtime.pendingNativeProviderRegistrations = [];
   return failures;
 }
+function builtinExtensions() {
+  return [
+    { name: "codemode", factory: createCodemodeExtension(), replaceable: true, builtin: true },
+    { name: "tool-search", factory: createToolSearchExtension(), replaceable: true, builtin: true },
+    { name: "mcp", factory: createMcpExtension(), replaceable: true, builtin: true }
+  ];
+}
+var BUILTIN_EXTENSION_PREFIX = "builtin:";
+function isLlamaModel(model) {
+  return model.provider === "llama.cpp";
+}
 async function createLocalPiSessionHandle(input, sessionStartEvent) {
-  const agentDir = input.agentDir ?? getAgentDir2();
+  const agentDir = input.agentDir ?? getAgentDir3();
   const systemPromptSource = workflowSystemPromptPath(input.cwd, agentDir, input.resourcePolicy?.projectTrusted ?? true);
   const systemPromptOptions = input.systemPrompt !== void 0 ? { systemPromptOverride: () => input.systemPrompt } : systemPromptSource !== void 0 ? { systemPrompt: systemPromptSource } : {};
   const contextFilesOverride = input.contextFiles === void 0 ? void 0 : (base) => ({ ...base, agentsFiles: filterContextFiles(base.agentsFiles, input.contextFiles ?? [], input.cwd, agentDir) });
-  const manager = input.sessionManager ?? (input.sessionPath ? SessionManager.open(input.sessionPath, join5(agentDir, "sessions"), input.cwd) : input.agentDir ? SessionManager.create(input.cwd, join5(agentDir, "sessions")) : SessionManager.create(input.cwd));
+  const manager = input.sessionManager ?? (input.sessionPath ? SessionManager.open(input.sessionPath, join6(agentDir, "sessions"), input.cwd) : input.agentDir ? SessionManager.create(input.cwd, join6(agentDir, "sessions")) : SessionManager.create(input.cwd));
   if (!input.sessionPath) manager.appendSessionInfo(input.sessionLabel);
-  const modelRuntime = await ModelRuntime.create({ authPath: join5(agentDir, "auth.json"), modelsPath: join5(agentDir, "models.json") });
+  const modelRuntime = await ModelRuntime.create({ authPath: join6(agentDir, "auth.json"), modelsPath: join6(agentDir, "models.json") });
   const customTools = [...input.customTools ?? [], ...input.resultTool ? [input.resultTool] : []];
   const tools = [.../* @__PURE__ */ new Set([...input.tools, ...customTools.map(({ name }) => name)])];
   let settingsManager;
   let resourceLoader;
+  const builtins = builtinExtensions();
+  const builtinNames = builtins.flatMap((extension2) => typeof extension2 === "function" ? [] : [extension2.name]);
+  const extensionFactories = [...builtins, ...input.extensionFactories ?? []];
   const policy = input.resourcePolicy;
   if (policy) {
     settingsManager = SettingsManager.create(input.cwd, agentDir, { projectTrusted: false });
     settingsManager.setProjectTrusted(policy.projectTrusted);
-    const packageManager = new DefaultPackageManager({ cwd: input.cwd, agentDir, settingsManager });
+    const packageManager = new DefaultPackageManager({ cwd: input.cwd, agentDir, settingsManager, builtinExtensions: builtinNames });
     const resolved = await packageManager.resolve();
-    const discoveredExtensions = [...new Set(resolved.extensions.filter(({ enabled, metadata }) => enabled && (policy.projectTrusted || metadata.scope !== "project")).map(({ path }) => canonicalPath(path)))];
+    const discoveredExtensions = [...new Set(resolved.extensions.filter(({ enabled, metadata }) => enabled && (policy.projectTrusted || metadata.scope !== "project")).map(({ path }) => extensionIdentity(path)))];
     const selectorSources = policy.selectorSources;
-    const extensionLayers = [selectorSources.global.extensions, selectorSources.project.extensions, selectorSources.role?.extensions, selectorSources.call?.extensions];
-    const extensionSelectors = extensionLayers.flatMap((layer) => (layer ?? []).map((original) => ({ original, matching: canonicalExtensionSelector(original, input.cwd) })));
-    const selectedExtensions = selectResourcesByLayers(extensionLayers.map((layer) => layer?.map((selector) => canonicalExtensionSelector(selector, input.cwd))), discoveredExtensions);
-    const extensionPaths = selectedExtensions.filter((path) => !WORKFLOW_HOST_ENTRIES.has(path));
-    const unmatchedExtensions = extensionSelectors.filter(({ matching }) => unmatchedResourcePatterns([matching], discoveredExtensions).length > 0).map(({ original }) => original);
+    const selection = resolveRole(void 0, {
+      cwd: input.cwd,
+      selectorSources,
+      resources: { extensions: discoveredExtensions }
+    });
+    const selectedExtensions = selection.selectedExtensions ?? [];
+    const extensionPaths = selectedExtensions.filter((path) => path.startsWith(BUILTIN_EXTENSION_PREFIX) || !isWorkflowHostEntry(path));
     policy.selectedExtensions = selectedExtensions;
-    policy.unmatchedExtensions = unmatchedExtensions;
+    policy.unmatchedExtensions = selection.unmatchedExtensions ?? [];
     const skillPaths = [...new Set(resolved.skills.filter(({ enabled, metadata }) => enabled && (policy.projectTrusted || metadata.scope !== "project")).map(({ path }) => path))];
     const updateSkillMatches = (skills) => {
       const names = [...new Set(skills.map(({ name }) => name))];
-      const skillLayers = [selectorSources.global.skills, selectorSources.project.skills, selectorSources.role?.skills, selectorSources.call?.skills];
-      const selectedSkills = selectResourcesByLayers(skillLayers, names);
+      const selected = resolveRole(void 0, { cwd: input.cwd, selectorSources, resources: { skills: names } });
+      const selectedSkills = selected.selectedSkills ?? [];
       policy.selectedSkills = selectedSkills;
-      policy.unmatchedSkills = unmatchedResourcePatterns(skillLayers.flatMap((layer) => layer ?? []), names);
+      policy.unmatchedSkills = selected.unmatchedSkills ?? [];
       return new Set(names.filter((name) => !selectedSkills.includes(name)));
     };
     resourceLoader = new DefaultResourceLoader({
@@ -3971,7 +4186,7 @@ async function createLocalPiSessionHandle(input, sessionStartEvent) {
       additionalExtensionPaths: extensionPaths,
       noSkills: true,
       additionalSkillPaths: [.../* @__PURE__ */ new Set([...skillPaths, ...input.additionalSkillPaths ?? []])],
-      ...input.extensionFactories?.length ? { extensionFactories: input.extensionFactories } : {},
+      extensionFactories,
       ...contextFilesOverride ? { agentsFilesOverride: contextFilesOverride } : {},
       skillsOverride: (base) => {
         const disabledSkills = updateSkillMatches(base.skills);
@@ -3983,17 +4198,17 @@ async function createLocalPiSessionHandle(input, sessionStartEvent) {
     await resourceLoader.reload();
   } else {
     settingsManager = SettingsManager.create(input.cwd, agentDir, { projectTrusted: true });
-    const packageManager = new DefaultPackageManager({ cwd: input.cwd, agentDir, settingsManager });
+    const packageManager = new DefaultPackageManager({ cwd: input.cwd, agentDir, settingsManager, builtinExtensions: builtinNames });
     const resolved = await packageManager.resolve();
-    const extensionPaths = [...new Set(resolved.extensions.filter(({ enabled }) => enabled).map(({ path }) => canonicalPath(path)).filter((path) => !WORKFLOW_HOST_ENTRIES.has(path)))];
-    resourceLoader = new DefaultResourceLoader({ cwd: input.cwd, agentDir, settingsManager, noExtensions: true, additionalExtensionPaths: extensionPaths, ...input.additionalSkillPaths?.length ? { additionalSkillPaths: [...input.additionalSkillPaths] } : {}, ...input.extensionFactories?.length ? { extensionFactories: input.extensionFactories } : {}, ...contextFilesOverride ? { agentsFilesOverride: contextFilesOverride } : {}, ...systemPromptOptions, ...input.systemPromptAppend ? { appendSystemPromptOverride: (base) => [...base, input.systemPromptAppend ?? ""] } : {} });
+    const extensionPaths = [...new Set(resolved.extensions.filter(({ enabled }) => enabled).map(({ path }) => extensionIdentity(path)).filter((path) => path.startsWith(BUILTIN_EXTENSION_PREFIX) || !isWorkflowHostEntry(path)))];
+    resourceLoader = new DefaultResourceLoader({ cwd: input.cwd, agentDir, settingsManager, noExtensions: true, additionalExtensionPaths: extensionPaths, ...input.additionalSkillPaths?.length ? { additionalSkillPaths: [...input.additionalSkillPaths] } : {}, extensionFactories, ...contextFilesOverride ? { agentsFilesOverride: contextFilesOverride } : {}, ...systemPromptOptions, ...input.systemPromptAppend ? { appendSystemPromptOverride: (base) => [...base, input.systemPromptAppend ?? ""] } : {} });
     await resourceLoader.reload();
   }
   const providerFailures = flushExtensionProviders(resourceLoader, modelRuntime);
   await modelRuntime.refresh({ allowNetwork: false });
   const model = modelRuntime.getModel(input.model.provider, input.model.model);
   if (!model) {
-    const because = providerFailures.length > 0 ? ` (provider registration failed \u2014 ${providerFailures.join("; ")})` : "";
+    const because = providerFailures.length > 0 ? ` (provider registration failed \u2014 ${providerFailures.join("; ")})` : isLlamaModel(input.model) ? " (Pi does not expose its built-in llama.cpp provider to extension sessions; declare the llama.cpp server as a provider in models.json and use that model instead)" : "";
     throw new WorkflowError("UNKNOWN_MODEL", `Unknown model: ${input.model.provider}/${input.model.model}${because}`);
   }
   const effectiveSessionStartEvent = input.settings === void 0 && sessionStartEvent === void 0 ? void 0 : { ...sessionStartEvent ?? { type: "session_start", reason: "startup" }, settings: input.settings ?? Object.freeze({}) };
@@ -4018,13 +4233,13 @@ async function createLocalPiSessionHandle(input, sessionStartEvent) {
     await shutdown("quit").catch(() => void 0);
     throw error;
   }
-  const resourcePaths = { extensions: resourceLoader.getExtensions().extensions.filter(({ path }) => !path.startsWith("<")).map(({ resolvedPath }) => canonicalPath(resolvedPath)), skills: resourceLoader.getSkills().skills.map(({ filePath }) => canonicalPath(filePath)) };
+  const resourcePaths = { extensions: resourceLoader.getExtensions().extensions.filter(({ path }) => !path.startsWith("<")).map(({ resolvedPath }) => extensionIdentity(resolvedPath)), skills: resourceLoader.getSkills().skills.map(({ filePath }) => canonicalPath(filePath)) };
   const resourceInspection = () => {
     const extensions = resourceLoader.getExtensions();
     const skills = resourceLoader.getSkills();
     const diagnostics = [...extensions.errors.map(({ path, error }) => ({ type: "error", message: error, source: path })), ...skills.diagnostics.map(({ type, path, message }) => ({ type, message, ...path ? { source: path } : {} }))];
     const systemSource = systemPromptSource;
-    return { extensions: resourceLoader.getExtensions().extensions.filter(({ path }) => !path.startsWith("<")).map(({ resolvedPath }) => canonicalPath(resolvedPath)), skills: skills.skills.map(({ name }) => name), diagnostics, ...systemSource ? { systemPromptSource: systemSource } : resourceLoader.getSystemPrompt() !== void 0 ? { systemPromptSource: "Pi resource loader" } : {} };
+    return { extensions: resourceLoader.getExtensions().extensions.filter(({ path }) => !path.startsWith("<")).map(({ resolvedPath }) => extensionIdentity(resolvedPath)), skills: skills.skills.map(({ name }) => name), diagnostics, ...systemSource ? { systemPromptSource: systemSource } : resourceLoader.getSystemPrompt() !== void 0 ? { systemPromptSource: "Pi resource loader" } : {} };
   };
   const managedSession = Object.assign(session, {
     getLeafId: () => manager.getLeafId(),
@@ -4439,27 +4654,27 @@ function appendResourcePolicyNarrowing(ceiling, candidate) {
   };
 }
 function packageRoot(start) {
-  let current = dirname4(realpathSync2(start));
+  let current = dirname5(realpathSync2(start));
   for (; ; ) {
-    const candidates = [current, join5(current, "..", "@earendil-works", "pi-coding-agent"), join5(current, "..", "pi-coding-agent")];
+    const candidates = [current, join6(current, "..", "@earendil-works", "pi-coding-agent"), join6(current, "..", "pi-coding-agent")];
     for (const candidate of candidates) {
-      const packageJsonPath = join5(candidate, "package.json");
+      const packageJsonPath = join6(candidate, "package.json");
       if (!existsSync(packageJsonPath)) continue;
-      const packageJson = JSON.parse(readFileSync3(packageJsonPath, "utf8"));
+      const packageJson = JSON.parse(readFileSync4(packageJsonPath, "utf8"));
       if (object(packageJson) && typeof packageJson.name === "string" && packageJson.name === "@earendil-works/pi-coding-agent") return candidate;
     }
-    const parent = dirname4(current);
+    const parent = dirname5(current);
     if (parent === current) return void 0;
     current = parent;
   }
 }
 function piPackageEntrypoint(root) {
-  const packageJson = JSON.parse(readFileSync3(join5(root, "package.json"), "utf8"));
+  const packageJson = JSON.parse(readFileSync4(join6(root, "package.json"), "utf8"));
   if (!object(packageJson)) throw new Error("the @earendil-works/pi-coding-agent package does not declare a pi CLI");
   const bin = packageJson.bin;
   const cli = typeof bin === "string" ? bin : object(bin) && typeof bin.pi === "string" ? bin.pi : void 0;
   if (!cli) throw new Error("the @earendil-works/pi-coding-agent package does not declare a pi CLI");
-  const entrypoint = resolve4(root, cli);
+  const entrypoint = resolve5(root, cli);
   if (!existsSync(entrypoint)) throw new Error(`the originating Pi CLI entrypoint is unavailable: ${entrypoint}`);
   return entrypoint;
 }
@@ -4500,7 +4715,7 @@ ${instruction}` : ""}`;
 }
 async function preparedAgentSession(input, initialPrompt) {
   const { runtime: piRuntime, error: piRuntimeError } = await piRuntimeResolution;
-  const systemPromptPath = input.systemPrompt === void 0 ? workflowSystemPromptPath(input.cwd, input.agentDir ?? getAgentDir2(), input.resourcePolicy?.projectTrusted ?? true) : void 0;
+  const systemPromptPath = input.systemPrompt === void 0 ? workflowSystemPromptPath(input.cwd, input.agentDir ?? getAgentDir3(), input.resourcePolicy?.projectTrusted ?? true) : void 0;
   const prepared = {
     cwd: input.cwd,
     model: Object.freeze({ ...input.model }),
@@ -4530,7 +4745,7 @@ function agentSetupSummary(setup, hookNames) {
   return { hookNames: [...hookNames], model: { provider: model.provider, model: model.model, ...model.thinking ? { thinking: model.thinking } : {} }, tools: [...setup.sessionInput.tools, ...setup.sessionInput.resultTool ? [setup.sessionInput.resultTool.name] : []], cwd: setup.sessionInput.cwd, ...setup.sessionInput.resourcePolicy ? { resourceSelectors: resourcePolicySummary(setup.sessionInput.resourcePolicy, setup.sessionInput.tools) } : {} };
 }
 async function attemptSessionInput(source, attempt) {
-  const target = join5(dirname4(source), `${basename4(source, ".jsonl")}-attempt-${String(attempt)}.jsonl`);
+  const target = join6(dirname5(source), `${basename4(source, ".jsonl")}-attempt-${String(attempt)}.jsonl`);
   await copyFile(source, target);
   return target;
 }
@@ -4632,7 +4847,6 @@ var WorkflowAgentExecutor = class {
     const roleName2 = typeof options.role === "string" ? options.role : void 0;
     const roleDefinition = roleName2 ? this.root.agentDefinitions?.[roleName2] : void 0;
     if (roleName2 && !roleDefinition) throw new WorkflowError("UNKNOWN_AGENT_TYPE", `Unknown agent role: ${roleName2}`);
-    const candidateTools = inheritedTools !== void 0 ? [...inheritedTools] : [...this.root.tools];
     if (inheritedTools === void 0) for (const pattern of roleDefinition?.tools ?? []) {
       const body = pattern.startsWith("!") ? pattern.slice(1) : pattern;
       if (!pattern.startsWith("!") && !resourcePatternHasMagic(pattern) && !this.root.tools.has(body)) {
@@ -4643,33 +4857,30 @@ var WorkflowAgentExecutor = class {
         }
       }
     }
-    const selectorLayers = [
-      this.root.resourceSelectors?.tools,
-      roleDefinition?.tools,
-      options.tools
-    ];
-    for (const pattern of options.tools ?? []) {
-      const body = pattern.startsWith("!") ? pattern.slice(1) : pattern;
-      if (!pattern.startsWith("!") && !resourcePatternHasMagic(pattern) && !candidateTools.includes(body)) throw new WorkflowError("UNKNOWN_TOOL", `Tool is outside the launching session boundary: ${body}`);
-    }
-    const outsideEffectiveTool = options.effectiveTools?.find((tool) => !candidateTools.includes(tool));
-    if (outsideEffectiveTool) throw new WorkflowError("UNKNOWN_TOOL", `Tool is outside the launching session boundary: ${outsideEffectiveTool}`);
-    const requested = options.effectiveTools ?? selectResourcesByLayers(selectorLayers, candidateTools);
-    const forbidden = requested.find((tool) => !this.root.tools.has(tool));
-    if (forbidden) throw new WorkflowError("UNKNOWN_TOOL", `Tool is outside the launching session boundary: ${forbidden}`);
-    const requestedModel = options.model ?? (roleDefinition?.model && roleDefinition.thinking && !roleDefinition.model.includes(":") ? `${roleDefinition.model}:${roleDefinition.thinking}` : roleDefinition?.model);
-    const alias = requestedModel === void 0 ? void 0 : modelAliasName(requestedModel, this.root.modelAliases ?? {});
-    const blockedAlias = requestedModel?.split(":", 1)[0];
-    if (requestedModel !== void 0 && blockedAlias && this.root.blockedAliases?.has(blockedAlias) && !alias) {
-      const target = this.root.blockedAliasTargets?.[blockedAlias];
-      throw new WorkflowError("UNKNOWN_MODEL", `Unknown model alias ${requestedModel}${target ? ` resolved to ${target}` : ""}${this.root.settingsPath ? ` (settings: ${this.root.settingsPath})` : ""}`);
-    }
-    const model = options.modelOverride ?? parseModel(requestedModel, this.root.model, this.root.modelAliases, this.root.knownModels ?? this.root.availableModels, this.root.settingsPath);
-    const availableModels = this.root.knownModels ?? this.root.availableModels ?? /* @__PURE__ */ new Set([modelCapability(this.root.model)]);
-    if (!availableModels.has(modelCapability(model))) throw new WorkflowError("UNKNOWN_MODEL", `Unknown model${requestedModel ? ` ${requestedModel} resolved to ${modelCapability(model)}` : ""}${this.root.settingsPath ? ` (settings: ${this.root.settingsPath})` : ""}`);
-    const overrideSystemPrompt = roleDefinition?.overrideSystemPrompt === true;
-    const contextFiles = options.contextFiles ?? roleDefinition?.contextFiles;
-    return { model, ...alias && requestedModel ? { requestedModel } : {}, tools: requested, ...overrideSystemPrompt ? { systemPrompt: roleDefinition.prompt ?? "" } : {}, systemPromptAppend: overrideSystemPrompt ? "" : roleDefinition?.prompt ?? "", ...contextFiles === void 0 ? {} : { contextFiles: [...contextFiles] } };
+    const resolved = resolveRole(roleName2, {
+      cwd: this.root.cwd,
+      ...roleDefinition === void 0 ? {} : { definition: roleDefinition },
+      ...this.root.agentDefinitions === void 0 ? {} : { definitions: this.root.agentDefinitions },
+      ...this.root.agentDir === void 0 ? {} : { agentDir: this.root.agentDir },
+      selectorSources: { global: this.root.resourceSelectors ?? {}, project: {} },
+      ...this.root.modelAliases === void 0 ? {} : { modelAliases: this.root.modelAliases },
+      ...this.root.knownModels === void 0 ? {} : { knownModels: this.root.knownModels },
+      ...this.root.availableModels === void 0 ? {} : { availableModels: this.root.availableModels },
+      ...this.root.blockedAliases === void 0 ? {} : { blockedAliases: this.root.blockedAliases },
+      ...this.root.blockedAliasTargets === void 0 ? {} : { blockedAliasTargets: this.root.blockedAliasTargets },
+      ...this.root.settingsPath === void 0 ? {} : { settingsPath: this.root.settingsPath },
+      rootModel: this.root.model,
+      rootTools: this.root.tools,
+      ...inheritedTools === void 0 ? {} : { inheritedTools },
+      ...options.model === void 0 ? {} : { model: options.model },
+      ...options.modelOverride === void 0 ? {} : { modelOverride: options.modelOverride },
+      ...options.tools === void 0 ? {} : { tools: options.tools },
+      ...options.skills === void 0 ? {} : { skills: options.skills },
+      ...options.extensions === void 0 ? {} : { extensions: options.extensions },
+      ...options.contextFiles === void 0 ? {} : { contextFiles: options.contextFiles },
+      ...options.effectiveTools === void 0 ? {} : { effectiveTools: options.effectiveTools }
+    });
+    return { model: physicalModel(resolved.model ?? this.root.model, this.root.modelAliases, this.root.knownModels, this.root.settingsPath), ...resolved.requestedModel === void 0 ? {} : { requestedModel: resolved.requestedModel }, tools: resolved.tools ?? [], ...resolved.overrideSystemPrompt ? { systemPrompt: resolved.prompt } : {}, systemPromptAppend: resolved.overrideSystemPrompt ? "" : resolved.prompt, ...resolved.contextFiles === void 0 ? {} : { contextFiles: resolved.contextFiles } };
   }
   async execute(task, options, signal, customTools = [], setSteer, beforeRetry) {
     const executionSignal = signal ?? this.root.runContext?.signal;
@@ -4926,7 +5137,7 @@ import { SettingsManager as SettingsManager2, truncateToVisualLines as truncateT
 import { spawn } from "node:child_process";
 import { mkdtemp, rm as rm4, writeFile as writeFile3 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 function workflowPromptArtifact(prompt) {
   return { extension: ".md", content: prompt };
 }
@@ -4937,23 +5148,23 @@ function workflowResultArtifact(value) {
 async function spawnWorkflowEditor(command, path) {
   const [editor, ...editorArgs] = command.split(" ");
   if (!editor) return null;
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     try {
       const child = spawn(editor, [...editorArgs, path], { stdio: "inherit", shell: process.platform === "win32" });
       child.once("error", () => {
-        resolve5(null);
+        resolve6(null);
       });
       child.once("close", (code) => {
-        resolve5(code);
+        resolve6(code);
       });
     } catch {
-      resolve5(null);
+      resolve6(null);
     }
   });
 }
 async function openWorkflowArtifact(tui, command, artifact) {
-  const directory = await mkdtemp(join6(tmpdir(), "pi-workflow-editor-"));
-  const path = join6(directory, `artifact${artifact.extension}`);
+  const directory = await mkdtemp(join7(tmpdir(), "pi-workflow-editor-"));
+  const path = join7(directory, `artifact${artifact.extension}`);
   try {
     await writeFile3(path, artifact.content, { encoding: "utf8", mode: 384 });
     tui.stop();
@@ -4970,23 +5181,88 @@ async function openWorkflowArtifact(tui, command, artifact) {
 
 // src/host-view.ts
 import { keyHint, truncateToVisualLines } from "@earendil-works/pi-coding-agent";
-import { truncateToWidth as truncateToWidth2 } from "@earendil-works/pi-tui";
+import { truncateToWidth as truncateToWidth2, visibleWidth as visibleWidth2 } from "@earendil-works/pi-tui";
 
 // src/background-widget.ts
 import { isKeyRelease, Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+var REPAINT_MS = 125;
 var QUIET_MS = 3 * 60 * 1e3;
+var ROLE = {
+  live: "accent",
+  done: "success",
+  failed: "error",
+  warn: "warning",
+  quiet: "muted"
+};
+var RESET = "\x1B[0m";
+var SPINNER = ["\u28F7", "\u28EF", "\u28DF", "\u287F", "\u28BF", "\u28FD", "\u28FB"];
+function spinner(now) {
+  return SPINNER[Math.floor(now / REPAINT_MS) % SPINNER.length] ?? SPINNER[0];
+}
+function mark(state, now, paint, runState) {
+  if (state === "running" && (runState === void 0 || runState === "running")) return paint(ROLE.live, spinner(now));
+  if (state === "completed") return paint(ROLE.done, "\u2713");
+  if (state === "failed" || state === "budget_exhausted") return paint(ROLE.failed, "\u2717");
+  return paint(ROLE.quiet, "\xB7");
+}
+function formatElapsed(ms) {
+  const total = Math.max(0, Math.floor(ms / 1e3));
+  const minutes = Math.floor(total / 60);
+  const seconds = total % 60;
+  return `${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
+}
+function formatTokens(tokens) {
+  if (!tokens) return "";
+  if (tokens < 1e3) return `${String(tokens)}t`;
+  const thousands = tokens / 1e3;
+  return `${thousands < 10 ? thousands.toFixed(1) : String(Math.round(thousands))}kt`;
+}
 function formatCost(cost) {
   if (!cost) return "";
   return cost < 0.01 ? `$${cost.toFixed(3)}` : `$${cost.toFixed(2)}`;
 }
+function visibleLength(text) {
+  return visibleWidth(text);
+}
+function truncate(text, limit) {
+  return `${truncateToWidth(text, limit, "\u2026")}${RESET}`;
+}
+function drawFrame(title, hint, body, width, paint, accent, scrollbar = () => void 0) {
+  const inner = Math.max(20, width - 4);
+  const lines = body.map((row, index) => {
+    const right = row.right ?? "";
+    const rightWidth = right === "" ? 0 : visibleLength(right) + 2;
+    const room = Math.max(0, inner - rightWidth);
+    const left = visibleLength(row.text) > room ? truncate(row.text, room) : row.text;
+    const gap = Math.max(0, inner - visibleLength(left) - (right === "" ? 0 : visibleLength(right)));
+    const text = right === "" ? left + " ".repeat(gap) : `${left}${" ".repeat(gap)}${paint(ROLE.quiet, right)}`;
+    const rule = accent("\u2502");
+    const bar = scrollbar(index);
+    return `${rule} ${text} ${bar === void 0 ? rule : accent(bar)}`;
+  });
+  const label2 = ` ${title} `;
+  const tail = hint === "" ? "" : ` ${hint} `;
+  const spare = inner + 2 - visibleLength(label2) - visibleLength(tail);
+  const heading = spare >= 2 ? accent(`\u256D${label2}${"\u2500".repeat(spare)}${tail}\u256E`) : accent(`\u256D${label2}${"\u2500".repeat(Math.max(0, inner + 2 - visibleLength(label2)))}\u256E`);
+  const foot = accent(`\u2570${"\u2500".repeat(inner + 2)}\u256F`);
+  return [heading, ...lines, foot];
+}
 
 // src/host-view.ts
 var PLAIN_WORKFLOW_PROGRESS_STYLES = { accent: (text) => text, success: (text) => text, error: (text) => text, warning: (text) => text, muted: (text) => text, dim: (text) => text, bold: (text) => text };
+var RUN_STATE_GLYPH = { "not started": "\u25CB", queued: "\u25CB", pausing: "\u23F8", paused: "\u23F8", completed: "\u2713", failed: "\u2717", stopped: "\u2717", interrupted: "\u21AF", budget_exhausted: "!", awaiting_input: "?" };
+function runStateGlyph(state, running) {
+  return state === "running" ? running : RUN_STATE_GLYPH[state] ?? "\u25C6";
+}
+var PROGRESS_STATE_STYLE = { completed: "success", failed: "error", cancelled: "error", running: "accent", paused: "warning", pausing: "warning", interrupted: "warning", retrying: "accent", budget_exhausted: "warning", awaiting_input: "warning" };
 var PHASE_STATE_STYLE = { completed: "success", failed: "error", cancelled: "error", stopped: "error", running: "accent", paused: "warning", pausing: "warning", interrupted: "warning", budget_exhausted: "warning" };
 function styleForState(map, state, styles) {
   const key = map[state] ?? "muted";
   return (text) => styles[key](text);
 }
+function progressStyleForState(state, styles) {
+  return styleForState(PROGRESS_STATE_STYLE, state, styles);
+}
 function phaseStyleForState(state, styles) {
   return styleForState(PHASE_STATE_STYLE, state, styles);
 }
@@ -5000,6 +5276,15 @@ function formatWorkflowRuntime(durationMs) {
   const remainingMinutes = minutes % 60;
   return `${String(hours)}h${remainingMinutes ? ` ${String(remainingMinutes)}m` : ""}`;
 }
+function textBlock(text) {
+  return {
+    render(width) {
+      return text.split("\n").map((line) => truncateToWidth2(line, Math.max(1, width), "\u2026"));
+    },
+    invalidate() {
+    }
+  };
+}
 var ANSI_SGR_SOURCE = `${String.fromCharCode(27)}\\[[0-9;]*m`;
 var ANSI_SGR = new RegExp(ANSI_SGR_SOURCE);
 function themeWorkflowProgressStyles(theme) {
@@ -5043,13 +5328,13 @@ function elapsedDurationMs(agent, end) {
   return agent.startedAt === void 0 || !Number.isFinite(agent.startedAt) ? void 0 : Math.max(0, end - agent.startedAt);
 }
 function agentActivityLabel(agent) {
-  const activity2 = agent.activity;
-  if (activity2?.kind === "reasoning" || activity2?.kind === "text") {
-    const name = activity2.kind === "reasoning" ? "reasoning" : "responding";
-    const text = sanitizeDisplayText(activity2.text);
+  const activity = agent.activity;
+  if (activity?.kind === "reasoning" || activity?.kind === "text") {
+    const name = activity.kind === "reasoning" ? "reasoning" : "responding";
+    const text = sanitizeDisplayText(activity.text);
     return text && text !== name ? `${name} \xB7 ${text}` : name;
   }
-  if (activity2?.kind === "tool") return sanitizeDisplayText(activity2.text);
+  if (activity?.kind === "tool") return sanitizeDisplayText(activity.text);
   return sanitizeDisplayText([...agent.toolCalls ?? []].reverse().find(({ state }) => state === "running")?.name ?? "");
 }
 function formatAccountingValue(value) {
@@ -5101,16 +5386,96 @@ function visibleStandaloneAgentAttemptActions(actions, context) {
     }
   });
 }
-function formatAgentAccounting(accounting3) {
-  const total = accounting3.input + accounting3.output + accounting3.cacheRead + accounting3.cacheWrite;
-  return [`Tokens: \u2211${formatAccountingValue(total)} \u2191${formatAccountingValue(accounting3.input)} \u2193${formatAccountingValue(accounting3.output)} \u21E2${formatAccountingValue(accounting3.cacheRead)} \u21E0${formatAccountingValue(accounting3.cacheWrite)}`, `Cost: ${formatCost(accounting3.cost) || "$0.00"}`];
+function formatAgentAccounting(accounting2) {
+  const total = accounting2.input + accounting2.output + accounting2.cacheRead + accounting2.cacheWrite;
+  return [`Tokens: \u2211${formatAccountingValue(total)} \u2191${formatAccountingValue(accounting2.input)} \u2193${formatAccountingValue(accounting2.output)} \u21E2${formatAccountingValue(accounting2.cacheRead)} \u21E0${formatAccountingValue(accounting2.cacheWrite)}`, `Cost: ${formatCost(accounting2.cost) || "$0.00"}`];
+}
+function wrapNavigatorLine(text, width) {
+  return truncateToVisualLines(text, Number.MAX_SAFE_INTEGER, Math.max(1, width), 0).visualLines.map((line) => line.trimEnd());
+}
+function formatNavigatorColumns(sidebar, detail, width, layout = {}) {
+  const safeWidth = Math.max(1, width);
+  if (safeWidth >= 80) {
+    const sidebarWidth = Math.min(42, Math.max(24, Math.floor((safeWidth - 3) * 0.38)));
+    const left2 = sidebar.flatMap((line) => wrapNavigatorLine(line, sidebarWidth));
+    const right = detail.flatMap((line) => wrapNavigatorLine(line, safeWidth - sidebarWidth - 3));
+    return Array.from({ length: Math.max(left2.length, right.length) }, (_, index) => {
+      const cell = left2[index] ?? "";
+      return `${cell}${" ".repeat(Math.max(0, sidebarWidth - visibleWidth2(cell)))} | ${right[index] ?? ""}`;
+    });
+  }
+  if (layout.detailsOnly) return detail.flatMap((line) => wrapNavigatorLine(line, safeWidth));
+  const left = sidebar.flatMap((line) => wrapNavigatorLine(line, safeWidth));
+  return layout.treeOnly ? left : [...left, ...detail.flatMap((line) => wrapNavigatorLine(line, safeWidth))];
 }
 
 // src/retention.ts
 var DAY_MS = 24 * 60 * 60 * 1e3;
 
+// src/host-navigator.ts
+function isKeybindingGetKeys(value) {
+  return typeof value === "function";
+}
+function keybindingKeys(keybindings, name) {
+  if (!object(keybindings)) return void 0;
+  const getKeys = keybindings.getKeys;
+  return isKeybindingGetKeys(getKeys) ? getKeys.call(keybindings, name) : void 0;
+}
+var WORKFLOW_VIM_KEYS = { "tui.select.up": "k", "tui.select.down": "j", "tui.editor.cursorLeft": "h", "tui.editor.cursorRight": "l" };
+function workflowKeyMatches(keybindings, data, binding) {
+  return keybindings.matches(data, binding) || WORKFLOW_VIM_KEYS[binding] === data;
+}
+var WORKFLOW_KEY_LABELS = { up: "\u2191", down: "\u2193", left: "\u2190", right: "\u2192", pageUp: "pgup", pageDown: "pgdn" };
+function workflowKeyLabel(keybindings, binding, fallback, labels = WORKFLOW_KEY_LABELS) {
+  const keys = keybindingKeys(keybindings, binding);
+  const configured = keys?.length ? keys.map((key) => labels[key] ?? key) : [fallback];
+  const vim = WORKFLOW_VIM_KEYS[binding];
+  return [...new Set(vim ? [...configured, vim] : configured)].join("/");
+}
+function createInlineConfirm(requestRender) {
+  let pending;
+  const answer = (value) => {
+    const current = pending;
+    pending = void 0;
+    current?.resolve(value);
+    requestRender();
+  };
+  return {
+    ask(title, message) {
+      answer(false);
+      return new Promise((resolve6) => {
+        pending = { title, message, yes: true, resolve: resolve6 };
+        requestRender();
+      });
+    },
+    active() {
+      return pending !== void 0;
+    },
+    rows(width, styles) {
+      if (!pending) return [];
+      const yes = pending.yes;
+      const message = truncateToVisualLines2(pending.message, Number.MAX_SAFE_INTEGER, Math.max(1, width), 0).visualLines.map((line) => line.trimEnd());
+      return [styles.bold(pending.title), ...message, ...["Yes", "No"].map((option) => option === "Yes" === yes ? `\u2192 ${styles.accent(option)}` : `  ${option}`)];
+    },
+    hint(keybindings) {
+      return `${workflowKeyLabel(keybindings, "tui.select.up", "\u2191")}/${workflowKeyLabel(keybindings, "tui.select.down", "\u2193")} select \xB7 ${workflowKeyLabel(keybindings, "tui.select.confirm", "enter")} confirm \xB7 ${workflowKeyLabel(keybindings, "tui.select.cancel", "esc")} cancel`;
+    },
+    handleInput(keybindings, data) {
+      if (!pending) return;
+      if (workflowKeyMatches(keybindings, data, "tui.select.up") || workflowKeyMatches(keybindings, data, "tui.select.down")) {
+        pending.yes = !pending.yes;
+        requestRender();
+      } else if (workflowKeyMatches(keybindings, data, "tui.select.confirm")) answer(pending.yes);
+      else if (workflowKeyMatches(keybindings, data, "tui.select.cancel")) answer(false);
+    },
+    cancel() {
+      answer(false);
+    }
+  };
+}
+
 // src/trajectory.ts
-import { createBashToolDefinition, createEditToolDefinition, createFindToolDefinition, createGrepToolDefinition, createLsToolDefinition, createReadToolDefinition, createWriteToolDefinition, DefaultPackageManager as DefaultPackageManager2, getAgentDir as getAgentDir3, SettingsManager as SettingsManager3, DEFAULT_MAX_BYTES as DEFAULT_MAX_BYTES2 } from "@earendil-works/pi-coding-agent";
+import { createBashToolDefinition, createEditToolDefinition, createFindToolDefinition, createGrepToolDefinition, createLsToolDefinition, createReadToolDefinition, createWriteToolDefinition, DefaultPackageManager as DefaultPackageManager2, getAgentDir as getAgentDir4, SettingsManager as SettingsManager3, DEFAULT_MAX_BYTES as DEFAULT_MAX_BYTES2 } from "@earendil-works/pi-coding-agent";
 
 // subagents/src/contracts.ts
 import { Type as Type2 } from "@earendil-works/pi-ai";
@@ -5145,7 +5510,8 @@ var SUBAGENTS_RUN_PARAMETERS = Type2.Object({
   timeoutMs: Type2.Optional(Type2.Union([Type2.Integer({ minimum: 1, description: "Optional execution timeout in milliseconds" }), Type2.Null()]))
 }, { additionalProperties: false });
 var SUBAGENTS_INSPECT_PARAMETERS = Type2.Object({
-  id: Type2.Optional(Type2.String({ description: "Subagent ID; omit to list ordered run summaries" }))
+  id: Type2.Optional(Type2.String({ description: "Subagent ID; omit to list ordered run summaries" })),
+  scope: Type2.Optional(Type2.Union([Type2.Literal("session"), Type2.Literal("all")], { description: "List scope when id is omitted: session (default) lists runs from the current Pi session; all lists every stored run" }))
 }, { additionalProperties: false });
 var SUBAGENTS_ID_PARAMETERS = Type2.Object({
   id: Type2.String({ description: "Subagent ID" })
@@ -5160,13 +5526,21 @@ var SUBAGENTS_STOP_PARAMETERS = Type2.Object({
 var SUBAGENTS_RETRY_PARAMETERS = Type2.Object({
   id: Type2.String({ description: "Failed or stopped subagent ID to retry" })
 }, { additionalProperties: false });
-var SUBAGENTS_TOOL_SCHEMAS = {
-  subagents_run: SUBAGENTS_RUN_PARAMETERS,
-  subagents_inspect: SUBAGENTS_INSPECT_PARAMETERS,
-  subagents_steer: SUBAGENTS_STEER_PARAMETERS,
-  subagents_stop: SUBAGENTS_STOP_PARAMETERS,
-  subagents_retry: SUBAGENTS_RETRY_PARAMETERS
-};
+var SUBAGENT_STATUS_OUTPUT = Type2.Object({
+  id: Type2.String(),
+  state: Type2.String(),
+  sessionId: Type2.Optional(Type2.String()),
+  startedAt: Type2.Optional(Type2.Number()),
+  finishedAt: Type2.Optional(Type2.Number()),
+  attempts: Type2.Optional(Type2.Number()),
+  attemptDetails: Type2.Optional(Type2.Array(Type2.Unknown())),
+  worktree: Type2.Optional(Type2.Object({ path: Type2.String(), branch: Type2.String() })),
+  error: Type2.Optional(Type2.Object({ code: Type2.String(), message: Type2.String() })),
+  progress: Type2.Optional(Type2.Unknown()),
+  value: Type2.Optional(Type2.Unknown())
+});
+var SUBAGENTS_INSPECT_OUTPUT = Type2.Union([SUBAGENT_STATUS_OUTPUT, Type2.Array(Type2.Object({ id: Type2.String(), state: Type2.String() }))]);
+var SUBAGENTS_STEER_OUTPUT = Type2.Object({ id: Type2.String(), accepted: Type2.Boolean() });
 function normalizeSubagentRunRequest(value) {
   if (!Value2.Check(SUBAGENTS_RUN_PARAMETERS, value)) throw new WorkflowError("INVALID_METADATA", "Invalid subagents_run parameters");
   if (typeof value.worktree === "string" && !value.worktree.trim()) throw new WorkflowError("INVALID_METADATA", "worktree name must be a non-empty string");
@@ -5214,14 +5588,14 @@ function accountingValue(value) {
   return { input, output, cacheRead, cacheWrite, cost };
 }
 function legacyAccountingValue(record2) {
-  const accounting3 = accountingValue(record2.accounting);
-  if (record2.accounting !== void 0 && !accounting3) return void 0;
+  const accounting2 = accountingValue(record2.accounting);
+  if (record2.accounting !== void 0 && !accounting2) return void 0;
   const usage = record2.usage;
-  if (usage === void 0) return accounting3;
+  if (usage === void 0) return accounting2;
   const usageRecord = objectValue(usage);
   const tokens = objectValue(usageRecord?.tokens);
   if (!usageRecord || !tokens || !finiteNumber(tokens.input) || !finiteNumber(tokens.output) || !finiteNumber(tokens.cacheRead) || !finiteNumber(tokens.cacheWrite) || !finiteNumber(tokens.total) || !finiteNumber(usageRecord.cost)) return void 0;
-  return accounting3 ?? { input: tokens.input, output: tokens.output, cacheRead: tokens.cacheRead, cacheWrite: tokens.cacheWrite, cost: usageRecord.cost };
+  return accounting2 ?? { input: tokens.input, output: tokens.output, cacheRead: tokens.cacheRead, cacheWrite: tokens.cacheWrite, cost: usageRecord.cost };
 }
 function activityValue(value) {
   const record2 = objectValue(value);
@@ -5255,11 +5629,11 @@ function worktreeValue(value) {
 function progressValue(value) {
   const record2 = objectValue(value);
   if (!record2) return void 0;
-  const accounting3 = accountingValue(record2.accounting);
+  const accounting2 = accountingValue(record2.accounting);
   const toolCalls = toolCallsValue(record2.toolCalls);
-  if (!accounting3 || !toolCalls) return void 0;
-  const activity2 = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
-  if (record2.activity !== void 0 && activity2 === void 0) return void 0;
+  if (!accounting2 || !toolCalls) return void 0;
+  const activity = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
+  if (record2.activity !== void 0 && activity === void 0) return void 0;
   const rawState = record2.state;
   let state;
   if (rawState !== void 0) {
@@ -5273,16 +5647,16 @@ function progressValue(value) {
   }
   const lastEventAt = record2.lastEventAt;
   if (lastEventAt !== void 0 && !nonnegativeInteger(lastEventAt)) return void 0;
-  return { accounting: accounting3, toolCalls, ...state === void 0 ? {} : { state }, ...activity2 === void 0 ? {} : { activity: activity2 }, ...lastEventAt === void 0 ? {} : { lastEventAt } };
+  return { accounting: accounting2, toolCalls, ...state === void 0 ? {} : { state }, ...activity === void 0 ? {} : { activity }, ...lastEventAt === void 0 ? {} : { lastEventAt } };
 }
 function legacyProgressValue(record2) {
-  const accounting3 = legacyAccountingValue(record2);
+  const accounting2 = legacyAccountingValue(record2);
   const toolCalls = record2.toolCalls === void 0 ? [] : toolCallsValue(record2.toolCalls);
-  if (!accounting3 || !toolCalls) return void 0;
-  const activity2 = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
+  if (!accounting2 || !toolCalls) return void 0;
+  const activity = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
   const lastEventAt = record2.lastEventAt;
-  if (record2.activity !== void 0 && activity2 === void 0 || lastEventAt !== void 0 && !nonnegativeInteger(lastEventAt)) return void 0;
-  return { accounting: accounting3, toolCalls, ...activity2 === void 0 ? {} : { activity: activity2 }, ...lastEventAt === void 0 ? {} : { lastEventAt } };
+  if (record2.activity !== void 0 && activity === void 0 || lastEventAt !== void 0 && !nonnegativeInteger(lastEventAt)) return void 0;
+  return { accounting: accounting2, toolCalls, ...activity === void 0 ? {} : { activity }, ...lastEventAt === void 0 ? {} : { lastEventAt } };
 }
 function attemptValue(value) {
   const record2 = objectValue(value);
@@ -5291,16 +5665,16 @@ function attemptValue(value) {
   const hookNames = stringArrayValue(setup?.hookNames);
   const tools = stringArrayValue(setup?.tools);
   const resources = setup?.resourceSelectors === void 0 ? void 0 : resourceSummaryValue(setup.resourceSelectors);
-  const accounting3 = accountingValue(record2?.accounting);
+  const accounting2 = accountingValue(record2?.accounting);
   const session = record2?.session === void 0 ? void 0 : sessionReferenceValue(record2.session);
   const error = record2?.error === void 0 ? void 0 : subagentErrorValue(record2.error);
   const thinking = parseThinking(model?.thinking);
-  if (!record2 || !nonnegativeInteger(record2.attempt) || record2.attempt < 1 || typeof record2.transport !== "string" || !record2.transport.trim() || !setup || typeof setup.cwd !== "string" || !setup.cwd.trim() || !model || typeof model.provider !== "string" || !model.provider.trim() || typeof model.model !== "string" || !model.model.trim() || model.thinking !== void 0 && thinking === void 0 || !hookNames || !tools || setup.resourceSelectors !== void 0 && resources === void 0 || !accounting3 || record2.session !== void 0 && session === void 0 || record2.error !== void 0 && error === void 0) return void 0;
+  if (!record2 || !nonnegativeInteger(record2.attempt) || record2.attempt < 1 || typeof record2.transport !== "string" || !record2.transport.trim() || !setup || typeof setup.cwd !== "string" || !setup.cwd.trim() || !model || typeof model.provider !== "string" || !model.provider.trim() || typeof model.model !== "string" || !model.model.trim() || model.thinking !== void 0 && thinking === void 0 || !hookNames || !tools || setup.resourceSelectors !== void 0 && resources === void 0 || !accounting2 || record2.session !== void 0 && session === void 0 || record2.error !== void 0 && error === void 0) return void 0;
   return {
     attempt: record2.attempt,
     transport: record2.transport,
     setup: { hookNames, model: { provider: model.provider, model: model.model, ...thinking === void 0 ? {} : { thinking } }, tools, cwd: setup.cwd, ...resources === void 0 ? {} : { resourceSelectors: resources } },
-    accounting: accounting3,
+    accounting: accounting2,
     ...session === void 0 ? {} : { session },
     ...error === void 0 ? {} : { error }
   };
@@ -5366,15 +5740,29 @@ var WORKFLOW_TOOL_PARAMETERS = Type3.Object({
 }, { additionalProperties: false });
 var WORKFLOW_STATUS_PARAMETERS = Type3.Object({ runId: Type3.String({ description: "Workflow run ID visible in the current project" }) }, { additionalProperties: false });
 var WORKFLOW_RETRY_PARAMETERS = Type3.Object({ runId: Type3.String({ description: "Explicit failed workflow run ID" }), expectedState: Type3.Optional(Type3.String({ description: "Persisted source state observed before recovery" })), foreground: Type3.Optional(Type3.Boolean({ description: "Override the source launch mode for this recovery" })) });
+var WORKFLOW_ERROR_OUTPUT = Type3.Object({ code: Type3.String(), message: Type3.String() });
+var WORKFLOW_LAUNCH_OUTPUT = Type3.Object({ runId: Type3.String(), state: Type3.String(), detached: Type3.Optional(Type3.Boolean()), value: Type3.Optional(Type3.Unknown()) });
+var WORKFLOW_STATUS_OUTPUT = Type3.Object({ runId: Type3.String(), workflowName: Type3.String(), state: Type3.String(), error: Type3.Optional(WORKFLOW_ERROR_OUTPUT), failedAt: Type3.Optional(Type3.String()), budget: Type3.Optional(Type3.Unknown()), usage: Type3.Optional(Type3.Unknown()), phase: Type3.Optional(Type3.String()), delivery: Type3.Optional(Type3.Object({ mode: Type3.String(), state: Type3.String() })), agents: Type3.Array(Type3.Object({ id: Type3.String(), label: Type3.Optional(Type3.String()), path: Type3.String(), state: Type3.String(), lastEventAt: Type3.Optional(Type3.Number()), accounting: Type3.Optional(Type3.Unknown()) })) });
+var WORKFLOW_STOP_OUTPUT = Type3.Object({ runId: Type3.String(), state: Type3.String(), stopped: Type3.Boolean(), reason: Type3.Optional(Type3.String()) });
+var WORKFLOW_RECOVERY_OUTPUT = Type3.Object({ state: Type3.String(), runId: Type3.Optional(Type3.String()), parentRunId: Type3.Optional(Type3.String()), proposalId: Type3.Optional(Type3.String()), value: Type3.Optional(Type3.Unknown()) });
+var WORKFLOW_RESPOND_OUTPUT = Type3.Object({ state: Type3.String(), approved: Type3.Boolean(), reason: Type3.String(), accepted: Type3.Optional(Type3.Boolean()), runId: Type3.Optional(Type3.String()), value: Type3.Optional(Type3.Unknown()) });
+var WORKFLOW_CATALOG_ALIAS_OUTPUT = Type3.Object({ name: Type3.String(), kind: Type3.String(), provenance: Type3.String(), version: Type3.Optional(Type3.String()), headline: Type3.Optional(Type3.String()) });
+var WORKFLOW_CATALOG_OUTPUT = Type3.Union([
+  Type3.Object({ functions: Type3.Array(Type3.Object({ name: Type3.String(), description: Type3.String(), input: Type3.Unknown() })), modelAliasEntries: Type3.Optional(Type3.Array(WORKFLOW_CATALOG_ALIAS_OUTPUT)), settings: Type3.Optional(Type3.Unknown()) }),
+  Type3.Object({ name: Type3.String(), version: Type3.String(), headline: Type3.String(), description: Type3.String(), input: Type3.Unknown(), output: Type3.Unknown() }),
+  WORKFLOW_CATALOG_ALIAS_OUTPUT,
+  Type3.Object({ error: Type3.Object({ code: Type3.String(), name: Type3.String(), message: Type3.String() }) })
+]);
+var SCRIPT_CALL_TEXT_LIMIT_BYTES = 16 * 1024;
 
 // subagents/src/manager.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { chmod, link as link2, mkdir as mkdir3, open as open2, readFile as readFile4, readdir as readdir3, rename as rename4, rm as rm5, stat as stat3 } from "node:fs/promises";
-import { join as join8 } from "node:path";
-import { getAgentDir as getAgentDir5 } from "@earendil-works/pi-coding-agent";
+import { join as join9 } from "node:path";
+import { getAgentDir as getAgentDir6 } from "@earendil-works/pi-coding-agent";
 
 // subagents/src/worktree.ts
-import { join as join7 } from "node:path";
+import { join as join8 } from "node:path";
 function syntheticRun(context) {
   return {
     id: context.runId,
@@ -5436,7 +5824,7 @@ function createRunStoreWorktreeAdapter(home) {
   };
 }
 function defaultWorktreeHome(storageDirectory3) {
-  return join7(storageDirectory3, ".worktrees");
+  return join8(storageDirectory3, ".worktrees");
 }
 
 // subagents/src/manager.ts
@@ -5489,7 +5877,7 @@ function validateStandaloneExtensionSources(context, external, registry, agentDi
 function executionRoot(context, dependencies, signal, runId, worktree, external) {
   const extensionContext = context.extensionContext;
   const model = rootModel(context);
-  const agentDir = dependencies.agentDir ?? getAgentDir5();
+  const agentDir = dependencies.agentDir ?? getAgentDir6();
   const currentTrustedProject = extensionContext.isProjectTrusted();
   if (external.projectTrusted && !currentTrustedProject) throw new WorkflowError("RESUME_INCOMPATIBLE", "Cannot retry standalone configuration from an untrusted project");
   const trustedProject = currentTrustedProject;
@@ -5569,25 +5957,25 @@ function executionOptions(request, onAttempt, onProgress) {
   };
 }
 function storageDirectory(dependencies) {
-  return dependencies.storageDir ?? join8(dependencies.agentDir ?? getAgentDir5(), STORAGE_DIRECTORY);
+  return dependencies.storageDir ?? join9(dependencies.agentDir ?? getAgentDir6(), STORAGE_DIRECTORY);
 }
 function runDirectory(root, id) {
-  return join8(root, id);
+  return join9(root, id);
 }
 function requestPath(directory) {
-  return join8(directory, "request.json");
+  return join9(directory, "request.json");
 }
 function configurationPath(directory) {
-  return join8(directory, CONFIGURATION_FILE);
+  return join9(directory, CONFIGURATION_FILE);
 }
 function statusPath(directory) {
-  return join8(directory, "status.json");
+  return join9(directory, "status.json");
 }
 function resultPath(directory) {
-  return join8(directory, "result.json");
+  return join9(directory, "result.json");
 }
 function failurePath(directory) {
-  return join8(directory, "failure.json");
+  return join9(directory, "failure.json");
 }
 async function secureDirectory(directory) {
   await mkdir3(directory, { recursive: true, mode: 448 });
@@ -5670,7 +6058,7 @@ async function releaseOwnerMarker(path, token) {
 }
 async function acquireStorageOwner(root, owner, liveness) {
   await secureDirectory(root);
-  const path = join8(root, OWNER_FILE);
+  const path = join9(root, OWNER_FILE);
   for (let attempt = 0; attempt < MAX_STORAGE_OWNER_ATTEMPTS; attempt += 1) {
     const marker = { ...owner, acquiredAt: Date.now() };
     try {
@@ -5757,7 +6145,7 @@ function decodePersistedStandaloneExternalConfiguration(value) {
 function standaloneExternalConfiguration(context, dependencies) {
   const cwd = context.extensionContext.cwd;
   const trustedProject = context.extensionContext.isProjectTrusted();
-  const agentDir = dependencies.agentDir ?? getAgentDir5();
+  const agentDir = dependencies.agentDir ?? getAgentDir6();
   const resolution = resolveWorkflowSettings(cwd, trustedProject, workflowSettingsPath(agentDir));
   const globalExtensionSettings = resolution.global.extensionSettings;
   const projectExtensionSettings = resolution.project.extensionSettings;
@@ -5923,15 +6311,15 @@ function attemptSummaryValue(value) {
   const transport = record2.transport;
   const session = record2.session === void 0 ? void 0 : sessionReferenceValue2(record2.session);
   const setup = setupSummaryValue(record2.setup);
-  const accounting3 = accountingValue(record2.accounting);
+  const accounting2 = accountingValue(record2.accounting);
   const error = record2.error === void 0 ? void 0 : decodeFailure(record2.error);
-  if (typeof attempt !== "number" || !Number.isSafeInteger(attempt) || attempt < 1 || typeof transport !== "string" || !transport.trim() || !setup || !accounting3 || record2.session !== void 0 && !session || record2.error !== void 0 && !error) return void 0;
+  if (typeof attempt !== "number" || !Number.isSafeInteger(attempt) || attempt < 1 || typeof transport !== "string" || !transport.trim() || !setup || !accounting2 || record2.session !== void 0 && !session || record2.error !== void 0 && !error) return void 0;
   return {
     attempt,
     transport: boundedAttemptText(transport),
     ...session === void 0 ? {} : { session },
     ...error === void 0 ? {} : { error: { code: boundedAttemptText(error.code), message: boundedAttemptText(error.message) } },
-    accounting: { ...accounting3 },
+    accounting: { ...accounting2 },
     setup: boundedAttemptSetup(setup)
   };
 }
@@ -5951,8 +6339,8 @@ function isPreparedSession(value) {
   const textFields = ["initialPrompt", "agentDir", "systemPromptPath", "systemPromptAppend", "piRuntimeError"];
   if (textFields.some((field) => record2[field] !== void 0 && typeof record2[field] !== "string")) return false;
   if (record2.systemPrompt !== void 0 && (typeof record2.systemPrompt !== "string" || record2.systemPrompt.length > SUBAGENT_SYSTEM_PROMPT_LIMIT)) return false;
-  const runtime2 = recordValue(record2.piRuntime);
-  if (record2.piRuntime !== void 0 && (!runtime2 || typeof runtime2.executable !== "string" || !runtime2.executable.trim() || runtime2.entrypoint !== void 0 && (typeof runtime2.entrypoint !== "string" || !runtime2.entrypoint.trim()))) return false;
+  const runtime = recordValue(record2.piRuntime);
+  if (record2.piRuntime !== void 0 && (!runtime || typeof runtime.executable !== "string" || !runtime.executable.trim() || runtime.entrypoint !== void 0 && (typeof runtime.entrypoint !== "string" || !runtime.entrypoint.trim()))) return false;
   return true;
 }
 function isLiveSessionHandoff(value) {
@@ -5982,23 +6370,23 @@ function sessionStateValue(value) {
 function progressValue2(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
   const record2 = value;
-  const accounting3 = accountingValue(record2.accounting);
+  const accounting2 = accountingValue(record2.accounting);
   const toolCalls = toolCallsValue2(record2.toolCalls);
   const state = record2.state === void 0 ? void 0 : sessionStateValue(record2.state);
-  if (!accounting3 || !toolCalls || record2.state !== void 0 && state === void 0) return void 0;
-  const activity2 = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
-  if (record2.activity !== void 0 && activity2 === void 0) return void 0;
+  if (!accounting2 || !toolCalls || record2.state !== void 0 && state === void 0) return void 0;
+  const activity = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
+  if (record2.activity !== void 0 && activity === void 0) return void 0;
   if (record2.lastEventAt !== void 0 && (!Number.isSafeInteger(record2.lastEventAt) || record2.lastEventAt < 0)) return void 0;
-  return { accounting: accounting3, toolCalls, ...state === void 0 ? {} : { state }, ...activity2 === void 0 ? {} : { activity: activity2 }, ...record2.lastEventAt === void 0 ? {} : { lastEventAt: record2.lastEventAt } };
+  return { accounting: accounting2, toolCalls, ...state === void 0 ? {} : { state }, ...activity === void 0 ? {} : { activity }, ...record2.lastEventAt === void 0 ? {} : { lastEventAt: record2.lastEventAt } };
 }
 function legacyProgressValue2(record2) {
-  const accounting3 = legacyAccountingValue(record2);
+  const accounting2 = legacyAccountingValue(record2);
   const toolCalls = record2.toolCalls === void 0 ? [] : toolCallsValue2(record2.toolCalls);
-  if (!accounting3 || !toolCalls) return void 0;
-  const activity2 = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
-  if (record2.activity !== void 0 && activity2 === void 0) return void 0;
+  if (!accounting2 || !toolCalls) return void 0;
+  const activity = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
+  if (record2.activity !== void 0 && activity === void 0) return void 0;
   if (record2.lastEventAt !== void 0 && (!Number.isSafeInteger(record2.lastEventAt) || record2.lastEventAt < 0)) return void 0;
-  return { accounting: accounting3, toolCalls, ...activity2 === void 0 ? {} : { activity: activity2 }, ...record2.lastEventAt === void 0 ? {} : { lastEventAt: record2.lastEventAt } };
+  return { accounting: accounting2, toolCalls, ...activity === void 0 ? {} : { activity }, ...record2.lastEventAt === void 0 ? {} : { lastEventAt: record2.lastEventAt } };
 }
 function worktreeContextValue(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
@@ -6310,7 +6698,7 @@ var PersistentSubagentManager = class {
     if (!sessionId.trim()) throw new WorkflowError("INTERNAL_ERROR", "Current Pi session identity is unavailable");
     const owner = this.runOwner;
     if (!owner) throw new WorkflowError("INTERNAL_ERROR", "Subagent storage owner identity is unavailable");
-    const settings = resolveWorkflowSettings(context.extensionContext.cwd, context.extensionContext.isProjectTrusted(), workflowSettingsPath(this.dependencies.agentDir ?? getAgentDir5()));
+    const settings = resolveWorkflowSettings(context.extensionContext.cwd, context.extensionContext.isProjectTrusted(), workflowSettingsPath(this.dependencies.agentDir ?? getAgentDir6()));
     const concurrency = settings.effective.concurrency;
     if (this.activeRunCount >= concurrency) throw new WorkflowError("AGENT_FAILED", `Subagent concurrency limit reached (${String(this.activeRunCount)}/${String(concurrency)} active runs); no queue is maintained. Retry after an active run settles.`);
     this.activeRunCount += 1;
@@ -6326,8 +6714,8 @@ var PersistentSubagentManager = class {
     }
     const current = {};
     let resolveTerminal;
-    const terminal = new Promise((resolve5) => {
-      resolveTerminal = resolve5;
+    const terminal = new Promise((resolve6) => {
+      resolveTerminal = resolve6;
     });
     const executorOwnership = { default: true };
     const execution = Promise.resolve().then(async () => {
@@ -6441,8 +6829,9 @@ var PersistentSubagentManager = class {
     if (request.id !== void 0) {
       const id = checkedId({ id: request.id });
       const active = this.activeRuns.get(id);
-      const status = active ? persistedStatus(active) : this.terminalSummaries.get(id) ?? await loadPersistedStatus(storageDirectory(this.dependencies), id);
-      const inspection = publicStatus(status, context.includeAttemptMetadata === true);
+      const includeActivity = context.includeActivity === true;
+      const status = active ? includeActivity ? liveStatus(active) : persistedStatus(active) : this.terminalSummaries.get(id) ?? await loadPersistedStatus(storageDirectory(this.dependencies), id);
+      const inspection = publicStatus(status, context.includeAttemptMetadata === true, includeActivity);
       if (status.state === "completed") return { ...inspection, value: await loadPersistedResult(storageDirectory(this.dependencies), id) };
       if (status.state === "failed") {
         const failure = status.error ?? await loadPersistedFailure(storageDirectory(this.dependencies), id);
@@ -6450,9 +6839,9 @@ var PersistentSubagentManager = class {
       }
       return inspection;
     }
-    return this.inspectList();
+    return this.inspectList(request.scope === "all" ? void 0 : context.extensionContext.sessionManager.getSessionId());
   }
-  async inspectList() {
+  async inspectList(sessionId) {
     const root = storageDirectory(this.dependencies);
     await secureDirectory(root);
     const entries = await readdir3(root, { withFileTypes: true });
@@ -6463,7 +6852,7 @@ var PersistentSubagentManager = class {
       try {
         const active = this.activeRuns.get(entry.name);
         const status = publicStatus(active ? persistedStatus(active) : this.terminalSummaries.get(entry.name) ?? await loadPersistedStatus(root, entry.name, false));
-        if (status.startedAt === void 0) continue;
+        if (status.startedAt === void 0 || sessionId !== void 0 && status.sessionId !== sessionId) continue;
         statuses.push({ status, startedAt: status.startedAt });
       } catch (error) {
         if (error instanceof WorkflowError && (error.code === "RUN_NOT_FOUND" || error instanceof InvalidPersistedSubagentStatusError)) continue;
@@ -6493,6 +6882,18 @@ var PersistentSubagentManager = class {
     await this.stopRun(run, false);
     return publicStatus(persistedStatus(run));
   }
+  /** Removes a settled record for the /subagents navigator, as /workflow deletes a terminal run; not a model tool. */
+  async delete(request) {
+    const id = checkedId(request);
+    await this.ensureInitialized();
+    const root = storageDirectory(this.dependencies);
+    const status = this.activeRuns.has(id) ? void 0 : this.terminalSummaries.get(id) ?? await loadPersistedStatus(root, id, false);
+    if (status === void 0 || status.state === "running") throw new WorkflowError("RUN_OWNED", `Stop subagent ${id} before deleting it`);
+    if (status.worktree !== void 0) throw new WorkflowError("WORKTREE_FAILED", `Subagent ${id} still has a worktree to clean up`);
+    await rm5(runDirectory(root, id), { recursive: true, force: true });
+    this.terminalSummaries.delete(id);
+    return { id, deleted: true };
+  }
   async dispose() {
     if (this.disposePromise) return this.disposePromise;
     this.disposePromise = (async () => {
@@ -6589,8 +6990,8 @@ var PersistentSubagentManager = class {
     if (!run || !this.canSteer(run)) return;
     if (run.activeAttempt !== void 0 && run.finalizedAttemptAccounting.has(run.activeAttempt)) return;
     const snapshot = portableProgress(progress, true);
-    const accounting3 = addAccounting(sumAccounting(run.finalizedAttemptAccounting.values()), progress.accounting);
-    run.progress = { ...snapshot, accounting: accounting3 };
+    const accounting2 = addAccounting(sumAccounting(run.finalizedAttemptAccounting.values()), progress.accounting);
+    run.progress = { ...snapshot, accounting: accounting2 };
     emitUpdate(run);
     if (!progress.persist) return;
     await enqueueWrite(run, () => atomicJson(statusPath(run.directory), persistedStatus(run)));
@@ -6605,10 +7006,10 @@ var PersistentSubagentManager = class {
       run.attemptDetails = [...run.attemptDetails ?? [], summary].slice(-SUBAGENT_ATTEMPT_DETAILS_LIMIT);
     }
     if (!finalized) return;
-    const accounting3 = summary?.accounting ?? accountingValue(record2?.accounting);
-    if (attempt === void 0 || accounting3 === void 0) return;
+    const accounting2 = summary?.accounting ?? accountingValue(record2?.accounting);
+    if (attempt === void 0 || accounting2 === void 0) return;
     if (run.finalizedAttemptAccounting.size >= MAX_PERSISTED_ATTEMPT_ARRAY_ITEMS && !run.finalizedAttemptAccounting.has(attempt)) return;
-    run.finalizedAttemptAccounting.set(attempt, accounting3);
+    run.finalizedAttemptAccounting.set(attempt, accounting2);
     const cumulative = sumAccounting(run.finalizedAttemptAccounting.values());
     run.progress = run.progress === void 0 ? { accounting: cumulative, toolCalls: [] } : { ...run.progress, accounting: cumulative };
   }
@@ -6663,8 +7064,8 @@ var PersistentSubagentManager = class {
       run.disposed = true;
       this.clearSteering(run);
       await this.cleanupSessions(run, true);
-      const worktreeCleaned = await this.cleanupWorktree(run);
-      if (worktreeCleaned) await enqueueWrite(run, () => atomicJson(statusPath(run.directory), persistedStatus(run)));
+      await this.cleanupWorktree(run);
+      await enqueueWrite(run, () => atomicJson(statusPath(run.directory), persistedStatus(run)));
       this.resolveTerminal(run);
       this.removeLiveRun(run);
     }
@@ -6867,23 +7268,23 @@ function createSubagentManager(dependencies = {}) {
   return {
     run: (request, context) => manager.run(request, context),
     inspect: (request, context) => manager.inspect(request, context),
-    getAttemptActionData: (id) => manager.getAttemptActionData?.(id),
-    steer: (request, context) => manager.steer(request, context),
-    stop: (request, context) => manager.stop(request, context),
+    getAttemptActionData: (id) => manager.getAttemptActionData(id),
+    steer: (request) => manager.steer(request),
+    stop: (request) => manager.stop(request),
     retry: (request, context) => manager.retry(request, context),
+    delete: (request) => manager.delete(request),
     dispose: async () => {
-      await manager.dispose?.();
+      await manager.dispose();
     }
   };
 }
 
 // subagents/src/navigator.ts
 import { readFile as readFile5 } from "node:fs/promises";
-import { join as join9 } from "node:path";
-import { copyToClipboard as copyToClipboard2, getAgentDir as getAgentDir6, SettingsManager as SettingsManager4 } from "@earendil-works/pi-coding-agent";
+import { join as join10 } from "node:path";
+import { copyToClipboard as copyToClipboard2, getAgentDir as getAgentDir7, SettingsManager as SettingsManager4 } from "@earendil-works/pi-coding-agent";
 import { Editor, truncateToWidth as truncateToWidth3 } from "@earendil-works/pi-tui";
 var MAX_DETAIL_TEXT = 4e3;
-var MAX_DETAIL_TOOL_CALLS = 32;
 function objectValue2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
@@ -6899,12 +7300,12 @@ function inspectionValue(value) {
   return record2 && status ? { status, record: record2 } : void 0;
 }
 function managerContext(context, waitForForeground = true, includeAttemptMetadata = false) {
-  return { toolCallId: "subagents-command", signal: void 0, onUpdate: void 0, ...waitForForeground ? {} : { waitForForeground: false }, ...includeAttemptMetadata ? { includeAttemptMetadata: true } : {}, extensionContext: context };
+  return { toolCallId: "subagents-command", signal: void 0, onUpdate: void 0, ...waitForForeground ? {} : { waitForForeground: false }, ...includeAttemptMetadata ? { includeAttemptMetadata: true, includeActivity: true } : {}, extensionContext: context };
 }
 async function loadRequest(storageDirectory3, id) {
   if (!safeRunId(id)) return {};
   try {
-    const value = JSON.parse(await readFile5(join9(storageDirectory3, id, "request.json"), "utf8"));
+    const value = JSON.parse(await readFile5(join10(storageDirectory3, id, "request.json"), "utf8"));
     return { request: normalizeSubagentRunRequest(value) };
   } catch (error) {
     if (isFileNotFound(error)) return {};
@@ -6937,9 +7338,6 @@ async function inspectEntry(manager, storageDirectory3, entry, context) {
     entry: { status: inspected.status, ...request.request === void 0 ? {} : { request: request.request }, ...request.error === void 0 ? {} : { requestError: request.error } }
   };
 }
-function requestLabel(request) {
-  return request?.label?.trim() || "none";
-}
 function requestRole(request) {
   const role = request?.role;
   if (typeof role === "string" && role.trim()) return role.trim();
@@ -6949,13 +7347,31 @@ function requestRole(request) {
 function shortId(id) {
   return id.length > 12 ? id.slice(0, 8) : id;
 }
-function pickerLabel(entry, index) {
-  return `${String(index + 1)}. label=${boundedText(requestLabel(entry.request), 256)} role=${boundedText(requestRole(entry.request), 256)} [${entry.status.state}] ${shortId(entry.status.id)}`;
+function entryName(entry) {
+  const role = requestRole(entry.request);
+  return boundedText(entry.request?.label?.trim() || (role === "none" ? shortId(entry.status.id) : role), 256);
+}
+function listNames(entries) {
+  const names = entries.map(entryName);
+  return entries.map(({ status }, index) => {
+    const name = names[index] ?? "";
+    return names.indexOf(name) === names.lastIndexOf(name) ? name : `${name} ${shortId(status.id)}`;
+  });
+}
+function pickerLabels(entries) {
+  const names = listNames(entries);
+  return entries.map(({ status }, index) => {
+    const name = names[index] ?? "";
+    const model = status.progress?.state?.model;
+    const cost = formatCost(status.progress?.accounting.cost);
+    const runtime = status.startedAt === void 0 ? "" : ` runtime=${formatWorkflowRuntime((status.finishedAt ?? Date.now()) - status.startedAt)}`;
+    return `${runStateGlyph(status.state, "\u2826")} ${name}  ${status.state}${model ? `  ${boundedText(model.model, 256)}${model.thinking ? `:${model.thinking}` : ""}` : ""}${cost ? ` ${cost}` : ""}${runtime}`;
+  });
 }
 function boundedText(value, limit = MAX_DETAIL_TEXT) {
   const text = typeof value === "string" ? value : (() => {
     try {
-      const serialized = JSON.stringify(value);
+      const serialized = JSON.stringify(value, null, 2);
       return typeof serialized === "string" ? serialized : String(value);
     } catch {
       return String(value);
@@ -6963,13 +7379,6 @@ function boundedText(value, limit = MAX_DETAIL_TEXT) {
   })();
   return text.length > limit ? `${text.slice(0, limit)}\u2026` : text;
 }
-function timestamp(value) {
-  return typeof value === "number" && Number.isFinite(value) ? new Date(value).toISOString() : void 0;
-}
-function appendValue(lines, title, value) {
-  lines.push(`${title}:`);
-  for (const line of boundedText(value).split("\n")) lines.push(`  ${line}`);
-}
 function latestAttempt(status) {
   return [...status.attemptDetails ?? []].sort((left, right) => right.attempt - left.attempt)[0];
 }
@@ -6980,17 +7389,17 @@ function detailPresentation(inspection) {
   const { status, request } = inspection.entry;
   const attempt = latestAttempt(status);
   const state = status.progress?.state;
-  const activity2 = status.progress?.activity;
+  const activity = status.progress?.activity;
   const model = state?.model ?? attempt?.setup.model;
   const tools = state?.tools ?? attempt?.setup.tools;
   const lastEventAt = status.progress?.lastEventAt;
   const attempts = status.attempts ?? attempt?.attempt;
-  const accounting3 = usageAccounting(status);
+  const accounting2 = usageAccounting(status);
   const role = requestRole(request);
   const error = status.error ?? attempt?.error;
   return {
     state: status.state,
-    ...activity2 === void 0 ? {} : { activity: { kind: activity2.kind, text: boundedText(activity2.text) } },
+    ...activity === void 0 ? {} : { activity: { kind: activity.kind, text: boundedText(activity.text) } },
     ...lastEventAt === void 0 ? {} : { lastEventAt },
     ...model === void 0 ? {} : { model: { provider: boundedText(model.provider, 256), model: boundedText(model.model, 256), ...model.thinking === void 0 ? {} : { thinking: model.thinking } } },
     ...role === "none" ? {} : { role: boundedText(role, 256) },
@@ -6998,33 +7407,34 @@ function detailPresentation(inspection) {
     ...attempts === void 0 ? {} : { attempts },
     ...status.startedAt === void 0 ? {} : { startedAt: status.startedAt },
     ...status.finishedAt === void 0 ? {} : { finishedAt: status.finishedAt },
-    ...accounting3 === void 0 ? {} : { accounting: accounting3 },
+    ...accounting2 === void 0 ? {} : { accounting: accounting2 },
     ...error === void 0 ? {} : { error: { code: boundedText(error.code, 256), message: boundedText(error.message) } }
   };
 }
-function detailLines(inspection, theme) {
-  const { entry, record: record2 } = inspection;
-  const { status, request } = entry;
-  const styles = theme === void 0 ? void 0 : themeWorkflowProgressStyles(theme);
-  const lines = [
-    theme?.bold(theme.fg("accent", `Subagent ${boundedText(status.id, 256)}`)) ?? `Subagent ${boundedText(status.id, 256)}`,
-    `label=${boundedText(requestLabel(request), 256)} role=${boundedText(requestRole(request), 256)}`,
-    ...formatAgentDetail(detailPresentation(inspection), styles, status.finishedAt ?? Date.now())
+function detailRows(inspection, styles, menu) {
+  const { entry } = inspection;
+  const presentation = detailPresentation(inspection);
+  return [
+    styles.bold(`Selected subagent: ${entryName(entry)}`),
+    `ID: ${boundedText(entry.status.id, 256)}`,
+    ...formatAgentDetail(presentation, styles, entry.status.finishedAt ?? Date.now(), { includeError: false }),
+    ...entry.requestError === void 0 ? [] : [styles.warning(`Request unavailable: ${boundedText(entry.requestError)}`)],
+    ...menu === "hint" ? [styles.muted("enter agent actions")] : [],
+    ...presentation.error === void 0 ? [] : [formatAgentError(presentation.error, styles)],
+    ...typeof menu === "object" ? [styles.bold("Agent actions"), ...menu.options.map((option, index) => index === menu.index ? `\u2192 ${styles.accent(option)}` : `  ${option}`)] : []
   ];
-  const startedAt = timestamp(status.startedAt);
-  const finishedAt = timestamp(status.finishedAt);
-  if (startedAt) lines.push(`startedAt=${startedAt}`);
-  if (finishedAt) lines.push(`finishedAt=${finishedAt}`);
-  if (request?.prompt) appendValue(lines, "prompt", request.prompt);
-  if (entry.requestError) lines.push(`request=unavailable: ${boundedText(entry.requestError)}`);
-  if (status.worktree) lines.push(`worktree=${boundedText(status.worktree.path)} branch=${boundedText(status.worktree.branch)}`);
-  const toolCalls = status.progress?.toolCalls;
-  if (toolCalls?.length) {
-    lines.push(`toolCalls=${String(toolCalls.length)}`);
-    for (const call of toolCalls.slice(-MAX_DETAIL_TOOL_CALLS)) lines.push(`  ${boundedText(call.name, 256)} [${call.state}]`);
-  }
-  if (Object.prototype.hasOwnProperty.call(record2, "value")) appendValue(lines, "value", record2.value);
-  return lines;
+}
+function listRows(entries, selectedId, styles) {
+  const names = listNames(entries);
+  return [styles.bold("Runs"), ...entries.map((entry, index) => `${entry.status.id === selectedId ? "\u2192" : " "} \u2022 ${names[index] ?? ""} \xB7 ${progressStyleForState(entry.status.state, styles)(runStateGlyph(entry.status.state, "\u2826"))}`)];
+}
+function headerRows(entries, styles) {
+  const counts = ["running", "failed", "stopped", "completed"].flatMap((state) => {
+    const count = entries.filter((entry) => entry.status.state === state).length;
+    return count ? [`${String(count)} ${state}`] : [];
+  });
+  const cost = formatCost(entries.reduce((sum, entry) => sum + (entry.status.progress?.accounting.cost ?? 0), 0));
+  return [styles.bold(styles.accent("Subagents")), [...counts, ...cost ? [cost] : []].join(" \xB7 ")];
 }
 function tuiRows(tui) {
   return typeof tui.terminal?.rows === "number" && Number.isFinite(tui.terminal.rows) ? tui.terminal.rows : 24;
@@ -7034,6 +7444,7 @@ function unrefTimer(timer) {
   if (typeof value !== "object" || value === null || !("unref" in value) || typeof value.unref !== "function") return;
   Reflect.apply(value.unref, value, []);
 }
+var DASHBOARD_FOOTER_ROWS = 2;
 function standaloneActionContext(manager, inspection, context) {
   const status = inspection.entry.status;
   const request = inspection.entry.request;
@@ -7070,11 +7481,16 @@ function standaloneActionContext(manager, inspection, context) {
 function liveSystemPrompt(manager, status) {
   return manager.getAttemptActionData?.(status.id)?.prepared?.systemPrompt;
 }
-function actionOptions(manager, inspection, context) {
+var BULK_DELETE = { "Delete all completed": "completed", "Delete all failed": "failed" };
+function bulkDeleteLabels(manager, entries) {
+  if (manager.delete === void 0) return [];
+  return Object.entries(BULK_DELETE).filter(([, state]) => entries.some((entry) => entry.status.state === state)).map(([label2]) => label2);
+}
+function actionOptions(manager, inspection, context, bulk = []) {
   const actionContext = standaloneActionContext(manager, inspection, context);
   const extensionLabels = actionContext === void 0 ? [] : visibleStandaloneAgentAttemptActions(loadingRegistry().agentAttemptActions(), actionContext).map(([, action]) => action.label);
   const value = inspection.record.value;
-  return agentActionLabels({
+  const labels = agentActionLabels({
     extensionLabels,
     hasWorktree: inspection.entry.status.worktree !== void 0,
     openPrompt: context.mode === "tui" && inspection.entry.request?.prompt !== void 0,
@@ -7082,13 +7498,33 @@ function actionOptions(manager, inspection, context) {
     openResult: context.mode === "tui" && Object.prototype.hasOwnProperty.call(inspection.record, "value") && jsonValue(value),
     standaloneState: inspection.entry.status.state
   });
+  const runActions = [...manager.delete !== void 0 && inspection.entry.status.state !== "running" ? ["Delete"] : [], ...bulk, ...context.mode === "tui" ? ["Copy run path"] : []];
+  labels.splice(labels.indexOf("Copy agent ID"), 0, ...runActions);
+  return labels;
+}
+async function deleteAll(manager, storageDirectory3, context, state, confirm) {
+  if (!await confirm(`Delete ${state} runs?`, `Delete all ${state} subagent runs and their records? This cannot be undone.`)) return false;
+  const skipped = [];
+  let deleted = 0;
+  for (const entry of await loadEntries(manager, storageDirectory3, context)) {
+    if (entry.status.state !== state) continue;
+    try {
+      await manager.delete?.({ id: entry.status.id }, managerContext(context));
+      deleted += 1;
+    } catch (error) {
+      skipped.push(`${entry.status.id} (${errorText(error)})`);
+    }
+  }
+  if (skipped.length) context.ui.notify(`Skipped ${state} runs: ${skipped.join(", ")}.`, "warning");
+  if (deleted) context.ui.notify(`Deleted ${String(deleted)} ${state} subagent run(s).`, "info");
+  return true;
 }
 function retryResult(value) {
   const record2 = objectValue2(value);
   return record2 && typeof record2.id === "string" && record2.id.trim() && record2.state === "running" ? { id: record2.id, state: "running" } : void 0;
 }
 async function openNavigatorArtifact(context, tui, artifact, label2) {
-  const command = SettingsManager4.create(context.cwd, getAgentDir6(), { projectTrusted: context.isProjectTrusted() }).getExternalEditorCommand();
+  const command = SettingsManager4.create(context.cwd, getAgentDir7(), { projectTrusted: context.isProjectTrusted() }).getExternalEditorCommand();
   if (!command) {
     context.ui.notify(`Cannot open ${label2}: no external editor is configured.`, "warning");
     return;
@@ -7102,7 +7538,7 @@ async function steerSubagent(manager, storageDirectory3, entry, context, message
   await manager.steer({ id: entry.status.id, message }, managerContext(context));
   context.ui.notify(`Steered subagent ${entry.status.id}.`, "info");
 }
-async function performAction(manager, storageDirectory3, entry, action, context, tui, clipboard) {
+async function performAction(manager, storageDirectory3, entry, action, context, tui, clipboard, confirm) {
   const fresh = await inspectEntry(manager, storageDirectory3, entry, context);
   const available = actionOptions(manager, fresh, context);
   if (!available.includes(action)) throw new Error(`Action ${action} is no longer available`);
@@ -7116,40 +7552,52 @@ async function performAction(manager, storageDirectory3, entry, action, context,
   if (action === "Copy agent ID") {
     await clipboard(fresh.entry.status.id);
     context.ui.notify("Copied agent ID.", "info");
-    return "stay";
+    return "unchanged";
+  }
+  if (action === "Copy run path") {
+    await clipboard(join10(storageDirectory3, fresh.entry.status.id));
+    context.ui.notify("Copied run path.", "info");
+    return "unchanged";
+  }
+  if (action === "Delete" && manager.delete !== void 0) {
+    if (!await confirm("Delete subagent?", `Delete ${entryName(fresh.entry)} (${fresh.entry.status.id}) and its record? This cannot be undone.`)) return "unchanged";
+    await manager.delete({ id: fresh.entry.status.id }, managerContext(context));
+    context.ui.notify(`Deleted subagent ${fresh.entry.status.id}.`, "info");
+    return "deleted";
   }
   if (action === "Copy branch" && fresh.entry.status.worktree) {
     await clipboard(fresh.entry.status.worktree.branch);
     context.ui.notify("Copied branch.", "info");
-    return "stay";
+    return "unchanged";
   }
   if (action === "Copy worktree path" && fresh.entry.status.worktree) {
     await clipboard(fresh.entry.status.worktree.path);
     context.ui.notify("Copied worktree path.", "info");
-    return "stay";
+    return "unchanged";
   }
   if (action === "Open prompt in editor" && tui && fresh.entry.request?.prompt !== void 0) {
     await openNavigatorArtifact(context, tui, workflowPromptArtifact(fresh.entry.request.prompt), "agent prompt");
-    return "stay";
+    return "unchanged";
   }
   if (action === "Open system prompt in editor" && tui) {
     const systemPrompt = liveSystemPrompt(manager, fresh.entry.status);
     if (systemPrompt !== void 0) {
       await openNavigatorArtifact(context, tui, workflowPromptArtifact(systemPrompt), "agent system prompt");
-      return "stay";
+      return "unchanged";
     }
   }
   if (action === "Open result in editor" && tui && Object.prototype.hasOwnProperty.call(fresh.record, "value") && jsonValue(fresh.record.value)) {
     await openNavigatorArtifact(context, tui, workflowResultArtifact(fresh.record.value), "agent result");
-    return "stay";
+    return "unchanged";
   }
   if (action === "Steer") {
     const message = await context.ui.input("Steer subagent", "Message for the running subagent");
-    if (message === void 0) return "stay";
+    if (message === void 0) return "unchanged";
     await steerSubagent(manager, storageDirectory3, entry, context, message);
     return "stay";
   }
   if (action === "Stop") {
+    if (!await confirm("Stop subagent?", `Stop subagent ${entryName(fresh.entry)} (${fresh.entry.status.id})? This cannot be undone.`)) return "unchanged";
     const current = await inspectEntry(manager, storageDirectory3, entry, context);
     if (current.entry.status.state !== "running") throw new Error(`Subagent ${entry.status.id} is no longer running`);
     await manager.stop({ id: entry.status.id }, managerContext(context));
@@ -7162,31 +7610,36 @@ async function performAction(manager, storageDirectory3, entry, action, context,
     const result = retryResult(await manager.retry({ id: entry.status.id }, managerContext(context, false)));
     if (!result) throw new Error("Retry returned an invalid subagent result");
     context.ui.notify(`Retried subagent ${entry.status.id} as ${result.id}.`, "info");
-    return "retry";
+    return { retryId: result.id };
   }
   return "stay";
 }
 async function showDetail(manager, storageDirectory3, entry, context, clipboard) {
   let inspection = await inspectEntry(manager, storageDirectory3, entry, context);
-  if (context.mode !== "tui") {
-    for (; ; ) {
-      const action = await context.ui.select(detailLines(inspection).join("\n"), actionOptions(manager, inspection, context));
-      if (!action || action === "Back") return;
-      try {
-        if (await performAction(manager, storageDirectory3, entry, action, context, void 0, clipboard) === "retry") return;
-        inspection = await inspectEntry(manager, storageDirectory3, entry, context);
-      } catch (error) {
-        context.ui.notify(`Cannot ${action.toLowerCase()}: ${errorText(error)}`, "warning");
-      }
+  for (; ; ) {
+    const action = await context.ui.select(detailRows(inspection, PLAIN_WORKFLOW_PROGRESS_STYLES).join("\n"), actionOptions(manager, inspection, context));
+    if (!action || action === "Back") return;
+    try {
+      const outcome = await performAction(manager, storageDirectory3, entry, action, context, void 0, clipboard, (title, message) => context.ui.confirm(title, message));
+      if (outcome === "deleted" || typeof outcome === "object") return;
+      inspection = await inspectEntry(manager, storageDirectory3, entry, context);
+    } catch (error) {
+      context.ui.notify(`Cannot ${action.toLowerCase()}: ${errorText(error)}`, "warning");
     }
   }
+}
+async function showDashboard(manager, storageDirectory3, initial, context, clipboard) {
+  const first = initial[0];
+  if (first === void 0) return;
+  let initialInspection;
+  try {
+    initialInspection = await inspectEntry(manager, storageDirectory3, first, context);
+  } catch (error) {
+    context.ui.notify(`Cannot inspect subagent ${first.status.id}: ${errorText(error)}`, "warning");
+    initialInspection = { entry: first, record: {} };
+  }
   const result = await context.ui.custom((tui, theme, keybindings, done) => {
-    let offset = 0;
-    let actionMode = false;
-    let actionIndex = 0;
-    let actionRunning = false;
-    let disposed = false;
-    let steerMode = false;
+    const styles = themeWorkflowProgressStyles(theme);
     const editorTheme = {
       borderColor: (text) => theme.fg("accent", text),
       selectList: {
@@ -7198,226 +7651,273 @@ async function showDetail(manager, storageDirectory3, entry, context, clipboard)
       }
     };
     const steerEditor = new Editor(tui, editorTheme);
-    let refreshTimer;
+    let entries = initial;
+    let inspection = initialInspection;
+    let offset = 0;
+    let detailsMode = false;
+    let actionMode = false;
+    let actionIndex = 0;
+    let steerMode = false;
+    const inlineConfirm = createInlineConfirm(() => {
+      if (!disposed) tui.requestRender();
+    });
+    const confirmInline = (title, message) => inlineConfirm.ask(title, message);
+    let actionRunning = false;
     let refreshing = false;
-    let refreshGeneration = 0;
+    let disposed = false;
+    let generation = 0;
+    let renderedWidth = 80;
+    let selectionNeedsScroll = true;
+    let timer;
+    const keyLabel = (binding, fallback) => workflowKeyLabel(keybindings, binding, fallback);
+    const matches = (data, binding) => workflowKeyMatches(keybindings, data, binding);
     const requestRender = () => {
       if (!disposed) tui.requestRender();
     };
-    const stopRefresh = () => {
-      if (refreshTimer !== void 0) {
-        clearInterval(refreshTimer);
-        refreshTimer = void 0;
+    const options = () => actionOptions(manager, inspection, context, bulkDeleteLabels(manager, entries));
+    const warn = (message) => {
+      if (disposed) return;
+      try {
+        context.ui.notify(message, "warning");
+      } catch {
       }
-      refreshGeneration += 1;
     };
-    const buildActionRows = (detail, options) => [
-      ...detail,
-      "",
-      theme.bold("Agent actions"),
-      ...options.map((option, index) => `${index === actionIndex ? "\u2192 " : "  "}${index === actionIndex ? theme.fg("accent", option) : option}`)
-    ];
-    const viewportRows = () => Math.max(1, tuiRows(tui) - 1);
-    const maxOffsetFor = (rows) => Math.max(0, rows.length - viewportRows());
-    const clampOffset = (rows) => {
-      offset = Math.max(0, Math.min(maxOffsetFor(rows), offset));
+    const stopTimer = () => {
+      if (timer === void 0) return;
+      clearInterval(timer);
+      timer = void 0;
     };
-    const actionView = () => {
-      const detail = detailLines(inspection, theme);
-      const options = actionOptions(manager, inspection, context);
-      return { detail, options, rows: buildActionRows(detail, options) };
+    const syncTimer = () => {
+      if (!entries.some((entry) => entry.status.state === "running") && inspection.entry.status.state !== "running") stopTimer();
+      else if (timer === void 0 && !disposed) {
+        timer = setInterval(() => {
+          if (timer !== void 0) void refresh();
+        }, 1e3);
+        unrefTimer(timer);
+      }
     };
-    const scrollActionIntoView = (view = actionView()) => {
-      const { options, rows } = view;
-      if (actionIndex >= options.length) {
-        clampOffset(rows);
-        return;
+    const apply = (nextEntries, next) => {
+      const selectedAction = actionMode ? options()[actionIndex] : void 0;
+      const position = (list) => list.findIndex((entry) => entry.status.id === next.entry.status.id);
+      if (position(entries) !== position(nextEntries)) selectionNeedsScroll = true;
+      entries = nextEntries;
+      inspection = next;
+      if (selectedAction !== void 0) {
+        const nextOptions = options();
+        const kept = nextOptions.indexOf(selectedAction);
+        actionIndex = kept >= 0 ? kept : Math.min(actionIndex, Math.max(0, nextOptions.length - 1));
       }
-      const viewport = viewportRows();
-      const actionRow = rows.length - options.length + actionIndex;
-      if (actionRow < offset) offset = actionRow;
-      else if (actionRow >= offset + viewport) offset = actionRow - viewport + 1;
-      clampOffset(rows);
+      syncTimer();
+      requestRender();
     };
-    const reportRefreshError = (error) => {
-      if (disposed) return;
+    const reload = async (id = inspection.entry.status.id) => {
+      const current = ++generation;
+      const nextEntries = await loadEntries(manager, storageDirectory3, context);
+      if (current !== generation) return;
+      const selected = nextEntries.find((entry) => entry.status.id === id) ?? nextEntries[0];
+      if (selected === void 0) {
+        context.ui.notify("No durable subagent runs in this session.", "info");
+        close(void 0);
+        return;
+      }
+      let next;
       try {
-        context.ui.notify(`Cannot refresh subagent ${entry.status.id}: ${errorText(error)}`, "warning");
-      } catch {
+        next = await inspectEntry(manager, storageDirectory3, selected, context);
+      } catch (error) {
+        if (current === generation) apply(nextEntries, { entry: selected, record: {} });
+        throw error;
       }
+      if (current === generation) apply(nextEntries, next);
     };
-    const refreshInspection = async () => {
-      if (disposed || actionRunning || refreshing || inspection.entry.status.state !== "running") return;
+    const refresh = async () => {
+      if (disposed || actionRunning || refreshing) return;
       refreshing = true;
-      const generation = ++refreshGeneration;
-      const actionIndexBeforeRefresh = actionIndex;
-      const viewBeforeRefresh = actionMode ? actionView() : void 0;
-      const actionRowBeforeRefresh = viewBeforeRefresh === void 0 ? -1 : viewBeforeRefresh.rows.length - viewBeforeRefresh.options.length + actionIndex;
-      const wasVisible = actionRowBeforeRefresh >= offset && actionRowBeforeRefresh < offset + viewportRows();
+      const current = generation;
+      const selectedId = inspection.entry.status.id;
       try {
-        const next = await inspectEntry(manager, storageDirectory3, entry, context);
-        if (generation !== refreshGeneration) return;
-        inspection = next;
-        if (inspection.entry.status.state !== "running") stopRefresh();
-        if (actionMode) {
-          const options = actionOptions(manager, inspection, context);
-          actionIndex = Math.min(actionIndex, Math.max(0, options.length - 1));
-          const view = actionView();
-          if (wasVisible || actionIndex !== actionIndexBeforeRefresh) scrollActionIntoView(view);
-          else clampOffset(view.rows);
-        }
-        requestRender();
-      } catch (error) {
-        if (generation === refreshGeneration) reportRefreshError(error);
+        const stale = entries.filter((entry) => entry.status.state === "running" || entry.status.id === selectedId);
+        const results = await Promise.allSettled(stale.map((entry) => inspectEntry(manager, storageDirectory3, entry, context)));
+        if (current !== generation) return;
+        const fresh = new Map(results.flatMap((result2) => result2.status === "fulfilled" ? [[result2.value.entry.status.id, result2.value]] : []));
+        apply(attentionSort(entries.map((entry) => fresh.get(entry.status.id)?.entry ?? entry)), fresh.get(selectedId) ?? inspection);
       } finally {
         refreshing = false;
       }
     };
+    const select = (delta) => {
+      const index = Math.max(0, entries.findIndex((entry2) => entry2.status.id === inspection.entry.status.id));
+      const entry = entries[(index + delta + entries.length) % entries.length];
+      if (entry === void 0 || entry.status.id === inspection.entry.status.id) return;
+      inspection = { entry, record: {} };
+      selectionNeedsScroll = true;
+      const current = ++generation;
+      void inspectEntry(manager, storageDirectory3, entry, context).then((next) => {
+        if (current === generation) apply(entries, next);
+      }, (error) => {
+        if (current === generation) warn(`Cannot inspect subagent ${entry.status.id}: ${errorText(error)}`);
+      });
+    };
+    const shutDown = () => {
+      disposed = true;
+      generation += 1;
+      stopTimer();
+      inlineConfirm.cancel();
+    };
     const close = (value) => {
       if (disposed) return;
-      disposed = true;
-      stopRefresh();
+      shutDown();
       done(value);
     };
     steerEditor.onSubmit = (value) => {
       const message = value.trim();
-      if (message) close({ kind: "steer", message });
+      if (message) close({ entry: inspection.entry, message });
     };
-    const isDisposed = () => disposed;
-    const renderLines = (width) => {
-      if (disposed) return [];
-      const renderWidth = Math.max(1, width);
-      const action = actionMode ? actionView() : void 0;
-      const detail = (action?.detail ?? detailLines(inspection, theme)).map((line) => truncateToWidth3(line, renderWidth, "\u2026"));
-      const rows = steerMode ? [...detail, "", theme.bold("Steer subagent"), ...steerEditor.render(renderWidth)] : action?.rows ?? detail;
-      const viewport = viewportRows();
-      const maxOffset = maxOffsetFor(rows);
-      const visibleOffset = steerMode ? maxOffset : Math.max(0, Math.min(maxOffset, offset));
-      const hint = theme.fg("dim", steerMode ? "enter submit \xB7 esc back" : actionMode ? "\u2191/\u2193 actions \xB7 enter run \xB7 esc back" : "\u2191/\u2193 scroll \xB7 a actions \xB7 enter actions \xB7 esc back");
-      return [...rows.slice(visibleOffset, visibleOffset + viewport), hint].map((line) => truncateToWidth3(line, renderWidth, "\u2026"));
+    const reloadAfterAction = async (id) => {
+      try {
+        await reload(id);
+      } catch (error) {
+        warn(`Cannot refresh subagents: ${errorText(error)}`);
+      }
     };
     const runAction = (action) => {
-      if (disposed) return;
       actionRunning = true;
       requestRender();
-      void performAction(manager, storageDirectory3, entry, action, context, tui, clipboard).then(async (outcome) => {
-        if (disposed) return;
-        if (outcome === "retry") {
-          close("retry");
-          return;
-        }
-        const next = await inspectEntry(manager, storageDirectory3, entry, context);
-        if (isDisposed()) return;
-        inspection = next;
-        if (inspection.entry.status.state !== "running") stopRefresh();
+      const bulk = BULK_DELETE[action];
+      const pending = bulk === void 0 ? performAction(manager, storageDirectory3, inspection.entry, action, context, tui, clipboard, confirmInline) : deleteAll(manager, storageDirectory3, context, bulk, confirmInline).then((done2) => done2 ? "stay" : "unchanged");
+      void pending.then(async (outcome) => {
+        if (disposed || outcome === "unchanged") return;
+        await reloadAfterAction(typeof outcome === "object" ? outcome.retryId : void 0);
         actionMode = false;
         actionIndex = 0;
         offset = 0;
-      }).catch((error) => {
-        if (!disposed) context.ui.notify(`Cannot ${action.toLowerCase()}: ${errorText(error)}`, "warning");
+        selectionNeedsScroll = true;
+      }, async (error) => {
+        warn(`Cannot ${action.toLowerCase()}: ${errorText(error)}`);
+        if (!disposed) await reloadAfterAction();
       }).finally(() => {
         actionRunning = false;
-        if (!disposed) requestRender();
+        requestRender();
       });
     };
-    if (inspection.entry.status.state === "running") {
-      refreshTimer = setInterval(() => {
-        void refreshInspection().catch(reportRefreshError);
-      }, 1e3);
-      unrefTimer(refreshTimer);
-    }
+    syncTimer();
     return {
-      render: renderLines,
+      render(width) {
+        if (disposed) return [];
+        renderedWidth = width;
+        const narrow = width < 80;
+        const actions = actionMode ? options() : [];
+        const menu = actionMode ? { options: actions, index: actionIndex } : steerMode ? void 0 : "hint";
+        const layout = narrow ? detailsMode || actionMode || steerMode ? { detailsOnly: true } : { treeOnly: true } : {};
+        const content = [...headerRows(entries, styles), ...formatNavigatorColumns(listRows(entries, inspection.entry.status.id, styles), detailRows(inspection, styles, menu), width, layout)];
+        const footer = steerMode ? [styles.bold("Steer subagent"), ...steerEditor.render(width)] : inlineConfirm.rows(width, styles);
+        const rows = Math.max(1, tuiRows(tui) - DASHBOARD_FOOTER_ROWS);
+        const hintRows = rows >= 3 ? 1 : 0;
+        const viewport = Math.max(1, rows - hintRows - footer.length);
+        const keepVisible = (row) => {
+          if (row < 0) return;
+          if (row < offset) offset = row;
+          else if (row >= offset + viewport) offset = row - viewport + 1;
+        };
+        if (actionMode) keepVisible(content.findIndex((line) => narrow ? line.startsWith("\u2192 ") : line.includes(" | \u2192 ")));
+        else if (selectionNeedsScroll && !(narrow && detailsMode)) {
+          keepVisible(content.findIndex((line) => line.startsWith("\u2192")));
+          selectionNeedsScroll = false;
+        }
+        offset = Math.max(0, Math.min(Math.max(0, content.length - viewport), offset));
+        const up = keyLabel("tui.select.up", "\u2191");
+        const down = keyLabel("tui.select.down", "\u2193");
+        const enter = keyLabel("tui.select.confirm", "enter");
+        const esc = keyLabel("tui.select.cancel", "esc");
+        const scroll = content.length > viewport ? ` \xB7 ${keyLabel("tui.select.pageUp", "pgup")}/${keyLabel("tui.select.pageDown", "pgdn")} scroll` : "";
+        const refreshHint = timer === void 0 ? "" : " \xB7 auto-refresh 1s";
+        const back = narrow && detailsMode ? "details" : "list";
+        const hint = steerMode ? "enter submit \xB7 esc back" : inlineConfirm.active() ? inlineConfirm.hint(keybindings) : actionMode ? `${up}/${down} actions \xB7 ${enter} run \xB7 ${keyLabel("tui.editor.cursorLeft", "\u2190")} ${back} \xB7 ${esc} ${back}` : narrow && detailsMode ? `${up}/${down} scroll \xB7 ${enter} actions \xB7 a actions \xB7 ${esc} list${scroll}${refreshHint}` : `${up}/${down} select \xB7 ${enter} ${narrow ? "details" : "actions"} \xB7 a actions \xB7 ${esc} close${scroll}${refreshHint}`;
+        return [...content.slice(offset, offset + viewport), ...footer, ...hintRows ? [styles.dim(hint)] : []].map((line) => truncateToWidth3(line, Math.max(1, width), "\u2026"));
+      },
       invalidate() {
       },
       handleInput(data) {
-        if (disposed || actionRunning) return;
+        if (disposed) return;
+        if (inlineConfirm.active()) {
+          inlineConfirm.handleInput(keybindings, data);
+          return;
+        }
+        if (actionRunning) return;
         if (steerMode) {
           if (keybindings.matches(data, "tui.select.cancel")) {
             steerMode = false;
             actionMode = true;
             steerEditor.setText("");
-            offset = 0;
-            scrollActionIntoView();
           } else steerEditor.handleInput(data);
           requestRender();
           return;
         }
-        if (!actionMode && data === "a") {
+        const narrow = renderedWidth < 80;
+        const page = Math.max(1, tuiRows(tui) - DASHBOARD_FOOTER_ROWS - 1);
+        if (matches(data, "tui.select.pageUp")) offset = Math.max(0, offset - page);
+        else if (matches(data, "tui.select.pageDown")) offset += page;
+        else if (actionMode) {
+          const actions = options();
+          if (matches(data, "tui.select.cancel") || matches(data, "tui.editor.cursorLeft")) {
+            actionMode = false;
+            offset = 0;
+            selectionNeedsScroll = true;
+          } else if (matches(data, "tui.select.up")) actionIndex = (actionIndex + actions.length - 1) % actions.length;
+          else if (matches(data, "tui.select.down")) actionIndex = (actionIndex + 1) % actions.length;
+          else if (matches(data, "tui.select.confirm")) {
+            const action = actions[actionIndex];
+            if (action === "Steer") {
+              steerMode = true;
+              actionMode = false;
+              steerEditor.setText("");
+            } else if (action && action !== "Back") runAction(action);
+            else {
+              actionMode = false;
+              offset = 0;
+              selectionNeedsScroll = true;
+            }
+          }
+        } else if (data === "a" || data === "A") {
           actionMode = true;
           actionIndex = 0;
           offset = 0;
-          scrollActionIntoView();
-          requestRender();
-          return;
-        }
-        if (keybindings.matches(data, "tui.select.cancel")) {
-          if (actionMode) {
-            actionMode = false;
-            actionIndex = 0;
-            offset = 0;
-            requestRender();
-          } else close(void 0);
-          return;
-        }
-        if (!actionMode) {
-          if (keybindings.matches(data, "tui.select.confirm")) {
+        } else if (matches(data, "tui.select.cancel")) {
+          if (!narrow || !detailsMode) {
+            close(void 0);
+            return;
+          }
+          detailsMode = false;
+          offset = 0;
+          selectionNeedsScroll = true;
+        } else if (narrow && detailsMode) {
+          if (matches(data, "tui.select.up")) offset = Math.max(0, offset - 1);
+          else if (matches(data, "tui.select.down")) offset += 1;
+          else if (matches(data, "tui.select.confirm")) {
             actionMode = true;
             actionIndex = 0;
             offset = 0;
-            scrollActionIntoView();
-            requestRender();
-          } else if (keybindings.matches(data, "tui.select.up")) {
-            offset = Math.max(0, offset - 1);
-            clampOffset(detailLines(inspection, theme));
-            requestRender();
-          } else if (keybindings.matches(data, "tui.select.down")) {
-            offset += 1;
-            clampOffset(detailLines(inspection, theme));
-            requestRender();
           }
-          return;
-        }
-        const options = actionOptions(manager, inspection, context);
-        if (keybindings.matches(data, "tui.select.up")) {
-          actionIndex = (actionIndex + options.length - 1) % options.length;
-          scrollActionIntoView();
-        } else if (keybindings.matches(data, "tui.select.down")) {
-          actionIndex = (actionIndex + 1) % options.length;
-          scrollActionIntoView();
-        } else if (keybindings.matches(data, "tui.select.confirm")) {
-          const action = options[actionIndex];
-          if (action === "Steer") {
-            steerMode = true;
-            actionMode = false;
-            steerEditor.setText("");
-            offset = 0;
-          } else if (action && action !== "Back") runAction(action);
-          else actionMode = false;
-        } else if (keybindings.matches(data, "tui.select.pageUp")) {
-          offset = Math.max(0, offset - viewportRows());
-          clampOffset(actionView().rows);
-        } else if (keybindings.matches(data, "tui.select.pageDown")) {
-          offset += viewportRows();
-          clampOffset(actionView().rows);
+        } else if (matches(data, "tui.select.up")) select(-1);
+        else if (matches(data, "tui.select.down")) select(1);
+        else if (matches(data, "tui.select.confirm")) {
+          if (narrow) detailsMode = true;
+          else actionMode = true;
+          actionIndex = 0;
+          offset = 0;
         }
         requestRender();
       },
       dispose() {
-        if (!disposed) {
-          disposed = true;
-          stopRefresh();
-        }
+        shutDown();
       }
     };
   });
-  if (!result || result === "retry") return;
+  if (result === void 0) return;
   try {
-    await steerSubagent(manager, storageDirectory3, entry, context, result.message);
+    await steerSubagent(manager, storageDirectory3, result.entry, context, result.message);
   } catch (error) {
     context.ui.notify(`Cannot steer: ${errorText(error)}`, "warning");
   }
-  return "exit";
 }
 async function runNavigator(manager, storageDirectory3, args, context, clipboard) {
   if (args.trim()) {
@@ -7430,17 +7930,30 @@ async function runNavigator(manager, storageDirectory3, args, context, clipboard
       context.ui.notify("No durable subagent runs in this session.", "info");
       return;
     }
+    const labels = pickerLabels(entries);
     if (!context.hasUI) {
-      context.ui.notify(entries.map((entry, index) => pickerLabel(entry, index)).join("\n"), "info");
+      context.ui.notify(labels.join("\n"), "info");
+      return;
+    }
+    if (context.mode === "tui") {
+      await showDashboard(manager, storageDirectory3, entries, context, clipboard);
       return;
     }
-    const labels = entries.map(pickerLabel);
-    const choice = await context.ui.select("Subagents\n", [...labels, "Close"]);
+    const choice = await context.ui.select("Subagents\n", [...labels, "Close", ...bulkDeleteLabels(manager, entries)]);
     if (!choice || choice === "Close") return;
+    const bulk = BULK_DELETE[choice];
+    if (bulk !== void 0) {
+      try {
+        await deleteAll(manager, storageDirectory3, context, bulk, (title, message) => context.ui.confirm(title, message));
+      } catch (error) {
+        context.ui.notify(`Cannot delete ${bulk} runs: ${errorText(error)}`, "warning");
+      }
+      continue;
+    }
     const selected = entries[labels.indexOf(choice)];
     if (!selected) return;
     try {
-      if (await showDetail(manager, storageDirectory3, selected, context, clipboard) === "exit") return;
+      await showDetail(manager, storageDirectory3, selected, context, clipboard);
     } catch (error) {
       context.ui.notify(`Cannot inspect subagent ${selected.status.id}: ${errorText(error)}`, "warning");
     }
@@ -7461,20 +7974,11 @@ function registerSubagentNavigator(registerCommand, manager, storageDirectory3,
 
 // subagents/src/view.ts
 import { truncateToWidth as truncateToWidth4 } from "@earendil-works/pi-tui";
-var SPINNER = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var SPINNER2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var TERMINAL_STATES = /* @__PURE__ */ new Set(["completed", "failed", "stopped"]);
 var MAX_INSPECT_VALUE_CHARS = 4e3;
 var MAX_INSPECT_TOOL_CALLS = 32;
 var MAX_BACKGROUND_WIDGET_ROWS = 10;
-function textBlock2(text) {
-  return {
-    render(width) {
-      return text.split("\n").map((line) => truncateToWidth4(line, Math.max(1, width), "\u2026"));
-    },
-    invalidate() {
-    }
-  };
-}
 function roleName(value) {
   if (typeof value === "string") return value.trim() || void 0;
   if (typeof value !== "object" || value === null || Array.isArray(value)) return void 0;
@@ -7516,49 +8020,23 @@ function statusValue2(value) {
   if (typeof record2.id !== "string" || record2.state !== "running" && record2.state !== "completed" && record2.state !== "failed" && record2.state !== "stopped") return void 0;
   return value;
 }
-function runtime(startedAt, finishedAt, now) {
-  if (startedAt === void 0) return "";
-  const seconds = Math.max(0, Math.floor(((finishedAt ?? now) - startedAt) / 1e3));
-  if (seconds < 60) return `${String(seconds)}s`;
-  const minutes = Math.floor(seconds / 60);
-  const remainingSeconds = seconds % 60;
-  if (minutes < 60) return `${String(minutes)}m${remainingSeconds ? ` ${String(remainingSeconds)}s` : ""}`;
-  const hours = Math.floor(minutes / 60);
-  const remainingMinutes = minutes % 60;
-  return `${String(hours)}h${remainingMinutes ? ` ${String(remainingMinutes)}m` : ""}`;
-}
-function stateGlyph(state, spinner) {
-  if (state === "running") return spinner;
+function stateGlyph(state, spinner2) {
+  if (state === "running") return spinner2;
   return state === "completed" ? "\u2713" : "\u2717";
 }
 function stateColor(state) {
   if (state === "running") return "accent";
   return state === "completed" ? "success" : "error";
 }
-function activity(status) {
-  if (status.state !== "running") return void 0;
-  const current = status.progress?.activity;
-  if (current?.kind === "reasoning" || current?.kind === "text") {
-    const name = current.kind === "reasoning" ? "reasoning" : "responding";
-    const text = sanitizeDisplayText(current.text);
-    return text && text !== name ? `${name} \xB7 ${text}` : name;
-  }
-  if (current?.kind === "tool") return sanitizeDisplayText(current.text);
-  return sanitizeDisplayText([...status.progress?.toolCalls ?? []].reverse().find(({ state }) => state === "running")?.name ?? "");
-}
-function stalledDuration2(status, now) {
-  const lastEventAt = status.progress?.lastEventAt;
-  if (status.state !== "running" || lastEventAt === void 0 || !Number.isFinite(lastEventAt)) return void 0;
-  const duration = now - lastEventAt;
-  return duration >= WORKFLOW_AGENT_STALL_THRESHOLD_MS ? duration : void 0;
-}
-function accounting2(status) {
+function usageStats(status) {
   const value = status.progress?.accounting;
-  if (!value) return void 0;
-  const total = value.input + value.output + value.cacheRead + value.cacheWrite;
-  return `tokens=${String(total)} cost=${formatCost(value.cost) || "$0.00"}`;
+  return value ? [formatTokens(value.input + value.output), formatCost(value.cost)].filter(Boolean).join(" \xB7 ") : "";
 }
-function timestamp2(value) {
+function modelName(status) {
+  const model = status.progress?.state?.model ?? status.attemptDetails?.at(-1)?.setup.model;
+  return model ? `${model.model}${model.thinking ? `:${model.thinking}` : ""}` : "";
+}
+function timestamp(value) {
   if (value === void 0 || !Number.isFinite(value) || value < 0) return void 0;
   const date = new Date(value);
   return Number.isNaN(date.getTime()) ? void 0 : date.toISOString();
@@ -7573,24 +8051,23 @@ function boundedValue(value) {
   }
   return text.length > MAX_INSPECT_VALUE_CHARS ? `${text.slice(0, MAX_INSPECT_VALUE_CHARS)}\u2026` : text;
 }
-function formatSubagentProgress(status, args, theme, spinner, now, expanded) {
+function formatSubagentProgress(status, args, theme, spinner2, now, expanded) {
   const color = stateColor(status.state);
-  const elapsed = runtime(status.startedAt, status.finishedAt, now);
+  const elapsed = status.startedAt === void 0 ? "" : formatWorkflowRuntime((status.finishedAt ?? now) - status.startedAt);
   const metadata = requestMetadata(args, args.id === void 0);
+  const stats = usageStats(status);
   const lines = [
-    `${theme.fg(color, stateGlyph(status.state, spinner))} ${theme.bold(theme.fg("accent", `Subagent: ${label({ ...args, id: status.id })}`))} ${theme.fg(color, `[${status.state}]`)}${metadata ? ` ${theme.fg("dim", metadata)}` : ""}${elapsed ? ` runtime=${elapsed}` : ""}`
+    `${theme.fg(color, stateGlyph(status.state, "\u25CF"))} ${theme.bold(theme.fg("accent", `Subagent: ${label({ ...args, id: status.id })}`))} ${theme.fg(color, `[${status.state}]`)}${metadata ? ` ${theme.fg("dim", metadata)}` : ""}${stats ? ` ${stats}` : ""}${elapsed ? ` runtime=${elapsed}` : ""}`
   ];
-  const current = activity(status);
-  const stalled = stalledDuration2(status, now);
-  if (current) lines.push(`  ${theme.fg("accent", spinner)} ${theme.fg("dim", current)}${stalled === void 0 ? "" : ` ${theme.fg("warning", `- stalled? ${formatStalledDuration(stalled)}`)}`}`);
+  const current = status.state === "running" ? agentActivityLabel(status.progress ?? {}) : void 0;
+  const stalled = stalledDuration({ ...status.progress, state: status.state }, now);
+  if (current || status.state === "running") lines.push(`  ${theme.fg("accent", spinner2)}${current ? ` ${theme.fg("dim", current)}` : ""}${stalled === void 0 ? "" : ` ${theme.fg("warning", `- stalled? ${formatStalledDuration(stalled)}`)}`}`);
   else if (stalled !== void 0) lines.push(`  ${theme.fg("warning", `stalled? ${formatStalledDuration(stalled)}`)}`);
   if (status.error) lines.push(`  ${theme.fg("error", `${status.error.code}: ${status.error.message}`)}`);
   if (expanded) {
     lines.push(`  ${theme.fg("dim", `id=${status.id}`)}`);
     const model = status.progress?.state?.model;
     if (model) lines.push(`  ${theme.fg("dim", `model=${model.provider}/${model.model}${model.thinking ? `:${model.thinking}` : ""}`)}`);
-    const usage = accounting2(status);
-    if (usage) lines.push(`  ${theme.fg("dim", usage)}`);
     if (status.worktree) lines.push(`  ${theme.fg("dim", `worktree=${status.worktree.path} branch=${status.worktree.branch}`)}`);
   }
   return lines.join("\n");
@@ -7607,9 +8084,9 @@ function formatSubagentInspection(status, args, details, theme, expanded) {
   const lines = [formatSubagentProgress(status, { id: args.id ?? status.id }, theme, "\u25C7", Date.now(), false)];
   if (!expanded) return lines[0] ?? "";
   lines.push(`  ${theme.fg("dim", `id=${status.id}`)}`);
-  const startedAt = timestamp2(status.startedAt);
-  const finishedAt = timestamp2(status.finishedAt);
-  const lastEventAt = timestamp2(status.progress?.lastEventAt);
+  const startedAt = timestamp(status.startedAt);
+  const finishedAt = timestamp(status.finishedAt);
+  const lastEventAt = timestamp(status.progress?.lastEventAt);
   if (startedAt) lines.push(`  ${theme.fg("dim", `startedAt=${startedAt}`)}`);
   if (finishedAt) lines.push(`  ${theme.fg("dim", `finishedAt=${finishedAt}`)}`);
   if (lastEventAt) lines.push(`  ${theme.fg("dim", `lastEventAt=${lastEventAt}`)}`);
@@ -7617,8 +8094,8 @@ function formatSubagentInspection(status, args, details, theme, expanded) {
   if (model) lines.push(`  ${theme.fg("dim", `model=${model.provider}/${model.model}${model.thinking ? `:${model.thinking}` : ""}`)}`);
   const currentActivity = status.progress?.activity;
   if (currentActivity) lines.push(`  ${theme.fg("dim", `activity=${currentActivity.kind}${currentActivity.text ? ` ${sanitizeDisplayText(currentActivity.text)}` : ""}`)}`);
-  const accounting3 = status.progress?.accounting;
-  if (accounting3) lines.push(`  ${theme.fg("dim", `accounting=input=${String(accounting3.input)} output=${String(accounting3.output)} cacheRead=${String(accounting3.cacheRead)} cacheWrite=${String(accounting3.cacheWrite)} cost=${formatCost(accounting3.cost) || "$0.00"}`)}`);
+  const accounting2 = status.progress?.accounting;
+  if (accounting2) lines.push(`  ${theme.fg("dim", `accounting=input=${String(accounting2.input)} output=${String(accounting2.output)} cacheRead=${String(accounting2.cacheRead)} cacheWrite=${String(accounting2.cacheWrite)} cost=${formatCost(accounting2.cost) || "$0.00"}`)}`);
   if (status.worktree) lines.push(`  ${theme.fg("dim", `worktree=${status.worktree.path} branch=${status.worktree.branch}`)}`);
   const toolCalls = status.progress?.toolCalls;
   if (toolCalls?.length) {
@@ -7650,7 +8127,7 @@ function subagentProgressBlock(status, args, theme, freezeAt) {
     render(width) {
       const now = TERMINAL_STATES.has(current.state) ? frozenAt : Date.now();
       if (!TERMINAL_STATES.has(current.state)) frozenAt = now;
-      const frame = SPINNER[Math.floor(now / 80) % SPINNER.length] ?? "\u25C7";
+      const frame = SPINNER2[Math.floor(now / REPAINT_MS) % SPINNER2.length] ?? "\u25C7";
       return formatSubagentProgress(current, args, currentTheme, frame, now, expanded).split("\n").map((line) => truncateToWidth4(line, Math.max(1, width), "\u2026"));
     },
     invalidate() {
@@ -7668,14 +8145,14 @@ function renderSubagentResult(result, options, theme, context) {
   if (status?.state === "running" && options.isPartial && !state.subagentSpinner) {
     state.subagentSpinner = setInterval(() => {
       context.invalidate();
-    }, 80);
+    }, REPAINT_MS);
     state.subagentSpinner.unref();
   } else if ((!options.isPartial || status?.state !== "running") && state.subagentSpinner) {
     clearInterval(state.subagentSpinner);
     delete state.subagentSpinner;
   }
-  if (!status || context.isError) return textBlock2(resultText(result));
-  if (!options.isPartial && status.state === "running") return textBlock2(formatSubagentLaunch(status, context.args, theme, options.expanded));
+  if (!status || context.isError) return textBlock(resultText(result));
+  if (!options.isPartial && status.state === "running") return textBlock(formatSubagentLaunch(status, context.args, theme, options.expanded));
   if (TERMINAL_STATES.has(status.state)) state.subagentProgressFrozenAt ??= Date.now();
   else delete state.subagentProgressFrozenAt;
   let component = state.subagentProgressComponent;
@@ -7688,9 +8165,68 @@ function renderSubagentResult(result, options, theme, context) {
   component.setExpanded(options.expanded);
   return component;
 }
-function createSubagentBackgroundWidget() {
+function widgetRow({ status, request }, now, paint) {
+  const lastEventAt = status.progress?.lastEventAt;
+  const silent = lastEventAt === void 0 || !Number.isFinite(lastEventAt) || now - lastEventAt < QUIET_MS ? void 0 : now - lastEventAt;
+  const role = silent !== void 0 && silent >= WORKFLOW_AGENT_STALL_THRESHOLD_MS ? "error" : "warning";
+  const icon = silent === void 0 ? mark(status.state, now, paint) : paint(role, "\u26A0");
+  const warning = silent === void 0 ? "" : `  ${paint(role, `${role === "error" ? "stalled" : "quiet"} ${formatElapsed(silent)}`)}`;
+  const accounting2 = status.progress?.accounting;
+  const attempts = status.attempts ?? 1;
+  const right = [
+    modelName(status),
+    formatTokens(accounting2 === void 0 ? void 0 : accounting2.input + accounting2.output),
+    formatCost(accounting2?.cost),
+    status.startedAt === void 0 ? "" : formatElapsed(now - status.startedAt),
+    attempts > 1 ? `attempt ${String(attempts)}` : ""
+  ].filter(Boolean).join(" \xB7 ");
+  return { text: `${icon} ${sanitizeDisplayText(label({ ...request, id: status.id }))}${warning}`, right };
+}
+var RECEIPT_ENTRY_TYPE = "piewf-subagent-receipt";
+function receiptFor(status, request) {
+  const accounting2 = status.progress?.accounting;
+  const model = modelName(status);
+  const role = roleName(request.role);
+  const tools = status.progress?.state?.tools ?? status.attemptDetails?.at(-1)?.setup.tools;
+  return {
+    id: status.id,
+    label: label({ ...request, id: status.id }),
+    state: status.state,
+    ...model ? { model } : {},
+    ...role === void 0 ? {} : { role },
+    ...tools === void 0 ? {} : { tools: [...tools] },
+    input: accounting2?.input ?? 0,
+    output: accounting2?.output ?? 0,
+    cacheRead: accounting2?.cacheRead ?? 0,
+    costUsd: accounting2?.cost ?? 0,
+    durationMs: status.startedAt === void 0 ? 0 : Math.max(0, (status.finishedAt ?? Date.now()) - status.startedAt),
+    attempts: status.attempts ?? 1,
+    ...status.error === void 0 ? {} : { error: `${status.error.code}: ${status.error.message}` }
+  };
+}
+function renderSubagentReceipt(data, expanded, theme) {
+  const glyph = data.state === "completed" ? theme.fg("success", "\u2713") : data.state === "failed" ? theme.fg("error", "\u2717") : theme.fg("muted", "\xB7");
+  const headline = [formatTokens(data.input + data.output), formatCost(data.costUsd) || "$0.00", formatElapsed(data.durationMs), data.state].filter(Boolean).join(" \xB7 ");
+  const lines = [`${glyph} ${theme.bold(sanitizeDisplayText(data.label))} ${theme.fg("muted", headline)}`];
+  if (!expanded) return lines;
+  const meta = [data.model ?? "", data.role ? `role ${data.role}` : "", data.attempts > 1 ? `${String(data.attempts)} attempts` : "", data.tools?.join(" ") ?? ""].filter(Boolean);
+  if (meta.length > 0) lines.push(theme.fg("muted", `   ${meta.join(" \xB7 ")}`));
+  const split = [data.input ? `in ${formatTokens(data.input)}` : "", data.output ? `out ${formatTokens(data.output)}` : "", data.cacheRead ? `cache ${formatTokens(data.cacheRead)}` : ""].filter(Boolean);
+  if (split.length > 0) lines.push(theme.fg("muted", `   ${split.join(" \xB7 ")}`));
+  if (data.error !== void 0) lines.push(theme.fg("error", `   ${sanitizeDisplayText(data.error)}`));
+  lines.push(theme.fg("muted", `   run ${data.id}`));
+  return lines;
+}
+function createSubagentBackgroundWidget(host = {}) {
   const key = "piewf-subagents-background";
   const runs = /* @__PURE__ */ new Map();
+  const receipted = /* @__PURE__ */ new Set();
+  host.registerEntryRenderer?.(RECEIPT_ENTRY_TYPE, (entry, options, theme) => {
+    if (!entry.data) return void 0;
+    const lines = renderSubagentReceipt(entry.data, options.expanded, theme);
+    return { render: (width) => lines.map((line) => truncateToWidth4(line, Math.max(1, width), "\u2026")), invalidate() {
+    } };
+  });
   let context;
   let requestRender;
   let timer;
@@ -7724,23 +8260,12 @@ function createSubagentBackgroundWidget() {
         return {
           render(width) {
             const now = Date.now();
-            const frame = SPINNER[Math.floor(now / 80) % SPINNER.length] ?? "\u25C7";
-            const title = theme.bold(theme.fg("accent", `Subagents (${String(runs.size)} running)`));
-            const blocks = [...runs.values()].map(({ status, request }) => formatSubagentProgress(status, request, theme, frame, now, false).split("\n"));
-            const allRunsFit = blocks.reduce((rows, block) => rows + block.length, 1) <= MAX_BACKGROUND_WIDGET_ROWS;
-            const runRowBudget = allRunsFit ? MAX_BACKGROUND_WIDGET_ROWS - 1 : MAX_BACKGROUND_WIDGET_ROWS - 2;
-            const lines = [title];
-            let runRows = 0;
-            let displayedRuns = 0;
-            for (const block of blocks) {
-              if (runRows + block.length > runRowBudget) break;
-              lines.push(...block);
-              runRows += block.length;
-              displayedRuns += 1;
-            }
-            const hiddenRuns = blocks.length - displayedRuns;
-            if (hiddenRuns > 0) lines.push(`\u2026 ${String(hiddenRuns)} more`);
-            return lines.map((line) => truncateToWidth4(line, Math.max(1, width), "\u2026"));
+            const paintRole = (role, text) => theme.fg(role, text);
+            const budget = MAX_BACKGROUND_WIDGET_ROWS - 2;
+            const rows = [...runs.values()].map((run) => widgetRow(run, now, paintRole));
+            const body = rows.length <= budget ? rows : [...rows.slice(0, budget - 1), { text: theme.fg("muted", `\u2026 ${String(rows.length - budget + 1)} more`) }];
+            const title = runs.size === 1 ? "Subagent" : `Subagents \xB7 ${String(runs.size)} runs`;
+            return drawFrame(title, "", body, width, paintRole, (text) => theme.fg("accent", text)).map((line) => truncateToWidth4(line, Math.max(1, width), ""));
           },
           invalidate() {
           }
@@ -7749,7 +8274,7 @@ function createSubagentBackgroundWidget() {
       showing = true;
       timer = setInterval(() => {
         requestRender?.();
-      }, 80);
+      }, REPAINT_MS);
       timer.unref();
     } catch {
       hide();
@@ -7759,12 +8284,21 @@ function createSubagentBackgroundWidget() {
     start(next) {
       hide();
       runs.clear();
+      receipted.clear();
       context = next.mode === "tui" ? next : void 0;
     },
     update(status, request) {
       if (request.mode !== "background" || context === void 0) return;
-      if (TERMINAL_STATES.has(status.state)) runs.delete(status.id);
-      else runs.set(status.id, { status, request });
+      if (TERMINAL_STATES.has(status.state)) {
+        runs.delete(status.id);
+        if (!receipted.has(status.id)) {
+          receipted.add(status.id);
+          try {
+            host.appendEntry?.(RECEIPT_ENTRY_TYPE, receiptFor(status, request));
+          } catch {
+          }
+        }
+      } else runs.set(status.id, { status, request });
       paint();
     },
     dispose() {
@@ -7776,35 +8310,35 @@ function createSubagentBackgroundWidget() {
 }
 function renderSubagentInspectCall(args, theme) {
   const title = theme.fg("toolTitle", theme.bold("subagents_inspect"));
-  return textBlock2(args.id ? `${title} ${theme.fg("accent", args.id)}` : `${title} ${theme.fg("muted", "all")}`);
+  return textBlock(args.id ? `${title} ${theme.fg("accent", args.id)}` : `${title} ${theme.fg("muted", args.scope === "all" ? "all" : "session")}`);
 }
 function renderSubagentInspectResult(result, options, theme, args) {
   const status = statusValue2(result.details);
-  if (status) return textBlock2(formatSubagentInspection(status, args, result.details, theme, options.expanded));
+  if (status) return textBlock(formatSubagentInspection(status, args, result.details, theme, options.expanded));
   if (Array.isArray(result.details)) {
     const statuses = result.details.map(statusValue2).filter((value) => value !== void 0);
     const lines = [theme.bold(theme.fg("accent", `Subagents (${String(statuses.length)})`)), ...statuses.map((entry) => {
       const color = stateColor(entry.state);
       return `  ${theme.fg(color, stateGlyph(entry.state, "\u25C7"))} ${entry.id.slice(0, 8)} ${theme.fg(color, `[${entry.state}]`)}`;
     })];
-    return textBlock2(lines.join("\n"));
+    return textBlock(lines.join("\n"));
   }
-  return textBlock2(resultText(result));
+  return textBlock(resultText(result));
 }
 function renderSubagentControlCall(name, args, theme) {
   const title = theme.fg("toolTitle", theme.bold(name));
   const message = args.message ? ` ${theme.fg("dim", args.message)}` : "";
-  return textBlock2(`${title} ${theme.fg("accent", args.id)}${message}`);
+  return textBlock(`${title} ${theme.fg("accent", args.id)}${message}`);
 }
 function renderSubagentControlResult(result, theme) {
   const status = statusValue2(result.details);
   if (status) {
     const color = stateColor(status.state);
-    return textBlock2(`${theme.fg(color, stateGlyph(status.state, "\u25C7"))} ${status.id.slice(0, 8)} ${theme.fg(color, `[${status.state}]`)}`);
+    return textBlock(`${theme.fg(color, stateGlyph(status.state, "\u25C7"))} ${status.id.slice(0, 8)} ${theme.fg(color, `[${status.state}]`)}`);
   }
   const record2 = typeof result.details === "object" && result.details !== null && !Array.isArray(result.details) ? result.details : void 0;
-  if (record2 && typeof record2.id === "string") return textBlock2(`${theme.fg("success", "\u2713")} ${record2.id.slice(0, 8)}`);
-  return textBlock2(resultText(result));
+  if (record2 && typeof record2.id === "string") return textBlock(`${theme.fg("success", "\u2713")} ${record2.id.slice(0, 8)}`);
+  return textBlock(resultText(result));
 }
 
 // subagents/src/index.ts
@@ -7833,7 +8367,7 @@ function serialize(value) {
   }
 }
 function toolResult(value) {
-  return { content: [{ type: "text", text: serialize(value) }], details: value };
+  return { content: [{ type: "text", text: serialize(value) }], details: value, structuredContent: value };
 }
 function managerContext2(toolCallId, signal, onUpdate, context) {
   return {
@@ -7857,6 +8391,7 @@ function createSubagentTools(manager) {
         "Do not poll a running ID; use subagents_inspect({ id }) when you need its current status or terminal result."
       ],
       parameters: SUBAGENTS_RUN_PARAMETERS,
+      outputSchema: SUBAGENT_STATUS_OUTPUT,
       async execute(toolCallId, params, signal, onUpdate, context) {
         return toolResult(await manager.run(validateSubagentRunRequest(params), managerContext2(toolCallId, signal, onUpdate, context)));
       },
@@ -7870,8 +8405,9 @@ function createSubagentTools(manager) {
     defineTool2({
       name: "subagents_inspect",
       label: "Subagents Inspect",
-      description: "Inspect durable subagent runs. Omit id for ordered run summaries, or provide id for detailed status, progress, activity, accounting, tool calls, timestamps, worktree metadata, and a terminal value or error when available.",
+      description: "Inspect durable subagent runs. Omit id for ordered run summaries of the current session (scope all for every session), or provide id for detailed status, progress, activity, accounting, tool calls, timestamps, worktree metadata, and a terminal value or error when available.",
       parameters: SUBAGENTS_INSPECT_PARAMETERS,
+      outputSchema: SUBAGENTS_INSPECT_OUTPUT,
       async execute(toolCallId, params, signal, onUpdate, context) {
         return toolResult(await manager.inspect(validateSubagentInspectRequest(params), managerContext2(toolCallId, signal, onUpdate, context)));
       },
@@ -7887,6 +8423,7 @@ function createSubagentTools(manager) {
       label: "Subagents Steer",
       description: "Send a message to a running subagent. The message is queued safely if its steering handler is not ready; settled runs cannot be steered.",
       parameters: SUBAGENTS_STEER_PARAMETERS,
+      outputSchema: SUBAGENTS_STEER_OUTPUT,
       async execute(toolCallId, params, signal, onUpdate, context) {
         return toolResult(await manager.steer(validateSubagentSteerRequest(params), managerContext2(toolCallId, signal, onUpdate, context)));
       },
@@ -7902,6 +8439,7 @@ function createSubagentTools(manager) {
       label: "Subagents Stop",
       description: 'Stop one running subagent, abort its active session, persist state "stopped", and clean its worktree without affecting sibling runs.',
       parameters: SUBAGENTS_STOP_PARAMETERS,
+      outputSchema: SUBAGENT_STATUS_OUTPUT,
       async execute(toolCallId, params, signal, onUpdate, context) {
         return toolResult(await manager.stop(validateSubagentIdRequest(params, "subagents_stop"), managerContext2(toolCallId, signal, onUpdate, context)));
       },
@@ -7917,6 +8455,7 @@ function createSubagentTools(manager) {
       label: "Subagents Retry",
       description: "Start a fresh run from a failed or stopped subagent's persisted request. The new run gets a new ID and preserves its original background or foreground mode.",
       parameters: SUBAGENTS_RETRY_PARAMETERS,
+      outputSchema: SUBAGENT_STATUS_OUTPUT,
       async execute(toolCallId, params, signal, onUpdate, context) {
         return toolResult(await manager.retry(validateSubagentIdRequest(params, "subagents_retry"), managerContext2(toolCallId, signal, onUpdate, context)));
       },
@@ -7949,7 +8488,7 @@ function managerDependencies(options, activeTools, notify, onStatus, onResourceW
 }
 function storageDirectory2(options) {
   const dependencies = options.managerDependencies;
-  return dependencies?.storageDir ?? join10(dependencies?.agentDir ?? getAgentDir7(), "subagents");
+  return dependencies?.storageDir ?? join11(dependencies?.agentDir ?? getAgentDir8(), "subagents");
 }
 function createSubagentsExtension(options = {}, activeTools, notify, onStatus, onResourceWarning) {
   const manager = options.manager ?? createSubagentManager(managerDependencies(options, activeTools, notify, onStatus, onResourceWarning));
@@ -7958,7 +8497,8 @@ function createSubagentsExtension(options = {}, activeTools, notify, onStatus, o
 }
 function registerSubagentsExtension(pi, options = {}) {
   const getActiveTools = pi.getActiveTools;
-  const activeTools = getActiveTools === void 0 ? void 0 : () => getActiveTools.call(pi);
+  const getAllTools = pi.getAllTools;
+  const activeTools = getActiveTools === void 0 ? void 0 : () => reachableTools({ getActiveTools: () => getActiveTools.call(pi), ...getAllTools === void 0 ? {} : { getAllTools: () => getAllTools.call(pi) } });
   const sendMessage = pi.sendMessage;
   const notify = sendMessage === void 0 ? void 0 : (notification) => {
     sendMessage.call(pi, { customType: "subagents", content: notificationContent(notification), display: true, details: notification }, { deliverAs: "steer", triggerTurn: true });
@@ -7966,13 +8506,17 @@ function registerSubagentsExtension(pi, options = {}) {
   const onResourceWarning = sendMessage === void 0 ? void 0 : (message) => {
     sendMessage.call(pi, { customType: "subagents", content: `Warning: ${message}`, display: true }, { deliverAs: "steer" });
   };
-  const widget2 = createSubagentBackgroundWidget();
+  const appendEntry = pi.appendEntry;
+  const widget2 = createSubagentBackgroundWidget({ ...appendEntry === void 0 ? {} : { appendEntry: (customType, data) => {
+    appendEntry.call(pi, customType, data);
+  } }, ...pi.registerEntryRenderer === void 0 ? {} : { registerEntryRenderer: pi.registerEntryRenderer.bind(pi) } });
   const extension2 = createSubagentsExtension(options, activeTools, notify, (status, request) => {
     widget2.update(status, request);
     const registry = loadingRegistry();
     if (typeof registry.observeSubagentStatus === "function") registry.observeSubagentStatus(status, request);
   }, onResourceWarning);
-  for (const tool of extension2.tools) pi.registerTool(tool);
+  const codemodeTools = loadCodemodeToolsSetting(options.managerDependencies?.agentDir);
+  for (const tool of extension2.tools) pi.registerTool({ ...tool, ...workflowToolExposure(tool.name, codemodeTools) });
   if (pi.registerCommand !== void 0) registerSubagentNavigator(pi.registerCommand.bind(pi), extension2.manager, storageDirectory2(options), options.clipboard);
   if (pi.on !== void 0) {
     setSubagentManager(extension2.manager);
@@ -7995,15 +8539,17 @@ function extension(pi, options = {}) {
 }
 export {
   SUBAGENTS_ID_PARAMETERS,
+  SUBAGENTS_INSPECT_OUTPUT,
   SUBAGENTS_INSPECT_PARAMETERS,
   SUBAGENTS_RETRY_PARAMETERS,
   SUBAGENTS_RUN_PARAMETERS,
+  SUBAGENTS_STEER_OUTPUT,
   SUBAGENTS_STEER_PARAMETERS,
   SUBAGENTS_STOP_PARAMETERS,
   SUBAGENTS_TOOL_NAMES,
-  SUBAGENTS_TOOL_SCHEMAS,
   SUBAGENT_ATTEMPT_DETAILS_LIMIT,
   SUBAGENT_MAX_RETRIES,
+  SUBAGENT_STATUS_OUTPUT,
   SUBAGENT_SYSTEM_PROMPT_LIMIT,
   attemptValue,
   createRunStoreWorktreeAdapter,