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

package/dist/subagents/index.js

@@ -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}`;
@@ -351,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);
 }
@@ -820,10 +834,10 @@ function decodeAgent(value) {
   const attemptDetails = value.attemptDetails === void 0 ? void 0 : decodeArray(value.attemptDetails, decodeAgentAttempt);
   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 && !accounting2 || 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 },
@@ -849,7 +863,7 @@ function decodeAgent(value) {
     ...attemptDetails === void 0 ? {} : { attemptDetails },
     ...accounting2 === void 0 ? {} : { accounting: accounting2 },
     ...toolCalls === void 0 ? {} : { toolCalls },
-    ...activity2 === void 0 ? {} : { activity: activity2 },
+    ...activity === void 0 ? {} : { activity },
     ...lastEventAt === void 0 ? {} : { lastEventAt }
   };
 }
@@ -897,6 +911,22 @@ function decodeRunEvent(value) {
   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;
   const mode = value.mode;
@@ -926,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 {
@@ -944,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 },
@@ -1952,7 +1985,7 @@ function workflowSettingsPath(agentDir = getAgentDir()) {
   return join3(agentDir, ROLE_DIRECTORY, "settings.json");
 }
 function normalizedResourcePath(value, settingsPath) {
-  if (value === "*") return value;
+  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);
@@ -2064,7 +2097,7 @@ function parseSettings(path, partial) {
     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 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}`);
@@ -2072,6 +2105,8 @@ function parseSettings(path, partial) {
   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");
@@ -2082,6 +2117,7 @@ function parseSettings(path, partial) {
   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 },
@@ -2094,6 +2130,18 @@ function parseSettings(path, partial) {
 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);
 }
@@ -2154,7 +2202,7 @@ function resolveAgentResourcePolicy(cwd, projectTrusted, globalSettingsPath = wo
 }
 
 // src/registry.ts
