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

package/dist/trajectory/index.js

@@ -1,11 +1,11 @@
 // trajectory/src/index.ts
 import { spawn } from "node:child_process";
 import { createHash as createHash3 } from "node:crypto";
-import { mkdir as mkdir3, open as open3, readFile as readFile6, rm as rm5 } from "node:fs/promises";
+import { mkdir as mkdir4, readFile as readFile7, rm as rm6 } from "node:fs/promises";
 import { existsSync } from "node:fs";
-import { dirname as dirname5, join as join8 } from "node:path";
-import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { getAgentDir as getAgentDir4 } from "@earendil-works/pi-coding-agent";
+import { dirname as dirname3, join as join7 } from "node:path";
+import { fileURLToPath } from "node:url";
+import { getAgentDir as getAgentDir3 } from "@earendil-works/pi-coding-agent";
 
 // src/trajectory-host-handle.ts
 var TRAJECTORY_HOST_KEY = /* @__PURE__ */ Symbol.for("pi-extensible-workflows.trajectory-host");
@@ -17,10 +17,12 @@ function clearTrajectoryHost(host) {
   if (globalTrajectoryHosts[TRAJECTORY_HOST_KEY] === host) globalTrajectoryHosts[TRAJECTORY_HOST_KEY] = void 0;
 }
 
-// src/session-lease.ts
-import { link, mkdir, open, readFile as readFile2, readdir, rename as rename2, rm as rm2, stat } from "node:fs/promises";
-import { homedir as homedir2 } from "node:os";
-import { join as join2 } from "node:path";
+// src/io.ts
+import { execFile } from "node:child_process";
+import { randomUUID } from "node:crypto";
+import { renameSync, rmSync, writeFileSync } from "node:fs";
+import { readFile, rename, rm, writeFile } from "node:fs/promises";
+import { promisify } from "node:util";
 
 // src/types.ts
 var RUN_STATES = ["queued", "running", "pausing", "paused", "awaiting_input", "completed", "failed", "stopped", "interrupted", "budget_exhausted"];