-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._-]*$/;
@@ -2629,7 +2677,7 @@ function loadAgentDefinitions(cwd, agentDir = getAgentDir2(), projectTrusted = t
 function canonicalExtensionSelector(selector, base = process.cwd()) {
   const negated = selector.startsWith("!");
   const body = negated ? selector.slice(1) : selector;
-  if (body === "*" || body === "**" || body.startsWith("**/")) return 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)}`;
@@ -2690,7 +2738,7 @@ function resolveRole(name, options) {
     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) => canonicalPath(extension2));
+  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);
@@ -2993,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);
@@ -3053,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 } });
@@ -3076,7 +3148,7 @@ import { basename as basename4, dirname as dirname5, join as join6, resolve as r
 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 getAgentDir3, 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"]);
@@ -3233,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) {
@@ -3251,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;
@@ -3259,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") {
@@ -3267,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;
@@ -3283,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);
@@ -3317,7 +3389,7 @@ function createPiRuntimeSessionAdapter(session, handoff, clock = Date.now) {
       disposed = true;
       toolCalls.clear();
       toolCallsView = [];
-      activity2 = void 0;
+      activity = void 0;
     }
   };
 }
@@ -3915,16 +3987,25 @@ 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 = dirname5(fileURLToPath3(import.meta.url));
-var workflowPackageRoot = basename4(dirname5(extensionDirectory)) === "dist" ? resolve5(extensionDirectory, "../..") : resolve5(extensionDirectory, "..");
-var WORKFLOW_HOST_ENTRIES = /* @__PURE__ */ new Set([
-  canonicalPath(resolve5(workflowPackageRoot, "src/index.ts")),
-  canonicalPath(resolve5(workflowPackageRoot, "dist/src/index.js")),
-  canonicalPath(resolve5(workflowPackageRoot, "starter/index.ts")),
-  canonicalPath(resolve5(workflowPackageRoot, "dist/starter/index.js")),
-  canonicalPath(resolve5(workflowPackageRoot, "subagents/index.ts")),
-  canonicalPath(resolve5(workflowPackageRoot, "dist/subagents/index.js"))
-]);
+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 = join6(cwd, ".pi", WORKFLOW_DIRECTORY, "SYSTEM.md");
@@ -3957,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 = resolve5(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 ??= resolve5(dirname5(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" });
@@ -4008,34 +4096,47 @@ 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 ?? getAgentDir3();
   const systemPromptSource = workflowSystemPromptPath(input.cwd, agentDir, input.resourcePolicy?.projectTrusted ?? true);
@@ -4048,13 +4149,16 @@ async function createLocalPiSessionHandle(input, sessionStartEvent) {
   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 selection = resolveRole(void 0, {
       cwd: input.cwd,
@@ -4062,7 +4166,7 @@ async function createLocalPiSessionHandle(input, sessionStartEvent) {
       resources: { extensions: discoveredExtensions }
     });
     const selectedExtensions = selection.selectedExtensions ?? [];
-    const extensionPaths = selectedExtensions.filter((path) => !WORKFLOW_HOST_ENTRIES.has(path));
+    const extensionPaths = selectedExtensions.filter((path) => path.startsWith(BUILTIN_EXTENSION_PREFIX) || !isWorkflowHostEntry(path));
     policy.selectedExtensions = selectedExtensions;
     policy.unmatchedExtensions = selection.unmatchedExtensions ?? [];
     const skillPaths = [...new Set(resolved.skills.filter(({ enabled, metadata }) => enabled && (policy.projectTrusted || metadata.scope !== "project")).map(({ path }) => path))];
@@ -4082,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);
@@ -4094,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({}) };
@@ -4129,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(),
@@ -4776,7 +4880,7 @@ var WorkflowAgentExecutor = class {
       ...options.contextFiles === void 0 ? {} : { contextFiles: options.contextFiles },
       ...options.effectiveTools === void 0 ? {} : { effectiveTools: options.effectiveTools }
     });
-    return { model: resolved.model ?? this.root.model, ...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 } };
+    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;
@@ -5172,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) {
@@ -5215,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) {
@@ -5397,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" })
@@ -5412,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");
@@ -5510,8 +5632,8 @@ function progressValue(value) {
   const accounting2 = accountingValue(record2.accounting);
   const toolCalls = toolCallsValue(record2.toolCalls);
   if (!accounting2 || !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;
+  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) {
@@ -5525,16 +5647,16 @@ function progressValue(value) {
   }
   const lastEventAt = record2.lastEventAt;
   if (lastEventAt !== void 0 && !nonnegativeInteger(lastEventAt)) return void 0;
-  return { accounting: accounting2, 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 accounting2 = legacyAccountingValue(record2);
   const toolCalls = record2.toolCalls === void 0 ? [] : toolCallsValue(record2.toolCalls);
   if (!accounting2 || !toolCalls) return void 0;
-  const activity2 = record2.activity === void 0 ? void 0 : activityValue(record2.activity);
+  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: accounting2, 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);
@@ -5618,6 +5740,20 @@ 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";
@@ -6203,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) {
@@ -6238,19 +6374,19 @@ function progressValue2(value) {
   const toolCalls = toolCallsValue2(record2.toolCalls);
   const state = record2.state === void 0 ? void 0 : sessionStateValue(record2.state);
   if (!accounting2 || !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;
+  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: accounting2, 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 accounting2 = legacyAccountingValue(record2);
   const toolCalls = record2.toolCalls === void 0 ? [] : toolCallsValue2(record2.toolCalls);
   if (!accounting2 || !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;
+  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: accounting2, 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;
@@ -6703,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 });
@@ -6716,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;
@@ -7228,8 +7364,8 @@ function pickerLabels(entries) {
     const name = names[index] ?? "";
     const model = status.progress?.state?.model;
     const cost = formatCost(status.progress?.accounting.cost);
-    const runtime2 = 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}` : ""}${runtime2}`;
+    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) {
@@ -7253,7 +7389,7 @@ 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;
@@ -7263,7 +7399,7 @@ function detailPresentation(inspection) {
   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) },
@@ -7843,15 +7979,6 @@ 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;
@@ -7893,17 +8020,6 @@ 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, spinner2) {
   if (state === "running") return spinner2;
   return state === "completed" ? "\u2713" : "\u2717";
@@ -7912,23 +8028,6 @@ 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 usageStats(status) {
   const value = status.progress?.accounting;
   return value ? [formatTokens(value.input + value.output), formatCost(value.cost)].filter(Boolean).join(" \xB7 ") : "";
@@ -7954,15 +8053,15 @@ function boundedValue(value) {
 }
 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, spinner2))} ${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}` : ""}`
+    `${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", spinner2)} ${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) {
@@ -8028,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 = SPINNER2[Math.floor(now / 80) % SPINNER2.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() {
@@ -8046,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;
@@ -8175,7 +8274,7 @@ function createSubagentBackgroundWidget(host = {}) {
       showing = true;
       timer = setInterval(() => {
         requestRender?.();
-      }, 80);
+      }, REPAINT_MS);
       timer.unref();
     } catch {
       hide();
@@ -8211,35 +8310,35 @@ function createSubagentBackgroundWidget(host = {}) {
 }
 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
@@ -8268,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 {
@@ -8292,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)));
       },
@@ -8305,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)));
       },
@@ -8322,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)));
       },
@@ -8337,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)));
       },
@@ -8352,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)));
       },
@@ -8393,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 });
@@ -8410,7 +8515,8 @@ function registerSubagentsExtension(pi, options = {}) {
     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);
@@ -8433,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,