@@ -35,7 +37,7 @@ var ERROR_CODES = [
   "INVALID_SCHEMA",
   "UNKNOWN_MODEL",
   "UNKNOWN_TOOL",
-  "UNKNOWN_AGENT_TYPE",
+  "UNKNOWN_AGENT",
   "RUN_OWNED",
   "RUN_NOT_FOUND",
   "REGISTRY_FROZEN",
@@ -47,6 +49,7 @@ var ERROR_CODES = [
   "AGENT_FAILED",
   "AGENT_RESULT_COLLECTED",
   "RESULT_INVALID",
+  "TOOL_FAILED",
   "CANCELLED",
   "WORKER_UNRESPONSIVE",
   "WORKTREE_FAILED",
@@ -55,13 +58,14 @@ var ERROR_CODES = [
   "INTERNAL_ERROR"
 ];
 var THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
-var BUDGET_DIMENSIONS = ["tokens", "costUsd", "durationMs", "agentLaunches"];
-var BUDGET_EVENT_TYPES = ["soft_crossed", "hard_overrun", "hard_exhausted", "adjustment_requested", "adjustment_approved", "adjustment_rejected"];
 var CONTEXT_FILE_SCOPES = ["global", "project", "cwd"];
 function isContextFileScope(value) {
   return CONTEXT_FILE_SCOPES.some((scope) => scope === value);
 }
+var BUDGET_DIMENSIONS = ["tokens", "costUsd", "durationMs", "agentLaunches"];
+var BUDGET_EVENT_TYPES = ["soft_crossed", "hard_overrun", "hard_exhausted", "adjustment_requested", "adjustment_approved", "adjustment_rejected"];
 var WORKFLOW_AGENT_STALL_THRESHOLD_MS = 10 * 60 * 1e3;
+var LAUNCH_SNAPSHOT_IDENTITY_VERSION = 6;
 var WORKFLOW_ERROR_BRAND = /* @__PURE__ */ Symbol.for("pi-extensible-workflows.workflow-error");
 var WorkflowError = class extends Error {
   constructor(code, message) {
@@ -139,90 +143,13 @@ function errorText(error) {
 function coerceWorkflowError(code, error) {
   return error instanceof WorkflowError && error.code === code ? error : new WorkflowError(code, errorText(error));
 }
-function errorCode(error) {
-  if (error instanceof WorkflowError) return isWorkflowErrorCode(error.code) ? error.code : void 0;
-  if (!object(error)) return void 0;
-  return isWorkflowErrorCode(error.code) ? error.code : void 0;
-}
-function fail(code, message) {
-  throw new WorkflowError(code, message);
-}
-function byPriorityThenName(left, right) {
-  return left.priority - right.priority || (left.name < right.name ? -1 : left.name > right.name ? 1 : 0);
-}
 function isThinkingLevel(value) {
   return THINKING_LEVELS.some((level) => level === value);
 }
-var MODEL_ALIAS_NAME = /^[A-Za-z][A-Za-z0-9_-]*$/;
 var WORKFLOW_EXTENSION_NAMESPACE = /^[A-Za-z][A-Za-z0-9_-]*$/;
 function validWorkflowExtensionNamespace(value) {
   return WORKFLOW_EXTENSION_NAMESPACE.test(value) && value !== "__proto__" && value !== "constructor" && value !== "prototype";
 }
-function parseModelReference(value) {
-  const match = /^([^/:\s]+)\/([^:\s]+)(?::([^:\s]+))?$/.exec(value);
-  if (!match?.[1] || !match[2]) fail("UNKNOWN_MODEL", `Invalid model spec: ${value}`);
-  const thinking = match[3];
-  if (thinking !== void 0 && !isThinkingLevel(thinking)) fail("UNKNOWN_MODEL", `Invalid thinking level: ${thinking}`);
-  return { provider: match[1], model: match[2], ...thinking !== void 0 ? { thinking } : {} };
-}
-var MODEL_ALIAS_ERROR_NAME = /* @__PURE__ */ Symbol("modelAliasErrorName");
-function aliasError(message, settingsPath, name) {
-  const error = new WorkflowError("CONFIG_ERROR", `${message} (settings: ${settingsPath})`);
-  if (name) Object.defineProperty(error, MODEL_ALIAS_ERROR_NAME, { value: name, configurable: true });
-  throw error;
-}
-function modelAliasName(value, aliases) {
-  const name = /^([^/:\s]+)(?::[^:\s]+)?$/.exec(value)?.[1];
-  return name && Object.prototype.hasOwnProperty.call(aliases, name) ? name : void 0;
-}
-function validateModelAliases(value, settingsPath = "workflow settings") {
-  if (!object(value)) aliasError("modelAliases must be an object", settingsPath);
-  const aliases = {};
-  for (const [name, target] of Object.entries(value)) {
-    if (!MODEL_ALIAS_NAME.test(name)) aliasError(`Invalid model alias name: ${name}`, settingsPath, name);
-    if (typeof target !== "string" || !target.trim()) aliasError(`Invalid model alias target for ${name}`, settingsPath, name);
-    aliases[name] = target;
-  }
-  for (const name of Object.keys(aliases)) {
-    try {
-      resolveModelReference(name, aliases);
-    } catch (error) {
-      aliasError(`Invalid model alias target for ${name}: ${errorText(error)}`, settingsPath, name);
-    }
-  }
-  return Object.freeze(aliases);
-}
-function unknownModel(value, target, settingsPath) {
-  const resolved = target ? ` resolved to ${target}` : "";
-  const path = settingsPath ? ` (settings: ${settingsPath})` : "";
-  fail("UNKNOWN_MODEL", `Unknown model${target ? " alias" : ""} ${value}${resolved}${path}`);
-}
-function resolveModelReference(value, aliases = {}, knownModels, settingsPath) {
-  const resolveReference = (reference, chain) => {
-    if (reference.includes("/")) return parseModelReference(reference);
-    const match = /^([^:\s]+)(?::([^:\s]+))?$/.exec(reference);
-    const thinking = match?.[2];
-    if (!match?.[1] || thinking !== void 0 && !isThinkingLevel(thinking)) unknownModel(reference, void 0, settingsPath);
-    const alias = modelAliasName(reference, aliases);
-    if (alias) {
-      if (chain.includes(alias)) fail("UNKNOWN_MODEL", `Circular model alias: ${[...chain, alias].join(" -> ")}${settingsPath ? ` (settings: ${settingsPath})` : ""}`);
-      const { [alias]: target } = aliases;
-      if (typeof target !== "string") unknownModel(reference, void 0, settingsPath);
-      const parsed = resolveReference(target, [...chain, alias]);
-      return thinking !== void 0 ? { ...parsed, thinking } : parsed;
-    }
-    const candidates = [...knownModels ?? []].filter((model) => model.slice(model.indexOf("/") + 1) === match[1]);
-    if (candidates.length === 1) {
-      const [candidate] = candidates;
-      if (candidate !== void 0) {
-        const parsed = parseModelReference(candidate);
-        return thinking !== void 0 ? { ...parsed, thinking } : parsed;
-      }
-    }
-    unknownModel(reference, void 0, settingsPath);
-  };
-  return resolveReference(value, []);
-}
 var RESOURCE_PATTERN_OPTIONS = { dot: true, nonegate: true, nocomment: true };
 function resourcePatternBody(pattern) {
   return pattern.startsWith("!") ? pattern.slice(1) : pattern;
@@ -230,12 +157,6 @@ function resourcePatternBody(pattern) {
 function resourcePatternPath(value) {
   return value.replaceAll("\\", "/");
 }
-function validateResourcePattern(pattern) {
-  const body = resourcePatternBody(pattern);
-  if (!body) throw new Error(`Empty minimatch pattern ${JSON.stringify(pattern)}`);
-  const matcher = new Minimatch(resourcePatternPath(body), RESOURCE_PATTERN_OPTIONS);
-  if (matcher.makeRe() === false) throw new Error(`Invalid minimatch pattern ${JSON.stringify(pattern)}`);
-}
 function resourcePatternMatches(resource, pattern) {
   const body = resourcePatternBody(pattern);
   if (body === "*") return true;
@@ -260,13 +181,137 @@ function resourcePatternHasMagic(pattern) {
 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/io.ts
+var execute = promisify(execFile);
+var RENAME_RETRY_DELAYS_MS = [10, 25, 50, 100, 200, 400, 800];
+var syncSleepBuffer = new Int32Array(new SharedArrayBuffer(4));
+function retryableRenameError(error) {
+  return isNodeError(error, "EPERM") || isNodeError(error, "EBUSY") || isNodeError(error, "EACCES");
+}
+async function renameWithRetry(from, to) {
+  for (let attempt = 0; ; attempt += 1) {
+    try {
+      await rename(from, to);
+      return;
+    } catch (error) {
+      const delayMs = RENAME_RETRY_DELAYS_MS[attempt];
+      if (!retryableRenameError(error) || delayMs === void 0) throw error;
+      await new Promise((resolve4) => setTimeout(resolve4, delayMs));
+    }
+  }
+}
+function renameSyncWithRetry(from, to) {
+  for (let attempt = 0; ; attempt += 1) {
+    try {
+      renameSync(from, to);
+      return;
+    } catch (error) {
+      const delayMs = RENAME_RETRY_DELAYS_MS[attempt];
+      if (!retryableRenameError(error) || delayMs === void 0) throw error;
+      Atomics.wait(syncSleepBuffer, 0, 0, delayMs);
+    }
+  }
+}
+var gitIdentity = {
+  GIT_AUTHOR_NAME: "pi-extensible-workflows",
+  GIT_AUTHOR_EMAIL: "pi-extensible-workflows@localhost",
+  GIT_COMMITTER_NAME: "pi-extensible-workflows",
+  GIT_COMMITTER_EMAIL: "pi-extensible-workflows@localhost",
+  GIT_AUTHOR_DATE: "2000-01-01T00:00:00Z",
+  GIT_COMMITTER_DATE: "2000-01-01T00:00:00Z"
+};
+function atomicWriteFile(path, content, sync = false) {
+  const temporary = `${path}.${String(process.pid)}.${randomUUID()}.tmp`;
+  if (sync) {
+    try {
+      writeFileSync(temporary, content, { encoding: "utf8", mode: 384 });
+      renameSyncWithRetry(temporary, path);
+    } catch (error) {
+      try {
+        rmSync(temporary, { force: true });
+      } catch {
+      }
+      throw error;
+    }
+    return;
+  }
+  return writeFile(temporary, content, { encoding: "utf8", mode: 384 }).then(() => renameWithRetry(temporary, path)).catch(async (error) => {
+    try {
+      await rm(temporary, { force: true });
+    } catch {
+    }
+    throw error;
+  });
+}
+async function atomicJson(path, value) {
+  const serialized = JSON.stringify(value);
+  if (typeof serialized !== "string") throw new WorkflowError("INTERNAL_ERROR", `Cannot serialize JSON for ${path}`);
+  await atomicWriteFile(path, `${serialized}
+`);
+}
+async function atomicPrettyJson(path, value) {
+  await atomicWriteFile(path, `${JSON.stringify(value, null, 2)}
+`);
+}
+async function json(path) {
+  return JSON.parse(await readFile(path, "utf8"));
+}
+async function git(cwd, args, extraEnv = {}) {
+  const { stdout } = await execute("git", ["-c", "core.hooksPath=/dev/null", "-c", "commit.gpgSign=false", ...args], { cwd, env: { ...process.env, ...extraEnv }, encoding: "utf8", maxBuffer: 10 * 1024 * 1024 });
+  return stdout;
 }
 
+// src/trajectory.ts
+import { open as open2, readFile as readFile4, readdir as readdir3, stat as stat3 } from "node:fs/promises";
+import { homedir as homedir4 } from "node:os";
+import { basename as basename2, dirname as dirname2, join as join4, resolve as resolve3 } from "node:path";
+import { createBashToolDefinition, createEditToolDefinition, createFindToolDefinition, createGrepToolDefinition, createLsToolDefinition, createReadToolDefinition, createWriteToolDefinition, DefaultPackageManager, getAgentDir as getAgentDir2, SettingsManager, DEFAULT_MAX_BYTES } from "@earendil-works/pi-coding-agent";
+
+// src/paths.ts
+import { createHash } from "node:crypto";
+import { realpathSync } from "node:fs";
+import { homedir } from "node:os";
+import { basename, isAbsolute, join, relative, resolve, sep } from "node:path";
+function safePart(value) {
+  return value.replace(/[^a-zA-Z0-9._-]/g, "_");
+}
+function canonicalPath(path) {
+  const absolute = resolve(path);
+  try {
+    return realpathSync(absolute);
+  } catch {
+    return absolute;
+  }
+}
+function sameFilesystemPath(left, right) {
+  return canonicalPath(left) === canonicalPath(right);
+}
+function workflowProjectSettingsPath(cwd) {
+  return join(cwd, ".pi", "pi-extensible-workflows", "settings.json");
+}
+function projectStorageKey(cwd) {
+  const exact = resolve(cwd);
+  const slug = safePart(basename(exact)) || "root";
+  return `${slug}-${createHash("sha256").update(exact).digest("hex").slice(0, 12)}`;
+}
+function projectSessionsDirectory(cwd, home = homedir()) {
+  return join(home, ".pi", "workflows", "projects", projectStorageKey(cwd), "sessions");
+}
+function runsDirectory(cwd, sessionId, home = homedir()) {
+  return join(projectSessionsDirectory(cwd, home), safePart(sessionId), "runs");
+}
+function structuralPath(...names) {
+  if (names.length === 0 || names.some((name) => name.trim() === "")) throw new WorkflowError("INVALID_METADATA", "Structural paths require non-empty explicit names");
+  return names.map((name) => encodeURIComponent(name)).join("/");
+}
+
+// src/session-lease.ts
+import { execFileSync } from "node:child_process";
+import { link, mkdir, open, readFile as readFile2, readdir, rename as rename2, rm as rm2, stat } from "node:fs/promises";
+import { homedir as homedir2 } from "node:os";
+import { join as join2 } from "node:path";
+
 // src/decoders.ts
 var INVALID_PERSISTED_VALUE = /* @__PURE__ */ Symbol("invalid persisted value");
 function integer(value) {
@@ -355,32 +400,19 @@ function decodeAgentResourceSelectors(value) {
 function decodeContextFileScopes(value) {
   return decodeArray(value, (scope) => isContextFileScope(scope) ? scope : void 0);
 }
-function decodeAgentDefinition(value) {
-  if (!object(value)) return void 0;
-  const prompt = optionalString(value.prompt);
-  const description = optionalString(value.description);
-  const model = optionalString(value.model);
-  const thinking = value.thinking;
-  const tools = value.tools === void 0 ? void 0 : decodeStringArray(value.tools);
-  const skills = value.skills === void 0 ? void 0 : decodeStringArray(value.skills);
-  const extensions = value.extensions === void 0 ? void 0 : decodeStringArray(value.extensions);
-  const overrideSystemPrompt = optionalBoolean(value.overrideSystemPrompt);
+function decodePreparedAgentConfiguration(value) {
+  if (!object(value) || !jsonValue(value) || typeof value.projectTrusted !== "boolean" || typeof value.systemPromptAppend !== "string") return void 0;
+  const model = decodeModelSpec(value.model);
+  const tools = decodeStringArray(value.tools);
+  const skills = decodeStringArray(value.skills);
+  const extensions = decodeStringArray(value.extensions);
+  const settings = decodeWorkflowExtensions(value.settings);
   const contextFiles = value.contextFiles === void 0 ? void 0 : decodeContextFileScopes(value.contextFiles);
-  const extensionSettings = value.extensionSettings === void 0 ? void 0 : decodeWorkflowExtensions(value.extensionSettings);
-  if (prompt === INVALID_PERSISTED_VALUE || description === INVALID_PERSISTED_VALUE || model === INVALID_PERSISTED_VALUE || overrideSystemPrompt === INVALID_PERSISTED_VALUE) return void 0;
-  if (thinking !== void 0 && !isThinkingLevel(thinking) || value.tools !== void 0 && !tools || value.skills !== void 0 && !skills || value.extensions !== void 0 && !extensions || value.contextFiles !== void 0 && !contextFiles || value.extensionSettings !== void 0 && !extensionSettings) return void 0;
-  const foldedModel = typeof model === "string" && thinking !== void 0 && !model.includes(":") ? `${model}:${thinking}` : model;
-  return {
-    ...prompt === void 0 ? {} : { prompt },
-    ...description === void 0 ? {} : { description },
-    ...foldedModel === void 0 ? {} : { model: foldedModel },
-    ...tools === void 0 ? {} : { tools },
-    ...skills === void 0 ? {} : { skills },
-    ...extensions === void 0 ? {} : { extensions },
-    ...overrideSystemPrompt === void 0 ? {} : { overrideSystemPrompt },
-    ...contextFiles === void 0 ? {} : { contextFiles },
-    ...extensionSettings === void 0 ? {} : { extensionSettings }
-  };
+  const label = optionalString(value.label);
+  const systemPrompt = optionalString(value.systemPrompt);
+  const excludeTools = value.excludeTools === void 0 ? void 0 : decodeStringArray(value.excludeTools);
+  if (!model || !tools || !skills || !extensions || !settings || label === INVALID_PERSISTED_VALUE || systemPrompt === INVALID_PERSISTED_VALUE || value.contextFiles !== void 0 && !contextFiles || value.excludeTools !== void 0 && !excludeTools) return void 0;
+  return { model, tools, skills, extensions, settings, projectTrusted: value.projectTrusted, systemPromptAppend: value.systemPromptAppend, ...contextFiles === void 0 ? {} : { contextFiles }, ...excludeTools === void 0 ? {} : { excludeTools }, ...label === void 0 ? {} : { label }, ...systemPrompt === void 0 ? {} : { systemPrompt } };
 }
 function decodeWorkflowMetadata(value) {
   if (!object(value) || typeof value.name !== "string") return void 0;
@@ -489,17 +521,22 @@ function decodeScheduledAgentOptions(value) {
   const parentBreadcrumb = optionalString(value.parentBreadcrumb);
   const worktreeOwner = optionalString(value.worktreeOwner);
   const model = optionalString(value.model);
-  const role = typeof value.role === "string" ? value.role : void 0;
   const contextFiles = value.contextFiles === void 0 ? void 0 : decodeContextFileScopes(value.contextFiles);
   const schema = value.schema === void 0 ? void 0 : decodeJsonObject(value.schema);
   const retries = optionalNumber(value.retries);
   const timeoutMs = value.timeoutMs;
+  if (value.projectTrusted !== void 0 && typeof value.projectTrusted !== "boolean") return void 0;
+  const rawCapabilities = value.capabilities;
+  const capabilities = rawCapabilities === void 0 ? void 0 : object(rawCapabilities) ? { tools: decodeStringArray(rawCapabilities.tools), skills: decodeStringArray(rawCapabilities.skills), extensions: decodeStringArray(rawCapabilities.extensions) } : void 0;
+  if (rawCapabilities !== void 0 && (!capabilities?.tools || !capabilities.skills || !capabilities.extensions)) return void 0;
+  const configuration = value.configuration === void 0 ? void 0 : decodePreparedAgentConfiguration(value.configuration);
+  if (value.configuration !== void 0 && configuration === void 0) return void 0;
   const agentOptions = value.agentOptions === void 0 ? void 0 : decodeJsonObject(value.agentOptions);
   const agentIdentity = value.agentIdentity === void 0 ? void 0 : decodeIdentity(value.agentIdentity);
   const sessionPath = optionalString(value.sessionPath);
   const continuity = value.continuity === void 0 ? void 0 : isAgentContinuity(value.continuity) ? value.continuity : INVALID_PERSISTED_VALUE;
   const extensionSettings = value.extensionSettings === void 0 ? void 0 : decodeWorkflowExtensions(value.extensionSettings);
-  if (sessionPath === INVALID_PERSISTED_VALUE || continuity === INVALID_PERSISTED_VALUE || requestedLabel === INVALID_PERSISTED_VALUE || parentBreadcrumb === INVALID_PERSISTED_VALUE || worktreeOwner === INVALID_PERSISTED_VALUE || model === INVALID_PERSISTED_VALUE || value.skills !== void 0 && !skills || value.extensions !== void 0 && !extensions || value.role !== void 0 && typeof value.role !== "string" || value.contextFiles !== void 0 && !contextFiles || value.schema !== void 0 && !schema || retries === INVALID_PERSISTED_VALUE || retries !== void 0 && !integer(retries) || timeoutMs !== void 0 && timeoutMs !== null && !finiteNumber(timeoutMs) || value.agentOptions !== void 0 && !agentOptions || value.agentIdentity !== void 0 && !agentIdentity || value.extensionSettings !== void 0 && !extensionSettings) return void 0;
+  if (sessionPath === INVALID_PERSISTED_VALUE || continuity === INVALID_PERSISTED_VALUE || requestedLabel === INVALID_PERSISTED_VALUE || parentBreadcrumb === INVALID_PERSISTED_VALUE || worktreeOwner === INVALID_PERSISTED_VALUE || model === INVALID_PERSISTED_VALUE || value.skills !== void 0 && !skills || value.extensions !== void 0 && !extensions || value.contextFiles !== void 0 && !contextFiles || value.schema !== void 0 && !schema || retries === INVALID_PERSISTED_VALUE || retries !== void 0 && !integer(retries) || timeoutMs !== void 0 && timeoutMs !== null && !finiteNumber(timeoutMs) || value.agentOptions !== void 0 && !agentOptions || value.agentIdentity !== void 0 && !agentIdentity || value.extensionSettings !== void 0 && !extensionSettings) return void 0;
   return {
     label: value.label,
     ...requestedLabel === void 0 ? {} : { requestedLabel },
@@ -510,7 +547,6 @@ function decodeScheduledAgentOptions(value) {
     ...extensions === void 0 ? {} : { extensions },
     ...worktreeOwner === void 0 ? {} : { worktreeOwner },
     ...model === void 0 ? {} : { model },
-    ...role === void 0 ? {} : { role },
     ...contextFiles === void 0 ? {} : { contextFiles },
     ...schema === void 0 ? {} : { schema },
     ...retries === void 0 ? {} : { retries },
@@ -518,6 +554,9 @@ function decodeScheduledAgentOptions(value) {
     ...sessionPath === void 0 ? {} : { sessionPath },
     ...continuity === void 0 ? {} : { continuity },
     ...agentOptions === void 0 ? {} : { agentOptions },
+    ...configuration === void 0 ? {} : { configuration },
+    ...value.projectTrusted === void 0 ? {} : { projectTrusted: value.projectTrusted },
+    ...capabilities?.tools && capabilities.skills && capabilities.extensions ? { capabilities: { tools: capabilities.tools, skills: capabilities.skills, extensions: capabilities.extensions } } : {},
     ...agentIdentity === void 0 ? {} : { agentIdentity },
     ...extensionSettings === void 0 ? {} : { extensionSettings }
   };
@@ -558,11 +597,10 @@ function decodeAgentResourceInspection(value) {
   const sources = sourceRecord === void 0 ? void 0 : {
     global: decodeAgentResourceSelectors(sourceRecord.global),
     project: decodeAgentResourceSelectors(sourceRecord.project),
-    ...sourceRecord.role === void 0 ? {} : { role: decodeAgentResourceSelectors(sourceRecord.role) },
     ...sourceRecord.call === void 0 ? {} : { call: decodeAgentResourceSelectors(sourceRecord.call) }
   };
-  if (!selectors || !skills || !extensions || !tools || !unmatchedSkills || !unmatchedExtensions || !unmatchedTools || rawSources !== void 0 && (!sources || !sources.global || !sources.project || sources.role === void 0 && sourceRecord?.role !== void 0 || sources.call === void 0 && sourceRecord?.call !== void 0)) return void 0;
-  return { selectors: { skills: [...selectors.skills ?? []], extensions: [...selectors.extensions ?? []], tools: [...selectors.tools ?? []] }, skills, extensions, tools, unmatchedSkills, unmatchedExtensions, unmatchedTools, ...sources === void 0 ? {} : { selectorSources: { global: sources.global ?? {}, project: sources.project ?? {}, ...sources.role === void 0 ? {} : { role: sources.role }, ...sources.call === void 0 ? {} : { call: sources.call } } } };
+  if (!selectors || !skills || !extensions || !tools || !unmatchedSkills || !unmatchedExtensions || !unmatchedTools || rawSources !== void 0 && (!sources || !sources.global || !sources.project || sources.call === void 0 && sourceRecord?.call !== void 0)) return void 0;
+  return { selectors: { skills: [...selectors.skills ?? []], extensions: [...selectors.extensions ?? []], tools: [...selectors.tools ?? []] }, skills, extensions, tools, unmatchedSkills, unmatchedExtensions, unmatchedTools, ...sources === void 0 ? {} : { selectorSources: { global: sources.global ?? {}, project: sources.project ?? {}, ...sources.call === void 0 ? {} : { call: sources.call } } } };
 }
 function decodeAgentSetupSummary(value) {
   if (!object(value) || typeof value.cwd !== "string") return void 0;
@@ -600,7 +638,6 @@ function decodeAgent(value) {
   const worktreeOwner = optionalString(value.worktreeOwner);
   const handle = optionalString(value.handle);
   const continuity = value.continuity === void 0 ? void 0 : isAgentContinuity(value.continuity) ? value.continuity : INVALID_PERSISTED_VALUE;
-  const role = optionalString(value.role);
   const requestedModel = optionalString(value.requestedModel);
   const startedAt = optionalNumber(value.startedAt);
   const durationMs = optionalNumber(value.durationMs);
@@ -609,7 +646,7 @@ function decodeAgent(value) {
   const toolCalls = value.toolCalls === void 0 ? void 0 : decodeArray(value.toolCalls, decodeAgentToolCall);
   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 || label === INVALID_PERSISTED_VALUE || parentId === INVALID_PERSISTED_VALUE || resultPath === 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 (systemPrompt === INVALID_PERSISTED_VALUE || prompt === INVALID_PERSISTED_VALUE || label === INVALID_PERSISTED_VALUE || parentId === INVALID_PERSISTED_VALUE || resultPath === INVALID_PERSISTED_VALUE || parentBreadcrumb === INVALID_PERSISTED_VALUE || worktreeOwner === 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 && !accounting || value.toolCalls !== void 0 && !toolCalls || value.activity !== void 0 && !activity) return void 0;
   return {
     ...systemPrompt === void 0 ? {} : { systemPrompt },
@@ -626,7 +663,6 @@ function decodeAgent(value) {
     ...worktreeOwner === void 0 ? {} : { worktreeOwner },
     ...handle === void 0 ? {} : { handle, turn: value.turn },
     ...continuity === void 0 ? {} : { continuity },
-    ...role === void 0 ? {} : { role },
     ...requestedModel === void 0 ? {} : { requestedModel },
     model,
     tools,
@@ -684,6 +720,22 @@ function decodeRunEvent(value) {
   if (timestamp === INVALID_PERSISTED_VALUE) return void 0;
   return { type: value.type, message: value.message, ...timestamp === void 0 ? {} : { timestamp } };
 }
+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;
@@ -713,6 +765,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 {
@@ -731,6 +785,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 },
@@ -755,13 +810,11 @@ function decodeLaunchSnapshot(value) {
   const phases = value.phases === void 0 ? void 0 : decodeStringArray(value.phases);
   const models = decodeStringArray(value.models);
   const tools = decodeStringArray(value.tools);
-  const agentTypes = decodeStringArray(value.agentTypes);
-  const roles = value.roles === void 0 ? void 0 : decodeRecord(value.roles, decodeAgentDefinition);
-  const projectRoles = value.projectRoles === void 0 ? void 0 : decodeStringArray(value.projectRoles);
+  const agentConfigurations = decodeRecord(value.agentConfigurations, decodePreparedAgentConfiguration);
   const schemas = decodeArray(value.schemas, decodeJsonObject);
-  if (identityVersion === INVALID_PERSISTED_VALUE || value.identityVersion !== void 0 && !integer(identityVersion) || launchMode !== void 0 && !isLaunchMode(launchMode) || args === void 0 || !metadata || !settings || value.settingsSources !== void 0 && !settingsSources || value.budget !== void 0 && !budget || settingsPath === INVALID_PERSISTED_VALUE || value.modelAliases !== void 0 && !modelAliases || value.phases !== void 0 && !phases || !models || !tools || !agentTypes || value.roles !== void 0 && !roles || value.projectRoles !== void 0 && !projectRoles || !schemas) return void 0;
+  if (identityVersion !== LAUNCH_SNAPSHOT_IDENTITY_VERSION || launchMode !== void 0 && !isLaunchMode(launchMode) || args === void 0 || !metadata || !settings || value.settingsSources !== void 0 && !settingsSources || value.budget !== void 0 && !budget || settingsPath === INVALID_PERSISTED_VALUE || value.modelAliases !== void 0 && !modelAliases || value.phases !== void 0 && !phases || !models || !tools || !agentConfigurations || !schemas) return void 0;
   return {
-    ...identityVersion === void 0 ? {} : { identityVersion },
+    identityVersion: LAUNCH_SNAPSHOT_IDENTITY_VERSION,
     ...launchMode === void 0 ? {} : { launchMode },
     script: value.script,
     args,
@@ -774,9 +827,7 @@ function decodeLaunchSnapshot(value) {
     ...phases === void 0 ? {} : { phases },
     models,
     tools,
-    agentTypes,
-    ...roles === void 0 ? {} : { roles },
-    ...projectRoles === void 0 ? {} : { projectRoles },
+    agentConfigurations,
     schemas
   };
 }
@@ -837,162 +888,64 @@ function decodeJournal(value) {
 function decodeBooleanCheckpointResult(value) {
   return typeof value === "boolean" ? value : void 0;
 }
-function decodeSummaryProjection(value) {
-  if (!object(value)) return void 0;
-  const createdAt = optionalString(value.createdAt);
-  const updatedAt = optionalString(value.updatedAt);
-  const terminalAt = optionalString(value.terminalAt);
-  if (createdAt === INVALID_PERSISTED_VALUE || updatedAt === INVALID_PERSISTED_VALUE || terminalAt === INVALID_PERSISTED_VALUE) return void 0;
-  return { ...createdAt === void 0 ? {} : { createdAt }, ...updatedAt === void 0 ? {} : { updatedAt }, ...terminalAt === void 0 ? {} : { terminalAt } };
-}
-function decodeEffectiveSystemPrompt(value) {
-  if (!object(value) || typeof value.sessionId !== "string" || !positiveInteger(value.attempt) || !positiveInteger(value.turn) || typeof value.sha256 !== "string" || !/^[0-9a-f]{64}$/.test(value.sha256) || typeof value.prompt !== "string") return void 0;
-  return { sessionId: value.sessionId, attempt: value.attempt, turn: value.turn, sha256: value.sha256, prompt: value.prompt };
-}
-function decodeSystemPromptArtifact(value) {
-  if (!object(value) || !finiteNumber(value.version)) return void 0;
-  const entries = value.entries === void 0 ? void 0 : decodeArray(value.entries, decodeEffectiveSystemPrompt);
-  if (value.entries !== void 0 && !entries) return void 0;
-  return { version: value.version, ...value.format === void 0 ? {} : { format: value.format }, ...value.storage === void 0 ? {} : { storage: value.storage }, ...entries === void 0 ? {} : { entries } };
-}
-
-// src/io.ts
-import { execFile } from "node:child_process";
-import { randomUUID } from "node:crypto";
-import { renameSync, rmSync, writeFileSync } from "node:fs";
-import { readFile, rename, rm, writeFile } from "node:fs/promises";
-import { promisify } from "node:util";
-var execute = promisify(execFile);
-var RENAME_RETRY_DELAYS_MS = [10, 25, 50, 100, 200, 400, 800];
-var syncSleepBuffer = new Int32Array(new SharedArrayBuffer(4));
-function retryableRenameError(error) {
-  return isNodeError(error, "EPERM") || isNodeError(error, "EBUSY") || isNodeError(error, "EACCES");
-}
-async function renameWithRetry(from, to) {
-  for (let attempt = 0; ; attempt += 1) {
-    try {
-      await rename(from, to);
-      return;
-    } catch (error) {
-      const delayMs = RENAME_RETRY_DELAYS_MS[attempt];
-      if (!retryableRenameError(error) || delayMs === void 0) throw error;
-      await new Promise((resolve5) => setTimeout(resolve5, delayMs));
-    }
-  }
-}
-function renameSyncWithRetry(from, to) {
-  for (let attempt = 0; ; attempt += 1) {
-    try {
-      renameSync(from, to);
-      return;
-    } catch (error) {
-      const delayMs = RENAME_RETRY_DELAYS_MS[attempt];
-      if (!retryableRenameError(error) || delayMs === void 0) throw error;
-      Atomics.wait(syncSleepBuffer, 0, 0, delayMs);
-    }
-  }
-}
-var gitIdentity = {
-  GIT_AUTHOR_NAME: "pi-extensible-workflows",
-  GIT_AUTHOR_EMAIL: "pi-extensible-workflows@localhost",
-  GIT_COMMITTER_NAME: "pi-extensible-workflows",
-  GIT_COMMITTER_EMAIL: "pi-extensible-workflows@localhost",
-  GIT_AUTHOR_DATE: "2000-01-01T00:00:00Z",
-  GIT_COMMITTER_DATE: "2000-01-01T00:00:00Z"
-};
-function atomicWriteFile(path, content, sync = false) {
-  const temporary = `${path}.${String(process.pid)}.${randomUUID()}.tmp`;
-  if (sync) {
-    try {
-      writeFileSync(temporary, content, { encoding: "utf8", mode: 384 });
-      renameSyncWithRetry(temporary, path);
-    } catch (error) {
-      try {
-        rmSync(temporary, { force: true });
-      } catch {
-      }
-      throw error;
-    }
-    return;
-  }
-  return writeFile(temporary, content, { encoding: "utf8", mode: 384 }).then(() => renameWithRetry(temporary, path)).catch(async (error) => {
-    try {
-      await rm(temporary, { force: true });
-    } catch {
-    }
-    throw error;
-  });
-}
-async function atomicJson(path, value) {
-  const serialized = JSON.stringify(value);
-  if (typeof serialized !== "string") throw new WorkflowError("INTERNAL_ERROR", `Cannot serialize JSON for ${path}`);
-  await atomicWriteFile(path, `${serialized}
-`);
-}
-async function atomicPrettyJson(path, value) {
-  await atomicWriteFile(path, `${JSON.stringify(value, null, 2)}
-`);
-}
-async function json(path) {
-  return JSON.parse(await readFile(path, "utf8"));
-}
-async function git(cwd, args, extraEnv = {}) {
-  const { stdout } = await execute("git", ["-c", "core.hooksPath=/dev/null", "-c", "commit.gpgSign=false", ...args], { cwd, env: { ...process.env, ...extraEnv }, encoding: "utf8", maxBuffer: 10 * 1024 * 1024 });
-  return stdout;
-}
-
-// src/paths.ts
-import { createHash } from "node:crypto";
-import { realpathSync } from "node:fs";
-import { homedir } from "node:os";
-import { basename, join, resolve } from "node:path";
-function safePart(value) {
-  return value.replace(/[^a-zA-Z0-9._-]/g, "_");
-}
-function canonicalPath(path) {
-  const absolute = resolve(path);
-  try {
-    return realpathSync(absolute);
-  } catch {
-    return absolute;
-  }
-}
-function sameFilesystemPath(left, right) {
-  return canonicalPath(left) === canonicalPath(right);
-}
-function workflowProjectSettingsPath(cwd) {
-  return join(cwd, ".pi", "pi-extensible-workflows", "settings.json");
-}
-function projectStorageKey(cwd) {
-  const exact = resolve(cwd);
-  const slug = safePart(basename(exact)) || "root";
-  return `${slug}-${createHash("sha256").update(exact).digest("hex").slice(0, 12)}`;
-}
-function projectSessionsDirectory(cwd, home = homedir()) {
-  return join(home, ".pi", "workflows", "projects", projectStorageKey(cwd), "sessions");
+function decodeSummaryProjection(value) {
+  if (!object(value)) return void 0;
+  const createdAt = optionalString(value.createdAt);
+  const updatedAt = optionalString(value.updatedAt);
+  const terminalAt = optionalString(value.terminalAt);
+  if (createdAt === INVALID_PERSISTED_VALUE || updatedAt === INVALID_PERSISTED_VALUE || terminalAt === INVALID_PERSISTED_VALUE) return void 0;
+  return { ...createdAt === void 0 ? {} : { createdAt }, ...updatedAt === void 0 ? {} : { updatedAt }, ...terminalAt === void 0 ? {} : { terminalAt } };
 }
-function runsDirectory(cwd, sessionId, home = homedir()) {
-  return join(projectSessionsDirectory(cwd, home), safePart(sessionId), "runs");
+function decodeEffectiveSystemPrompt(value) {
+  if (!object(value) || typeof value.sessionId !== "string" || !positiveInteger(value.attempt) || !positiveInteger(value.turn) || typeof value.sha256 !== "string" || !/^[0-9a-f]{64}$/.test(value.sha256) || typeof value.prompt !== "string") return void 0;
+  return { sessionId: value.sessionId, attempt: value.attempt, turn: value.turn, sha256: value.sha256, prompt: value.prompt };
 }
-function structuralPath(...names) {
-  if (names.length === 0 || names.some((name) => name.trim() === "")) throw new WorkflowError("INVALID_METADATA", "Structural paths require non-empty explicit names");
-  return names.map((name) => encodeURIComponent(name)).join("/");
+function decodeSystemPromptArtifact(value) {
+  if (!object(value) || !finiteNumber(value.version)) return void 0;
+  const entries = value.entries === void 0 ? void 0 : decodeArray(value.entries, decodeEffectiveSystemPrompt);
+  if (value.entries !== void 0 && !entries) return void 0;
+  return { version: value.version, ...value.format === void 0 ? {} : { format: value.format }, ...value.storage === void 0 ? {} : { storage: value.storage }, ...entries === void 0 ? {} : { entries } };
 }
 
 // src/session-lease.ts
 var RUN_CREATE_TEMP = /^\.([a-zA-Z0-9._-]+)\.(\d+)\.[0-9a-f-]+\.tmp$/;
-async function processAlive(pid, startedAt) {
+var START_MARGIN_MS = 6e4;
+var clockTicks;
+function clockTickRate() {
+  if (clockTicks !== void 0) return clockTicks;
+  try {
+    const rate = Number(execFileSync("getconf", ["CLK_TCK"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim());
+    clockTicks = Number.isInteger(rate) && rate > 0 ? rate : 100;
+  } catch {
+    clockTicks = 100;
+  }
+  return clockTicks;
+}
+async function linuxProcessStart(pid, procRoot) {
+  try {
+    const text = await readFile2(join2(procRoot, String(pid), "stat"), "utf8");
+    const close = text.lastIndexOf(")");
+    const ticks = close < 0 ? Number.NaN : Number(text.slice(close + 2).split(" ")[19]);
+    const btime = /^btime (\d+)$/m.exec(await readFile2(join2(procRoot, "stat"), "utf8"))?.[1];
+    if (btime === void 0 || !Number.isInteger(ticks) || ticks < 0) return void 0;
+    return Number(btime) * 1e3 + ticks / clockTickRate() * 1e3;
+  } catch {
+    return void 0;
+  }
+}
+async function processAlive(pid, startedAt, procRoot = "/proc") {
   try {
     process.kill(pid, 0);
   } catch (error) {
     return !isNodeError(error, "ESRCH");
   }
-  if (startedAt !== void 0 && process.platform === "linux") {
-    try {
-      if ((await stat(`/proc/${String(pid)}`)).ctimeMs > startedAt) return false;
-    } catch (error) {
-      if (isNodeError(error, "ENOENT")) return false;
-    }
+  if (startedAt === void 0 || process.platform !== "linux") return true;
+  const start = await linuxProcessStart(pid, procRoot);
+  if (start !== void 0) return start <= startedAt + START_MARGIN_MS;
+  try {
+    process.kill(pid, 0);
+  } catch (error) {
+    return !isNodeError(error, "ESRCH");
   }
   return true;
 }
@@ -1015,18 +968,12 @@ async function listRunIds(cwd, sessionId, home = homedir2(), cleanTemps = true)
   }
 }
 
-// src/trajectory.ts
-import { open as open2, readFile as readFile4, readdir as readdir3, stat as stat3 } from "node:fs/promises";
-import { homedir as homedir5 } from "node:os";
-import { basename as basename3, dirname as dirname4, join as join6, resolve as resolve4 } from "node:path";
-import { createBashToolDefinition, createEditToolDefinition, createFindToolDefinition, createGrepToolDefinition, createLsToolDefinition, createReadToolDefinition, createWriteToolDefinition, DefaultPackageManager, getAgentDir as getAgentDir3, SettingsManager, DEFAULT_MAX_BYTES } from "@earendil-works/pi-coding-agent";
-
 // src/store.ts
 import { execFile as execFile2 } from "node:child_process";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import { access, mkdir as mkdir2, readdir as readdir2, readFile as readFile3, realpath, rename as rename3, rm as rm3, stat as stat2, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
-import { dirname, join as join3, relative, resolve as resolve2, sep } from "node:path";
+import { dirname, join as join3, relative as relative2, resolve as resolve2, sep as sep2 } from "node:path";
 import { promisify as promisify2 } from "node:util";
 
 // src/budget.ts
@@ -1051,7 +998,7 @@ function summaryFromRun(run, directory, journal, previous, fallbackCreatedAt, no
   const failedAt = run.failedAt ?? run.error?.failedAt;
   const replayablePaths = [.../* @__PURE__ */ new Set([...run.retry?.completedPaths ?? [], ...Object.keys(journal.completed)])];
   const incompletePaths = [.../* @__PURE__ */ new Set([...run.retry?.incompletePaths ?? [], ...failedAt ? [failedAt] : []])];
-  return { schemaVersion: 1, runId: run.id, sessionId: run.sessionId, workflowName: run.workflowName, state: run.state, createdAt, updatedAt: now, ...previous?.terminalAt || HARD_TERMINAL_RUN_STATES.has(run.state) ? { terminalAt: previous?.terminalAt ?? now } : {}, usage: budgetUsage(run.usage), agents: run.agents.map(({ id, name, label, state, role, attempts }) => ({ id, name, ...label ? { label } : {}, state, ...role ? { role } : {}, attempts })), ...run.error ? { error: run.error } : {}, ...failedAt ? { failedAt } : {}, replayablePaths, incompletePaths, artifacts: summaryArtifacts(directory) };
+  return { schemaVersion: 1, runId: run.id, sessionId: run.sessionId, workflowName: run.workflowName, state: run.state, createdAt, updatedAt: now, ...previous?.terminalAt || HARD_TERMINAL_RUN_STATES.has(run.state) ? { terminalAt: previous?.terminalAt ?? now } : {}, usage: budgetUsage(run.usage), agents: run.agents.map(({ id, name, label, state, attempts }) => ({ id, name, ...label ? { label } : {}, state, attempts })), ...run.error ? { error: run.error } : {}, ...failedAt ? { failedAt } : {}, replayablePaths, incompletePaths, artifacts: summaryArtifacts(directory) };
 }
 function systemPromptStoragePath(directory) {
   return join3(directory, SYSTEM_PROMPT_STORAGE);
@@ -1199,6 +1146,20 @@ var RunStore = class _RunStore {
     });
     return write;
   }
+  async saveAgentConfiguration(key, configuration) {
+    await this.launchSnapshotLane.run(async () => {
+      const snapshot = decodeLaunchSnapshot(await json(join3(this.directory, "snapshot.json")));
+      if (!snapshot) throw new WorkflowError("RESUME_INCOMPATIBLE", "Workflow launch snapshot identity version is incompatible");
+      await atomicJson(join3(this.directory, "snapshot.json"), { ...snapshot, agentConfigurations: { ...snapshot.agentConfigurations, [key]: configuration } });
+    });
+  }
+  async setLaunchMode(launchMode) {
+    await this.launchSnapshotLane.run(async () => {
+      const snapshot = decodeLaunchSnapshot(await json(join3(this.directory, "snapshot.json")));
+      if (!snapshot) throw new WorkflowError("RESUME_INCOMPATIBLE", "Workflow launch snapshot identity version is incompatible");
+      await atomicJson(join3(this.directory, "snapshot.json"), { ...snapshot, launchMode });
+    });
+  }
   async saveSnapshot(snapshot) {
     const write = this.launchSnapshotLane.run(() => atomicJson(join3(this.directory, "snapshot.json"), snapshot));
     await write;
@@ -1473,9 +1434,9 @@ var RunStore = class _RunStore {
   }
   structuralWorktree(owner, record) {
     const expected = this.expectedWorktree(owner);
-    const relativePath = relative(this.directory, record.path);
-    const relativeCwd = relative(record.path, record.cwd);
-    if (record.owner !== owner || resolve2(record.path) !== expected.path || record.branch !== expected.branch || relativePath === ".." || relativePath.startsWith(`..${sep}`) || relativeCwd === ".." || relativeCwd.startsWith(`..${sep}`)) throw new Error(`Invalid worktree record for ${owner}`);
+    const relativePath = relative2(this.directory, record.path);
+    const relativeCwd = relative2(record.path, record.cwd);
+    if (record.owner !== owner || resolve2(record.path) !== expected.path || record.branch !== expected.branch || relativePath === ".." || relativePath.startsWith(`..${sep2}`) || relativeCwd === ".." || relativeCwd.startsWith(`..${sep2}`)) throw new Error(`Invalid worktree record for ${owner}`);
     return record;
   }
   async #loadWorktreeRecords(missingOk = true) {
@@ -1713,8 +1674,8 @@ var RunStore = class _RunStore {
       try {
         const root = (await git(this.cwd, ["rev-parse", "--show-toplevel"])).trim();
         const [canonicalRoot, canonicalCwd] = await Promise.all([realpath(root), realpath(this.cwd)]);
-        const launchRelative = relative(canonicalRoot, canonicalCwd);
-        if (launchRelative === ".." || launchRelative.startsWith(`..${sep}`)) throw new Error("launch cwd is outside the repository");
+        const launchRelative = relative2(canonicalRoot, canonicalCwd);
+        if (launchRelative === ".." || launchRelative.startsWith(`..${sep2}`)) throw new Error("launch cwd is outside the repository");
         await this.cleanupMarker(markerPath);
         const dirty = (await git(root, ["status", "--porcelain", "--untracked-files=normal"])).trim();
         if (dirty) {
@@ -1900,517 +1861,12 @@ import { Type } from "@earendil-works/pi-ai";
 // src/validation.ts
 import * as acorn from "acorn";
 
-// src/roles.ts
-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 join5 } from "node:path";
-import { fileURLToPath as fileURLToPath2 } from "node:url";
-import { Value } from "typebox/value";
-
 // src/settings.ts
-import { mkdirSync, readFileSync } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { dirname as dirname2, join as join4, 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 join4(agentDir, ROLE_DIRECTORY, "settings.json");
-}
-function normalizedResourcePath(value, settingsPath) {
-  if (value === "*") return value;
-  let expanded = value === "~" ? homedir4() : value.startsWith("~/") || value.startsWith("~\\") ? join4(homedir4(), 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 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"]]);
-  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");
-  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 };
-}
-
-// src/package-identity.ts
-var CORE_PACKAGE_NAME = "@marcoscale98/pi-extensible-workflows";
-var CORE_PACKAGE_COMPATIBILITY_NAME = "pi-extensible-workflows";
-var CORE_PACKAGE_NAMES = [CORE_PACKAGE_NAME, CORE_PACKAGE_COMPATIBILITY_NAME];
-function isCorePackageName(value) {
-  return typeof value === "string" && CORE_PACKAGE_NAMES.includes(value);
-}
-
-// 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 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._-]*$/;
-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 fileURLToPath2(value);
-    }
-    if (typeof value === "string") {
-      if (value.startsWith("file:")) return fileURLToPath2(value);
-      if (isAbsolute(value)) return value;
-    }
-  } catch (error) {
-    fail("INVALID_METADATA", `Invalid workflow role directory: ${errorText(error)}`);
-  }
-  fail("INVALID_METADATA", "Workflow role directories require file URLs or absolute filesystem paths");
-}
-function isBuiltinRoleDirectory(path) {
-  const canonical = canonicalPath(path);
-  const starterDirectory = dirname3(canonical);
-  if (basename2(canonical) !== "roles" || basename2(starterDirectory) !== "starter") return false;
-  const distributionDirectory = dirname3(starterDirectory);
-  const packageRoot = basename2(distributionDirectory) === "dist" ? dirname3(distributionDirectory) : distributionDirectory;
-  try {
-    const metadata = JSON.parse(readFileSync2(join5(packageRoot, "package.json"), "utf8"));
-    return object(metadata) && isCorePackageName(metadata.name);
-  } catch {
-    return false;
-  }
-}
-function catalogSchema(schema, at) {
-  validateSchema(schema, at);
-  return structuredClone(schema);
-}
-var WorkflowRegistry = class {
-  #extensions = /* @__PURE__ */ new Set();
-  #functionSources = /* @__PURE__ */ new Map();
-  #globals = /* @__PURE__ */ new Map();
-  #hooks = /* @__PURE__ */ new Map();
-  #agentAttemptActions = /* @__PURE__ */ new Map();
-  #roleDirectories = /* @__PURE__ */ new Map();
-  #modelAliases = /* @__PURE__ */ new Map();
-  #settingsValidators = /* @__PURE__ */ new Set();
-  #frozen = false;
-  #subagentStatusObserver;
-  get frozen() {
-    return this.#frozen;
-  }
-  freeze() {
-    this.#frozen = true;
-  }
-  setSubagentStatusObserver(observer) {
-    this.#subagentStatusObserver = observer;
-  }
-  observeSubagentStatus(status, request) {
-    this.#subagentStatusObserver?.(status, request);
-  }
-  register(extension2) {
-    if (this.#frozen) fail("REGISTRY_FROZEN", "Workflow extension registration is closed after session_start");
-    if (object(extension2) && Object.prototype.hasOwnProperty.call(extension2, "workflows")) fail("INVALID_METADATA", "Separate registered workflow definitions were removed; register a function with input and output schemas instead");
-    if (!object(extension2) || Object.keys(extension2).some((key) => !["version", "headline", "description", "source", "dependencies", "validateSettings", "functions", "modelAliases", "agentSetupHooks", "agentAttemptActions", "roleDirectories"].includes(key)) || typeof extension2.version !== "string" || !SEMVER.test(extension2.version) || typeof extension2.headline !== "string" || !extension2.headline.trim()) fail("INVALID_METADATA", "Workflow extensions require a semantic version and non-empty headline");
-    const functions = extension2.functions ?? {};
-    const modelAliases = extension2.modelAliases ?? {};
-    const agentSetupHooks = extension2.agentSetupHooks ?? {};
-    const agentAttemptActions = extension2.agentAttemptActions ?? {};
-    const source = extension2.source;
-    const dependencyValues = extension2.dependencies;
-    const dependencies = dependencyValues ?? [];
-    const validateSettings = extension2.validateSettings;
-    if (validateSettings !== void 0 && typeof validateSettings !== "function") fail("INVALID_METADATA", "Workflow extension validateSettings must be a function");
-    if (source !== void 0 && (typeof source !== "string" || !source.trim())) fail("INVALID_METADATA", "Workflow extension source must be a non-empty module URL");
-    if (dependencyValues !== void 0 && (!Array.isArray(dependencyValues) || dependencyValues.some((dependency) => typeof dependency !== "string" || dependency.trim() !== dependency || !PACKAGE_NAME.test(dependency)) || new Set(dependencyValues).size !== dependencyValues.length)) fail("INVALID_METADATA", "Workflow extension dependencies must be unique, non-empty package names");
-    const roleDirectoryValues = extension2.roleDirectories === void 0 ? [] : extension2.roleDirectories;
-    if (!Array.isArray(roleDirectoryValues)) fail("INVALID_METADATA", "Workflow extension roleDirectories must be an array");
-    const roleDirectories = [...new Set(Array.from(roleDirectoryValues, (value) => normalizeRoleDirectory(value)))];
-    if (!object(functions) || !object(modelAliases) || !object(agentSetupHooks) || !object(agentAttemptActions) || Object.keys(functions).length === 0 && Object.keys(modelAliases).length === 0 && Object.keys(agentSetupHooks).length === 0 && Object.keys(agentAttemptActions).length === 0 && roleDirectories.length === 0 && validateSettings === void 0) fail("INVALID_METADATA", "Workflow extensions require functions, model aliases, agent setup hooks, agent attempt actions, role directories, or a settings validator");
-    const names = Object.keys(functions);
-    if (new Set(names).size !== names.length) fail("GLOBAL_COLLISION", "Global name collision inside extension");
-    for (const name of names) {
-      if (!IDENTIFIER.test(name) || name.startsWith("__pi_extensible_workflows_")) fail("INVALID_METADATA", `Invalid global name: ${name}`);
-      if (RESERVED_GLOBALS.has(name)) fail("GLOBAL_COLLISION", `Global name is reserved: ${name}`);
-      if (this.#globals.has(name)) fail("GLOBAL_COLLISION", `Global name is already registered: ${name}`);
-    }
-    for (const [name, fn] of Object.entries(functions)) {
-      if (!object(fn) || Object.keys(fn).some((key) => !["description", "input", "output", "run"].includes(key)) || typeof fn.description !== "string" || !fn.description.trim() || typeof fn.run !== "function") fail("INVALID_METADATA", `Invalid workflow function: ${name}`);
-      validateSchema(fn.input, `${name} input`);
-      validateSchema(fn.output, `${name} output`);
-      if (fn.input.type !== "object") fail("INVALID_SCHEMA", `${name} input must describe one object`);
-    }
-    for (const [name, alias] of Object.entries(modelAliases)) {
-      if (!MODEL_ALIAS_NAME.test(name)) fail("INVALID_METADATA", `Invalid model alias name: ${name}`);
-      if (!object(alias) || Object.keys(alias).some((key) => key !== "resolve") || typeof alias.resolve !== "function") fail("INVALID_METADATA", `Invalid model alias resolver: ${name}`);
-      if (this.#modelAliases.has(name)) fail("DUPLICATE_NAME", `Model alias already registered: ${name}`);
-    }
-    for (const [name, hook] of Object.entries(agentSetupHooks)) {
-      if (!IDENTIFIER.test(name) || !object(hook) || Object.keys(hook).some((key) => !["priority", "setup"].includes(key)) || typeof hook.setup !== "function" || hook.priority !== void 0 && (typeof hook.priority !== "number" || !Number.isFinite(hook.priority))) fail("INVALID_METADATA", `Invalid agent setup hook: ${name}`);
-      if (this.#hooks.has(name)) fail("DUPLICATE_NAME", `Agent setup hook already registered: ${name}`);
-    }
-    for (const [name, action] of Object.entries(agentAttemptActions)) {
-      if (!IDENTIFIER.test(name) || !object(action) || Object.keys(action).some((key) => !["label", "visible", "run", "visibleStandalone", "runStandalone"].includes(key)) || typeof action.label !== "string" || !action.label.trim() || typeof action.visible !== "function" || typeof action.run !== "function" || action.visibleStandalone !== void 0 && typeof action.visibleStandalone !== "function" || action.runStandalone !== void 0 && typeof action.runStandalone !== "function") fail("INVALID_METADATA", `Invalid agent attempt action: ${name}`);
-      if (action.visibleStandalone !== void 0 !== (action.runStandalone !== void 0)) fail("INVALID_METADATA", `Standalone agent attempt actions require visibleStandalone and runStandalone: ${name}`);
-      if (this.#agentAttemptActions.has(name)) fail("DUPLICATE_NAME", `Agent attempt action already registered: ${name}`);
-    }
-    const stored = deepFreeze({ ...extension2, functions, modelAliases, agentSetupHooks, agentAttemptActions, ...roleDirectories.length ? { roleDirectories } : {} });
-    if (source !== void 0) for (const name of names) this.#functionSources.set(name, Object.freeze({ module: source, export: "default", dependencies: Object.freeze([...dependencies]) }));
-    this.#extensions.add(stored);
-    for (const directory of roleDirectories) if (!this.#roleDirectories.has(directory)) this.#roleDirectories.set(directory, deepFreeze({ path: directory, extension: { version: extension2.version, headline: extension2.headline }, ...isBuiltinRoleDirectory(directory) ? { builtin: true } : {} }));
-    for (const name of names) this.#globals.set(name, name);
-    for (const [name, alias] of Object.entries(modelAliases)) this.#modelAliases.set(name, { name, version: extension2.version, headline: extension2.headline, resolve: alias.resolve });
-    for (const [name, hook] of Object.entries(agentSetupHooks)) this.#hooks.set(name, { name, priority: hook.priority ?? 10, setup: hook.setup });
-    for (const [name, action] of Object.entries(agentAttemptActions)) this.#agentAttemptActions.set(name, action);
-    if (validateSettings !== void 0) this.#settingsValidators.add({ headline: extension2.headline, validate: validateSettings });
-  }
-  function(name) {
-    if (!IDENTIFIER.test(name)) fail("MISSING_WORKFLOW", `Registered functions require an unqualified name: ${name}`);
-    const fn = [...this.#extensions].find((extension2) => extension2.functions?.[name])?.functions?.[name];
-    if (!fn) fail("MISSING_WORKFLOW", `Registered function is unavailable: ${name}; the separate registered-workflow format was removed`);
-    return fn;
-  }
-  functions() {
-    return Object.freeze(Object.fromEntries([...this.#extensions].flatMap((extension2) => Object.entries(extension2.functions ?? {}))));
-  }
-  functionSources() {
-    return Object.freeze(Object.fromEntries(this.#functionSources));
-  }
-  catalog(context) {
-    const functions = [];
-    for (const extension2 of this.#extensions) {
-      for (const [name, fn] of Object.entries(extension2.functions ?? {})) functions.push({ name, version: extension2.version, headline: extension2.headline, description: fn.description, input: catalogSchema(fn.input, `${name} input`), output: catalogSchema(fn.output, `${name} output`) });
-    }
-    let aliases;
-    let settings;
-    let source = "global settings";
-    try {
-      const resolved = context ? resolveWorkflowSettings(context.cwd, context.projectTrusted, context.globalSettingsPath) : void 0;
-      aliases = resolved?.effective.modelAliases ?? loadSettings().modelAliases;
-      if (resolved) {
-        source = resolved.projectTrusted && [resolved.sources.modelAliases, resolved.sources.skills, resolved.sources.extensions, resolved.sources.tools].some((path) => path === resolved.projectSettingsPath) ? "trusted project settings" : "global settings";
-        settings = { concurrency: resolved.effective.concurrency, backgroundWidget: resolved.effective.backgroundWidget ?? true, modelAliases: resolved.effective.modelAliases ?? {}, skills: resolved.effective.skills ?? [], extensions: Array.isArray(resolved.effective.extensions) ? resolved.effective.extensions : [], tools: resolved.effective.tools ?? [], ...resolved.effective.extensionSettings === void 0 ? {} : { extensionSettings: resolved.effective.extensionSettings }, ...resolved.effective.worktreePostCreateCommand === void 0 ? {} : { worktreePostCreateCommand: resolved.effective.worktreePostCreateCommand }, globalSettingsPath: resolved.globalSettingsPath, projectSettingsPath: resolved.projectSettingsPath, projectTrusted: resolved.projectTrusted, sources: resolved.sources };
-      }
-    } catch {
-      aliases = void 0;
-    }
-    const staticEntries = Object.keys(aliases ?? {}).map((name) => ({ name, kind: "static", provenance: source }));
-    const dynamicEntries = [...this.#modelAliases.values()].map(({ name, version, headline }) => ({ name, kind: "dynamic", provenance: `extension: ${headline}`, version, headline }));
-    const modelAliasEntries = [...staticEntries, ...dynamicEntries].sort((left, right) => left.name.localeCompare(right.name) || left.kind.localeCompare(right.kind) || left.provenance.localeCompare(right.provenance));
-    const sort = (left, right) => left.name.localeCompare(right.name);
-    const catalog = { functions: functions.sort(sort), ...modelAliasEntries.length ? { modelAliasEntries } : {} };
-    if (aliases && Object.keys(aliases).length) Object.defineProperty(catalog, "modelAliases", { value: Object.freeze(structuredClone(aliases)), enumerable: false });
-    if (settings) {
-      const publicSettings = { ...settings, modelAliases: Object.keys(aliases ?? {}).length ? {} : settings.modelAliases };
-      Object.defineProperty(catalog, "settings", { value: deepFreeze(publicSettings), enumerable: true });
-    }
-    return deepFreeze(catalog);
-  }
-  catalogIndex(context) {
-    const catalog = this.catalog(context);
-    let modelAliasEntries;
-    if (catalog.modelAliasEntries !== void 0) {
-      const winningEntries = /* @__PURE__ */ new Map();
-      for (const entry of catalog.modelAliasEntries) {
-        if (!winningEntries.has(entry.name) || entry.kind === "static") winningEntries.set(entry.name, entry);
-      }
-      modelAliasEntries = [...winningEntries.values()];
-    }
-    const index = {
-      functions: catalog.functions.map(({ name, description, input }) => ({ name, description, input: structuredClone(input) })),
-      ...modelAliasEntries ? { modelAliasEntries: structuredClone(modelAliasEntries) } : {}
-    };
-    if (catalog.modelAliases) Object.defineProperty(index, "modelAliases", { value: Object.freeze(structuredClone(catalog.modelAliases)), enumerable: false });
-    if (catalog.settings) Object.defineProperty(index, "settings", { value: deepFreeze(structuredClone(catalog.settings)), enumerable: true });
-    return deepFreeze(index);
-  }
-  catalogDetail(name, context) {
-    const catalog = this.catalog(context);
-    const entry = catalog.functions.find((candidate) => candidate.name === name);
-    if (entry) return entry;
-    const alias = catalog.modelAliasEntries?.find((candidate) => candidate.name === name && candidate.kind === "static") ?? catalog.modelAliasEntries?.find((candidate) => candidate.name === name);
-    if (alias) return alias;
-    return deepFreeze({ error: { code: "NOT_FOUND", name, message: `No registered workflow function is available: ${name}` } });
-  }
-  globals() {
-    return Object.freeze(Object.fromEntries([...this.#extensions].flatMap((extension2) => Object.keys(extension2.functions ?? {}).map((name) => [name, { name }]))));
-  }
-  validateExtensionSettings(settings, context) {
-    const effectiveSettings = settings ?? Object.freeze({});
-    if (!jsonValue(effectiveSettings) || !object(effectiveSettings)) fail("INVALID_SETTINGS", "Workflow extension settings must be a JSON object");
-    const unsafeNamespace = Object.keys(effectiveSettings).find((namespace) => !validWorkflowExtensionNamespace(namespace));
-    if (unsafeNamespace !== void 0) fail("INVALID_SETTINGS", `Workflow extension settings contains an invalid namespace: ${unsafeNamespace}`);
-    const frozenSettings = deepFreeze(structuredClone(effectiveSettings));
-    for (const { headline, validate } of this.#settingsValidators) {
-      try {
-        validate(frozenSettings, Object.freeze({ ...context }));
-      } catch (error) {
-        const location = context.source === "role" && context.role ? `role ${context.role}` : context.source;
-        fail("INVALID_SETTINGS", `Invalid extension settings (${headline}; ${location}): ${errorText(error)}`);
-      }
-    }
-  }
-  async invokeFunction(name, input, context, path, journal) {
-    const fn = this.function(name);
-    if (!object(input) || !jsonValue(input) || !Value.Check(fn.input, input)) fail("RESULT_INVALID", `Invalid input for ${name}`);
-    const replayed = journal.get(path);
-    if (replayed !== void 0) {
-      if (!jsonValue(replayed) || !Value.Check(fn.output, replayed)) fail("RESULT_INVALID", `Invalid replay for ${name}`);
-      return structuredClone(replayed);
-    }
-    const result = await fn.run(deepFreeze(structuredClone(input)), Object.freeze({ run: context.run, settings: deepFreeze(structuredClone(context.settings)), invoke: context.invoke, agent: context.agent, shell: context.shell, prompt: context.prompt, parallel: context.parallel, pipeline: context.pipeline, withWorktree: context.withWorktree, checkpoint: context.checkpoint, phase: context.phase, log: context.log }));
-    if (!jsonValue(result) || !Value.Check(fn.output, result)) fail("RESULT_INVALID", `Invalid output from ${name}`);
-    const stored = structuredClone(result);
-    journal.put(path, stored);
-    return structuredClone(stored);
-  }
-  agentSetupHooks() {
-    return [...this.#hooks.values()].sort(byPriorityThenName);
-  }
-  agentAttemptActions() {
-    return Object.freeze(Object.fromEntries(this.#agentAttemptActions.entries()));
-  }
-  roleDirectories() {
-    return [...this.#roleDirectories.keys()];
-  }
-  roleDirectoryRegistrations() {
-    return [...this.#roleDirectories.values()];
-  }
-  modelAliases() {
-    return [...this.#modelAliases.values()].sort((left, right) => left.name.localeCompare(right.name));
-  }
-  async resolveModelAliases(context, shadowed = /* @__PURE__ */ new Set()) {
-    const resolved = {};
-    const isAborted = () => context.signal.aborted;
-    for (const alias of this.modelAliases()) {
-      if (shadowed.has(alias.name)) continue;
-      if (isAborted()) fail("CANCELLED", `Model alias resolver cancelled: ${alias.name} (${alias.headline})`);
-      let target;
-      try {
-        target = await alias.resolve(Object.freeze({ cwd: context.cwd, projectTrusted: context.projectTrusted, rootModel: Object.freeze({ ...context.rootModel }), knownModels: new Set(context.knownModels), availableModels: new Set(context.availableModels), signal: context.signal }));
-      } catch (error) {
-        if (isAborted() || error instanceof Error && error.name === "AbortError" || errorCode(error) === "CANCELLED") fail("CANCELLED", `Model alias resolver cancelled: ${alias.name} (${alias.headline})`);
-        fail("CONFIG_ERROR", `Model alias resolver failed for ${alias.name} (${alias.headline}): ${errorText(error)}`);
-      }
-      if (isAborted()) fail("CANCELLED", `Model alias resolver cancelled: ${alias.name} (${alias.headline})`);
-      if (typeof target !== "string" || !target.trim()) fail("CONFIG_ERROR", `Model alias resolver returned an invalid target for ${alias.name} (${alias.headline})`);
-      resolved[alias.name] = target.trim();
-    }
-    return Object.freeze(resolved);
-  }
-};
-var WORKFLOW_REGISTRY_KEY = /* @__PURE__ */ Symbol.for("pi-extensible-workflows.workflow-registry");
-var globalRegistry = globalThis;
-function createWorkflowRegistryApi(registry) {
-  return {
-    get frozen() {
-      return registry.frozen;
-    },
-    freeze: () => {
-      registry.freeze();
-    },
-    setSubagentStatusObserver: (observer) => {
-      registry.setSubagentStatusObserver(observer);
-    },
-    observeSubagentStatus: (status, request) => {
-      registry.observeSubagentStatus(status, request);
-    },
-    register: (extension2) => {
-      registry.register(extension2);
-    },
-    function: (name) => registry.function(name),
-    functions: () => registry.functions(),
-    functionSources: () => registry.functionSources(),
-    catalog: (context) => registry.catalog(context),
-    catalogIndex: (context) => registry.catalogIndex(context),
-    catalogDetail: (name, context) => registry.catalogDetail(name, context),
-    globals: () => registry.globals(),
-    invokeFunction: (...args) => registry.invokeFunction(...args),
-    validateExtensionSettings: (...args) => {
-      registry.validateExtensionSettings(...args);
-    },
-    modelAliases: () => registry.modelAliases(),
-    resolveModelAliases: (...args) => registry.resolveModelAliases(...args),
-    roleDirectories: () => registry.roleDirectories(),
-    roleDirectoryRegistrations: () => registry.roleDirectoryRegistrations(),
-    agentSetupHooks: () => registry.agentSetupHooks(),
-    agentAttemptActions: () => registry.agentAttemptActions()
-  };
-}
-function workflowRegistryHost() {
-  return globalRegistry[WORKFLOW_REGISTRY_KEY] ??= { api: createWorkflowRegistryApi(new WorkflowRegistry()), activeHosts: 0 };
-}
-function resetWorkflowRegistry() {
-  workflowRegistryHost().api = createWorkflowRegistryApi(new WorkflowRegistry());
-}
-function beginWorkflowExtensionLoading() {
-  const host = workflowRegistryHost();
-  if (host.api.frozen && host.activeHosts === 0) resetWorkflowRegistry();
-}
-beginWorkflowExtensionLoading();
 
 // subagents/src/contracts.ts
-import { Value as Value2 } from "typebox/value";
+import { Value } from "typebox/value";
 var SUBAGENT_MAX_RETRIES = 255;
 var SUBAGENT_SYSTEM_PROMPT_LIMIT = 64 * 1024;
 var SUBAGENTS_MODE = Type.Union([
@@ -2423,17 +1879,18 @@ var SUBAGENTS_RUN_PARAMETERS = Type.Object({
   label: Type.Optional(Type.String({ description: "Optional display label for the subagent" })),
   model: Type.Optional(Type.String({ description: "Optional model as provider/model:thinking or alias[:thinking]" })),
   tools: Type.Optional(Type.Array(Type.String(), { description: "Optional ordered tool selectors; candidates start enabled and !* restricts the set" })),
+  excludeTools: Type.Optional(Type.Array(Type.String(), { description: "Optional exact tool names removed after preparation; no patterns, cannot remove workflow_result" })),
   skills: Type.Optional(Type.Array(Type.String(), { description: "Optional ordered skill selectors; candidates start enabled and !* restricts the set" })),
   extensions: Type.Optional(Type.Array(Type.String(), { description: "Optional ordered extension selectors; candidates start enabled and !* restricts the set" })),
   contextFiles: Type.Optional(Type.Array(Type.String(), { description: "Optional context-file scopes: global, project, cwd" })),
-  role: Type.Optional(Type.String({ description: "Workflow role name" })),
   worktree: Type.Optional(Type.String({ description: "Optional named worktree; requires a clean working tree" })),
   outputSchema: Type.Optional(Type.Record(Type.String(), Type.Unknown(), { description: "Optional JSON schema for the result" })),
   retries: Type.Optional(Type.Integer({ minimum: 0, maximum: SUBAGENT_MAX_RETRIES, description: "Optional retry count; at most 255 retries" })),
   timeoutMs: Type.Optional(Type.Union([Type.Integer({ minimum: 1, description: "Optional execution timeout in milliseconds" }), Type.Null()]))
-}, { additionalProperties: false });
+}, { additionalProperties: true });
 var SUBAGENTS_INSPECT_PARAMETERS = Type.Object({
-  id: Type.Optional(Type.String({ description: "Subagent ID; omit to list ordered run summaries" }))
+  id: Type.Optional(Type.String({ description: "Subagent ID; omit to list ordered run summaries" })),
+  scope: Type.Optional(Type.Union([Type.Literal("session"), Type.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 = Type.Object({
   id: Type.String({ description: "Subagent ID" })
@@ -2448,6 +1905,24 @@ var SUBAGENTS_STOP_PARAMETERS = Type.Object({
 var SUBAGENTS_RETRY_PARAMETERS = Type.Object({
   id: Type.String({ description: "Failed or stopped subagent ID to retry" })
 }, { additionalProperties: false });
+var SUBAGENT_STATUS_OUTPUT = Type.Object({
+  id: Type.String(),
+  state: Type.String(),
+  sessionId: Type.Optional(Type.String()),
+  startedAt: Type.Optional(Type.Number()),
+  finishedAt: Type.Optional(Type.Number()),
+  attempts: Type.Optional(Type.Number()),
+  attemptDetails: Type.Optional(Type.Array(Type.Unknown())),
+  worktree: Type.Optional(Type.Object({ path: Type.String(), branch: Type.String() })),
+  error: Type.Optional(Type.Object({ code: Type.String(), message: Type.String() })),
+  progress: Type.Optional(Type.Unknown()),
+  value: Type.Optional(Type.Unknown())
+});
+var SUBAGENTS_INSPECT_OUTPUT = Type.Union([SUBAGENT_STATUS_OUTPUT, Type.Array(Type.Object({ id: Type.String(), state: Type.String() }))]);
+var SUBAGENTS_STEER_OUTPUT = Type.Object({ id: Type.String(), accepted: Type.Boolean() });
+
+// src/tool-timing.ts
+var TOOL_TIMING_ENTRY_TYPE = "pi-workflows:tool-timing";
 
 // src/trajectory-contracts.ts
 var TRAJECTORY_ACTIONS = ["checkpoint-approve", "checkpoint-reject", "pause", "resume", "steer", "stop", "retry", "share"];
@@ -2480,7 +1955,7 @@ function transcriptToolCallId(value) {
   return void 0;
 }
 function isTimingTranscriptEntry(value) {
-  return object(value) && value.type === "custom" && value.customType === "pi-workflows:tool-timing";
+  return object(value) && value.type === "custom" && value.customType === TOOL_TIMING_ENTRY_TYPE;
 }
 function timingToolCallId(value) {
   if (!object(value) || !isTimingTranscriptEntry(value) || !object(value.data)) return void 0;
@@ -2601,21 +2076,21 @@ function withPiToolDescriptions(run) {
 function canonicalExtensionSelector(selector, base) {
   const negated = selector.startsWith("!");
   const body = negated ? selector.slice(1) : selector;
-  if (body === "*" || body === "**" || body.startsWith("**/")) return selector;
-  const resolved = resolve4(base, body);
+  if (body === "*" || body === "**" || body.startsWith("**/") || body.startsWith("builtin:")) return selector;
+  const resolved = resolve3(base, body);
   if (resourcePatternHasMagic(body)) return `${negated ? "!" : ""}${resolved}`;
   return `${negated ? "!" : ""}${canonicalPath(resolved)}`;
 }
 function skillNameFromPath(path) {
-  const file = basename3(path);
-  return file.toLowerCase() === "skill.md" ? basename3(dirname4(path)) : file;
+  const file = basename2(path);
+  return file.toLowerCase() === "skill.md" ? basename2(dirname2(path)) : file;
 }
 var discoveredResourcesByCwd = /* @__PURE__ */ new Map();
 async function discoveredResources(cwd) {
   const cached = discoveredResourcesByCwd.get(cwd);
   if (cached) return cached;
   const pending = (async () => {
-    const agentDir = getAgentDir3();
+    const agentDir = getAgentDir2();
     const settingsManager = SettingsManager.create(cwd, agentDir, { projectTrusted: false });
     const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
     const resolved = await packageManager.resolve();
@@ -2637,8 +2112,8 @@ async function resolveResourceInspection(inspection, cwd, selectorCwd = cwd) {
     return inspection;
   }
   const sources = inspection.selectorSources ?? { global: inspection.selectors, project: {} };
-  const skills = inspection.skills.length ? inspection.skills : selectResourcesByLayers([sources.global.skills, sources.project.skills, sources.role?.skills, sources.call?.skills], discovered.skills);
-  const extensions = inspection.extensions.length ? inspection.extensions : selectResourcesByLayers([sources.global.extensions, sources.project.extensions, sources.role?.extensions, sources.call?.extensions].map((layer) => layer?.map((selector) => canonicalExtensionSelector(selector, selectorCwd))), discovered.extensions);
+  const skills = inspection.skills.length ? inspection.skills : selectResourcesByLayers([sources.global.skills, sources.project.skills, sources.call?.skills], discovered.skills);
+  const extensions = inspection.extensions.length ? inspection.extensions : selectResourcesByLayers([sources.global.extensions, sources.project.extensions, sources.call?.extensions].map((layer) => layer?.map((selector) => canonicalExtensionSelector(selector, selectorCwd))), discovered.extensions);
   return skills === inspection.skills && extensions === inspection.extensions ? inspection : { ...inspection, skills, extensions };
 }
 async function withResolvedResources(run, cwd) {
@@ -2671,11 +2146,17 @@ function failedAgentOutput(agent) {
   const status = agent.state === "cancelled" ? "cancelled" : "failed";
   return { status, code: error?.code ?? (status === "cancelled" ? "CANCELLED" : "AGENT_FAILED"), message: error?.message ?? `Agent ${agent.state}` };
 }
+function operationOutput(operation) {
+  const bytes = serializedJsonBytes(operation.value);
+  return bytes > DEFAULT_MAX_BYTES ? { status: "truncated", kind: "result", bytes } : { status: "available", value: operation.value, bytes };
+}
+function outputForCall(call, operation) {
+  if (operation !== void 0) return call.kind === "tool" ? { status: "completed" } : operationOutput(operation);
+  if (call.error) return { status: call.error.code === "CANCELLED" ? "cancelled" : "failed", code: call.error.code, ...call.kind === "shell" ? { message: call.error.message ?? "Shell failed" } : {} };
+  return call.finishedAt === void 0 ? { status: "pending" } : { status: "unavailable" };
+}
 function outputForAgent(agent, operation) {
-  if (operation !== void 0) {
-    const bytes = serializedJsonBytes(operation.value);
-    return bytes > DEFAULT_MAX_BYTES ? { status: "truncated", kind: "result", bytes } : { status: "available", value: operation.value, bytes };
-  }
+  if (operation !== void 0) return operationOutput(operation);
   if (agent.state === "failed" || agent.state === "cancelled") return failedAgentOutput(agent);
   if (agent.state === "completed") return { status: "unavailable" };
   return { status: "pending" };
@@ -2683,7 +2164,17 @@ function outputForAgent(agent, operation) {
 function applyTrajectoryAgentOutputs(run, operations) {
   const byPath = new Map(operations.map((operation) => [operation.path, operation]));
   const agents = run.agents.map((agent) => ({ ...agent, output: outputForAgent(agent, agent.resultPath === void 0 ? void 0 : byPath.get(agent.resultPath)) }));
-  return { ...run, agents };
+  const scriptCalls = run.scriptCalls?.map((call) => {
+    const recorded = { ...call, output: outputForCall(call, byPath.get(call.path)) };
+    if (call.kind === "tool") {
+      delete recorded.input;
+      delete recorded.inputBytes;
+      if (call.error) recorded.error = { code: call.error.code };
+    }
+    return recorded;
+  });
+  const rest = run;
+  return { ...rest, agents, ...scriptCalls === void 0 ? {} : { scriptCalls } };
 }
 function overlayTrajectoryRun(run, overlay) {
   const overlaid = overlay(run);
@@ -2693,7 +2184,7 @@ function overlayTrajectoryRun(run, overlay) {
     const output = previous?.status === "available" || previous?.status === "truncated" ? previous : outputForAgent(agent, void 0);
     return { ...agent, output };
   });
-  return { ...overlaid, agents };
+  return { ...overlaid, agents, ...run.scriptCalls === void 0 ? {} : { scriptCalls: run.scriptCalls } };
 }
 async function loadTrajectoryRun(store, includeTranscripts = true) {
   const value = await store.load();
@@ -2704,7 +2195,7 @@ async function loadTrajectoryRun(store, includeTranscripts = true) {
   const run = applyTrajectoryAgentOutputs(prepared, operations);
   return { run, snapshot: value.snapshot, awaiting: await store.awaitingCheckpoints(), ...summary?.createdAt === void 0 ? {} : { createdAt: summary.createdAt }, transcripts: includeTranscripts ? await runTranscripts(run) : {} };
 }
-async function loadTrajectoryRuns(cwd, sessionId, home = homedir5(), overlay) {
+async function loadTrajectoryRuns(cwd, sessionId, home = homedir4(), overlay) {
   const loaded = [];
   for (const runId of await listRunIds(cwd, sessionId, home, false)) {
     try {
@@ -2719,15 +2210,15 @@ async function loadTrajectoryRuns(cwd, sessionId, home = homedir5(), overlay) {
 // trajectory/src/export.ts
 import { execFile as execFile3 } from "node:child_process";
 import { mkdtemp, readFile as readFile5, rm as rm4, writeFile as writeFile3 } from "node:fs/promises";
-import { homedir as homedir6, tmpdir } from "node:os";
-import { join as join7 } from "node:path";
+import { homedir as homedir5, tmpdir } from "node:os";
+import { join as join5 } from "node:path";
 var DEFAULT_SHARE_VIEWER_URL = "https://vekexasia.github.io/pi-extensible-workflows/run.html";
 function inlineAsset(html, tag, replacement) {
   if (!html.includes(tag)) throw new Error(`Trajectory UI is missing the expected ${tag} reference`);
   return html.replace(tag, () => replacement);
 }
 async function exportTrajectoryRunHtml(options) {
-  const home = options.home ?? homedir6();
+  const home = options.home ?? homedir5();
   const runs = await loadTrajectoryRuns(options.cwd, options.sessionId, home);
   const run = runs.find((candidate) => candidate.run.id === options.runId);
   if (!run) throw new Error(`Workflow run ${options.runId} was not found for session ${options.sessionId}`);
@@ -2755,22 +2246,22 @@ async function exportTrajectoryRunHtml(options) {
   return output;
 }
 function runGh(ghPath, args) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve4, reject) => {
     execFile3(ghPath, [...args], { encoding: "utf8", maxBuffer: 1024 * 1024 }, (error, stdout, stderr) => {
       if (error) {
         const notFound = error.code === "ENOENT";
         reject(new Error(notFound ? "GitHub CLI (gh) is not installed. Install it from https://cli.github.com/ and run `gh auth login`." : stderr.trim() || error.message));
         return;
       }
-      resolve5(stdout);
+      resolve4(stdout);
     });
   });
 }
 async function shareTrajectoryRun(options) {
   const html = await exportTrajectoryRunHtml(options);
-  const directory = await mkdtemp(join7(tmpdir(), "piewf-share-"));
+  const directory = await mkdtemp(join5(tmpdir(), "piewf-share-"));
   try {
-    const file = join7(directory, "trajectory.html");
+    const file = join5(directory, "trajectory.html");
     await writeFile3(file, html);
     const stdout = await runGh(options.ghPath ?? "gh", ["gist", "create", "--public=false", file]);
     const gistUrl = stdout.trim().split("\n").pop() ?? "";
@@ -2783,21 +2274,158 @@ async function shareTrajectoryRun(options) {
   }
 }
 
+// trajectory/src/startup-mutex.ts
+import { randomUUID as randomUUID3 } from "node:crypto";
+import { readFileSync } from "node:fs";
+import { mkdir as mkdir3, readdir as readdir4, readFile as readFile6, rm as rm5 } from "node:fs/promises";
+import { join as join6 } from "node:path";
+var bootId;
+function processStart(pid) {
+  if (process.platform !== "linux") return void 0;
+  try {
+    bootId ??= readFileSync("/proc/sys/kernel/random/boot_id", "utf8").trim();
+    const stat4 = readFileSync(`/proc/${String(pid)}/stat`, "utf8");
+    const startTicks = stat4.slice(stat4.lastIndexOf(")") + 2).split(" ")[19];
+    return startTicks === void 0 || !/^\d+$/.test(startTicks) ? void 0 : `${bootId}:${startTicks}`;
+  } catch {
+    return void 0;
+  }
+}
+function processLive(identity) {
+  try {
+    process.kill(identity.pid, 0);
+  } catch (error) {
+    if (isNodeError(error, "ESRCH")) return false;
+  }
+  if (identity.start === void 0) return true;
+  const current = processStart(identity.pid);
+  return current === void 0 || current === identity.start;
+}
+function processConfirmed(identity) {
+  return identity.start !== void 0 && processStart(identity.pid) === identity.start;
+}
+function holderDirectory(lockPath) {
+  return `${lockPath}.startup`;
+}
+function holderPath(lockPath, token) {
+  return join6(holderDirectory(lockPath), `${token}.json`);
+}
+function identityOf(pid) {
+  const start = processStart(pid);
+  return start === void 0 ? { pid } : { pid, start };
+}
+function processIdentity(value) {
+  if (!object(value) || !positiveInteger(value.pid)) return void 0;
+  return typeof value.start === "string" ? { pid: value.pid, start: value.start } : { pid: value.pid };
+}
+function decodeHolder(text) {
+  try {
+    const parsed = JSON.parse(text);
+    const holder = processIdentity(parsed);
+    if (holder === void 0 || !object(parsed) || typeof parsed.token !== "string") return void 0;
+    const server = processIdentity(parsed.server);
+    return { ...holder, token: parsed.token, ...server === void 0 ? {} : { server } };
+  } catch {
+    return void 0;
+  }
+}
+function readStartupHolder(lockPath, token) {
+  try {
+    return decodeHolder(readFileSync(holderPath(lockPath, token), "utf8"));
+  } catch (error) {
+    if (isNodeError(error, "ENOENT")) return void 0;
+    throw error;
+  }
+}
+async function serverPending(lockPath, server) {
+  if (!processLive(server)) return false;
+  let text;
+  try {
+    text = await readFile6(lockPath, "utf8");
+  } catch (error) {
+    if (isNodeError(error, "ENOENT")) return true;
+    throw error;
+  }
+  try {
+    const lock = JSON.parse(text);
+    return !(object(lock) && lock.pid === server.pid);
+  } catch {
+    return true;
+  }
+}
+async function holderLive(lockPath, path, read) {
+  if (processLive(read)) return true;
+  let holder;
+  try {
+    holder = decodeHolder(await readFile6(path, "utf8"));
+  } catch (error) {
+    if (isNodeError(error, "ENOENT")) return false;
+    throw error;
+  }
+  if (holder?.server === void 0 || !await serverPending(lockPath, holder.server)) return false;
+  if (!processConfirmed(holder.server)) return true;
+  try {
+    process.kill(holder.server.pid, "SIGKILL");
+  } catch (error) {
+    if (!isNodeError(error, "ESRCH")) throw error;
+  }
+  return true;
+}
+async function tryAcquireStartupMutex(lockPath) {
+  const directory = holderDirectory(lockPath);
+  await mkdir3(directory, { recursive: true, mode: 448 });
+  const token = randomUUID3();
+  const own = `${token}.json`;
+  await atomicWriteFile(join6(directory, own), `${JSON.stringify({ ...identityOf(process.pid), token })}
+`);
+  let contended = false;
+  try {
+    for (const name of await readdir4(directory)) {
+      if (name === own || !name.endsWith(".json")) continue;
+      const path = join6(directory, name);
+      let holder;
+      try {
+        holder = decodeHolder(await readFile6(path, "utf8"));
+      } catch (error) {
+        if (isNodeError(error, "ENOENT")) continue;
+        throw error;
+      }
+      if (holder !== void 0 && await holderLive(lockPath, path, holder)) contended = true;
+      else await rm5(path, { force: true });
+    }
+  } catch (error) {
+    await rm5(join6(directory, own), { force: true });
+    throw error;
+  }
+  if (!contended) return token;
+  await rm5(join6(directory, own), { force: true });
+  return void 0;
+}
+function recordStartupServer(lockPath, token, pid) {
+  const holder = readStartupHolder(lockPath, token);
+  if (holder === void 0) throw new Error("Trajectory startup mutex was lost");
+  atomicWriteFile(holderPath(lockPath, token), `${JSON.stringify({ ...holder, server: identityOf(pid) })}
+`, true);
+}
+async function releaseStartupMutex(lockPath, token) {
+  await rm5(holderPath(lockPath, token), { force: true });
+}
+
 // trajectory/src/index.ts
 var DEFAULT_TRAJECTORY_PORT = 7432;
 var TRAJECTORY_IDLE_EXIT_MS = 5 * 60 * 1e3;
 var TRAJECTORY_LOCK_NAME = "trajectory.lock";
 function trajectoryLockPath(agentDir) {
-  return join8(agentDir, "pi-extensible-workflows", TRAJECTORY_LOCK_NAME);
+  return join7(agentDir, "pi-extensible-workflows", TRAJECTORY_LOCK_NAME);
 }
-function trajectoryServerPath(moduleDirectory = dirname5(fileURLToPath3(import.meta.url))) {
-  const candidates = [join8(moduleDirectory, "server.js"), join8(moduleDirectory, "../../dist/trajectory/src/server.js")];
+function trajectoryServerPath(moduleDirectory = dirname3(fileURLToPath(import.meta.url))) {
+  const candidates = [join7(moduleDirectory, "server.js"), join7(moduleDirectory, "../../dist/trajectory/src/server.js")];
   const path = candidates.find((candidate) => existsSync(candidate));
   if (!path) throw new Error("Trajectory server implementation is unavailable");
   return path;
 }
 async function trajectoryFingerprint(serverPath) {
-  const [serverBytes, htmlBytes] = await Promise.all([readFile6(serverPath), readFile6(join8(dirname5(serverPath), "assets/index.html"))]);
+  const [serverBytes, htmlBytes] = await Promise.all([readFile7(serverPath), readFile7(join7(dirname3(serverPath), "assets/index.html"))]);
   return `${createHash3("sha256").update(serverBytes).digest("hex")}:${createHash3("sha256").update(htmlBytes).digest("hex")}`;
 }
 function publisherId(cwd, sessionId) {
@@ -2808,7 +2436,7 @@ function trajectoryPort(value) {
   return positiveInteger(value) && value <= 65535 ? value : DEFAULT_TRAJECTORY_PORT;
 }
 function delay(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 async function serverHealth(port) {
   try {
@@ -2831,107 +2459,133 @@ function signalProcess(pid, signal) {
     if (!isNodeError(error, "ESRCH")) throw error;
   }
 }
-async function stopStaleServer(lock) {
-  if (lock.pid === process.pid) return;
-  if (!await processAlive(lock.pid, lock.startedAt)) return;
-  signalProcess(lock.pid, "SIGTERM");
+async function stopStaleServer(pid, port) {
+  const server = identityOf(pid);
+  if (!processLive(server)) return;
+  signalProcess(pid, "SIGTERM");
   const deadline = Date.now() + 3e3;
   while (Date.now() < deadline) {
-    if (!await serverHealthy(lock.port)) break;
+    if (!await serverHealthy(port)) break;
     const remaining = deadline - Date.now();
     if (remaining <= 0) break;
     await delay(Math.min(50, remaining));
   }
-  if (await processAlive(lock.pid, lock.startedAt)) signalProcess(lock.pid, "SIGKILL");
+  if (processConfirmed(server)) signalProcess(pid, "SIGKILL");
+  for (let attempt = 0; attempt < 50 && processLive(server); attempt += 1) await delay(20);
+  if (processLive(server)) throw new Error(`Stale Trajectory server ${String(pid)} on port ${String(port)} did not stop; stop it and retry`);
 }
 async function readLock(path) {
+  let text;
   try {
-    const parsed = JSON.parse(await readFile6(path, "utf8"));
-    if (!object(parsed) || !positiveInteger(parsed.pid) || !positiveInteger(parsed.port) || parsed.port > 65535) return void 0;
-    const fingerprint = typeof parsed.fingerprint === "string" ? parsed.fingerprint : void 0;
-    const startedAt = positiveInteger(parsed.startedAt) ? parsed.startedAt : void 0;
-    return { pid: parsed.pid, port: parsed.port, ...fingerprint === void 0 ? {} : { fingerprint }, ...startedAt === void 0 ? {} : { startedAt } };
+    text = await readFile7(path, "utf8");
   } catch (error) {
     if (isNodeError(error, "ENOENT")) return void 0;
+    throw error;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
     return void 0;
   }
+  if (!object(parsed) || !positiveInteger(parsed.pid) || !positiveInteger(parsed.port) || parsed.port > 65535) return void 0;
+  const fingerprint = typeof parsed.fingerprint === "string" ? parsed.fingerprint : void 0;
+  const startedAt = positiveInteger(parsed.startedAt) ? parsed.startedAt : void 0;
+  const start = typeof parsed.start === "string" ? parsed.start : void 0;
+  return { pid: parsed.pid, port: parsed.port, ...fingerprint === void 0 ? {} : { fingerprint }, ...startedAt === void 0 ? {} : { startedAt }, ...start === void 0 ? {} : { start } };
+}
+var STARTUP_MUTEX_WAIT_MS = 2 * 60 * (300 + 50) + 3e3 + 1e3 + 1e3;
+async function acquireStartupMutex(lockPath) {
+  const deadline = Date.now() + STARTUP_MUTEX_WAIT_MS;
+  for (; ; ) {
+    const token = await tryAcquireStartupMutex(lockPath);
+    if (token !== void 0) return token;
+    if (Date.now() >= deadline) throw new Error("Another Pi is still starting Trajectory; retry");
+    await delay(25 + Math.floor(Math.random() * 50));
+  }
+}
+function isTrajectoryServer(health) {
+  return health?.pid !== void 0 && health.fingerprint !== void 0;
 }
-async function waitForServer(port, fingerprint) {
-  let foreign = false;
-  for (let attempt = 0; attempt < 60; attempt += 1) {
+function ownsLock(health, lock) {
+  return isTrajectoryServer(health) && health.pid === lock.pid && (lock.startedAt === void 0 || lock.startedAt === health.startedAt);
+}
+async function awaitHealth(port, accept, stopped = () => false) {
+  for (let attempt = 0; attempt < 60 && !stopped(); attempt += 1) {
     const health = await serverHealth(port);
-    if (health?.fingerprint === fingerprint) return;
-    foreign = health !== void 0;
+    if (health !== void 0 && accept(health)) return health;
     await delay(50);
   }
-  throw new Error(foreign ? `Trajectory port ${String(port)} is held by another Trajectory server; stop it and retry` : `Trajectory server did not start on port ${String(port)}`);
+  return void 0;
 }
-async function resolveExistingServer(lockPath, existing, fingerprint) {
-  const health = await serverHealth(existing.port);
-  if (health) {
-    if (existing.fingerprint === fingerprint && health.fingerprint === fingerprint) return existing;
-    await stopStaleServer(existing);
-    await rm5(lockPath, { force: true });
-    return void 0;
+async function startServer(lockPath, serverPath, fingerprint, port, startupToken) {
+  const child = spawn(process.versions.bun ? "node" : process.execPath, [serverPath, "--port", String(port), "--lock", lockPath, "--fingerprint", fingerprint, "--startup", startupToken], { detached: true, stdio: "ignore" });
+  const startup = { ended: false };
+  const exited = new Promise((resolve4) => {
+    child.once("error", (error) => {
+      startup.error = error;
+      startup.ended = true;
+      resolve4();
+    });
+    child.once("exit", () => {
+      startup.ended = true;
+      resolve4();
+    });
+  });
+  try {
+    if (child.pid !== void 0) recordStartupServer(lockPath, startupToken, child.pid);
+    const health = await awaitHealth(port, (candidate) => candidate.pid === child.pid && candidate.fingerprint === fingerprint, () => startup.ended);
+    if (startup.error !== void 0) throw startup.error;
+    const lock = health === void 0 ? void 0 : await readLock(lockPath);
+    if (lock !== void 0 && ownsLock(health, lock) && lock.port === port && lock.fingerprint === fingerprint) {
+      child.unref();
+      return { port };
+    }
+    throw new Error(`Trajectory server did not start on port ${String(port)}`);
+  } catch (error) {
+    if (!startup.ended) {
+      child.kill("SIGKILL");
+      await exited;
+    }
+    if ((await readLock(lockPath))?.pid === child.pid) await rm6(lockPath, { force: true });
+    throw error;
   }
-  if (await processAlive(existing.pid, existing.startedAt)) {
-    try {
-      await waitForServer(existing.port, fingerprint);
-      return existing;
-    } catch {
-      await stopStaleServer(existing);
-      await rm5(lockPath, { force: true });
-      return void 0;
+}
+async function startOrReuseServer(lockPath, serverPath, fingerprint, configuredPort, startupToken) {
+  const existing = await readLock(lockPath);
+  if (existing) {
+    let health = await serverHealth(existing.port);
+    if (health === void 0 && processLive(existing)) health = await awaitHealth(existing.port, (candidate) => candidate.pid === existing.pid);
+    const lock = health === void 0 ? existing : await readLock(lockPath) ?? existing;
+    if (ownsLock(health, lock)) {
+      if (lock.fingerprint === fingerprint && health.fingerprint === fingerprint) return { port: lock.port };
+      await stopStaleServer(health.pid, lock.port);
+    } else if (!isTrajectoryServer(health) && lock.pid !== process.pid && processLive(lock)) {
+      throw new Error(health === void 0 ? `Trajectory server ${String(lock.pid)} named by ${lockPath} is alive but not answering on port ${String(lock.port)}; retry once it answers, or remove the lock if that process is not a Trajectory server` : `Trajectory port ${String(lock.port)} is held by another Trajectory server; stop it and retry`);
     }
+    await rm6(lockPath, { force: true });
   }
-  await rm5(lockPath, { force: true });
-  return void 0;
+  const occupant = await serverHealth(configuredPort);
+  if (occupant !== void 0) {
+    if (!isTrajectoryServer(occupant)) throw new Error(`Trajectory port ${String(configuredPort)} is held by another Trajectory server; stop it and retry`);
+    if (occupant.fingerprint === fingerprint && occupant.startedAt !== void 0) {
+      await atomicJson(lockPath, { pid: occupant.pid, port: configuredPort, fingerprint, startedAt: occupant.startedAt, start: processStart(occupant.pid) });
+      return { port: configuredPort };
+    }
+    await stopStaleServer(occupant.pid, configuredPort);
+  }
+  return startServer(lockPath, serverPath, fingerprint, configuredPort, startupToken);
 }
 async function ensureTrajectoryServer(agentDir, configuredPort) {
   const lockPath = trajectoryLockPath(agentDir);
   const serverPath = trajectoryServerPath();
   const fingerprint = await trajectoryFingerprint(serverPath);
-  await mkdir3(dirname5(lockPath), { recursive: true, mode: 448 });
-  const existing = await readLock(lockPath);
-  if (existing) {
-    const reused = await resolveExistingServer(lockPath, existing, fingerprint);
-    if (reused) return reused;
-  }
-  let lockHandle;
+  await mkdir4(dirname3(lockPath), { recursive: true, mode: 448 });
+  const startupToken = await acquireStartupMutex(lockPath);
   try {
-    lockHandle = await open3(lockPath, "wx", 384);
-    await lockHandle.writeFile(`${JSON.stringify({ pid: process.pid, port: configuredPort, fingerprint, startedAt: Date.now() })}
-`, "utf8");
-  } catch (error) {
-    if (isNodeError(error, "EEXIST")) {
-      const raced = await readLock(lockPath);
-      if (raced) {
-        const reused = await resolveExistingServer(lockPath, raced, fingerprint);
-        if (reused) return reused;
-      }
-      await rm5(lockPath, { force: true });
-      lockHandle = await open3(lockPath, "wx", 384);
-      await lockHandle.writeFile(`${JSON.stringify({ pid: process.pid, port: configuredPort, fingerprint, startedAt: Date.now() })}
-`, "utf8");
-    } else {
-      throw error;
-    }
+    return await startOrReuseServer(lockPath, serverPath, fingerprint, configuredPort, startupToken);
   } finally {
-    await lockHandle?.close();
-  }
-  const occupant = await serverHealth(configuredPort);
-  if (occupant?.pid !== void 0 && occupant.fingerprint !== fingerprint) await stopStaleServer({ pid: occupant.pid, port: configuredPort, ...occupant.startedAt === void 0 ? {} : { startedAt: occupant.startedAt } });
-  try {
-    const child = spawn(process.versions.bun ? "node" : process.execPath, [serverPath, "--port", String(configuredPort), "--lock", lockPath, "--fingerprint", fingerprint], { detached: true, stdio: "ignore" });
-    const startupError = new Promise((_resolve, reject) => {
-      child.once("error", reject);
-    });
-    child.unref();
-    await Promise.race([waitForServer(configuredPort, fingerprint), startupError]);
-    return { port: configuredPort };
-  } catch (error) {
-    await rm5(lockPath, { force: true });
-    throw error;
+    await releaseStartupMutex(lockPath, startupToken);
   }
 }
 function trajectoryWebSocket() {
@@ -2962,9 +2616,6 @@ var ACTIVE_POLL_MS = 1e3;
 var IDLE_POLL_MS = 1e4;
 var RECONNECT_INITIAL_DELAY_MS = 100;
 var RECONNECT_MAX_DELAY_MS = 5e3;
-function isTimingEntry(value) {
-  return object(value) && value.type === "custom" && value.customType === "pi-workflows:tool-timing";
-}
 function boundedString(value, maxLength = 1024) {
   if (typeof value !== "string") return value;
   const bytes = Buffer.from(value);
@@ -2974,7 +2625,7 @@ var MAX_LIVE_STRING_BYTES = 64 * 1024;
 var MAX_LIVE_ARRAY_ENTRIES = 256;
 var MAX_LIVE_OBJECT_KEYS = 64;
 var LIVE_METADATA_ARRAY_KEYS = /* @__PURE__ */ new Set(["agents", "runs", "subagents"]);
-var LIVE_TRUNCATABLE_ARRAY_KEYS = /* @__PURE__ */ new Set(["events", "phaseHistory"]);
+var LIVE_TRUNCATABLE_ARRAY_KEYS = /* @__PURE__ */ new Set(["events", "phaseHistory", "scriptCalls"]);
 var LIVE_METADATA_OBJECT_KEYS = /* @__PURE__ */ new Set(["transcripts"]);
 function liveValueWillBeBounded(value, key = "", depth = 0) {
   if (typeof value === "string") return Buffer.byteLength(value) > MAX_LIVE_STRING_BYTES;
@@ -2992,7 +2643,7 @@ function liveValueWillBeBounded(value, key = "", depth = 0) {
 }
 var MAX_LIVE_TIMING_BYTES = 64 * 1024;
 function boundedTiming(value) {
-  const entries = Array.isArray(value) ? value.filter(isTimingEntry) : [];
+  const entries = Array.isArray(value) ? value.filter(isTimingTranscriptEntry) : [];
   const retained = [];
   let bytes = 2;
   for (let index = entries.length - 1; index >= 0; index -= 1) {
@@ -3241,22 +2892,15 @@ function createTrajectoryController(agentDir) {
     }
   };
   const transcriptFromFallback = async (input, request) => {
-    const boundedTranscriptResult = (result) => {
-      try {
-        if (result.status === "available" && Buffer.byteLength(JSON.stringify(result.entries)) > TRAJECTORY_MAX_TRANSCRIPT_BYTES) return { status: "oversized", revision: result.revision, entries: [], error: "Transcript is too large" };
-      } catch {
-        return { status: "failed", revision: result.revision, entries: [], error: "Transcript failed" };
-      }
-      return result;
-    };
-    const boundedResult = (entries, revision) => {
+    const oversized = (entries, revision) => {
       try {
-        if (Buffer.byteLength(JSON.stringify(entries)) > TRAJECTORY_MAX_TRANSCRIPT_BYTES) return { status: "oversized", revision, entries: [], error: "Transcript is too large" };
+        return Buffer.byteLength(JSON.stringify(entries)) > TRAJECTORY_MAX_TRANSCRIPT_BYTES ? { status: "oversized", revision, entries: [], error: "Transcript is too large" } : void 0;
       } catch {
         return { status: "failed", revision, entries: [], error: "Transcript failed" };
       }
-      return { status: entries.length ? "available" : "empty", revision, entries };
     };
+    const boundedTranscriptResult = (result) => (result.status === "available" ? oversized(result.entries, result.revision) : void 0) ?? result;
+    const boundedResult = (entries, revision) => oversized(entries, revision) ?? { status: entries.length ? "available" : "empty", revision, entries };
     if (input.loadTranscript) {
       const result = await input.loadTranscript(request);
       const revisionChanged = request.revision !== void 0 && result.revision !== request.revision && result.status !== "missing" && result.status !== "failed" && result.status !== "oversized" && result.status !== "disconnected";
@@ -3412,13 +3056,13 @@ function createTrajectoryController(agentDir) {
       } catch {
       }
     });
-    await new Promise((resolve5, reject) => {
+    await new Promise((resolve4, reject) => {
       let settled = false;
       const finish = (error) => {
         if (settled) return;
         settled = true;
         if (error) reject(error);
-        else resolve5();
+        else resolve4();
       };
       next.addEventListener("open", () => {
         finish();
@@ -3438,11 +3082,11 @@ function createTrajectoryController(agentDir) {
     next.send(JSON.stringify({ type: "publisher:attach", publisherId: publisherId(input.cwd, input.sessionId) }));
   };
   let reconnectCancel;
-  const waitReconnect = (ms) => new Promise((resolve5) => {
+  const waitReconnect = (ms) => new Promise((resolve4) => {
     const timer = setTimeout(() => {
       if (reconnectTimer === timer) reconnectTimer = void 0;
       reconnectCancel = void 0;
-      resolve5();
+      resolve4();
     }, ms);
     timer.unref();
     reconnectTimer = timer;
@@ -3450,7 +3094,7 @@ function createTrajectoryController(agentDir) {
       clearTimeout(timer);
       if (reconnectTimer === timer) reconnectTimer = void 0;
       reconnectCancel = void 0;
-      resolve5();
+      resolve4();
     };
   });
   const scheduleReconnect = () => {
@@ -3517,7 +3161,7 @@ function createTrajectoryController(agentDir) {
   };
 }
 function registerTrajectoryExtension(pi, options = {}) {
-  const controller = options.controller ?? createTrajectoryController(options.agentDir ?? getAgentDir4());
+  const controller = options.controller ?? createTrajectoryController(options.agentDir ?? getAgentDir3());
   const openUrl = options.openUrl ?? openTrajectoryUrl;
   let autoAttached = false;
   const notify = (context, message, level) => {
@@ -3533,7 +3177,7 @@ function registerTrajectoryExtension(pi, options = {}) {
       return void 0;
     }
   };
-  const open4 = async (provider, context) => {
+  const open3 = async (provider, context) => {
     const server = await attach(provider, context);
     if (server === void 0) return;
     const url = trajectoryUrl(server.port);
@@ -3541,7 +3185,7 @@ function registerTrajectoryExtension(pi, options = {}) {
     notify(context, `Trajectory opened at ${url}`, "info");
   };
   const host = {
-    open: open4,
+    open: open3,
     autoAttach(provider, context) {
       if (autoAttached || !context.hasUI) return;
       autoAttached = true;