@xingular/harness 1.3.1-unstable.4 → 1.3.1-unstable.5

package/dist/cli.js

@@ -161,7 +161,7 @@ function runSetup(input) {
   if (!input.trust.trusted(input.repoRoot, script.hash)) return Promise.resolve({ state: "untrusted", hash: script.hash, log: null });
   mkdirSync20(dirname17(input.logFile), { recursive: true });
   const log2 = openSync4(input.logFile, "w");
-  return new Promise((resolve19) => {
+  return new Promise((resolve23) => {
     const child = spawn3("/bin/sh", [script.path], {
       cwd: input.checkout,
       env: { ...process.env, HARNESS_WORKTREE_PATH: input.checkout, HARNESS_WORKTREE_SOURCE: input.source, HARNESS_WORKTREE_NAME: input.name },
@@ -174,7 +174,7 @@ function runSetup(input) {
       settled3 = true;
       clearTimeout(timer);
       closeSync4(log2);
-      resolve19({ state: exitCode2 === 0 ? "ran" : "failed", hash: script.hash, log: input.logFile, exitCode: exitCode2 });
+      resolve23({ state: exitCode2 === 0 ? "ran" : "failed", hash: script.hash, log: input.logFile, exitCode: exitCode2 });
     };
     child.once("error", () => finish(null));
     child.once("close", (code) => finish(code));
@@ -209,12 +209,12 @@ var init_setup = __esm({
 });
 
 // src/cli.ts
-import { resolve as resolve18 } from "node:path";
+import { resolve as resolve22 } from "node:path";
 
 // package.json
 var package_default = {
   name: "@xingular/harness",
-  version: "1.3.1-unstable.4",
+  version: "1.3.1-unstable.5",
   type: "module",
   description: "Xingular Harness \u2014 a Pi agent harness built on recursive harnessing (Harness\xB2): versioned eight-component variants, refinement from evidence, multi-account sessions, a compiled prompt, project notes, tools, and MCP",
   repository: {
@@ -457,6 +457,7 @@ var runEventTypeSchema = z.enum([
   "message.steered",
   "tool.started",
   "tool.completed",
+  "tool.refused",
   "retry.started",
   "retry.ended",
   "compaction.started",
@@ -517,7 +518,38 @@ var toolPayload = z.object({
 });
 var retryStartedPayload = z.object({ attempt: z.number(), maxAttempts: z.number(), delayMs: z.number(), error: z.string().max(1e3).optional() });
 var retryEndedPayload = z.object({ attempt: z.number(), success: z.boolean(), error: z.string().max(1e3).optional() });
-var compactionStartedPayload = z.object({ reason: z.string() });
+var refusalCodeSchema = z.enum([
+  /** Plan mode allows only research tools and read-only Bash. */
+  "plan_mode",
+  /** A file write or command outside the active project workspace, or a workspace that could not be verified. */
+  "workspace",
+  /** The host's work scope does not cover the call. */
+  "scope",
+  /** The host's tool policy disabled the tool. */
+  "policy",
+  /** The tool is outside the run's capability set. */
+  "capability",
+  /** A person was asked and declined. */
+  "approval_denied",
+  /** The call needs a person and the run has nobody to ask: refinement, reflection, diagnostics. */
+  "unattended",
+  /** The reply reached its work-slice budget. */
+  "work_slice",
+  /** The terminal controller could not be reached to decide. */
+  "controller_unavailable"
+]);
+var toolRefusedPayload = z.object({
+  toolCallId: z.string(),
+  name: z.string(),
+  code: refusalCodeSchema,
+  reason: z.string().max(2e3)
+});
+var compactionStartedPayload = z.object({
+  reason: z.string(),
+  /** The latest request's size and the model's limit when compaction began, when known. */
+  contextTokens: z.number().optional(),
+  contextWindow: z.number().optional()
+});
 var compactionEndedPayload = z.object({
   reason: z.string(),
   aborted: z.boolean(),
@@ -565,6 +597,34 @@ var questionOptionSchema = z.object({
   recommended: z.boolean().optional(),
   sketch: questionSketchSchema.optional()
 });
+function questionAnswerProblem(question, answer) {
+  const name = question.summary?.trim() ? `Question "${question.summary.trim()}"` : "This question";
+  const selected = answer.selected;
+  if (question.multiSelect !== true && selected.length > 1) {
+    return { field: "selection", message: `${name} takes one choice, but ${selected.length} were selected.` };
+  }
+  if (new Set(selected).size !== selected.length) {
+    return { field: "selection", message: `${name} lists the same choice more than once.` };
+  }
+  const unknown = selected.find((label) => !question.options.some((option) => option.label === label));
+  if (unknown !== void 0) {
+    return { field: "selection", message: `${name} does not offer "${unknown}".` };
+  }
+  if (answer.text?.trim() && question.allowText === false) {
+    return { field: "text", message: `${name} does not take a typed answer; choose one of its options.` };
+  }
+  for (const [label, note] of Object.entries(answer.notes ?? {})) {
+    const normalized = typeof note === "string" ? note.trim() : "";
+    if (!normalized) continue;
+    if (!selected.includes(label)) {
+      return { field: "notes", message: `${name}: a note is attached to "${label}", which is not selected.` };
+    }
+    if (normalized.length > 1e4) {
+      return { field: "notes", message: `${name}: the note for "${label}" is longer than 10,000 characters.` };
+    }
+  }
+  return null;
+}
 var questionBatchFields = {
   batchId: z.string().min(1).optional(),
   batchIndex: z.number().int().min(1).max(5).optional(),
@@ -720,7 +780,37 @@ var accountStatusPayload = z.object({
   plan: z.string().optional(),
   limits: z.array(accountLimitSchema).optional()
 });
-var statusPayload = z.object({ status: runStatusSchema, reason: z.string().optional() });
+var runStopCodeSchema = z.enum([
+  "completed",
+  /** A person stopped the run. */
+  "user_abort",
+  /** The reply reached its work-slice budget and handed off. */
+  "slice_budget",
+  /** Three compactions in one reply ended it. */
+  "compaction_thrash",
+  /** The model request failed (auth, quota, rate limit, network, unsupported model). */
+  "provider_error",
+  /** The run stopped reporting progress or heartbeats. */
+  "stalled",
+  /** The owning process went away without settling the run. */
+  "owner_gone",
+  /** The harness started and found the run unsettled. */
+  "harness_restart",
+  /** The terminal needs attention: a startup error or a lost decision callback. */
+  "terminal_attention",
+  /** The terminal closed while the run was live. */
+  "terminal_closed",
+  /** An ancestor run stopped, so this one did too. */
+  "parent_stopped",
+  /** Any other failure. */
+  "failed"
+]);
+var stopCodeOf = (code) => {
+  const parsed = runStopCodeSchema.safeParse(code);
+  if (parsed.success) return parsed.data;
+  return code.startsWith("provider_") ? "provider_error" : "failed";
+};
+var statusPayload = z.object({ status: runStatusSchema, reason: z.string().optional(), code: runStopCodeSchema.optional() });
 var failedPayload = z.object({ code: z.string(), message: z.string() });
 var emptyPayload = z.object({}).passthrough();
 var runEventPayloadSchemas = {
@@ -731,6 +821,7 @@ var runEventPayloadSchemas = {
   "message.steered": messageSteeredPayload,
   "tool.started": toolPayload,
   "tool.completed": toolPayload,
+  "tool.refused": toolRefusedPayload,
   "retry.started": retryStartedPayload,
   "retry.ended": retryEndedPayload,
   "compaction.started": compactionStartedPayload,
@@ -777,9 +868,11 @@ var runRecordSchema = z.object({
   parentRunId: text,
   relation: text,
   terminalReason: text,
+  terminalCode: runStopCodeSchema.nullish().transform((value) => value ?? null),
   id: z.string(),
   projectId: text,
   mode: z.string(),
+  effectiveMode: z.enum(["plan", "normal"]).optional(),
   harness: z.string(),
   sessionType: z.string(),
   sessionId: z.string(),
@@ -802,7 +895,9 @@ var runRecordSchema = z.object({
   profile: text.optional(),
   title: text.optional(),
   model: text.optional(),
-  effort: text.optional()
+  effort: text.optional(),
+  loadedSkills: z.array(z.string()).optional(),
+  activatedPlugins: z.array(z.string()).optional()
 });
 function upgradeRunRecord(raw) {
   if (!raw || typeof raw !== "object") return raw;
@@ -2434,6 +2529,7 @@ var REQUIRED_SKILLS_POINTER = "Some required skill text was omitted to fit. Load
 var REFERENCES_BUDGET = 12e3;
 var VARIANT_BUDGET = 3e4;
 var NOTES_LISTED = 25;
+var APPROVAL_GUIDANCE = "Approvals: when a call needs a person, the Harness pauses that exact call and shows them Allow and Deny. Never ask for permission in a message, never end your turn to wait for an answer, and never call a task blocked on approval before trying: a denial arrives as the tool result, and you continue from it.";
 var SECTION_ORDER = { harnessIdentity: 5, system: 25, sessionState: 30, guardrails: 40, memory: 45, references: 50, requiredSkills: 52, subagents: 64, scripts: 66, wiki: 80, tools: 90, reporting: 95 };
 var REPORTING_GUIDANCE = `When you finish work, write the final reply for a person who did not watch you work.
 
@@ -2540,7 +2636,7 @@ function toolGroups(context, launch, dataRoot) {
   const native = NATIVE_GROUP.filter((name) => enabled.includes(name));
   const wikiTools = WIKI_GROUP.filter((name) => name !== "wiki_write" || enabled.includes(name));
   const readGuidance = `Read-only file tools accept absolute paths and paths beginning with ~ anywhere this process has operating-system read access. The working folder is a default location, not a read boundary.${dataRoot ? ` The Harness data root is ${dataRoot}.` : ""}`;
-  const writeGuidance = "Keep native file writes and Bash filesystem effects inside the active project workspace. Outside file targets require one-call approval; remembered tool grants do not satisfy it. Bash, including an initial ! command, may read as before but writes are sandboxed to the workspace unless the explicit Full Permission switch is on. Keep task outputs in the project, following an existing artifacts/ or outputs/ convention when present.";
+  const writeGuidance = "Keep native file writes and Bash filesystem effects inside the active project workspace, where they run without asking. An outside file target is allowed too: call the tool and the Harness pauses that one call until the person clicks Allow or Deny, so nothing outside changes first. Remembered tool grants do not answer an outside target; only the explicit Full Permission switch answers it for the run. Bash, including an initial ! command, may read as before but writes are sandboxed to the workspace unless that switch is on. Keep task outputs in the project, following an existing artifacts/ or outputs/ convention when present.";
   const nativeGuidance = `Files and shell: ${readGuidance} ${writeGuidance} Edits and commands still pass through the Harness gate.`;
   const groups = [
     {
@@ -2589,7 +2685,9 @@ function toolGroups(context, launch, dataRoot) {
   return present2.map((group, index) => ({ group, index })).sort((left, right) => left.group.order - right.group.order || left.index - right.index).map(({ group }) => group);
 }
 function tools2(groups, guidance, pointer) {
-  let text11 = "";
+  let text11 = `${APPROVAL_GUIDANCE}
+
+`;
   for (const group of groups) if (group.guidance) text11 += `${group.guidance}
 
 `;
@@ -3205,9 +3303,11 @@ function ordered(record3) {
     parentRunId: record3.parentRunId,
     relation: record3.relation,
     terminalReason: record3.terminalReason,
+    ...record3.terminalCode !== void 0 ? { terminalCode: record3.terminalCode } : {},
     id: record3.id,
     projectId: record3.projectId,
     mode: record3.mode,
+    ...record3.effectiveMode !== void 0 ? { effectiveMode: record3.effectiveMode } : {},
     harness: record3.harness,
     sessionType: record3.sessionType,
     sessionId: record3.sessionId,
@@ -3230,7 +3330,9 @@ function ordered(record3) {
     ...record3.profile ? { profile: record3.profile } : {},
     ...record3.title ? { title: record3.title } : {},
     ...record3.model ? { model: record3.model } : {},
-    ...record3.effort ? { effort: record3.effort } : {}
+    ...record3.effort ? { effort: record3.effort } : {},
+    ...record3.loadedSkills !== void 0 ? { loadedSkills: record3.loadedSkills } : {},
+    ...record3.activatedPlugins !== void 0 ? { activatedPlugins: record3.activatedPlugins } : {}
   };
 }
 function write2(root, record3) {
@@ -3287,9 +3389,9 @@ function recordedSubagents(root, parentRunId) {
 function updateRun(root, runId, update3) {
   const record3 = readRecord(recordPath(root, runId));
   if (!record3) return;
-  const { status, endedAt, terminalReason } = record3;
+  const { status, endedAt, terminalReason, terminalCode } = record3;
   update3(record3);
-  if (!isActiveStatus(status)) Object.assign(record3, { status, endedAt, terminalReason });
+  if (!isActiveStatus(status)) Object.assign(record3, { status, endedAt, terminalReason, terminalCode });
   write2(root, record3);
 }
 function terminalStatus(event) {
@@ -3304,6 +3406,12 @@ function reasonOf(event) {
   const reason = payload2?.reason ?? payload2?.message;
   return typeof reason === "string" ? reason : null;
 }
+function stopCodeOfEvent(event) {
+  const payload2 = event.payload;
+  if (event.type === "completed") return "completed";
+  if (event.type === "failed") return stopCodeOf(typeof payload2?.code === "string" ? payload2.code : "failed");
+  return typeof payload2?.code === "string" ? stopCodeOf(payload2.code) : null;
+}
 function appendEvent(root, event) {
   const directory = runDir(root, event.runId);
   mkdirSync5(directory, { recursive: true });
@@ -3347,6 +3455,7 @@ function persistEvent(root, event) {
     record3.status = outcome;
     record3.endedAt = event.timestamp;
     record3.terminalReason = reasonOf(event);
+    record3.terminalCode = stopCodeOfEvent(event);
     changed2 = true;
   } else if (event.type === "status.changed") {
     const status = event.payload.status;
@@ -3373,10 +3482,11 @@ function markInterruptedRuns(root, reason = STOPPED) {
     if (settled3) {
       const status = terminalStatus(settled3);
       const settledReason = reasonOf(settled3);
-      if (record3.status !== status || record3.endedAt !== settled3.timestamp || record3.terminalReason !== settledReason) {
+      const settledCode = stopCodeOfEvent(settled3);
+      if (record3.status !== status || record3.endedAt !== settled3.timestamp || record3.terminalReason !== settledReason || settledCode !== null && record3.terminalCode !== settledCode) {
         const backup2 = `${path4}.before-outcome-repair`;
         if (!existsSync9(backup2)) copyFileSync2(path4, backup2);
-        Object.assign(record3, { status, endedAt: settled3.timestamp, terminalReason: settledReason });
+        Object.assign(record3, { status, endedAt: settled3.timestamp, terminalReason: settledReason, ...settledCode ? { terminalCode: settledCode } : {} });
         write2(root, record3);
       }
     }
@@ -3384,9 +3494,10 @@ function markInterruptedRuns(root, reason = STOPPED) {
     if (ownedElsewhere(root, record3.id)) continue;
     record3.status = "interrupted";
     record3.terminalReason = reason;
+    record3.terminalCode = "harness_restart";
     record3.endedAt ??= now();
     const last = events2.reduce((highest, event) => Math.max(highest, event.sequence), -1);
-    appendEvent(root, { id: newId(), runId: record3.id, sessionId: record3.sessionId, sequence: last + 1, timestamp: now(), type: "status.changed", payload: { status: "interrupted", reason } });
+    appendEvent(root, { id: newId(), runId: record3.id, sessionId: record3.sessionId, sequence: last + 1, timestamp: now(), type: "status.changed", payload: { status: "interrupted", reason, code: "harness_restart" } });
     write2(root, record3);
     interrupted.push(record3.id);
   }
@@ -3408,9 +3519,10 @@ function reconcileStaleRuns(root, at = Date.now(), options2 = {}) {
     const reason = lastHeartbeat ? "stalled" : "owner_gone";
     record3.status = "interrupted";
     record3.terminalReason = reason;
+    record3.terminalCode = reason;
     record3.endedAt = now();
     const sequence = events2.reduce((highest, event) => Math.max(highest, event.sequence), -1) + 1;
-    appendEvent(root, { id: newId(), runId: record3.id, sessionId: record3.sessionId, sequence, timestamp: now(), type: "status.changed", payload: { status: "interrupted", reason } });
+    appendEvent(root, { id: newId(), runId: record3.id, sessionId: record3.sessionId, sequence, timestamp: now(), type: "status.changed", payload: { status: "interrupted", reason, code: reason } });
     write2(root, record3);
     stalled.push(record3.id);
   }
@@ -3648,10 +3760,10 @@ function until(promise, signal) {
     });
     return Promise.reject(new HarnessError("run_not_active", "The parent run stopped."));
   }
-  return new Promise((resolve19, reject2) => {
+  return new Promise((resolve23, reject2) => {
     const abort = () => reject2(new HarnessError("run_not_active", "The parent run stopped."));
     signal.addEventListener("abort", abort, { once: true });
-    promise.then(resolve19, reject2).finally(() => signal.removeEventListener("abort", abort));
+    promise.then(resolve23, reject2).finally(() => signal.removeEventListener("abort", abort));
   });
 }
 var Subagents = class {
@@ -3692,8 +3804,8 @@ var Subagents = class {
       contributions: capabilities.contributions.filter((id2) => frozen.contributions.includes(id2))
     };
     let started;
-    const ready = new Promise((resolve19) => {
-      started = resolve19;
+    const ready = new Promise((resolve23) => {
+      started = resolve23;
     });
     if (!deferUntilPrompt) started();
     this.parents.set(input.run.id, { ready, started, input: structuredClone({ ...input, text: "", images: void 0, requiresImageInput: false, preamble: null, resume: null }), accountId, capabilities: ceiling, stopped: new AbortController(), recovered: /* @__PURE__ */ new Set(), launching: /* @__PURE__ */ new Map() });
@@ -4113,7 +4225,7 @@ It stopped before finishing. ${continueHint(result.runId)}` : ""}`;
 
 // src/harness.ts
 import { mkdirSync as mkdirSync26 } from "node:fs";
-import { join as join69 } from "node:path";
+import { join as join70 } from "node:path";
 
 // src/accounts/accounts.ts
 import { chmodSync as chmodSync3, existsSync as existsSync10, mkdirSync as mkdirSync9, readdirSync as readdirSync11, rmSync as rmSync7 } from "node:fs";
@@ -4480,7 +4592,7 @@ async function withCredentialLock(dir2, key, work2, options2 = {}) {
       const blocked = participants().some((entry2) => entry2.id !== id2 && (entry2.ticket === null || entry2.ticket < ticket || entry2.ticket === ticket && entry2.id < id2));
       if (!blocked) return await work2();
       if (performance.now() - started >= timeout) throw new Error("Timed out waiting for credential modification; no credentials were changed.");
-      await new Promise((resolve19) => setTimeout(resolve19, Math.min(poll, Math.max(1, timeout - (performance.now() - started)))));
+      await new Promise((resolve23) => setTimeout(resolve23, Math.min(poll, Math.max(1, timeout - (performance.now() - started)))));
     }
   } finally {
     rmSync6(own, { recursive: true, force: true });
@@ -5156,9 +5268,9 @@ var Accounts = class {
     const interaction = {
       signal: controller.signal,
       notify: (notification) => event(notification),
-      prompt: (prompt) => new Promise((resolve19, reject2) => {
+      prompt: (prompt) => new Promise((resolve23, reject2) => {
         const promptId = randomUUID4();
-        login.prompts.set(promptId, { resolve: resolve19, reject: reject2 });
+        login.prompts.set(promptId, { resolve: resolve23, reject: reject2 });
         prompt.signal?.addEventListener("abort", () => {
           login.prompts.delete(promptId);
           event({ type: "promptClosed", promptId });
@@ -5667,6 +5779,7 @@ function packageManifest(packageRoot) {
     version: text3(manifest.version) ?? text3(plugin.version),
     extends: (Array.isArray(own.extends) ? own.extends : typeof own.extends === "string" ? [own.extends] : []).filter((id2) => typeof id2 === "string" && !!id2),
     commandPrefix: typeof own.commandPrefix === "string" && /^[a-z][a-z0-9-]*$/i.test(own.commandPrefix) && !["plugin", "skill"].includes(own.commandPrefix.toLowerCase()) ? own.commandPrefix.toLowerCase() : null,
+    defaultPrompt: typeof own.defaultPrompt === "string" && /^[a-z][a-z0-9-]*$/.test(own.defaultPrompt) ? own.defaultPrompt : null,
     hooks: inside2(own.hooks),
     agents: inside2(own.agents) ?? "agents",
     connectorTemplates: (Array.isArray(own.connectors) ? own.connectors : []).flatMap((value) => {
@@ -5725,14 +5838,14 @@ var piResolver = async ({ cwd, agentDir, install: install3, packages }) => {
   const settings = pi.SettingsManager.create(cwd, agentDir);
   const shared = new Set((settings.getGlobalSettings().packages ?? []).map((entry2) => typeof entry2 === "string" ? entry2 : entry2.source));
   const manager2 = () => new pi.DefaultPackageManager({ cwd, agentDir, settingsManager: settings, builtinExtensions: [...PI_BUILTINS] });
-  const resolve19 = (installing) => manager2().resolve(async (source) => installing && shared.has(source) ? "install" : "skip");
+  const resolve23 = (installing) => manager2().resolve(async (source) => installing && shared.has(source) ? "install" : "skip");
   let resolved2;
   try {
-    resolved2 = install3 ? await withoutInstallScripts(() => resolve19(true)) : await resolve19(false);
+    resolved2 = install3 ? await withoutInstallScripts(() => resolve23(true)) : await resolve23(false);
   } catch (error) {
     if (!install3) throw error;
     log("a plugin package could not be installed", error instanceof Error ? error.message : String(error));
-    resolved2 = await resolve19(false);
+    resolved2 = await resolve23(false);
   }
   const found = [];
   const add = (paths2) => {
@@ -7222,7 +7335,7 @@ var TRAJECTORY_TOOLS = [
     name: "trajectory_search",
     call: "trajectory.search",
     label: "Search trajectories",
-    description: "List recorded runs across this {product} data root, including active runs. Filter by agent name or id, project name or slug, mode, status, or start time. Results are newest first; use the returned cursor to continue. Then use trajectory_read for captured prompts, context snapshots, model and tool events, decisions, retries, compaction, and usage. Hidden agents excluded by the host stay hidden.",
+    description: "List recorded runs across this {product} data root, including active runs. Filter by agent name or id, project name or slug, mode, status, or start time. Results include terminalReason and terminalCode (null when unavailable) and are newest first; use the returned cursor to continue. Then use trajectory_read for captured prompts, context snapshots, model and tool events, decisions, retries, compaction, and usage. Hidden agents excluded by the host stay hidden.",
     parameters: {
       type: "object",
       properties: {
@@ -7419,13 +7532,17 @@ function workSliceGuard(options2) {
     });
     pi.on("tool_call", (event) => {
       const name = event.toolName;
+      const refuse = (result) => {
+        options2.onRefuse?.(event, result.reason);
+        return result;
+      };
       state.steps += 1;
       state.lastTool = name;
       const canCheckpoint = checkpointAvailable();
       const handoff = canCheckpoint && HANDOFF_TOOLS.has(name);
       if (state.endedBy) {
         const reason = state.checkpointWritten ? "This reply is over. Its checkpoint is recorded; nothing else runs." : "This reply is over. The Harness will record an evidence-derived checkpoint; nothing else runs.";
-        return handoff ? void 0 : { block: true, terminate: true, reason };
+        return handoff ? void 0 : refuse({ block: true, terminate: true, reason });
       }
       if (state.compactions >= 3) {
         if (handoff) {
@@ -7433,14 +7550,14 @@ function workSliceGuard(options2) {
           state.endedByLimit = "three compactions";
           return void 0;
         }
-        return end("compaction-thrash", "three compactions");
+        return refuse(end("compaction-thrash", "three compactions"));
       }
       const limit2 = sliceLimitReached(policy, state);
       if (limit2) {
         state.endedBy = "budget";
         state.endedByLimit = limit2;
         state.refusedAt ??= state.steps;
-        return handoff ? void 0 : { block: true, reason: handoffRequest(limit2, state, canCheckpoint) };
+        return handoff ? void 0 : refuse({ block: true, reason: handoffRequest(limit2, state, canCheckpoint) });
       }
     });
   };
@@ -7642,14 +7759,14 @@ var safeRequest = async (start, options2) => {
   }
 };
 function readOnce(url, options2) {
-  return new Promise((resolve19, reject2) => {
+  return new Promise((resolve23, reject2) => {
     const start = url.protocol === "https:" ? httpsRequest : httpRequest;
     let settled3 = false;
     const finish = (value) => {
       if (settled3) return;
       settled3 = true;
       clearTimeout(total);
-      resolve19(value);
+      resolve23(value);
     };
     const fail3 = (error) => {
       if (settled3) return;
@@ -8105,9 +8222,9 @@ import { isIP as isIP2 } from "node:net";
 var OPEN_SCHEMES = /* @__PURE__ */ new Set(["data:", "blob:", "about:"]);
 var CACHE_MS2 = 6e4;
 var NetworkPolicy = class {
-  constructor(config, resolve19 = async (host) => (await lookup(host, { all: true, verbatim: true })).map((entry2) => entry2.address)) {
+  constructor(config, resolve23 = async (host) => (await lookup(host, { all: true, verbatim: true })).map((entry2) => entry2.address)) {
     this.config = config;
-    this.resolve = resolve19;
+    this.resolve = resolve23;
   }
   config;
   resolve;
@@ -8364,7 +8481,7 @@ async function askForAction(ask) {
     rememberable: false,
     standing: "none"
   });
-  return decision === "approved" ? null : "The user denied this action. Ask how they would like to proceed.";
+  return decision === "approved" ? null : "The user denied this action. Do not repeat it or ask for permission in a message; choose another approach or report what is blocked.";
 }
 
 // src/browser/contracts.ts
@@ -12196,6 +12313,8 @@ function summary2(env, run2, projects) {
     project: project ? { id: project.id, name: project.name, slug: project.slug } : null,
     mode: run2.mode,
     status: run2.status,
+    terminalReason: run2.terminalReason ?? null,
+    terminalCode: run2.terminalCode ?? null,
     goal: goal.length > 500 ? `${goal.slice(0, 497)}\u2026` : goal || null,
     startedAt: run2.startedAt,
     endedAt: run2.endedAt,
@@ -12485,12 +12604,19 @@ ${tail}` : ""}`;
       return `Proposed ${proposal.name} (${proposal.id}). A person can review it in the plugin manager; it is not installed or enabled.`;
     }
     case "skill.load":
-      return loadSkill(options2.variantDir ?? null, str(params, "name"));
+      return loadSkill(options2.variantDir ?? null, str(params, "name"), (name) => {
+        if (!context.runId) return;
+        const run2 = findRun(env.root, context.runId);
+        if (!run2 || !isActiveStatus(run2.status) || !run2.loadedSkills) return;
+        updateRun(env.root, context.runId, (record3) => {
+          if (record3.loadedSkills && !record3.loadedSkills.includes(name)) record3.loadedSkills.push(name);
+        });
+      });
     default:
       throw new HarnessError("unknown_method", `Unknown harness call ${call}.`);
   }
 }
-function loadSkill(variantDir, name) {
+function loadSkill(variantDir, name, onLoad) {
   const skills = variantDir && existsSync17(join40(variantDir, "skills")) ? readdirSync20(join40(variantDir, "skills"), { withFileTypes: true }).filter((entry2) => entry2.isDirectory() && existsSync17(join40(variantDir, "skills", entry2.name, "SKILL.md"))).map((entry2) => entry2.name).sort() : [];
   if (!skills.includes("plugin-authoring") && defaultSkillPaths(variantDir).length) skills.push("plugin-authoring");
   skills.sort();
@@ -12503,7 +12629,9 @@ function loadSkill(variantDir, name) {
   const helperNote = skill.helpers.length ? `
 
 (This skill's helpers are in ${join40(skill.baseDir, "scripts")}: ${skill.helpers.join(", ")}.)` : "";
-  return `${readFileSync20(skill.path, "utf8")}${helperNote}`;
+  const text11 = readFileSync20(skill.path, "utf8");
+  onLoad?.(wanted);
+  return `${text11}${helperNote}`;
 }
 
 // src/tools/harnessTools.ts
@@ -14182,8 +14310,8 @@ var cancelActive = null;
 function listenForCallback(expectedState, clientName) {
   return new Promise((ready, failed) => {
     let settle;
-    const result = new Promise((resolve19, reject2) => {
-      settle = { resolve: resolve19, reject: reject2 };
+    const result = new Promise((resolve23, reject2) => {
+      settle = { resolve: resolve23, reject: reject2 };
     });
     result.catch(() => void 0);
     const server = createServer((request2, response) => {
@@ -14207,7 +14335,7 @@ function listenForCallback(expectedState, clientName) {
       clearTimeout(timer);
       failed(new HarnessError("invalid_request", error.code === "EADDRINUSE" ? `Port ${MCP_OAUTH_PORT} is in use. Finish or cancel the other sign-in, or quit the program using that port, then try again.` : "The sign-in listener could not start."));
     });
-    const closed = new Promise((resolve19) => server.once("close", resolve19));
+    const closed = new Promise((resolve23) => server.once("close", resolve23));
     const close = () => {
       clearTimeout(timer);
       if (cancelActive === cancel) cancelActive = null;
@@ -14887,6 +15015,9 @@ ${clip4(payload2.text, options2.obsTrunc)}`);
 ${clip4(text11, options2.obsTrunc)}${payload2.outputTruncated ? "\n(the tool output was already bounded when it was recorded)" : ""}`);
         break;
       }
+      case "tool.refused":
+        out.push(`[ERROR] ${String(payload2.name ?? "tool")} refused${typeof payload2.code === "string" ? ` (${payload2.code})` : ""}${typeof payload2.reason === "string" && payload2.reason ? `: ${clip4(payload2.reason, options2.obsTrunc)}` : ""}`);
+        break;
       case "retry.started":
         out.push(`[ERROR] model request failed, retrying (${String(payload2.attempt)}/${String(payload2.maxAttempts)}): ${String(payload2.error ?? "")}`);
         break;
@@ -14903,7 +15034,10 @@ ${clip4(text11, options2.obsTrunc)}${payload2.outputTruncated ? "\n(the tool out
         out.push(`[ERROR] run failed: ${String(payload2.message ?? payload2.code ?? "")}`);
         break;
       case "status.changed":
-        if (payload2.status === "interrupted") out.push("[ERROR] run interrupted");
+        if (payload2.status === "interrupted") {
+          const reason = typeof payload2.reason === "string" && payload2.reason ? payload2.reason : typeof payload2.code === "string" ? payload2.code : "";
+          out.push(`[ERROR] run interrupted${reason ? `: ${clip4(reason, options2.obsTrunc)}` : ""}`);
+        }
         break;
       default:
         break;
@@ -14931,7 +15065,7 @@ var PROBE_TRIGGER = "probe";
 var IMPROVER_TRIGGER = "improver";
 var IMPROVER_IDENTITY = "You improve the harness an autonomous agent runs with, from evidence of how it ran. Work only inside the current folder: the evidence is under `context/`. Follow the mission in the user message exactly.";
 function settled(runtime, runId, signal, timeoutMs = 60 * 6e4) {
-  return new Promise((resolve19) => {
+  return new Promise((resolve23) => {
     let done = false;
     const finish = (status) => {
       if (done) return;
@@ -14939,7 +15073,7 @@ function settled(runtime, runId, signal, timeoutMs = 60 * 6e4) {
       stop();
       clearTimeout(timer);
       signal?.removeEventListener("abort", abort);
-      resolve19(status);
+      resolve23(status);
     };
     const stop = runtime.runs.listen((event) => {
       if (event.runId !== runId) return;
@@ -15924,8 +16058,8 @@ function shellPath() {
   if (!shell) throw new Error("The workspace write-boundary sandbox requires Bash, but no Bash executable was found.");
   return shell;
 }
-function requireShell(resolve19) {
-  const shell = resolve19();
+function requireShell(resolve23) {
+  const shell = resolve23();
   if (!shell) {
     throw new Error(process.platform === "win32" ? "No shell was found: neither Git Bash nor PowerShell is available. Bash was not run." : "No Bash executable was found. Bash was not run.");
   }
@@ -16064,7 +16198,7 @@ function killProcess(child) {
 }
 function runProcess(spec, cwd, options2, marker) {
   if (options2.signal?.aborted) return Promise.reject(new Error("aborted"));
-  return new Promise((resolve19, reject2) => {
+  return new Promise((resolve23, reject2) => {
     const child = spawn2(spec.executable, spec.args, {
       cwd,
       detached: process.platform !== "win32",
@@ -16107,7 +16241,7 @@ function runProcess(spec, cwd, options2, marker) {
       if (!started && pending2) options2.onData(Buffer.from(pending2));
       if (options2.signal?.aborted) reject2(new Error("aborted"));
       else if (timedOut) reject2(new Error(`timeout:${options2.timeout}`));
-      else resolve19({ exitCode: code });
+      else resolve23({ exitCode: code });
     };
     const onAbort = () => killProcess(child);
     if (options2.timeout !== void 0 && options2.timeout > 0) {
@@ -16220,6 +16354,28 @@ function createWorkspaceBashOperations(workspaceRoot, options2 = {}) {
   };
 }
 
+// src/context/runDetails.ts
+function runDetails(root, runId) {
+  const run2 = loadRun2(root, runId);
+  const capabilities = loadRun(root, runId);
+  const snapshot2 = readEvents(root, runId).filter((event) => event.type === "context.snapshot").at(-1);
+  const payload2 = snapshot2?.payload;
+  return {
+    runId: run2.id,
+    status: run2.status ?? null,
+    mode: run2.effectiveMode ?? null,
+    model: run2.model ?? null,
+    effort: run2.effort ?? null,
+    variantScope: run2.variantScope ?? null,
+    variantVersion: run2.variantVersion ?? null,
+    workspaceRoot: run2.workspaceRoot ?? null,
+    tools: payload2 && !payload2.toolsTruncated && Array.isArray(payload2.tools) ? payload2.tools.map((tool) => tool.name) : null,
+    connectors: capabilities?.connectors ?? null,
+    skills: run2.loadedSkills ?? null,
+    plugins: run2.activatedPlugins ?? null
+  };
+}
+
 // src/terminal/terminals.ts
 import { chmodSync as chmodSync11, existsSync as existsSync26, lstatSync as lstatSync13, mkdirSync as mkdirSync22, readFileSync as readFileSync30, unlinkSync as unlinkSync5, writeFileSync as writeFileSync11 } from "node:fs";
 import { basename as basename12, dirname as dirname20, join as join59 } from "node:path";
@@ -16644,7 +16800,7 @@ function request(connection, body2, what, timeoutMs, signal) {
 var StaleConnection = class extends Error {
 };
 function attempt(connection, body2, what, timeoutMs, reused, signal) {
-  return new Promise((resolve19, reject2) => {
+  return new Promise((resolve23, reject2) => {
     const stream = reused ?? createConnection(connection.socket);
     let buffer = "";
     let replied = false;
@@ -16662,7 +16818,7 @@ function attempt(connection, body2, what, timeoutMs, reused, signal) {
         if (reply2.error) {
           const error = typeof reply2.error === "string" ? { message: reply2.error } : reply2.error;
           finish(() => reject2(new SocketError(error.code ?? "error", error.message ?? `${what} failed.`)), !rest);
-        } else finish(() => resolve19(reply2.result), !rest);
+        } else finish(() => resolve23(reply2.result), !rest);
       } catch {
         finish(() => reject2(new SocketError("invalid_reply", "The harness sent an unreadable reply.")));
       }
@@ -17029,11 +17185,11 @@ var TerminalController = class {
   }
   async waitPending(revision) {
     if (revision === this.pendingRevision && !this.disposed) {
-      await new Promise((resolve19) => {
+      await new Promise((resolve23) => {
         const wake = () => {
           clearTimeout(timer);
           this.pendingWaiters.delete(wake);
-          resolve19();
+          resolve23();
         };
         const timer = setTimeout(wake, 2e4);
         this.pendingWaiters.add(wake);
@@ -17076,9 +17232,9 @@ var TerminalController = class {
     this.delivery = null;
     return run2;
   }
-  finish(outcome, message4, reason) {
+  finish(outcome, message4, reason, code) {
     this.stopStallWatch();
-    this.run?.finish(outcome, message4 ? { code: "terminal_attention", message: message4 } : void 0, reason);
+    this.run?.finish(outcome, message4 ? { code: code === "provider_error" ? "provider_error" : "terminal_attention", message: message4 } : void 0, reason, code);
     this.run = null;
     this.seen.clear();
     if (this.pending.size) {
@@ -17118,15 +17274,15 @@ var TerminalController = class {
     if (this.disposed) throw new HarnessError("terminal_not_ready", "Reopen the terminal before sending instructions.");
     if (this.activeRun || this.delivery) throw new HarnessError("session_busy", "This terminal has an active task or delivery.");
     const deadline = Date.now() + READY_TIMEOUT_MS;
-    while (!this.ready && !this.startupError && !this.disposed && Date.now() < deadline) await new Promise((resolve19) => setTimeout(resolve19, 50));
+    while (!this.ready && !this.startupError && !this.disposed && Date.now() < deadline) await new Promise((resolve23) => setTimeout(resolve23, 50));
     if (this.disposed) throw new HarnessError("terminal_not_ready", "The terminal stopped during initialization.");
     if (this.startupError) throw new HarnessError("terminal_not_ready", this.startupError);
     if (!this.ready) throw new HarnessError("terminal_not_ready", `The native telemetry handshake is missing (${this.startupPhase}). Inspect the terminal sign-in or trust screen.`);
     if (this.dirty) throw new HarnessError("terminal_has_draft", "The terminal contains user input. Submit or clear it before handing back control.");
     let timer;
-    const ack = new Promise((resolve19, reject2) => {
+    const ack = new Promise((resolve23, reject2) => {
       timer = setTimeout(() => reject2(new HarnessError("delivery_uncertain", "The native prompt acknowledgement was not received. Inspect the terminal; this instruction will not be resent.")), ACK_TIMEOUT_MS);
-      this.delivery = { runId, text: text11, resolve: resolve19, reject: reject2 };
+      this.delivery = { runId, text: text11, resolve: resolve23, reject: reject2 };
     });
     void ack.catch(() => {
     });
@@ -17346,14 +17502,15 @@ var TerminalController = class {
     }
     if (event === "shutdown") {
       this.ready = false;
-      this.finish("interrupted");
+      this.finish("interrupted", void 0, void 0, "terminal_closed");
       return {};
     }
     if (event === "settled") {
       const stalled = this.stallRequested !== null && this.stallRequested === this.run?.runId;
-      const reason = stalled ? "stalled" : typeof data.reason === "string" ? data.reason : void 0;
+      const reason = data.error ? void 0 : stalled ? "stalled" : typeof data.reason === "string" ? data.reason : void 0;
       const outcome = data.error ? "failed" : data.aborted || reason ? "interrupted" : "completed";
-      this.finish(outcome, data.error ? String(data.error) : void 0, reason);
+      const code = data.error ? data.errorCode === "provider_error" ? "provider_error" : void 0 : stalled ? "stalled" : data.code === "slice_budget" || data.code === "compaction_thrash" ? data.code : data.aborted ? "user_abort" : void 0;
+      this.finish(outcome, data.error ? String(data.error) : void 0, reason, code);
       return {};
     }
     const run2 = this.run;
@@ -17392,6 +17549,8 @@ var TerminalController = class {
       }
     }
     if (event === "usage") run2.emit("usage.updated", data);
+    else if (event === "refusal") run2.emit("tool.refused", data);
+    else if (event === "compaction.started" || event === "compaction.ended") run2.emit(event, data);
     else if (event === "heartbeat") run2.emit("heartbeat", data);
     else if (event === "todo" || event === "checklist") run2.emit("todo.updated", { items: data.items });
     else if (event === "checkpoint") run2.emit("checkpoint", data);
@@ -17416,7 +17575,7 @@ var TerminalController = class {
     this.ready = false;
     this.delivery?.reject(new Error("The terminal stopped before prompt acknowledgement."));
     this.delivery = null;
-    this.finish("interrupted");
+    this.finish("interrupted", void 0, void 0, "terminal_closed");
     this.subagents.clear();
     this.subagentParentRunId = null;
   }
@@ -17651,7 +17810,7 @@ var SessionSocket = class {
     });
   }
   bind(path4) {
-    return new Promise((resolve19, reject2) => {
+    return new Promise((resolve23, reject2) => {
       const server = createServer2((client) => this.serve(client));
       server.once("error", reject2);
       server.listen(path4, () => {
@@ -17663,7 +17822,7 @@ var SessionSocket = class {
           }
         }
         this.server = server;
-        resolve19();
+        resolve23();
       });
     });
   }
@@ -17699,7 +17858,7 @@ var SessionSocket = class {
     this.server = null;
     this.listening = null;
     for (const client of this.clients) client.destroy();
-    if (server) await new Promise((resolve19) => server.close(() => resolve19()));
+    if (server) await new Promise((resolve23) => server.close(() => resolve23()));
     if (!isPipePath(this.path)) rmSync22(this.path, { force: true });
   }
 };
@@ -17751,7 +17910,7 @@ function summary3(run2) {
 }
 function listTerminalTrajectoryRuns(root, sessionId, nativeSessionId) {
   if (!nativeSessionId) return [];
-  return listRuns(root, { sessionId }).filter((run2) => run2.nativeSessionId === nativeSessionId || run2.trigger === "side-question" && run2.sessionId === sessionId).map(summary3);
+  return listRuns(root, { sessionId }).filter((run2) => run2.nativeSessionId === nativeSessionId).map(summary3);
 }
 function latestTerminalTodo(root, sessionId, nativeSessionId) {
   if (!nativeSessionId) return { runId: "", todo: [] };
@@ -17761,7 +17920,7 @@ function latestTerminalTodo(root, sessionId, nativeSessionId) {
 function readTerminalTrajectory(root, sessionId, nativeSessionId, runId, afterSequence) {
   if (!nativeSessionId || !Number.isSafeInteger(afterSequence ?? 0) || (afterSequence ?? 0) < 0) throw notFound("Run");
   const run2 = findRun(root, runId);
-  if (!run2 || run2.sessionId !== sessionId || run2.nativeSessionId !== nativeSessionId && run2.trigger !== "side-question") throw notFound("Run");
+  if (!run2 || run2.sessionId !== sessionId || run2.nativeSessionId !== nativeSessionId) throw notFound("Run");
   const events2 = readEvents(root, runId).filter((event) => afterSequence === void 0 || event.sequence > afterSequence);
   return { run: summary3(run2), events: events2 };
 }
@@ -18202,13 +18361,13 @@ var Pairing = class {
     if (this.pending) throw new HarnessError("remote_busy", "Another device is waiting for approval in the terminal.");
     if (this.devices.size >= MAX_DEVICES) throw new HarnessError("remote_full", `At most ${MAX_DEVICES} devices can control a session. Press n in /remote-control to start over.`);
     const label = deviceLabel(body2.userAgent);
-    const allowed3 = await new Promise((resolve19) => {
+    const allowed3 = await new Promise((resolve23) => {
       const timer = setTimeout(() => decide2(false), confirmMs);
       timer.unref?.();
       const decide2 = (allow) => {
         clearTimeout(timer);
         if (this.pending?.decide === decide2) this.pending = null;
-        resolve19(allow);
+        resolve23(allow);
         this.changed();
       };
       this.pending = { id: id(), label, at, decide: decide2 };
@@ -18357,11 +18516,11 @@ async function listenRemote(host, port, routes) {
     sockets.add(socket);
     socket.on("close", () => sockets.delete(socket));
   });
-  await new Promise((resolve19, reject2) => {
+  await new Promise((resolve23, reject2) => {
     server.once("error", reject2);
     server.listen({ host, port, exclusive: true }, () => {
       server.off("error", reject2);
-      resolve19();
+      resolve23();
     });
   });
   const bound = server.address().port;
@@ -18371,8 +18530,8 @@ async function listenRemote(host, port, routes) {
     port: bound,
     close: async () => {
       for (const stream of [...streams]) stream.end();
-      await new Promise((resolve19) => {
-        server.close(() => resolve19());
+      await new Promise((resolve23) => {
+        server.close(() => resolve23());
         for (const socket of sockets) socket.destroy();
       });
     }
@@ -18685,11 +18844,15 @@ var PAGE_JS = String.raw`
       inputs.push(input)
       void index
     })
-    var other = document.createElement('input'); other.type = 'text'; other.placeholder = 'Or type an answer'
-    card.appendChild(other)
+    var allowsText = request.allowText !== false
+    var other = null
+    if (allowsText) {
+      other = document.createElement('input'); other.type = 'text'; other.placeholder = 'Or type an answer'
+      card.appendChild(other)
+    }
     return function () {
       var selected = inputs.filter(function (i) { return i.checked }).map(function (i) { return i.value })
-      var typed = other.value.trim()
+      var typed = allowsText && other ? other.value.trim() : ''
       if (!selected.length && !typed) throw new Error('Choose an answer first.')
       return typed ? { selected: selected, text: typed } : { selected: selected }
     }
@@ -18927,11 +19090,11 @@ var RemoteControl = class {
   /** Returns at once for a changed revision, otherwise after a change or 20 seconds. */
   async waitStatus(revision) {
     if (revision === this.revision && !this.ended) {
-      await new Promise((resolve19) => {
+      await new Promise((resolve23) => {
         const wake = () => {
           clearTimeout(timer);
           this.waiters.delete(wake);
-          resolve19();
+          resolve23();
         };
         const timer = setTimeout(wake, 2e4);
         timer.unref?.();
@@ -19065,7 +19228,7 @@ var RemoteControl = class {
           if (changed2) this.broadcast({ type: "pending", requests: snapshot2.requests.map(projectRequest) });
         } catch {
           if (loop.signal.aborted) return;
-          await new Promise((resolve19) => setTimeout(resolve19, 1e3).unref?.());
+          await new Promise((resolve23) => setTimeout(resolve23, 1e3).unref?.());
           revision = void 0;
         }
       }
@@ -19123,6 +19286,7 @@ function resourceIdentity(loading) {
     builtins: loading.builtins,
     skills: loading.skillPaths,
     prompts: loading.promptPaths,
+    resourceOwners: loading.found.filter((item) => (item.kind === "prompt" || item.kind === "extension") && item.packageRoot),
     themes: loading.themePaths,
     profiles: loading.profilePaths,
     detached: loading.detached,
@@ -19304,7 +19468,8 @@ var Terminals = class {
   ownNames = /* @__PURE__ */ new Map();
   async ownTools(live, listing) {
     const sessionId = live.caller.sessionId;
-    const all3 = harnessTools(this.options.env, live.caller, { variantDir: this.variantDirs.get(sessionId) ?? null }).filter((tool) => DEFAULT_TOOL_NAMES.includes(tool.name));
+    const caller = { ...live.caller, runId: live.controller.activeRun?.runId ?? null };
+    const all3 = harnessTools(this.options.env, caller, { variantDir: this.variantDirs.get(sessionId) ?? null }).filter((tool) => DEFAULT_TOOL_NAMES.includes(tool.name));
     if (!listing) return all3.filter((tool) => this.ownNames.get(sessionId)?.has(tool.name) ?? false);
     const on = await this.worldOn(live);
     const owner = (tool) => HARNESS_PLUGINS.find((plugin) => plugin.tools?.some((entry2) => entry2.name === tool))?.id ?? null;
@@ -19600,10 +19765,12 @@ var Terminals = class {
         throw new HarnessError("unknown_method", `Unknown call ${call}.`);
     }
   }
-  /** `/context`: what the session's latest request was made of, and one row's text on request. */
+  /** `/context`: the selected run's request, and one row's text on request. */
   contextCall(live, params) {
-    const runId = live.controller.lastRun;
+    if (params.runId !== void 0 && (typeof params.runId !== "string" || !params.runId)) throw invalid("A valid run id is required.");
+    const runId = typeof params.runId === "string" ? params.runId : live.controller.lastRun;
     if (!runId) return { attribution: null, text: null };
+    if (params.runId !== void 0) readTerminalTrajectory(this.options.env.root, live.input.sessionId, live.controller.nativeSessionId, runId);
     const text11 = typeof params.section === "string" && params.section ? rowText(this.options.env, runId, params.section) : null;
     return { attribution: attribution(this.options.env, runId), text: text11 };
   }
@@ -19786,6 +19953,7 @@ var Terminals = class {
       startedAt: now(),
       endedAt: null,
       status: "queued",
+      loadedSkills: [],
       exitCode: null,
       handoffId: null,
       accountId: live.account.id,
@@ -19951,6 +20119,9 @@ ${formatBashCommandForApproval(command)}`,
         }, packaged).body
       };
       freezeRun(this.options.env.root, run2.runId, caller, capabilities);
+      updateRun(this.options.env.root, run2.runId, (record3) => {
+        record3.effectiveMode = params.plan === true ? "plan" : "normal";
+      });
       if (!service || live.input.subagents === null) return { runId: run2.runId, connectors: capabilities.connectors, subagentProfiles };
       service.register({
         run: { id: run2.runId, sessionId: live.input.sessionId, mode: live.input.run?.mode ?? "code", projectId: live.input.projectId, worktreeId: live.input.run?.worktreeId },
@@ -20027,6 +20198,11 @@ ${formatBashCommandForApproval(command)}`,
     if (call === "terminal.trajectory.list") {
       return { runs: listTerminalTrajectoryRuns(this.options.env.root, live.input.sessionId, live.controller.nativeSessionId) };
     }
+    if (call === "terminal.trajectory.details") {
+      if (typeof params.runId !== "string" || !params.runId) throw invalid("A run id is required.");
+      readTerminalTrajectory(this.options.env.root, live.input.sessionId, live.controller.nativeSessionId, params.runId);
+      return runDetails(this.options.env.root, params.runId);
+    }
     if (call === "terminal.trajectory.events") {
       if (typeof params.runId !== "string" || !params.runId) throw invalid("A run id is required.");
       const afterSequence = params.afterSequence;
@@ -20266,7 +20442,8 @@ ${formatBashCommandForApproval(command)}`,
           if (resourceIdentity(current2) !== resourceIdentity(loading) || variant && (currentVariant?.fingerprint !== variant.fingerprint || JSON.stringify(currentVariant.extensionPaths) !== JSON.stringify(variant.extensionPaths))) {
             throw new HarnessError("terminal_resources_changed", "Trusted resources changed since this terminal was prepared. Review /plugins and reopen the terminal to load the new selection.");
           }
-          return {};
+          const resourceOwners = (current2?.found ?? []).filter((item) => item.packageRoot && (item.kind === "prompt" && current2?.promptPaths.includes(item.path) || item.kind === "extension" && current2?.extensionPaths.includes(item.path)));
+          return resourceOwners.length ? { resourceOwners } : {};
         } }
       });
       live.token = token;
@@ -20502,6 +20679,7 @@ async function builtinChecks(harness, context, secrets, assets = defaultAssets()
         }
       }
     },
+    check2("computer.capture", "tools", "Application window capture", async () => context.tools.includes("computer_screenshot") ? { status: "unverified", evidence: "A computer screenshot tool is listed for this session; its backend and window isolation were not tested.", remedy: "Check the provider and approve an application window before capture." } : { status: "blocked", evidence: "No computer screenshot tool is listed for this session. An application window cannot be read through this capability.", remedy: "Use a host with an approved-window capture backend." }),
     check2("runtime.pi", "runtime", "Pi runtime", async () => {
       await loadPi();
       return pass(`Pi ${PINNED_PI_VERSION} loaded with its required dispatcher.`);
@@ -20702,7 +20880,7 @@ async function diagnosticProbe(harness, context, inputSignal, action) {
   const run2 = harness.runs.start(id2, id2);
   run2.onInterrupt(() => interrupt.abort());
   const abort = () => {
-    run2.finish("interrupted");
+    run2.finish("interrupted", void 0, void 0, "user_abort");
     void harness.world.release(id2);
   };
   signal.addEventListener("abort", abort, { once: true });
@@ -20716,10 +20894,13 @@ async function diagnosticProbe(harness, context, inputSignal, action) {
       call: async (name, input) => {
         signal.throwIfAborted();
         if (run2.finished || !capabilities.tools.includes(name)) throw new HarnessError("doctor_blocked", "This tool is outside the diagnostic capability set.");
-        const refusal = await gate.check(name, input);
-        if (refusal) throw new HarnessError("doctor_blocked", "The tool policy refused this diagnostic call.");
-        signal.throwIfAborted();
         const callId = randomUUID15();
+        const refusal = await gate.checkDetailed?.(name, input);
+        if (refusal) {
+          run2.emit("tool.refused", { toolCallId: callId, name, code: refusal.code, reason: "The tool policy refused this diagnostic call." });
+          throw new HarnessError("doctor_blocked", "The tool policy refused this diagnostic call.");
+        }
+        signal.throwIfAborted();
         run2.emit("tool.started", { toolCallId: callId, name, summary: "Synthetic diagnostic input" });
         try {
           let result2;
@@ -20746,11 +20927,11 @@ async function diagnosticProbe(harness, context, inputSignal, action) {
     });
     return result;
   } catch (error) {
-    run2.finish(signal.aborted ? "interrupted" : "failed", { code: "doctor_failed", message: "The diagnostic probe failed." });
+    run2.finish(signal.aborted ? "interrupted" : "failed", { code: "doctor_failed", message: "The diagnostic probe failed." }, void 0, signal.aborted ? "user_abort" : void 0);
     throw error;
   } finally {
     signal.removeEventListener("abort", abort);
-    run2.finish(signal.aborted ? "interrupted" : "completed");
+    run2.finish(signal.aborted ? "interrupted" : "completed", void 0, void 0, signal.aborted ? "user_abort" : void 0);
     harness.apps.revokeRun(id2, id2);
     await harness.world.release(id2);
   }
@@ -21054,7 +21235,7 @@ var RunRegistry = class {
       if (finished || finishing || this.nativeCleared.delete(questionId)) return Promise.resolve({ selected: [] });
       validateQuestionRecommendations(input);
       if (this.questions.has(questionId)) throw new HarnessError("invalid_request", "This question id is already pending.");
-      return new Promise((resolve19) => {
+      return new Promise((resolve23) => {
         this.questions.set(questionId, {
           runId,
           input,
@@ -21063,7 +21244,7 @@ var RunRegistry = class {
             this.questions.delete(questionId);
             emit("question.answered", { questionId, ...answer, ...batch ?? {} });
             emit("status.changed", { status: waitingStatus() });
-            resolve19(answer);
+            resolve23(answer);
           }
         });
         emit("question.requested", { questionId, ...payload2, ...batch ?? {} });
@@ -21106,7 +21287,7 @@ var RunRegistry = class {
         }
         emit("approval.requested", { approvalId, ...payload2 });
         emit("status.changed", { status: "waiting_for_approval" });
-        return new Promise((resolve19) => {
+        return new Promise((resolve23) => {
           const timer = timeoutMs ? setTimeout(() => this.approvals.get(approvalId)?.resolve("denied"), timeoutMs) : null;
           this.approvals.set(approvalId, {
             runId,
@@ -21115,7 +21296,7 @@ var RunRegistry = class {
               this.approvals.delete(approvalId);
               emit("approval.resolved", { approvalId, decision });
               emit("status.changed", { status: waitingStatus() });
-              resolve19(decision);
+              resolve23(decision);
             }
           });
         });
@@ -21136,17 +21317,17 @@ var RunRegistry = class {
         emit("status.changed", { status: "waiting_for_input" });
         return Promise.all(answers);
       },
-      finish: (outcome, failure3, reason) => {
+      finish: (outcome, failure3, reason, code) => {
         if (finished || finishing) return;
         finishing = true;
         for (const [, approval] of [...this.approvals]) if (approval.runId === runId) approval.resolve("denied");
         for (const [, question] of [...this.questions]) if (question.runId === runId) question.resolve({ selected: [] });
         if (outcome === "failed") emit("failed", failure3 ?? { code: "failed", message: "The run failed." });
-        else if (outcome === "interrupted") emit("status.changed", { status: "interrupted", ...reason ? { reason } : {} });
+        else if (outcome === "interrupted") emit("status.changed", { status: "interrupted", ...reason ? { reason } : {}, ...code ? { code } : {} });
         else emit("completed", {});
         finished = true;
         this.runs.delete(runId);
-        for (const resolve19 of [...this.waiters.get(runId) ?? []]) resolve19();
+        for (const resolve23 of [...this.waiters.get(runId) ?? []]) resolve23();
         this.waiters.delete(runId);
         for (const [id2, owner] of this.nativeCleared) if (owner === runId) this.nativeCleared.delete(id2);
         try {
@@ -21159,7 +21340,7 @@ var RunRegistry = class {
         return finished;
       },
       interrupt: async () => {
-        run2.finish("interrupted");
+        run2.finish("interrupted", void 0, void 0, "user_abort");
         for (const handler of interruptHandlers) {
           try {
             await handler();
@@ -21173,7 +21354,7 @@ var RunRegistry = class {
     emit("started", {});
     emit("status.changed", { status: "running" });
     const record3 = findRun(this.options.root(), runId);
-    if (record3?.parentRunId && this.hasStoppedAncestor(record3.parentRunId)) run2.finish("interrupted");
+    if (record3?.parentRunId && this.hasStoppedAncestor(record3.parentRunId)) run2.finish("interrupted", void 0, void 0, "parent_stopped");
     return run2;
   }
   hasStoppedAncestor(runId) {
@@ -21196,7 +21377,7 @@ var RunRegistry = class {
     if (!isActiveStatus(record3.status)) return Promise.resolve();
     if (!this.runs.has(runId)) throw new HarnessError("run_not_active", "This run is not active in this process.");
     if (signal?.aborted) return Promise.reject(new HarnessError("run_not_active", "The wait was interrupted."));
-    return new Promise((resolve19, reject2) => {
+    return new Promise((resolve23, reject2) => {
       const cleanup = () => {
         signal?.removeEventListener("abort", abort);
         const pending3 = this.waiters.get(runId);
@@ -21206,7 +21387,7 @@ var RunRegistry = class {
       };
       const done = () => {
         cleanup();
-        resolve19();
+        resolve23();
       };
       const abort = () => {
         cleanup();
@@ -21248,7 +21429,7 @@ var RunRegistry = class {
   }
   /** Interrupts every live run, giving each a moment to stop cleanly. */
   async interruptAll(timeoutMs = 3e3) {
-    await Promise.race([Promise.allSettled(this.activeRunIds().map((id2) => this.interrupt(id2))), new Promise((resolve19) => setTimeout(resolve19, timeoutMs))]);
+    await Promise.race([Promise.allSettled(this.activeRunIds().map((id2) => this.interrupt(id2))), new Promise((resolve23) => setTimeout(resolve23, timeoutMs))]);
   }
   resolveApproval(runId, approvalId, decision) {
     if (decision !== "approved" && decision !== "denied" && decision !== "native") throw new HarnessError("invalid_request", "Unknown decision.");
@@ -21277,15 +21458,22 @@ var RunRegistry = class {
   }
   validateAnswer(input, answer) {
     const selected = answer.selected;
-    const selectedLabels = new Set(selected);
     const notes = {};
     for (const [label, note] of Object.entries(answer.notes ?? {})) {
       const normalized = typeof note === "string" ? note.trim() : "";
       if (normalized) notes[label] = normalized;
     }
     const text11 = answer.text?.trim();
-    if (!input.multiSelect && selected.length > 1 || selectedLabels.size !== selected.length || selected.some((label) => !input.options.some((option) => option.label === label)) || text11 && !input.allowText || Object.keys(notes).some((label) => !selectedLabels.has(label)) || Object.values(notes).some((note) => note.length > 1e4)) {
-      throw new HarnessError("invalid_answer", "Choose the offered options or an allowed text answer, and attach notes only to selected choices.");
+    const problem = questionAnswerProblem(input, { selected, ...text11 ? { text: text11 } : {}, notes });
+    if (problem) {
+      log("a question answer was refused", {
+        summary: input.summary ?? null,
+        field: problem.field,
+        selected: selected.length,
+        notes: Object.keys(notes).length,
+        textLength: text11?.length ?? 0
+      });
+      throw new HarnessError("invalid_answer", problem.message);
     }
     return { selected, ...text11 ? { text: text11 } : {}, ...Object.keys(notes).length ? { notes } : {} };
   }
@@ -21306,7 +21494,7 @@ var RunRegistry = class {
 // src/sessions/sessions.ts
 import { randomUUID as randomUUID17 } from "node:crypto";
 import { existsSync as existsSync28, mkdirSync as mkdirSync23 } from "node:fs";
-import { isAbsolute as isAbsolute9, join as join63 } from "node:path";
+import { isAbsolute as isAbsolute9, join as join64 } from "node:path";
 init_errors();
 init_fs();
 
@@ -21372,7 +21560,7 @@ ${text11}`);
 async function waitForChildren(root, runId, signal) {
   while (!signal?.aborted) {
     if (settled2(root, runId)) return true;
-    await new Promise((resolve19) => setTimeout(resolve19, 250));
+    await new Promise((resolve23) => setTimeout(resolve23, 250));
   }
   return false;
 }
@@ -21921,11 +22109,11 @@ var MAX_TEXT2 = 4e3;
 var clip5 = (text11) => text11.length > MAX_TEXT2 ? `${text11.slice(0, MAX_TEXT2)}\u2026` : text11;
 function dismissable(answer, fallback, options2) {
   if (!options2?.signal && !options2?.timeout) return answer;
-  return new Promise((resolve19) => {
+  return new Promise((resolve23) => {
     let timer;
     const done = (value) => {
       if (timer) clearTimeout(timer);
-      resolve19(value);
+      resolve23(value);
     };
     if (options2.signal?.aborted) return done(fallback);
     options2.signal?.addEventListener("abort", () => done(fallback), { once: true });
@@ -22006,6 +22194,217 @@ function parseInitialBashCommand(input) {
   return outside ? { command: input.slice(outside[0].length).trim(), workspaceWriteScope: "outside" } : { command: input, workspaceWriteScope: "workspace" };
 }
 
+// src/commands/promptLoader.ts
+import { readdirSync as readdirSync29, statSync as statSync22 } from "node:fs";
+import { dirname as dirname23, join as join63, resolve as resolve12 } from "node:path";
+
+// src/commands/promptRoutes.ts
+import { resolve as resolve11, sep as sep10 } from "node:path";
+
+// src/plugins/commandPrefix.ts
+import { basename as basename14, dirname as dirname22, extname as extname3 } from "node:path";
+var slug3 = (value) => {
+  const normalized = value.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+  const prefix = /^[a-z]/.test(normalized) ? normalized : `plugin-${normalized || "command"}`;
+  return prefix === "plugin" || prefix === "skill" ? `extension-${prefix}` : prefix;
+};
+function pluginCommandPrefix(source) {
+  if (source.origin === "package" && source.baseDir) {
+    const manifest = packageManifest(source.baseDir);
+    return manifest.commandPrefix ?? slug3(manifest.name);
+  }
+  if (source.path.startsWith("builtin:")) return slug3(source.path.slice("builtin:".length));
+  const synthetic = /^<[^:>]+:([^>]+)>$/.exec(source.path);
+  if (synthetic) return slug3(synthetic[1]);
+  const file2 = basename14(source.path, extname3(source.path));
+  return slug3(file2 === "index" ? basename14(dirname22(source.path)) : file2);
+}
+
+// src/commands/routes.ts
+function commandRoutes(commands) {
+  const routes = /* @__PURE__ */ new Map();
+  const byName = /* @__PURE__ */ new Map();
+  const ownersByPrefix = /* @__PURE__ */ new Map();
+  const builtinPrefixes = new Map(BUILTIN_PLUGIN_REGISTRY.commands().map((command) => [command.prefix, command.pluginId]));
+  for (const command of commands) {
+    const owners = ownersByPrefix.get(command.prefix) ?? /* @__PURE__ */ new Map();
+    const paths2 = owners.get(command.owner) ?? /* @__PURE__ */ new Set();
+    paths2.add(command.path);
+    owners.set(command.owner, paths2);
+    ownersByPrefix.set(command.prefix, owners);
+    const route = `${command.prefix}:${command.name}`;
+    routes.set(route, [...routes.get(route) ?? [], command]);
+    byName.set(command.name, [...byName.get(command.name) ?? [], command]);
+  }
+  const conflictingPrefixes = /* @__PURE__ */ new Map();
+  for (const [prefix, owners] of ownersByPrefix) {
+    const builtin = builtinPrefixes.get(prefix);
+    if (owners.size > 1 || builtin || prefix === "plugin" || prefix === "skill") {
+      conflictingPrefixes.set(prefix, [
+        ...builtin ? [`built-in plugin ${builtin}`] : [],
+        ...[...owners.values()].flatMap((paths2) => [...paths2])
+      ]);
+    }
+  }
+  return { routes, byName, ownersByPrefix, conflictingPrefixes };
+}
+function promptCommandAvailable(name, taken, extensionCommands = /* @__PURE__ */ new Set()) {
+  return !name.includes(":") && !taken.has(name) && !extensionCommands.has(name);
+}
+
+// src/commands/promptRoutes.ts
+function promptOwners(path4, found) {
+  const target = resolve11(path4);
+  return found.filter((item) => item.kind === "prompt" && item.packageRoot && (target === resolve11(item.path) || target.startsWith(`${resolve11(item.path)}${sep10}`))).sort((a, b) => b.path.length - a.path.length);
+}
+function promptOwner(path4, found) {
+  return promptOwners(path4, found)[0];
+}
+function promptPackageRoot(prompt, found) {
+  return promptOwner(prompt.filePath, found)?.packageRoot ?? (prompt.sourceInfo.origin === "package" ? prompt.sourceInfo.baseDir ?? null : null);
+}
+function namespacePrompts(prompts, found, extensions = []) {
+  const loose = [];
+  const routes = [];
+  for (const prompt of prompts) {
+    const owners = new Set(promptOwners(prompt.filePath, found).map((owner) => owner.packageRoot));
+    if (owners.size > 1) continue;
+    const packageRoot = promptPackageRoot(prompt, found);
+    if (!packageRoot) {
+      if (!prompt.name.includes(":")) loose.push(prompt);
+      continue;
+    }
+    const attribution2 = promptOwner(prompt.filePath, found)?.commandOwner;
+    const prefix = attribution2?.prefix ?? pluginCommandPrefix({ path: prompt.filePath, origin: "package", baseDir: packageRoot });
+    const name = !attribution2 && packageManifest(packageRoot).defaultPrompt === prompt.name ? "" : prompt.name;
+    if (name && !/^[a-z][a-z0-9-]*$/.test(name)) continue;
+    routes.push({ prefix, name, owner: attribution2?.owner ?? `package:${packageRoot}`, path: prompt.filePath, prompt });
+  }
+  const index = commandRoutes([...extensions, ...routes]);
+  const selected = routes.flatMap((route) => {
+    const key = `${route.prefix}:${route.name}`;
+    return !index.conflictingPrefixes.has(route.prefix) && index.routes.get(key)?.length === 1 ? [{ ...route.prompt, name: key }] : [];
+  });
+  return [...loose, ...selected];
+}
+
+// src/commands/promptLoader.ts
+var originalGetters = /* @__PURE__ */ new WeakMap();
+async function wrapPromptLoader(pi, loader, found, paths2, cwd, agentDir, extensions = () => [], bare = /* @__PURE__ */ new Set()) {
+  const scan = async (paths3) => {
+    const files3 = paths3.flatMap((path4) => {
+      try {
+        return statSync22(path4).isDirectory() ? readdirSync29(path4).filter((name) => name.endsWith(".md") && !name.startsWith(".")).sort().map((name) => join63(path4, name)) : [path4];
+      } catch {
+        return [];
+      }
+    });
+    const templates2 = [];
+    for (const path4 of [...new Set(files3)]) {
+      const scanner = new pi.DefaultResourceLoader({ cwd, agentDir, settingsManager: pi.SettingsManager.inMemory({}), noExtensions: true, noSkills: true, noPromptTemplates: true, noThemes: true, noContextFiles: true, additionalPromptTemplatePaths: [path4] });
+      await scanner.reload();
+      templates2.push(...scanner.getPrompts().prompts);
+    }
+    return templates2;
+  };
+  const templates = await scan(paths2);
+  const discovered = /* @__PURE__ */ new Map();
+  for (const extension of loader.getExtensions().extensions) {
+    if (extension.hidden) continue;
+    const handlers = extension.handlers.get("resources_discover");
+    if (!handlers) continue;
+    const source = extension.sourceInfo;
+    extension.handlers.set("resources_discover", handlers.map((handler, index) => async (event, context) => {
+      const result = await handler(event, context);
+      const key = `${extension.resolvedPath}:${index}`;
+      if (!result) discovered.delete(key);
+      else {
+        const paths3 = (result.promptPaths ?? []).map((path4) => resolve12(dirname23(extension.resolvedPath), path4));
+        const isPackage = source.origin === "package" && !!source.baseDir;
+        const root = isPackage ? source.baseDir : extension.resolvedPath;
+        const commandOwner = isPackage ? void 0 : { prefix: pluginCommandPrefix(source), owner: `extension:${source.path}` };
+        const owners = paths3.map((path4) => ({ kind: "prompt", path: path4, origin: isPackage ? "package" : "shared", packageRoot: root, source: source.source, project: source.scope === "project", enabled: true, ...commandOwner ? { commandOwner } : {} }));
+        discovered.set(key, { owners, prompts: await scan(paths3) });
+      }
+      return result;
+    }));
+  }
+  bare.clear();
+  for (const prompt of templates) if (promptPackageRoot(prompt, found)) bare.add(prompt.name);
+  const getPrompts = originalGetters.get(loader) ?? loader.getPrompts.bind(loader);
+  originalGetters.set(loader, getPrompts);
+  loader.getPrompts = () => {
+    const base = getPrompts();
+    const dynamic = [...discovered.values()];
+    const owners = [...found, ...dynamic.flatMap((item) => item.owners)];
+    const byPath = new Map(base.prompts.map((prompt) => [prompt.filePath, prompt]));
+    for (const prompt of [...templates, ...dynamic.flatMap((item) => item.prompts)]) {
+      if (byPath.has(prompt.filePath)) continue;
+      if (promptPackageRoot(prompt, owners) || ![...byPath.values()].some((item) => item.name === prompt.name && !promptPackageRoot(item, owners))) byPath.set(prompt.filePath, prompt);
+    }
+    bare.clear();
+    for (const prompt of byPath.values()) if (promptPackageRoot(prompt, owners)) bare.add(prompt.name);
+    return { ...base, prompts: namespacePrompts([...byPath.values()], owners, extensions()) };
+  };
+  return bare;
+}
+
+// src/commands/extensionOwners.ts
+import { resolve as resolve13, sep as sep11 } from "node:path";
+function applyExtensionOwners(loader, found) {
+  for (const extension of loader.getExtensions().extensions) {
+    if (extension.hidden) continue;
+    const path4 = resolve13(extension.resolvedPath || extension.path);
+    const owner = found.filter((item) => item.kind === "extension" && item.packageRoot && (path4 === resolve13(item.path) || path4.startsWith(`${resolve13(item.path)}${sep11}`))).sort((a, b) => b.path.length - a.path.length)[0];
+    if (!owner?.packageRoot) continue;
+    const sourceInfo = { ...extension.sourceInfo, origin: "package", baseDir: owner.packageRoot, source: owner.source ?? owner.packageRoot };
+    extension.sourceInfo = sourceInfo;
+    for (const command of extension.commands.values()) command.sourceInfo = sourceInfo;
+  }
+}
+
+// src/commands/runtimeRouter.ts
+init_errors();
+import { resolve as resolve14, sep as sep12 } from "node:path";
+function installPluginCommandRouter(session, found, barePrompts) {
+  const registrations = () => session.extensionRunner.getRegisteredCommands().map((command) => {
+    const source = command.sourceInfo;
+    const path4 = resolve14(source.path);
+    const owner = found.filter((item) => item.kind === "extension" && item.packageRoot && (path4 === resolve14(item.path) || path4.startsWith(`${resolve14(item.path)}${sep12}`))).sort((a, b) => b.path.length - a.path.length)[0];
+    const prefix = pluginCommandPrefix(owner?.packageRoot ? { path: source.path, origin: "package", baseDir: owner.packageRoot } : source);
+    return { ...command, prefix, owner: owner?.packageRoot ? `package:${owner.packageRoot}` : source.origin === "package" ? `package:${source.baseDir ?? source.source}` : `extension:${source.path}`, path: source.path };
+  });
+  const originalPrompt = session.prompt.bind(session);
+  session.prompt = async (text11, options2) => {
+    if (options2?.expandPromptTemplates === false) return originalPrompt(text11, options2);
+    const match = /^\/([^\s]+)(?:\s+([\s\S]*))?$/.exec(text11.trim());
+    if (match) {
+      const name = match[1];
+      const index = commandRoutes(registrations());
+      const promptNames = new Set(session.resourceLoader.getPrompts().prompts.map((prompt) => prompt.name));
+      if (name.startsWith("plugin:") || index.byName.has(name) || barePrompts.has(name) && !promptNames.has(name)) {
+        throw new HarnessError("invalid_request", `Plugin command /${name} requires its owner prefix.`);
+      }
+      const separator = name.indexOf(":");
+      const prefix = separator < 0 ? "" : name.slice(0, separator);
+      if (separator > 0 && index.ownersByPrefix.has(prefix)) {
+        if (index.conflictingPrefixes.has(prefix)) throw new HarnessError("invalid_request", `Plugin prefix /${prefix}: is ambiguous.`);
+        const matches = index.routes.get(name) ?? [];
+        if (matches.length > 1 || matches.length === 1 && promptNames.has(name)) throw new HarnessError("invalid_request", `Plugin command /${name} is ambiguous.`);
+        if (matches.length === 1) {
+          const command = session.extensionRunner.getCommand(matches[0].invocationName);
+          if (!command) throw new HarnessError("invalid_request", `Plugin command /${name} is unavailable.`);
+          await command.handler(match[2]?.trim() ?? "", session.extensionRunner.createCommandContext());
+          return;
+        }
+        if (!promptNames.has(name)) throw new HarnessError("invalid_request", `Unknown plugin command /${name}.`);
+      }
+    }
+    await originalPrompt(text11, options2);
+  };
+  return () => [...registrations().map((command) => `${command.prefix}:${command.name}`), ...session.resourceLoader.getPrompts().prompts.map((prompt) => prompt.name)];
+}
+
 // src/sessions/runner.ts
 function summarize(input, toolName = "") {
   if (input && typeof input === "object") {
@@ -22141,6 +22540,7 @@ async function runTurn(run2, session, params) {
   let aborted = false;
   const usage = { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0, costUsd: 0, requests: 0 };
   let usageReported = false;
+  let lastContextTokens;
   let reasoningTokens;
   let requestStartedAt = null;
   let firstOutputAt = null;
@@ -22266,6 +22666,7 @@ async function runTurn(run2, session, params) {
             ...message4.stopReason ? { stopReason: message4.stopReason } : {}
           };
           requestStartedAt = null;
+          if (reported2) lastContextTokens = (reported2.input ?? 0) + (reported2.cacheRead ?? 0) + (reported2.cacheWrite ?? 0);
           const contextWindow = session.model?.contextWindow;
           const { costUsd, ...tokens } = usage;
           run2.emit("usage.updated", {
@@ -22349,16 +22750,18 @@ async function runTurn(run2, session, params) {
         break;
       }
       case "compaction_start": {
-        run2.emit("compaction.started", { reason: stringField(event, "reason", "context limit") });
+        run2.emit("compaction.started", { reason: stringField(event, "reason", "context limit"), ...lastContextTokens === void 0 ? {} : { contextTokens: lastContextTokens }, ...session.model?.contextWindow ? { contextWindow: session.model.contextWindow } : {} });
         break;
       }
       case "compaction_end": {
         const compaction2 = event;
+        const result = compaction2.result && typeof compaction2.result === "object" ? compaction2.result : null;
         const summary4 = evidenceText(compaction2.result);
         const boundedSummary = summary4 ? limitedText(summary4) : null;
         run2.emit("compaction.ended", {
           reason: stringField(compaction2, "reason", "context limit"),
           aborted: compaction2.aborted === true,
+          ...typeof result?.tokensBefore === "number" && Number.isFinite(result.tokensBefore) ? { tokensBefore: result.tokensBefore } : {},
           ...typeof compaction2.willRetry === "boolean" ? { willRetry: compaction2.willRetry } : {},
           ...stringField(compaction2, "errorMessage") ? { error: stringField(compaction2, "errorMessage").slice(0, 1e3) } : {},
           ...boundedSummary ? { summary: boundedSummary.text, ...boundedSummary.truncated ? { summaryTruncated: true } : {} } : {}
@@ -22372,7 +22775,7 @@ async function runTurn(run2, session, params) {
     if (params.command) {
       const notice = await runCommand(session, params.command);
       if (notice) run2.emit("extension.notice", { kind: "notify", level: "info", text: notice });
-      if (aborted) run2.finish("interrupted");
+      if (aborted) run2.finish("interrupted", void 0, void 0, "user_abort");
       else run2.finish("completed");
       return;
     }
@@ -22381,8 +22784,7 @@ async function runTurn(run2, session, params) {
       await session.sendCustomMessage({ customType: CONTEXT_MESSAGE_TYPE, content: params.update.content, display: false, details: { [CONTEXT_SNAPSHOT_KEY]: params.update.snapshot } }, { triggerTurn: false });
     }
     const command = /^\/(\S+)/.exec(params.text)?.[1];
-    const extensionCommand = command && session.extensionCommands?.includes(command);
-    if (params.preamble && extensionCommand) {
+    if (params.preamble && command) {
       if (!session.sendCustomMessage) throw new HarnessError("provider_error", "The Pi session cannot receive the command context.");
       await session.sendCustomMessage({ customType: "xingular-preamble", content: params.preamble, display: false, details: {} }, { triggerTurn: false });
     }
@@ -22409,9 +22811,15 @@ ${result}`;
         ...input.truncated ? { inputTruncated: true } : {}
       });
       let refusal = !command2 ? "Enter a Bash command after !outside." : !params.initialBashAvailable ? "Bash is not available in this run's capability snapshot." : !session.executeBash ? "This Pi session cannot execute Bash directly." : !params.gate ? "This run has no Bash policy gate." : null;
+      if (refusal && !params.initialBashAvailable && command2) params.onRefusal?.(toolCallId, "bash", { code: "capability", reason: refusal });
       if (!refusal) {
         try {
-          refusal = await params.gate.check("bash", args);
+          const blocked = params.gate.checkDetailed ? await params.gate.checkDetailed("bash", args) : null;
+          if (!params.gate.checkDetailed) refusal = await params.gate.check("bash", args);
+          if (blocked) {
+            params.onRefusal?.(toolCallId, "bash", blocked);
+            refusal = blocked.reason;
+          }
         } catch (error) {
           refusal = error instanceof Error ? error.message : "The Bash policy could not be checked.";
         }
@@ -22445,7 +22853,7 @@ ${result}`;
       await session.sendCustomMessage({ customType: "xingular-initial-bash", content: initialBashInstruction, display: false, details: {} }, { triggerTurn: false });
       initialBashInstruction = void 0;
     }
-    const prompt = params.preamble && !extensionCommand ? `${params.preamble}
+    const prompt = params.preamble && !command ? `${params.preamble}
 
 ${params.text}` : params.text;
     const images = (params.images ?? []).map((image) => ({ type: "image", mimeType: image.mediaType, data: image.data }));
@@ -22475,14 +22883,14 @@ ${initialBashInstruction}` : prompt;
     }
     if (slice?.endedBy && !aborted && !lastError) {
       if (!slice.checkpointWritten) run2.emit("checkpoint", derivedCheckpoint(slice, ledger));
-      run2.finish("interrupted", void 0, "slice_complete");
+      run2.finish("interrupted", void 0, "slice_complete", slice.endedBy === "budget" ? "slice_budget" : "compaction_thrash");
       return;
     }
-    if (aborted) run2.finish("interrupted");
+    if (aborted) run2.finish("interrupted", void 0, void 0, "user_abort");
     else if (lastError) run2.finish("failed", { code: "provider_error", message: lastError });
     else run2.finish("completed");
   } catch (error) {
-    if (aborted) run2.finish("interrupted");
+    if (aborted) run2.finish("interrupted", void 0, void 0, "user_abort");
     else run2.finish("failed", { code: "provider_error", message: error instanceof Error ? error.message : String(error) });
   } finally {
     if (heartbeat) clearInterval(heartbeat);
@@ -22509,6 +22917,7 @@ async function runCommand(session, command) {
     }
   }
 }
+var promptRouting = /* @__PURE__ */ new WeakMap();
 async function loadResources(pi, params, gate, automaticSettings) {
   const loading = params.automatic ? null : await params.plugins?.loading() ?? null;
   const resourceLoader = new pi.DefaultResourceLoader({
@@ -22530,11 +22939,37 @@ async function loadResources(pi, params, gate, automaticSettings) {
   });
   await resourceLoader.reload();
   if (loading) {
+    applyExtensionOwners(resourceLoader, loading.found);
+    const extensions = () => registeredBy(resourceLoader).flatMap((record3) => {
+      const owner = runtimeOwner(loading, record3.path);
+      const prefix = pluginCommandPrefix(owner?.packageRoot ? { path: record3.path, origin: "package", baseDir: owner.packageRoot } : { path: record3.path });
+      return record3.commands.map((name) => ({ prefix, name, owner: owner?.packageRoot ? `package:${owner.packageRoot}` : `extension:${record3.path}`, path: record3.path }));
+    });
     const records = registeredBy(resourceLoader).map((record3) => ({ ...record3, hash: registrationHash(loading, record3.path) }));
     const publish = () => params.plugins?.loaded(records);
     observeResources(pi, resourceLoader, loading, records, publish);
+    const bare = await wrapPromptLoader(pi, resourceLoader, loading.found, loading.promptPaths, params.cwd, params.account.configDir, extensions);
+    promptRouting.set(resourceLoader, { loading, bare });
     publish();
   }
+  if (loading || params.automatic) {
+    const extensions = resourceLoader.getExtensions().extensions;
+    const ids2 = [];
+    let known = true;
+    for (const extension of extensions) {
+      const path4 = extension.resolvedPath || extension.path;
+      if (extension.hidden) {
+        for (const id2 of [OUTPUT_TRIM, BUDGET_GUARD]) if (path4 === `<inline:${id2}>`) ids2.push(id2);
+      } else if (params.variantExtensions?.some((entry2) => path4 === entry2 || path4.startsWith(`${entry2}/`))) {
+        ids2.push("variant");
+      } else {
+        const owner = loading && runtimeOwner(loading, path4);
+        if (owner) ids2.push(pluginIdOf(owner));
+        else known = false;
+      }
+    }
+    if (known) params.activatedPlugins?.([...new Set(ids2)]);
+  }
   return resourceLoader;
 }
 function registeredBy(loader) {
@@ -22581,11 +23016,20 @@ var piSessionFactory = async ({ params, allow, gate, tools: tools4, runtime: loa
             authorized: false
           };
         } catch (error) {
-          return { block: true, reason: error instanceof Error ? error.message : "The active project workspace could not be verified." };
+          const reason = error instanceof Error ? error.message : "The active project workspace could not be verified.";
+          params.onRefusal?.(event.toolCallId, event.toolName, { code: "workspace", reason });
+          return { block: true, reason };
         }
       }
-      const reason = await gate.check(event.toolName, event.input);
-      if (reason) return { block: true, reason };
+      const refusal = gate.checkDetailed ? await gate.checkDetailed(event.toolName, event.input) : null;
+      if (!gate.checkDetailed) {
+        const reason = await gate.check(event.toolName, event.input);
+        if (reason) return { block: true, reason };
+      }
+      if (refusal) {
+        params.onRefusal?.(event.toolCallId, event.toolName, refusal);
+        return { block: true, reason: refusal.reason };
+      }
       if (authorization) {
         authorization.authorized = true;
         writeAuthorizations.set(event.toolCallId, authorization);
@@ -22638,7 +23082,9 @@ var piSessionFactory = async ({ params, allow, gate, tools: tools4, runtime: loa
     });
   }
   const piSession = session;
-  piSession.extensionCommands = loaded.flatMap((extension) => extension.commands);
+  const routing = promptRouting.get(resourceLoader);
+  const routes = installPluginCommandRouter(session, routing?.loading.found ?? [], routing?.bare ?? /* @__PURE__ */ new Set());
+  piSession.extensionCommands = routes();
   supportsImageInput = piSession.model?.input.includes("image") ?? false;
   const streamAgent = piSession.agent;
   const originalStream = streamAgent.streamFunction;
@@ -22736,32 +23182,34 @@ var Sessions = class {
   }
   gate(run2, caller, gated, diagnostic = false, automatic = false) {
     const { policy } = this.options;
-    return {
+    const gate = {
+      check: async (name, input) => (await gate.checkDetailed(name, input))?.reason ?? null,
       ask: (names2) => {
         for (const name of names2) gated.add(name);
       },
-      check: async (tool, args) => {
+      checkDetailed: async (tool, args) => {
         let record3;
         let inspection;
         try {
           record3 = loadRun2(this.env.root, run2.runId);
           inspection = inspectRunWorkspaceWrite(record3, tool, args);
         } catch (error) {
-          return error instanceof Error ? error.message : "The active project workspace could not be verified.";
+          return { code: "workspace", reason: error instanceof Error ? error.message : "The active project workspace could not be verified." };
         }
         const call = { run: record3, caller, tool, args: inspection.input };
         const hostScope = await policy.scope?.(call) ?? { allowed: true };
         const scope = combineWorkspaceScope(hostScope, inspection);
-        if (!scope.allowed && (scope.automatic || automatic && inspection.outside || !scope.requiresApproval)) return scope.reason ?? "Outside the approved work scope.";
+        if (!scope.allowed && (scope.automatic || automatic && inspection.outside || !scope.requiresApproval)) return { code: inspection.outside ? "workspace" : "scope", reason: scope.reason ?? "Outside the approved work scope." };
         try {
           await policy.authorize?.(call);
         } catch (error) {
-          return error instanceof Error ? error.message : "Tool unavailable in the app settings.";
+          return { code: "policy", reason: error instanceof Error ? error.message : "Tool unavailable in the app settings." };
         }
         if (scope.allowed && !scope.humanOnly && (scope.automatic || !gated.has(tool))) return null;
-        if (diagnostic) return "This diagnostic call requires a separate per-call approval.";
-        if (call.run.trigger === "probe" || call.run.trigger === "improver") return scope.reason ? `Refused in a refinement run: ${scope.reason}` : "Refused in a refinement run: this call needs a person to approve it.";
-        if (call.run.trigger === "reflection") return scope.reason ? `Refused in a reflection run: ${scope.reason}` : "Refused in a reflection run: this call needs a person to approve it.";
+        if (diagnostic) return { code: "unattended", reason: "This diagnostic call requires a separate per-call approval." };
+        if (call.run.trigger === "probe" || call.run.trigger === "improver") return { code: "unattended", reason: scope.reason ? `Refused in a refinement run: ${scope.reason}` : "Refused in a refinement run: this call needs a person to approve it." };
+        if (call.run.trigger === "reflection") return { code: "unattended", reason: scope.reason ? `Refused in a reflection run: ${scope.reason}` : "Refused in a reflection run: this call needs a person to approve it." };
+        if (automatic) return { code: "unattended", reason: scope.reason ?? "Refused in an unattended run: this call needs a person to approve it." };
         const boundaryAction = inspection.outside ? `${inspection.reason} ${summarize(call.args, tool)}` : summarize(call.args);
         const decision = await run2.requestApproval({
           target: tool,
@@ -22770,11 +23218,11 @@ var Sessions = class {
           rememberable: scope.allowed && !scope.humanOnly,
           standing: scope.humanOnly ? scope.allowGlobalApproval ? "switch" : "none" : void 0
         });
-        if (decision !== "approved") return "The user denied this action. Ask how they would like to proceed.";
+        if (decision !== "approved") return { code: "approval_denied", reason: "The user denied this action. Do not repeat it or ask for permission in a message; choose another approach or report what is blocked." };
         try {
           await policy.authorize?.(call);
         } catch (error) {
-          return error instanceof Error ? error.message : "Tool was disabled while waiting.";
+          return { code: "policy", reason: error instanceof Error ? error.message : "Tool was disabled while waiting." };
         }
         return null;
       },
@@ -22831,6 +23279,7 @@ ${formatBashCommandForApproval(operationArgs.command)}`,
         }
       }
     };
+    return gate;
   }
   /** Compatibility alias for the shared native service. */
   spawnSubagent(request2) {
@@ -22985,6 +23434,7 @@ Attached saved file references:`);
       id: runId,
       projectId: input.run.projectId ?? caller.projectId ?? null,
       mode: input.run.mode ?? "chat",
+      effectiveMode: input.plan ? "plan" : "normal",
       harness: input.run.harness ?? "pi",
       sessionType: input.run.sessionType ?? "structured",
       sessionId: input.run.sessionId,
@@ -22997,6 +23447,7 @@ Attached saved file references:`);
       startedAt: now(),
       endedAt: null,
       status: "queued",
+      loadedSkills: [],
       exitCode: null,
       handoffId: input.run.handoffId ?? null,
       accountId: account.id,
@@ -23010,12 +23461,12 @@ Attached saved file references:`);
       ...input.effort ? { effort: input.effort } : {}
     });
     try {
-      writeJson(join63(runDir(root, runId), "caller.json"), caller);
+      writeJson(join64(runDir(root, runId), "caller.json"), caller);
     } catch {
     }
     const fail3 = (error, code = "provider_unavailable") => {
       const message4 = error instanceof Error ? error.message : String(error);
-      updateRun(root, runId, (record3) => Object.assign(record3, { status: "failed", endedAt: now(), terminalReason: message4 }));
+      updateRun(root, runId, (record3) => Object.assign(record3, { status: "failed", endedAt: now(), terminalReason: message4, terminalCode: stopCodeOf(code) }));
       log(`session ${runId} did not start: ${message4}`, code);
     };
     const { plugins } = this.options;
@@ -23117,20 +23568,19 @@ Attached saved file references:`);
       for (const tool of tools4) if (tool.planModeSafe) planModeSafety.set(tool.name, tool.planModeSafe);
       const gate = (() => {
         const baseGate = this.gate(run2, caller, new Set((input.tools.gated ?? []).filter((name) => capabilities.tools.includes(name))), false, input.automatic === true);
-        return {
-          ...baseGate,
-          check: (name, args) => {
-            if (input.run.relation === "subagent" && !capabilities.tools.includes(name)) return Promise.resolve("This tool is outside the child capability snapshot.");
-            const refusal = input.plan ? planRefusal(name, readOnly, args, planModeSafety.get(name)) : null;
-            return refusal ? Promise.resolve(refusal) : baseGate.check(name, args);
-          }
+        const checkDetailed = (name, args) => {
+          if (input.run.relation === "subagent" && !capabilities.tools.includes(name)) return Promise.resolve({ code: "capability", reason: "This tool is outside the child capability snapshot." });
+          const refusal = input.plan ? planRefusal(name, readOnly, args, planModeSafety.get(name)) : null;
+          return refusal ? Promise.resolve({ code: "plan_mode", reason: refusal }) : baseGate.checkDetailed(name, args);
         };
+        return { ...baseGate, checkDetailed, check: async (name, args) => (await checkDetailed(name, args))?.reason ?? null };
       })();
       const params = {
         runId,
         ...input.initialBashCommand !== void 0 && input.initialBashCommand !== null ? { initialBashCommand: input.initialBashCommand, initialBashAvailable: capabilities.tools.includes("bash") } : {},
         ...input.initialBashContext !== void 0 && input.initialBashContext !== null ? { initialBashContext: input.initialBashContext } : {},
         gate,
+        onRefusal: (toolCallId, name, refusal) => run2.emit("tool.refused", { toolCallId, name, ...refusal, reason: refusal.reason.slice(0, 2e3) }),
         restrictTools: input.run.relation === "subagent",
         ...input.plan ? { plan: true } : {},
         ...stateEligible && input.plan ? { repairPlan: true } : {},
@@ -23154,9 +23604,14 @@ Attached saved file references:`);
           this.options.subagents.extension(runId),
           { name: "image-pruning", factory: imagePruning() },
           { name: COMPACTION_CHECKPOINT_EXTENSION, factory: compactionCheckpoint({ initialTodo: continuation?.todo, planInstructions: checkpointPlanInstructions }) },
-          ...sliceEnabled ? [{ name: WORK_SLICE_EXTENSION, factory: workSliceGuard({ policy: slicePolicy, state: sliceState, checkpointAvailable }) }] : []
+          ...sliceEnabled ? [{ name: WORK_SLICE_EXTENSION, factory: workSliceGuard({ policy: slicePolicy, state: sliceState, checkpointAvailable, onRefuse: (event, reason) => {
+            if (typeof event.toolCallId === "string") run2.emit("tool.refused", { toolCallId: event.toolCallId, name: event.toolName, code: "work_slice", reason: reason.slice(0, 2e3) });
+          } }) }] : []
         ],
         ...plugins && loadPlugins ? { plugins: { loading: loadPlugins, loaded: (extensions) => plugins.loaded(extensions) } } : {},
+        activatedPlugins: (ids2) => updateRun(root, runId, (record3) => {
+          record3.activatedPlugins = ids2;
+        }),
         system,
         ...sliceEnabled ? { slice: { state: sliceState, maxToolCalls: slicePolicy.maxToolCalls } } : {},
         // A command sends no request of its own, so the context update waits for the next turn.
@@ -23218,7 +23673,7 @@ Attached saved file references:`);
 // src/sessions/sideQuestions.ts
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir as tmpdir8 } from "node:os";
-import { join as join64 } from "node:path";
+import { join as join65 } from "node:path";
 import { z as z6 } from "zod";
 init_errors();
 init_fs();
@@ -23419,7 +23874,7 @@ ${note.body}`;
         return `${reference.label ?? reference.path}: this selected reference is unavailable.`;
       }
     });
-    const sessionDir = await mkdtemp(join64(tmpdir8(), "xh-side-question-"));
+    const sessionDir = await mkdtemp(join65(tmpdir8(), "xh-side-question-"));
     this.sessionDirs.set(runId, sessionDir);
     const caller = { ...input.caller, runId, sessionId };
     try {
@@ -23493,13 +23948,13 @@ init_fs();
 import { createHash as createHash14, randomBytes as randomBytes3 } from "node:crypto";
 import { existsSync as existsSync30, mkdirSync as mkdirSync25, realpathSync as realpathSync7, rmSync as rmSync23 } from "node:fs";
 import { tmpdir as tmpdir9 } from "node:os";
-import { basename as basename14, dirname as dirname23, isAbsolute as isAbsolute10, join as join66, resolve as resolve11 } from "node:path";
+import { basename as basename15, dirname as dirname25, isAbsolute as isAbsolute10, join as join67, resolve as resolve15 } from "node:path";
 
 // src/worktrees/copy.ts
 init_errors();
 init_fs();
 import { copyFileSync as copyFileSync5, existsSync as existsSync29, lstatSync as lstatSync14, mkdirSync as mkdirSync24 } from "node:fs";
-import { dirname as dirname22, join as join65 } from "node:path";
+import { dirname as dirname24, join as join66 } from "node:path";
 
 // src/worktrees/git.ts
 init_errors();
@@ -23507,7 +23962,7 @@ import { spawn as spawn5 } from "node:child_process";
 var QUIET_FILTERS = ["-c", "filter.lfs.smudge=", "-c", "filter.lfs.process=", "-c", "filter.lfs.required=false", "-c", "core.hooksPath=/dev/null"];
 var FILTER_KEYS = /^filter\.(.*)\.(?:clean|smudge|process|required)$/i;
 function configuredFilters(cwd, env) {
-  return new Promise((resolve19, reject2) => {
+  return new Promise((resolve23, reject2) => {
     const child = spawn5("git", ["config", "--null", "--name-only", "--get-regexp", "^filter\\..*\\.(clean|smudge|process|required)$"], {
       cwd,
       env,
@@ -23530,7 +23985,7 @@ function configuredFilters(cwd, env) {
         const match = FILTER_KEYS.exec(key);
         if (match) filters.add(match[1]);
       }
-      resolve19([...filters].flatMap((filter) => [
+      resolve23([...filters].flatMap((filter) => [
         "-c",
         `filter.${filter}.clean=`,
         "-c",
@@ -23546,7 +24001,7 @@ function configuredFilters(cwd, env) {
 async function git(cwd, args, options2 = {}) {
   const env = { ...process.env, GIT_TERMINAL_PROMPT: "0", GIT_LFS_SKIP_SMUDGE: "1", LC_ALL: "C", ...options2.env };
   const filters = await configuredFilters(cwd, env);
-  return new Promise((resolve19, reject2) => {
+  return new Promise((resolve23, reject2) => {
     const input = options2.input;
     const hasInput = input !== void 0 && input.length > 0;
     const child = spawn5("git", [...QUIET_FILTERS, ...filters, ...args], {
@@ -23565,7 +24020,7 @@ async function git(cwd, args, options2 = {}) {
         reject2(new HarnessError("git_failed", `git ${args.join(" ")} failed: ${result.stderr.trim() || result.stdout.trim() || `exit ${result.code}`}`));
         return;
       }
-      resolve19(result);
+      resolve23(result);
     });
     if (hasInput && child.stdin) {
       child.stdin.on("error", (error) => {
@@ -23598,8 +24053,8 @@ function copyFiles(from, to, paths2) {
     } catch {
       continue;
     }
-    const source = join65(from, relative10);
-    const target = join65(to, relative10);
+    const source = join66(from, relative10);
+    const target = join66(to, relative10);
     if (existsSync29(target)) {
       report.skipped.push({ path: relative10, reason: "exists" });
       continue;
@@ -23626,7 +24081,7 @@ function copyFiles(from, to, paths2) {
       report.skipped.push({ path: relative10, reason: "over_total" });
       continue;
     }
-    mkdirSync24(dirname22(target), { recursive: true });
+    mkdirSync24(dirname24(target), { recursive: true });
     copyFileSync5(source, target);
     total += stat.size;
     report.copied.push(relative10);
@@ -23652,7 +24107,7 @@ async function ignoredFiles(checkout) {
     if (pathBytes > IGNORED_PATH_BYTES_CAP) throw ignoredFilesError("the ignored paths exceed the snapshot limit");
     let stat;
     try {
-      stat = lstatSync14(join65(checkout, relative10));
+      stat = lstatSync14(join66(checkout, relative10));
     } catch {
       throw ignoredFilesError(`could not inspect ${relative10}`);
     }
@@ -23667,7 +24122,7 @@ function ignoredFilesError(reason) {
   return new HarnessError("worktree_has_work", `Ignored files cannot be safely preserved: ${reason}.`, "Move or remove those files, then try again.");
 }
 async function includedFiles(checkout) {
-  const patterns2 = join65(checkout, INCLUDE_FILE);
+  const patterns2 = join66(checkout, INCLUDE_FILE);
   if (!existsSync29(patterns2)) return [];
   const ignored = new Set(nulList((await git(checkout, ["ls-files", "--others", "--ignored", "--exclude-standard", "-z"])).stdout));
   const matching = nulList((await git(checkout, ["ls-files", "--others", "--ignored", `--exclude-from=${patterns2}`, "-z"])).stdout);
@@ -23691,10 +24146,10 @@ function real(path4) {
   try {
     return realpathSync7(path4);
   } catch {
-    return resolve11(path4);
+    return resolve15(path4);
   }
 }
-function slug3(text11) {
+function slug4(text11) {
   return text11.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40) || "repo";
 }
 function statusPaths(output) {
@@ -23716,11 +24171,11 @@ var Worktrees = class {
   leaseCounts = /* @__PURE__ */ new Map();
   chain = Promise.resolve();
   constructor(stateDir, options2 = {}) {
-    this.root = options2.root ?? join66(stateDir, "worktrees");
+    this.root = options2.root ?? join67(stateDir, "worktrees");
     this.branchPrefix = options2.branchPrefix ?? "wt/";
     this.keep = options2.keep ?? 15;
-    this.registryFile = join66(stateDir, "worktrees.json");
-    this.trust = new SetupTrust(join66(stateDir, "worktree-setup-trust.json"));
+    this.registryFile = join67(stateDir, "worktrees.json");
+    this.trust = new SetupTrust(join67(stateDir, "worktree-setup-trust.json"));
     this.recover(true);
   }
   // ---- Registry -------------------------------------------------------------------------------
@@ -23785,7 +24240,7 @@ var Worktrees = class {
     const top = await git(folder2, ["rev-parse", "--show-toplevel"], { allowFail: true });
     if (top.code !== 0) throw new HarnessError("not_a_repository", `${folder2} is not inside a git repository.`, "Worktrees need a git repository with at least one commit.");
     const gitDir = await gitText(folder2, ["rev-parse", "--absolute-git-dir"]);
-    const common = resolve11(top.stdout.trim(), await gitText(folder2, ["rev-parse", "--git-common-dir"]));
+    const common = resolve15(top.stdout.trim(), await gitText(folder2, ["rev-parse", "--git-common-dir"]));
     if (real(gitDir) === real(common)) return real(top.stdout.trim());
     const main2 = (await gitText(folder2, ["worktree", "list", "--porcelain"])).split("\n").find((line2) => line2.startsWith("worktree "));
     return real(main2 ? main2.slice("worktree ".length) : top.stdout.trim());
@@ -23808,19 +24263,19 @@ var Worktrees = class {
   }
   // ---- Create and adopt -----------------------------------------------------------------------
   repoKey(repoRoot) {
-    return `${slug3(basename14(repoRoot))}-${createHash14("sha256").update(repoRoot).digest("hex").slice(0, 8)}`;
+    return `${slug4(basename15(repoRoot))}-${createHash14("sha256").update(repoRoot).digest("hex").slice(0, 8)}`;
   }
   uniqueName(repoRoot, wanted) {
     const taken = new Set(this.read().worktrees.filter((record3) => record3.repoRoot === repoRoot && !record3.removed).map((record3) => record3.name));
-    const folder2 = join66(this.root, this.repoKey(repoRoot));
+    const folder2 = join67(this.root, this.repoKey(repoRoot));
     if (wanted !== void 0) {
       if (!NAME2.test(wanted)) throw invalid("A worktree name uses lowercase letters, digits and dashes (at most 63).");
-      if (taken.has(wanted) || existsSync30(join66(folder2, wanted))) throw new HarnessError("worktree_exists", `A worktree named ${wanted} already exists.`);
+      if (taken.has(wanted) || existsSync30(join67(folder2, wanted))) throw new HarnessError("worktree_exists", `A worktree named ${wanted} already exists.`);
       return wanted;
     }
     for (; ; ) {
       const name = `wt-${randomBytes3(3).toString("hex")}`;
-      if (!taken.has(name) && !existsSync30(join66(folder2, name))) return name;
+      if (!taken.has(name) && !existsSync30(join67(folder2, name))) return name;
     }
   }
   async branchName(repoRoot, name) {
@@ -23842,8 +24297,8 @@ var Worktrees = class {
       const baseCommit = (await git(repoRoot, ["rev-parse", "--verify", "-q", `${baseRef}^{commit}`], { allowFail: true })).stdout.trim();
       if (!baseCommit) throw invalid(`${baseRef} does not name a commit.`);
       const branch = input.branch ? await this.branchName(repoRoot, input.branch) : null;
-      const path4 = join66(this.root, this.repoKey(repoRoot), name);
-      mkdirSync25(dirname23(path4), { recursive: true });
+      const path4 = join67(this.root, this.repoKey(repoRoot), name);
+      mkdirSync25(dirname25(path4), { recursive: true });
       await git(repoRoot, ["worktree", "add", ...branch ? ["-b", branch] : ["--detach"], path4, baseCommit]);
       const at = now();
       const record3 = {
@@ -23872,7 +24327,7 @@ var Worktrees = class {
         carried = copyFiles(repoRoot, path4, await untrackedFiles(repoRoot));
       }
       const included = copyFiles(repoRoot, path4, await includedFiles(repoRoot));
-      const setup = input.setup === false ? { state: "none", hash: null, log: null } : await runSetup({ checkout: path4, source: repoRoot, name, repoRoot, logFile: join66(this.root, "logs", `${record3.id}.setup.log`), trust: this.trust });
+      const setup = input.setup === false ? { state: "none", hash: null, log: null } : await runSetup({ checkout: path4, source: repoRoot, name, repoRoot, logFile: join67(this.root, "logs", `${record3.id}.setup.log`), trust: this.trust });
       return { worktree: record3, carried: { ...carried, patched }, included, setup };
     });
   }
@@ -23889,7 +24344,7 @@ var Worktrees = class {
       const branch = (await git(folder2, ["symbolic-ref", "-q", "--short", "HEAD"], { allowFail: true })).stdout.trim() || null;
       const head2 = await gitText(folder2, ["rev-parse", "HEAD"]);
       const taken = new Set(this.read().worktrees.filter((record4) => record4.repoRoot === repoRoot && !record4.removed).map((record4) => record4.name));
-      let name = slug3(basename14(folder2)).slice(0, 56) || "adopted";
+      let name = slug4(basename15(folder2)).slice(0, 56) || "adopted";
       if (!/^[a-z0-9]/.test(name)) name = `w-${name}`;
       for (let suffix = 2; taken.has(name); suffix += 1) name = `${name.replace(/-\d+$/, "")}-${suffix}`;
       const at = now();
@@ -23979,7 +24434,7 @@ var Worktrees = class {
   }
   /** Records the worktree's commits and working changes under a snapshot ref. */
   async snapshot(record3, ignored) {
-    const index = join66(tmpdir9(), `xharness-index-${record3.id}-${randomBytes3(4).toString("hex")}`);
+    const index = join67(tmpdir9(), `xharness-index-${record3.id}-${randomBytes3(4).toString("hex")}`);
     const env = { ...IDENTITY, GIT_INDEX_FILE: index };
     try {
       await git(record3.path, ["read-tree", "HEAD"], { env });
@@ -24036,7 +24491,7 @@ var Worktrees = class {
       const { snapshot: snapshot2, head: head2 } = record3.removed;
       const start = snapshot2 ? await gitText(record3.repoRoot, ["rev-parse", `${snapshot2}^`]) : head2;
       const onBranch = record3.branch && (await git(record3.repoRoot, ["rev-parse", "--verify", "-q", `refs/heads/${record3.branch}`], { allowFail: true })).stdout.trim() === start;
-      mkdirSync25(dirname23(record3.path), { recursive: true });
+      mkdirSync25(dirname25(record3.path), { recursive: true });
       await git(record3.repoRoot, ["worktree", "add", ...onBranch ? [record3.path, record3.branch] : ["--detach", record3.path, start]]);
       if (snapshot2) {
         await git(record3.path, ["read-tree", "-u", "--reset", snapshot2]);
@@ -24094,7 +24549,7 @@ var Worktrees = class {
       if (dirty) throw new HarnessError("handoff_target_dirty", `The ${direction === "toSource" ? "main checkout" : "worktree"} has uncommitted changes.`, "Commit or stash them, then hand off again.");
       const patch = (await git(origin3, ["diff", "--binary", direction === "toSource" ? record3.baseCommit : "HEAD"])).stdout;
       const untracked = await untrackedFiles(origin3);
-      const collisions = untracked.filter((path4) => existsSync30(join66(target, path4)));
+      const collisions = untracked.filter((path4) => existsSync30(join67(target, path4)));
       if (collisions.length) throw new HarnessError("handoff_conflict", `${collisions.length} untracked file(s) already exist in the target, for example ${collisions[0]}.`);
       if (patch.trim()) {
         const check2 = await git(target, ["apply", "--check", "--binary", "--whitespace=nowarn"], { input: patch, allowFail: true });
@@ -25246,16 +25701,16 @@ var UsageLimits = class {
 // src/annotations/capture.ts
 import { spawn as spawn6 } from "node:child_process";
 import { randomUUID as randomUUID18 } from "node:crypto";
-import { existsSync as existsSync32, readdirSync as readdirSync29, statSync as statSync22 } from "node:fs";
+import { existsSync as existsSync32, readdirSync as readdirSync30, statSync as statSync23 } from "node:fs";
 import { createServer as createServer5 } from "node:net";
-import { basename as basename15, join as join68 } from "node:path";
+import { basename as basename16, join as join69 } from "node:path";
 
 // src/annotations/bridge.ts
 init_fs();
 import { randomBytes as randomBytes4 } from "node:crypto";
 import { chmodSync as chmodSync14, existsSync as existsSync31 } from "node:fs";
 import { createServer as createServer4 } from "node:http";
-import { join as join67 } from "node:path";
+import { join as join68 } from "node:path";
 var POLL_MS = 2e4;
 var GONE_MS = 45e3;
 var CALL_MS = 1e4;
@@ -25308,7 +25763,7 @@ var NotesBridge = class {
   nextWindow = 1;
   nextCall = 1;
   settingsFile() {
-    return join67(this.options.stateDir, "notes-bridge.json");
+    return join68(this.options.stateDir, "notes-bridge.json");
   }
   /** Starts the bridge (once) on the port and token kept from last time, so the app's snippet stays valid. */
   start() {
@@ -25329,13 +25784,13 @@ var NotesBridge = class {
     const token = typeof saved?.token === "string" && /^[a-f0-9]{48}$/.test(saved.token) ? saved.token : randomBytes4(24).toString("hex");
     const wanted = this.options.port ?? (Number.isSafeInteger(saved?.port) ? saved.port : 0);
     const server = createServer4((request2, response) => void this.handle(request2, response, token));
-    const port = await new Promise((resolve19, reject2) => {
+    const port = await new Promise((resolve23, reject2) => {
       const attempt2 = (port2, retry) => {
         server.once("error", (error) => {
           if (retry && error.code === "EADDRINUSE") attempt2(0, false);
           else reject2(error);
         });
-        server.listen(port2, "127.0.0.1", () => resolve19(server.address().port));
+        server.listen(port2, "127.0.0.1", () => resolve23(server.address().port));
       };
       attempt2(wanted, wanted !== 0);
     });
@@ -25361,12 +25816,12 @@ var NotesBridge = class {
     this.sweep();
     const live = this.windows.get(windowId);
     if (!live) return Promise.reject(new Error("That app window is no longer connected."));
-    return new Promise((resolve19, reject2) => {
+    return new Promise((resolve23, reject2) => {
       const id2 = String(this.nextCall++);
       const pending2 = {
         id: id2,
         operation,
-        resolve: resolve19,
+        resolve: resolve23,
         reject: reject2,
         timer: setTimeout(() => {
           live.sent.delete(id2);
@@ -25487,7 +25942,7 @@ var NotesBridge = class {
     this.server = null;
     this.info = null;
     if (server) {
-      const closed = new Promise((resolve19) => server.close(() => resolve19()));
+      const closed = new Promise((resolve23) => server.close(() => resolve23()));
       server.closeAllConnections();
       await closed;
     }
@@ -25555,24 +26010,24 @@ var spawnApp = (command, args) => {
   child.on("error", () => void 0);
   child.unref();
 };
-var freePort = () => new Promise((resolve19, reject2) => {
+var freePort = () => new Promise((resolve23, reject2) => {
   const server = createServer5();
   server.unref();
   server.on("error", reject2);
   server.listen(0, "127.0.0.1", () => {
     const address = server.address();
-    server.close(() => typeof address === "object" && address ? resolve19(address.port) : reject2(new Error("No free port.")));
+    server.close(() => typeof address === "object" && address ? resolve23(address.port) : reject2(new Error("No free port.")));
   });
 });
 function appExecutable(path4) {
   if (!/\.app\/?$/.test(path4)) return path4;
-  const folder2 = join68(path4, "Contents", "MacOS");
+  const folder2 = join69(path4, "Contents", "MacOS");
   if (!existsSync32(folder2)) throw new Error(`${path4} has no Contents/MacOS folder.`);
-  const programs = readdirSync29(folder2).filter((name) => !name.startsWith(".") && statSync22(join68(folder2, name)).isFile());
-  const named2 = basename15(path4.replace(/\/$/, ""), ".app");
+  const programs = readdirSync30(folder2).filter((name) => !name.startsWith(".") && statSync23(join69(folder2, name)).isFile());
+  const named2 = basename16(path4.replace(/\/$/, ""), ".app");
   const program = programs.find((name) => name === named2) ?? programs[0];
   if (!program) throw new Error(`${path4} has no program in Contents/MacOS.`);
-  return join68(folder2, program);
+  return join69(folder2, program);
 }
 function describeApp(port, version2, list7) {
   const agent = typeof version2["User-Agent"] === "string" ? version2["User-Agent"] : "";
@@ -25704,8 +26159,8 @@ var AnnotationCapture = class {
     if (existing instanceof WebTarget) return existing;
     const session = new BrowserSession({
       key: `notes-${key}`,
-      profileDir: join68(this.options.stateDir, "browser", "profiles", "person"),
-      downloadsDir: join68(this.options.stateDir, "browser", "downloads", fileName(`notes-${key}`)),
+      profileDir: join69(this.options.stateDir, "browser", "profiles", "person"),
+      downloadsDir: join69(this.options.stateDir, "browser", "downloads", fileName(`notes-${key}`)),
       // Always a window the person can see and select in.
       config: () => ({ ...readBrowserConfig(this.options.stateDir), headed: true }),
       network: this.network,
@@ -25790,10 +26245,10 @@ var AnnotationCapture = class {
     const deadline = Date.now() + (this.options.launchTimeoutMs ?? 2e4);
     for (; ; ) {
       if (await probe(`${endpoint}/json/version`, PROBE_MS)) break;
-      if (Date.now() > deadline) throw new Error(`${basename15(path4)} did not open a DevTools port. Only Chromium and Electron apps can be inspected this way.`);
-      await new Promise((resolve19) => setTimeout(resolve19, 250));
+      if (Date.now() > deadline) throw new Error(`${basename16(path4)} did not open a DevTools port. Only Chromium and Electron apps can be inspected this way.`);
+      await new Promise((resolve23) => setTimeout(resolve23, 250));
     }
-    const name = basename15(path4.trim().replace(/\/$/, "")).replace(/\.app$/, "");
+    const name = basename16(path4.trim().replace(/\/$/, "")).replace(/\.app$/, "");
     const attached2 = await this.attach(key, { kind: "cdp", endpoint, name });
     return { kind: "cdp", app: attached2.app, windows: attached2.windows, endpoint };
   }
@@ -25936,8 +26391,8 @@ function compose(notes, prompt) {
 
 // src/annotations/delivery.ts
 var RETRY_DELAYS = [250, 1e3, 3e3, 8e3];
-var wait = (ms) => new Promise((resolve19) => {
-  const timer = setTimeout(resolve19, ms);
+var wait = (ms) => new Promise((resolve23) => {
+  const timer = setTimeout(resolve23, ms);
   timer.unref?.();
 });
 var NoteDeliveries = class {
@@ -26140,7 +26595,7 @@ var Harness = class {
     this.browserEnabled = options2.browser !== false;
     this.stateDir = options2.stateDir;
     mkdirSync26(this.stateDir, { recursive: true });
-    isolateProcess(join69(this.stateDir, "accounts"));
+    isolateProcess(join70(this.stateDir, "accounts"));
     this.env = new Env(options2.dataRoot || null, options2.directory ?? EMPTY_DIRECTORY, options2.productName ?? DEFAULT_PRODUCT_NAME, this.bus);
     this.hub = new Hub(this, options2.hub);
     this.policy = options2.policy ?? {};
@@ -26148,8 +26603,8 @@ var Harness = class {
     configureBuiltins(options2.builtins ?? []);
     this.trust = new VariantTrust(this.stateDir);
     this.refineHost = options2.refineHost ?? null;
-    const secrets = options2.secrets ?? fileSecretStore(join69(this.stateDir, "secrets.json"));
-    this.accounts = new Accounts({ dir: join69(this.stateDir, "accounts"), secrets, bus: this.bus });
+    const secrets = options2.secrets ?? fileSecretStore(join70(this.stateDir, "secrets.json"));
+    this.accounts = new Accounts({ dir: join70(this.stateDir, "accounts"), secrets, bus: this.bus });
     this.approvals = new Approvals(this.stateDir, this.bus);
     this.usageLimits = new UsageLimits({ accounts: this.accounts, root: () => this.env.dataRoot });
     this.accounts.observeModels = (models, accountId) => this.usageLimits.observeModels(models, accountId);
@@ -26164,7 +26619,7 @@ var Harness = class {
       ended: (runId, sessionId) => this.apps.revokeRun(runId, sessionId)
     });
     this.apps = new ConnectedApps({ env: this.env, stateDir: this.stateDir, secrets, bus: this.bus, runs: this.runs, policy: this.policy, oauthClients: options2.oauthClients });
-    this.plugins = new Plugins({ stateDir: this.stateDir, bus: this.bus, resolver: options2.resolver, attachments: () => this.env.dataRoot ? load3(this.env.dataRoot) : null, packagesDir: () => this.env.dataRoot ? join69(this.env.dataRoot, "plugins") : null });
+    this.plugins = new Plugins({ stateDir: this.stateDir, bus: this.bus, resolver: options2.resolver, attachments: () => this.env.dataRoot ? load3(this.env.dataRoot) : null, packagesDir: () => this.env.dataRoot ? join70(this.env.dataRoot, "plugins") : null });
     this.hooks = new Hooks({
       stateDir: this.stateDir,
       bus: this.bus,
@@ -26172,9 +26627,9 @@ var Harness = class {
       // The shared folder stands in for an account: packages are the same for all of them.
       wanted: async () => {
         if (!this.env.dataRoot) return [];
-        const shared = ensureSharedDir(join69(this.stateDir, "accounts"));
-        const named2 = readJsonOr(join69(shared, "settings.json"), {}).packages;
-        if (!packageFolders(join69(this.env.dataRoot, "plugins")).length && !(Array.isArray(named2) && named2.length)) return [];
+        const shared = ensureSharedDir(join70(this.stateDir, "accounts"));
+        const named2 = readJsonOr(join70(shared, "settings.json"), {}).packages;
+        if (!packageFolders(join70(this.env.dataRoot, "plugins")).length && !(Array.isArray(named2) && named2.length)) return [];
         return (await this.plugins.loading({ cwd: this.stateDir, agentDir: shared, caller: {} })).hooks;
       },
       call: (connection, tool, args) => this.apps.callUnattended(connection, tool, args ?? {}),
@@ -26259,7 +26714,7 @@ var Harness = class {
     const root = dataRoot;
     this.hooks.watch(wikiDir(root));
     void this.hooks.reload();
-    for (const folder2 of ["registry/skills", "registry/prompts", "registry/rules", "config", "runs"]) mkdirSync26(join69(root, folder2), { recursive: true });
+    for (const folder2 of ["registry/skills", "registry/prompts", "registry/rules", "config", "runs"]) mkdirSync26(join70(root, folder2), { recursive: true });
     let migrationError = null;
     try {
       const moved = migrateVariantLayout(root);
@@ -26268,7 +26723,7 @@ var Harness = class {
       migrationError = error instanceof Error ? error.message : String(error);
       log("variant layout", migrationError);
     }
-    mkdirSync26(join69(root, "variants"), { recursive: true });
+    mkdirSync26(join70(root, "variants"), { recursive: true });
     let legacyWiki = null;
     try {
       legacyWiki = moveLegacy(root);
@@ -26365,7 +26820,7 @@ function createHarness(options2) {
 
 // src/plugins/cli.ts
 import { homedir as homedir6 } from "node:os";
-import { join as join70, resolve as resolve12 } from "node:path";
+import { join as join71, resolve as resolve16 } from "node:path";
 import { createInterface } from "node:readline/promises";
 var PLUGINS_USAGE = `Usage: xagent plugins <command> [options]
 
@@ -26431,10 +26886,10 @@ async function runPluginsCli(argv, dependencies = {}) {
     return command ? 0 : 2;
   }
   const base = dependencies.cwd ?? process.cwd();
-  const root = join70(dependencies.home ?? homedir6(), ".xingular-harness");
-  const options2 = { dataRoot: parsed.values.data ? resolve12(base, parsed.values.data) : join70(root, "data"), stateDir: parsed.values.state ? resolve12(base, parsed.values.state) : join70(root, "state"), productName: DEFAULT_PRODUCT_NAME };
+  const root = join71(dependencies.home ?? homedir6(), ".xingular-harness");
+  const options2 = { dataRoot: parsed.values.data ? resolve16(base, parsed.values.data) : join71(root, "data"), stateDir: parsed.values.state ? resolve16(base, parsed.values.state) : join71(root, "state"), productName: DEFAULT_PRODUCT_NAME };
   const harness = dependencies.createHarness ? dependencies.createHarness(options2) : new Harness(options2);
-  const scope = { cwd: parsed.values.cwd ? resolve12(base, parsed.values.cwd) : null };
+  const scope = { cwd: parsed.values.cwd ? resolve16(base, parsed.values.cwd) : null };
   const need = (what) => {
     if (!target) throw new Error(`${command} needs ${what}.`);
     return target;
@@ -26545,7 +27000,7 @@ function terminalAsk() {
 
 // src/hub/cli.ts
 import { homedir as homedir7 } from "node:os";
-import { join as join71, resolve as resolve13 } from "node:path";
+import { join as join72, resolve as resolve17 } from "node:path";
 var HUB_USAGE = `Usage: xagent hub <list | show | install> [id@version] [options]
 
   list [--refresh]             Browse the curated catalog and locally installed versions
@@ -26571,7 +27026,7 @@ async function runHubCli(argv, dependencies = {}) {
 `);
         return 2;
       }
-      values2[arg.slice(2)] = resolve13(value);
+      values2[arg.slice(2)] = resolve17(value);
     } else if (arg.startsWith("--")) {
       write4(`Unknown option ${arg}.
 `);
@@ -26587,8 +27042,8 @@ async function runHubCli(argv, dependencies = {}) {
     write4(HUB_USAGE);
     return 2;
   }
-  const root = join71(dependencies.home ?? homedir7(), ".xingular-harness");
-  const options2 = { dataRoot: values2.data ?? join71(root, "data"), stateDir: values2.state ?? join71(root, "state") };
+  const root = join72(dependencies.home ?? homedir7(), ".xingular-harness");
+  const options2 = { dataRoot: values2.data ?? join72(root, "data"), stateDir: values2.state ?? join72(root, "state") };
   const harness = dependencies.createHarness?.(options2) ?? new Harness(options2);
   try {
     const overview2 = await harness.hub.list(refresh);
@@ -26634,13 +27089,13 @@ Delivery: ${JSON.stringify(delivery)}
 init_fs();
 import { mkdtempSync as mkdtempSync10, readFileSync as readFileSync35 } from "node:fs";
 import { homedir as homedir8, tmpdir as tmpdir11 } from "node:os";
-import { basename as basename16, join as join74, resolve as resolve14 } from "node:path";
+import { basename as basename17, join as join75, resolve as resolve18 } from "node:path";
 
 // src/refine/demo.ts
 import { spawnSync as spawnSync3 } from "node:child_process";
-import { cpSync as cpSync5, existsSync as existsSync33, mkdirSync as mkdirSync27, mkdtempSync as mkdtempSync9, readdirSync as readdirSync30, readFileSync as readFileSync33, writeFileSync as writeFileSync12 } from "node:fs";
+import { cpSync as cpSync5, existsSync as existsSync33, mkdirSync as mkdirSync27, mkdtempSync as mkdtempSync9, readdirSync as readdirSync31, readFileSync as readFileSync33, writeFileSync as writeFileSync12 } from "node:fs";
 import { tmpdir as tmpdir10 } from "node:os";
-import { join as join72 } from "node:path";
+import { join as join73 } from "node:path";
 var DEMO_SCRIPT = `import { readFileSync } from 'node:fs'
 
 const rows = readFileSync(process.argv[2], 'utf8').trim().split('\\n').slice(1)
@@ -26663,11 +27118,11 @@ var DEMO_LEDGERS = {
 };
 function demoTasks(root, scope = "demo") {
   return Object.entries(DEMO_LEDGERS).map(([id2, amounts]) => {
-    const sourceDir = join72(root, "sources", id2);
+    const sourceDir = join73(root, "sources", id2);
     mkdirSync27(sourceDir, { recursive: true });
-    writeFileSync12(join72(sourceDir, "ledger.csv"), `amount
+    writeFileSync12(join73(sourceDir, "ledger.csv"), `amount
 ${amounts}`);
-    writeFileSync12(join72(sourceDir, "reference_answer.txt"), "never shown to a model");
+    writeFileSync12(join73(sourceDir, "reference_answer.txt"), "never shown to a model");
     return {
       id: id2,
       scope,
@@ -26687,24 +27142,24 @@ var DemoExecutor = class {
   executions = 0;
   async execute(task, variantDir, label, runId) {
     this.executions++;
-    const dir2 = join72(this.root, "executions", runId);
+    const dir2 = join73(this.root, "executions", runId);
     mkdirSync27(dir2, { recursive: true });
-    const script = join72(variantDir ?? "", "scripts", "summarize.mjs");
-    const result = spawnSync3(process.execPath, [script, join72(task.sourceDir ?? "", "ledger.csv")], { encoding: "utf8", timeout: 1e4 });
+    const script = join73(variantDir ?? "", "scripts", "summarize.mjs");
+    const result = spawnSync3(process.execPath, [script, join73(task.sourceDir ?? "", "ledger.csv")], { encoding: "utf8", timeout: 1e4 });
     if (result.status !== 0) {
       return { label, runId, dir: dir2, ok: false, delivered: false, costUsd: 0, wallMs: 0, error: result.stderr || "script failed" };
     }
-    writeFileSync12(join72(dir2, "answer.txt"), result.stdout);
-    writeFileSync12(join72(dir2, "trajectory.md"), `[ACTION] Run scripts/summarize.mjs on ledger.csv
+    writeFileSync12(join73(dir2, "answer.txt"), result.stdout);
+    writeFileSync12(join73(dir2, "trajectory.md"), `[ACTION] Run scripts/summarize.mjs on ledger.csv
 [OBSERVATION]
 ${result.stdout}`);
     return { label, runId, dir: dir2, ok: true, delivered: true, costUsd: 0, wallMs: 0, error: "" };
   }
   trajectory(rollout) {
-    return readFileSync33(join72(rollout.dir, "trajectory.md"), "utf8");
+    return readFileSync33(join73(rollout.dir, "trajectory.md"), "utf8");
   }
   deliverableFiles(rollout) {
-    const path4 = join72(rollout.dir, "answer.txt");
+    const path4 = join73(rollout.dir, "answer.txt");
     return existsSync33(path4) ? { "answer.txt": readFileSync33(path4, "utf8") } : {};
   }
   validateVariant(_task, variant) {
@@ -26723,15 +27178,15 @@ var DemoImprover = class {
     let workspace = null;
     let text11;
     if (input.label.startsWith("select.")) {
-      const expected = `Total: ${signedTotal(readFileSync33(join72(context, "source", "ledger.csv"), "utf8"))}`;
-      const ids2 = readdirSync30(join72(context, "candidates")).filter((name) => name.endsWith(".md")).sort();
-      const chosen = ids2.find((name) => readFileSync33(join72(context, "candidates", name), "utf8").includes(expected))?.replace(/\.md$/, "") ?? ids2[0].replace(/\.md$/, "");
+      const expected = `Total: ${signedTotal(readFileSync33(join73(context, "source", "ledger.csv"), "utf8"))}`;
+      const ids2 = readdirSync31(join73(context, "candidates")).filter((name) => name.endsWith(".md")).sort();
+      const chosen = ids2.find((name) => readFileSync33(join73(context, "candidates", name), "utf8").includes(expected))?.replace(/\.md$/, "") ?? ids2[0].replace(/\.md$/, "");
       text11 = `<why>The signed total matches the source ledger.</why>
 \`\`\`choice
 ${chosen}
 \`\`\``;
     } else if (input.label.startsWith("experience.")) {
-      const changed2 = readFileSync33(join72(context, "harness", "scripts", "summarize.mjs"), "utf8") !== readFileSync33(join72(context, "base_harness", "scripts", "summarize.mjs"), "utf8");
+      const changed2 = readFileSync33(join73(context, "harness", "scripts", "summarize.mjs"), "utf8") !== readFileSync33(join73(context, "base_harness", "scripts", "summarize.mjs"), "utf8");
       text11 = `<edits>
 component: scripts/summarize.mjs
 candidates: inv1
@@ -26742,9 +27197,9 @@ verdict: ${changed2 ? "helped" : "no observed effect"}
 
 ` + (changed2 ? "<experience>\ncue: When a ledger includes credits and debits\nlesson: Include both signs when summing in scripts/summarize.mjs.\nevidence: The scripts/summarize.mjs row -- removing the positive-only filter changed the probe total to include the credits omitted by the base trajectory.\nconfidence: high for this observed arithmetic contrast\n</experience>" : "NO_ENTRY");
     } else {
-      workspace = mkdtempSync9(join72(tmpdir10(), "harness-demo-"));
-      cpSync5(join72(context, "harness"), workspace, { recursive: true });
-      const script = join72(workspace, "scripts", "summarize.mjs");
+      workspace = mkdtempSync9(join73(tmpdir10(), "harness-demo-"));
+      cpSync5(join73(context, "harness"), workspace, { recursive: true });
+      const script = join73(workspace, "scripts", "summarize.mjs");
       writeFileSync12(script, readFileSync33(script, "utf8").replace(".filter((amount) => amount > 0)", ""));
       text11 = "<notes>Keep signed amounts: the base total omitted credits in the source ledger.</notes>";
     }
@@ -26756,10 +27211,10 @@ verdict: ${changed2 ? "helped" : "no observed effect"}
 init_fs();
 import { createHash as createHash15 } from "node:crypto";
 import { existsSync as existsSync34, readFileSync as readFileSync34 } from "node:fs";
-import { dirname as dirname24, join as join73 } from "node:path";
+import { dirname as dirname26, join as join74 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 function matrixDir(root, id2) {
-  return join73(root, "refine", safeId(id2));
+  return join74(root, "refine", safeId(id2));
 }
 var packageVersionMemo = null;
 function packageVersion() {
@@ -26768,8 +27223,8 @@ function packageVersion() {
     try {
       let dir2 = fileURLToPath3(import.meta.url);
       for (let up = 0; up < 6; up++) {
-        dir2 = dirname24(dir2);
-        const manifest = join73(dir2, "package.json");
+        dir2 = dirname26(dir2);
+        const manifest = join74(dir2, "package.json");
         if (existsSync34(manifest)) {
           const json2 = JSON.parse(readFileSync34(manifest, "utf8"));
           if (json2.version) packageVersionMemo = json2.version;
@@ -26797,7 +27252,7 @@ function stage(input) {
   return input.versions.map((entry2) => {
     try {
       assertVariantHasNoGraderVerdicts(entry2.variant);
-      return { label: entry2.label, variant: entry2.variant, fingerprint: fingerprint(entry2.variant), dir: writeVariant(PI_SURFACE, entry2.variant, join73(matrixDir(input.root, input.id), "variants", entry2.label)), error: "" };
+      return { label: entry2.label, variant: entry2.variant, fingerprint: fingerprint(entry2.variant), dir: writeVariant(PI_SURFACE, entry2.variant, join74(matrixDir(input.root, input.id), "variants", entry2.label)), error: "" };
     } catch (error) {
       return { label: entry2.label, variant: entry2.variant, fingerprint: fingerprint(entry2.variant), dir: "", error: error instanceof Error ? error.message : String(error) };
     }
@@ -26824,10 +27279,10 @@ async function runMatrix(input) {
   };
   const save3 = () => {
     summary4.usd = Math.round(summary4.rows.reduce((sum, row) => sum + row.costUsd, 0) * 1e6) / 1e6;
-    writeJson(join73(matrixDir(root, id2), "matrix.json"), summary4);
+    writeJson(join74(matrixDir(root, id2), "matrix.json"), summary4);
     emit({ type: "summary", summary: structuredClone(summary4) });
   };
-  writeJson(join73(matrixDir(root, id2), "suite.json"), { id: id2, versions: staged.map(({ label, fingerprint: fingerprint2 }) => ({ label, fingerprint: fingerprint2 })), tasks });
+  writeJson(join74(matrixDir(root, id2), "suite.json"), { id: id2, versions: staged.map(({ label, fingerprint: fingerprint2 }) => ({ label, fingerprint: fingerprint2 })), tasks });
   save3();
   const pairs = staged.flatMap((version2) => tasks.map((task) => ({ version: version2, task })));
   await mapLimit(pairs, input.rolloutWidth ?? 4, async ({ version: version2, task }) => {
@@ -26851,7 +27306,7 @@ async function runMatrix(input) {
         try {
           rollout = await executor.execute(task, version2.dir, runId, runId);
         } catch (error) {
-          rollout = { label: runId, runId, dir: join73(matrixDir(root, id2), "missing", version2.label, task.id), ok: false, delivered: false, costUsd: 0, wallMs: 0, error: error instanceof Error ? error.message : String(error) };
+          rollout = { label: runId, runId, dir: join74(matrixDir(root, id2), "missing", version2.label, task.id), ok: false, delivered: false, costUsd: 0, wallMs: 0, error: error instanceof Error ? error.message : String(error) };
         }
         emit({ type: "execution.finished", version: version2.label, task: task.id, ok: rollout.ok, delivered: rollout.delivered, error: rollout.error });
         row = rowOf(version2, task, runId, executorName, rollout);
@@ -26953,7 +27408,7 @@ async function runRefineCli(argv, io = { write: (text11) => void process.stdout.
   const { command, values: values2 } = parse3(argv);
   try {
     if (command === "demo") {
-      const root = values2.out ? resolve14(values2.out) : mkdtempSync10(join74(tmpdir11(), "harness-refine-demo-"));
+      const root = values2.out ? resolve18(values2.out) : mkdtempSync10(join75(tmpdir11(), "harness-refine-demo-"));
       const k = Number(values2.k ?? 1);
       seed(root, "demo", demoBaseVariant(), "demo base harness");
       const executor = new DemoExecutor(root);
@@ -26963,7 +27418,7 @@ async function runRefineCli(argv, io = { write: (text11) => void process.stdout.
         describe3(summary4, io.write);
       }
       io.write(`library: ${new Library(root, "demo", "accounting").entries().join(", ") || "(empty)"}
-records: ${join74(root, "refine")}
+records: ${join75(root, "refine")}
 `);
       return 0;
     }
@@ -26972,15 +27427,15 @@ records: ${join74(root, "refine")}
         io.write(REFINE_USAGE);
         return 2;
       }
-      const base = join74(homedir8(), ".xingular-harness");
-      const harness = createHarness({ dataRoot: resolve14(values2.data ?? join74(base, "data")), stateDir: resolve14(values2.state ?? join74(base, "state")) });
+      const base = join75(homedir8(), ".xingular-harness");
+      const harness = createHarness({ dataRoot: resolve18(values2.data ?? join75(base, "data")), stateDir: resolve18(values2.state ?? join75(base, "state")) });
       try {
-        const scope = values2.scope ?? basename16(resolve14(values2.variant)).replace(/[^A-Za-z0-9_-]/g, "-");
-        const variant = readVariant(PI_SURFACE, resolve14(values2.variant));
+        const scope = values2.scope ?? basename17(resolve18(values2.variant)).replace(/[^A-Za-z0-9_-]/g, "-");
+        const variant = readVariant(PI_SURFACE, resolve18(values2.variant));
         commit(harness.env.root, scope, variant, { kind: "import", note: `from ${values2.variant}` });
-        const prompt = readFileSync35(resolve14(values2.task), "utf8");
+        const prompt = readFileSync35(resolve18(values2.task), "utf8");
         const { id: id2 } = harness.refine.start({
-          task: { id: basename16(values2.task).replace(/\.md$/, "").replace(/[^A-Za-z0-9_-]/g, "-"), prompt, scope, sourceDir: values2.source ? resolve14(values2.source) : null },
+          task: { id: basename17(values2.task).replace(/\.md$/, "").replace(/[^A-Za-z0-9_-]/g, "-"), prompt, scope, sourceDir: values2.source ? resolve18(values2.source) : null },
           k: Number(values2.k ?? 1),
           mode: mode(values2.mode),
           improver: values2.model ? { model: values2.model } : {},
@@ -27004,7 +27459,7 @@ records: ${join74(root, "refine")}
       }
     }
     if (command === "matrix") {
-      const root = resolve14(values2.data ?? join74(homedir8(), ".xingular-harness", "data"));
+      const root = resolve18(values2.data ?? join75(homedir8(), ".xingular-harness", "data"));
       let versions2 = [];
       let tasks;
       if (values2.demo) {
@@ -27016,10 +27471,10 @@ records: ${join74(root, "refine")}
           io.write(REFINE_USAGE);
           return 2;
         }
-        const suite = JSON.parse(readFileSync35(resolve14(values2.suite), "utf8"));
+        const suite = JSON.parse(readFileSync35(resolve18(values2.suite), "utf8"));
         if (suite.executor && suite.executor !== "demo") throw new Error(`Executor '${suite.executor}' needs a model; this command runs without one. Use 'demo'.`);
         for (const entry2 of suite.versions) {
-          if (entry2.dir) versions2.push({ label: entry2.label, variant: readVariant(PI_SURFACE, resolve14(entry2.dir)) });
+          if (entry2.dir) versions2.push({ label: entry2.label, variant: readVariant(PI_SURFACE, resolve18(entry2.dir)) });
           else if (entry2.scope) {
             const fingerprint2 = entry2.version ?? head(root, entry2.scope)?.fingerprint;
             if (!fingerprint2) throw new Error(`The harness '${entry2.scope}' has no head version to evaluate.`);
@@ -27030,7 +27485,7 @@ records: ${join74(root, "refine")}
       }
       const executor = new DemoExecutor(root);
       const summary4 = await runMatrix({ root, id: values2.id ?? "matrix", versions: versions2, tasks, executor, rolloutWidth: values2.width ? Number(values2.width) : void 0 });
-      if (values2.out) writeJson(resolve14(values2.out), summary4);
+      if (values2.out) writeJson(resolve18(values2.out), summary4);
       describeMatrix(summary4, io.write);
       return summary4.status === "ok" || summary4.status === "partial" ? 0 : 1;
     }
@@ -27045,7 +27500,7 @@ records: ${join74(root, "refine")}
 
 // src/world/cli.ts
 import { homedir as homedir9 } from "node:os";
-import { join as join75, resolve as resolve15 } from "node:path";
+import { join as join76, resolve as resolve19 } from "node:path";
 var WEB_USAGE = `Usage: xagent web <status | key <provider> [--remove] | keyless on|off> [--state <dir>] [--data <dir>]
 
   status                 Which search services are ready
@@ -27071,11 +27526,11 @@ var BROWSER_USAGE = `Usage: xagent browser [status | set <options>] [--state <di
 `;
 function stateOf2(argv, home) {
   const args = [];
-  let stateDir = join75(home, ".xingular-harness", "state");
-  let dataRoot = join75(home, ".xingular-harness", "data");
+  let stateDir = join76(home, ".xingular-harness", "state");
+  let dataRoot = join76(home, ".xingular-harness", "data");
   for (let index = 0; index < argv.length; index += 1) {
-    if (argv[index] === "--state") stateDir = resolve15(argv[++index] ?? stateDir);
-    else if (argv[index] === "--data") dataRoot = resolve15(argv[++index] ?? dataRoot);
+    if (argv[index] === "--state") stateDir = resolve19(argv[++index] ?? stateDir);
+    else if (argv[index] === "--data") dataRoot = resolve19(argv[++index] ?? dataRoot);
     else args.push(argv[index]);
   }
   return { args, stateDir, dataRoot };
@@ -27090,7 +27545,7 @@ async function readStdin2() {
 async function runWebCli(argv, dependencies = {}) {
   const write4 = dependencies.write ?? ((text11) => void process.stdout.write(text11));
   const { args, stateDir, dataRoot } = stateOf2(argv, dependencies.home ?? homedir9());
-  const secrets = dependencies.secrets ?? fileSecretStore(join75(stateDir, "secrets.json"));
+  const secrets = dependencies.secrets ?? fileSecretStore(join76(stateDir, "secrets.json"));
   const [command, name] = args;
   if (!command || command === "help") {
     write4(WEB_USAGE);
@@ -27324,7 +27779,7 @@ var RpcPeer = class {
   /** Asks the host to perform a named operation. */
   callHost(call, params, timeoutMs = 3e4) {
     const id2 = `s${++this.nextCallId}`;
-    return new Promise((resolve19, reject2) => {
+    return new Promise((resolve23, reject2) => {
       const timer = setTimeout(() => {
         this.pendingCalls.delete(id2);
         reject2(new HarnessError("host_timeout", `The host did not answer ${call}.`));
@@ -27332,7 +27787,7 @@ var RpcPeer = class {
       this.pendingCalls.set(id2, {
         resolve: (value) => {
           clearTimeout(timer);
-          resolve19(value);
+          resolve23(value);
         },
         reject: (error) => {
           clearTimeout(timer);
@@ -27508,25 +27963,6 @@ function ensureDir(dir2) {
   return dir2;
 }
 
-// src/plugins/commandPrefix.ts
-import { basename as basename17, dirname as dirname25, extname as extname3 } from "node:path";
-var slug4 = (value) => {
-  const normalized = value.toLowerCase().replace(/[^a-z0-9-]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
-  const prefix = /^[a-z]/.test(normalized) ? normalized : `plugin-${normalized || "command"}`;
-  return prefix === "plugin" || prefix === "skill" ? `extension-${prefix}` : prefix;
-};
-function pluginCommandPrefix(source) {
-  if (source.origin === "package" && source.baseDir) {
-    const manifest = packageManifest(source.baseDir);
-    return manifest.commandPrefix ?? slug4(manifest.name);
-  }
-  if (source.path.startsWith("builtin:")) return slug4(source.path.slice("builtin:".length));
-  const synthetic = /^<[^:>]+:([^>]+)>$/.exec(source.path);
-  if (synthetic) return slug4(synthetic[1]);
-  const file2 = basename17(source.path, extname3(source.path));
-  return slug4(file2 === "index" ? basename17(dirname25(source.path)) : file2);
-}
-
 // src/commands/registry.ts
 var CORE_COMMANDS = [
   { name: "help", description: "List the commands", group: "Core", kind: "local" },
@@ -27571,38 +28007,6 @@ var CORE_COMMANDS = [
 ];
 var ALIASES = new Map(CORE_COMMANDS.flatMap((command) => ("aliases" in command ? command.aliases : []).map((alias) => [alias, command.name])));
 
-// src/commands/routes.ts
-function commandRoutes(commands) {
-  const routes = /* @__PURE__ */ new Map();
-  const byName = /* @__PURE__ */ new Map();
-  const ownersByPrefix = /* @__PURE__ */ new Map();
-  const builtinPrefixes = new Map(BUILTIN_PLUGIN_REGISTRY.commands().map((command) => [command.prefix, command.pluginId]));
-  for (const command of commands) {
-    const owners = ownersByPrefix.get(command.prefix) ?? /* @__PURE__ */ new Map();
-    const paths2 = owners.get(command.owner) ?? /* @__PURE__ */ new Set();
-    paths2.add(command.path);
-    owners.set(command.owner, paths2);
-    ownersByPrefix.set(command.prefix, owners);
-    const route = `${command.prefix}:${command.name}`;
-    routes.set(route, [...routes.get(route) ?? [], command]);
-    byName.set(command.name, [...byName.get(command.name) ?? [], command]);
-  }
-  const conflictingPrefixes = /* @__PURE__ */ new Map();
-  for (const [prefix, owners] of ownersByPrefix) {
-    const builtin = builtinPrefixes.get(prefix);
-    if (owners.size > 1 || builtin || prefix === "plugin" || prefix === "skill") {
-      conflictingPrefixes.set(prefix, [
-        ...builtin ? [`built-in plugin ${builtin}`] : [],
-        ...[...owners.values()].flatMap((paths2) => [...paths2])
-      ]);
-    }
-  }
-  return { routes, byName, ownersByPrefix, conflictingPrefixes };
-}
-function promptCommandAvailable(name, taken, extensionCommands = /* @__PURE__ */ new Set()) {
-  return !name.includes(":") && !taken.has(name) && !extensionCommands.has(name);
-}
-
 // src/commands/list.ts
 function listCommands(plugins) {
   const out = /* @__PURE__ */ new Map();
@@ -27656,8 +28060,24 @@ function listCommands(plugins) {
           });
         }
       }
-      if (contribution2.kind === "command" && contribution2.path && promptCommandAvailable(contribution2.name, taken, extensionCommandNames) && !out.has(contribution2.name)) {
-        out.set(contribution2.name, { name: contribution2.name, description: contribution2.description, group: "Prompts", source: "prompt", owner: plugin.id });
+      if (contribution2.kind === "command" && contribution2.path) {
+        const packageRoot = plugin.source === "package" || plugin.id.startsWith("package:") ? plugin.path : null;
+        const producer = plugin.contributions.find((item) => item.kind === "code" && item.state === "on" && item.path && item.registered?.resources?.some((resource) => resource.kind === "command" && resource.path === contribution2.path));
+        if (packageRoot || producer?.path) {
+          const prefix = pluginCommandPrefix(packageRoot ? { path: contribution2.path, origin: "package", baseDir: packageRoot } : { path: producer.path });
+          const name = packageRoot && packageManifest(packageRoot).defaultPrompt === contribution2.name ? "" : contribution2.name;
+          if (/^[a-z][a-z0-9-]*$/.test(name) || name === "") {
+            extensions.push({
+              prefix,
+              name,
+              owner: packageRoot ? `package:${packageRoot}` : `extension:${producer.path}`,
+              path: contribution2.path,
+              listed: { name: `${prefix}:${name}`, description: contribution2.description, group: "Prompts", source: "prompt", owner: plugin.id }
+            });
+          }
+        } else if (promptCommandAvailable(contribution2.name, taken, extensionCommandNames) && !out.has(contribution2.name)) {
+          out.set(contribution2.name, { name: contribution2.name, description: contribution2.description, group: "Prompts", source: "prompt", owner: plugin.id });
+        }
       }
       if (contribution2.kind === "skill") {
         const name = `skill:${contribution2.name}`;
@@ -27673,8 +28093,8 @@ function listCommands(plugins) {
 }
 
 // src/variant/seed.ts
-import { existsSync as existsSync36, readdirSync as readdirSync31, readFileSync as readFileSync36, statSync as statSync23 } from "node:fs";
-import { join as join76 } from "node:path";
+import { existsSync as existsSync36, readdirSync as readdirSync32, readFileSync as readFileSync36, statSync as statSync24 } from "node:fs";
+import { join as join77 } from "node:path";
 function body(text11) {
   return (parse(text11)?.body ?? text11).trim();
 }
@@ -27687,15 +28107,15 @@ function read4(path4) {
 }
 function folders2(dir2) {
   try {
-    return readdirSync31(dir2).filter((name) => !name.startsWith(".")).sort();
+    return readdirSync32(dir2).filter((name) => !name.startsWith(".")).sort();
   } catch {
     return [];
   }
 }
 function blocksDir(root) {
-  if (existsSync36(join76(root, "wiki", "blocks"))) return join76(root, "wiki", "blocks");
-  const moved = folders2(join76(root, "legacy")).filter((name) => name.startsWith("wiki-")).reverse();
-  for (const name of moved) if (existsSync36(join76(root, "legacy", name, "blocks"))) return join76(root, "legacy", name, "blocks");
+  if (existsSync36(join77(root, "wiki", "blocks"))) return join77(root, "wiki", "blocks");
+  const moved = folders2(join77(root, "legacy")).filter((name) => name.startsWith("wiki-")).reverse();
+  for (const name of moved) if (existsSync36(join77(root, "legacy", name, "blocks"))) return join77(root, "legacy", name, "blocks");
   return null;
 }
 function skillName2(stem) {
@@ -27706,20 +28126,20 @@ function legacyPieces(root, input) {
   const scope = { agentId: input.agentId ?? null, projectId: input.projectId ?? null };
   const on = (id2) => attached(choices, [id2], scope, false);
   const rules = [];
-  const rulesDir = join76(root, "registry", "rules");
+  const rulesDir = join77(root, "registry", "rules");
   for (const name of folders2(rulesDir)) {
     const stem = name.replace(/\.md$/, "");
-    const path4 = name.endsWith(".md") ? join76(rulesDir, name) : join76(rulesDir, name, "SKILL.md");
+    const path4 = name.endsWith(".md") ? join77(rulesDir, name) : join77(rulesDir, name, "SKILL.md");
     const text11 = read4(path4);
     if (text11 && on(`rules/${stem}`)) rules.push(body(text11));
   }
   const skills = {};
-  const skillsDir = join76(root, "registry", "skills");
+  const skillsDir = join77(root, "registry", "skills");
   for (const name of folders2(skillsDir)) {
     const stem = name.replace(/\.md$/, "");
-    let path4 = join76(skillsDir, name);
+    let path4 = join77(skillsDir, name);
     try {
-      if (statSync23(path4).isDirectory()) path4 = join76(path4, "SKILL.md");
+      if (statSync24(path4).isDirectory()) path4 = join77(path4, "SKILL.md");
     } catch {
       continue;
     }
@@ -27738,13 +28158,13 @@ ${body(text11)}
   const memory = [];
   const blocks = blocksDir(root);
   if (blocks) {
-    const user = read4(join76(blocks, "shared", "user.md"));
+    const user = read4(join77(blocks, "shared", "user.md"));
     if (user && body(user)) memory.push(`## About the person
 
 ${body(user)}`);
     if (input.agentId && /^[A-Za-z0-9_-]+$/.test(input.agentId)) {
       for (const [file2, title2] of [["persona.md", "Persona"], ["notes.md", "Notes"]]) {
-        const text11 = read4(join76(blocks, "agents", input.agentId, file2));
+        const text11 = read4(join77(blocks, "agents", input.agentId, file2));
         if (text11 && body(text11)) memory.push(`## ${title2}
 
 ${body(text11)}`);
@@ -27942,6 +28362,7 @@ function methods(harness) {
       return params.render ? { pack, text: render(env, pack) } : pack;
     },
     "context.runPack": (params) => load2(root(), text7(params, "runId")),
+    "context.runDetails": (params) => runDetails(root(), text7(params, "runId")),
     // What the request was made of: one row per contributor, reconciled to the provider's figure.
     "context.attribution": (params) => attribution(env, text7(params, "runId")),
     // ---- Plugins: everything that shapes a session, and the trust a working folder's code needs ---
@@ -28079,12 +28500,12 @@ import { spawn as nodeSpawn } from "node:child_process";
 import { createHash as createHash16, randomUUID as randomUUID19 } from "node:crypto";
 import { appendFileSync as appendFileSync2 } from "node:fs";
 import { homedir as homedir11 } from "node:os";
-import { isAbsolute as isAbsolute13, join as join78, resolve as resolve16 } from "node:path";
+import { isAbsolute as isAbsolute13, join as join79, resolve as resolve20 } from "node:path";
 
 // src/core/interactiveProfile.ts
-import { closeSync as closeSync7, fsyncSync as fsyncSync3, linkSync as linkSync2, mkdirSync as mkdirSync29, openSync as openSync7, readFileSync as readFileSync37, rmSync as rmSync24, statSync as statSync24, writeFileSync as writeFileSync14 } from "node:fs";
+import { closeSync as closeSync7, fsyncSync as fsyncSync3, linkSync as linkSync2, mkdirSync as mkdirSync29, openSync as openSync7, readFileSync as readFileSync37, rmSync as rmSync24, statSync as statSync25, writeFileSync as writeFileSync14 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
-import { dirname as dirname26, isAbsolute as isAbsolute12, join as join77 } from "node:path";
+import { dirname as dirname27, isAbsolute as isAbsolute12, join as join78 } from "node:path";
 var fail2 = () => {
   throw new Error("Invalid interactive profile configuration.");
 };
@@ -28125,7 +28546,7 @@ function validateInteractiveProfile(value) {
   };
 }
 function interactiveProfilePath(home = homedir10()) {
-  return join77(absolute(home), ".xingular-harness", "profile.json");
+  return join78(absolute(home), ".xingular-harness", "profile.json");
 }
 function selectedConfigPath(location = {}) {
   return location.configPath === void 0 ? interactiveProfilePath(location.home) : absolute(location.configPath);
@@ -28133,7 +28554,7 @@ function selectedConfigPath(location = {}) {
 function readInteractiveProfile(location = {}) {
   const path4 = selectedConfigPath(location);
   try {
-    const info = statSync24(path4);
+    const info = statSync25(path4);
     if (!info.isFile() || info.size > 16384) return fail2();
     return validateInteractiveProfile(JSON.parse(readFileSync37(path4, "utf8")));
   } catch (error) {
@@ -28149,16 +28570,16 @@ function overrides(value) {
 }
 function resolveInteractiveProfile(options2 = {}) {
   const home = absolute(options2.home ?? homedir10());
-  const root = join77(home, ".xingular-harness");
+  const root = join78(home, ".xingular-harness");
   const selected = readInteractiveProfile(options2);
   const legacy = overrides(options2.legacyDefaults);
   const explicit = overrides(options2.overrides);
-  const dataRoot = explicit.dataRoot ?? selected?.dataRoot ?? legacy.dataRoot ?? join77(root, "data");
-  const stateDir = explicit.stateDir ?? selected?.stateDir ?? legacy.stateDir ?? join77(root, "state");
+  const dataRoot = explicit.dataRoot ?? selected?.dataRoot ?? legacy.dataRoot ?? join78(root, "data");
+  const stateDir = explicit.stateDir ?? selected?.stateDir ?? legacy.stateDir ?? join78(root, "state");
   const defaultVariantScope = explicit.defaultVariantScope ?? selected?.defaultVariantScope ?? legacy.defaultVariantScope ?? "default";
   const secretBackend = explicit.secretBackend ?? selected?.secretBackend ?? legacy.secretBackend ?? {
     kind: "file",
-    path: join77(stateDir, "secrets.json")
+    path: join78(stateDir, "secrets.json")
   };
   return validateInteractiveProfile({ version: 1, dataRoot, stateDir, defaultVariantScope, secretBackend });
 }
@@ -28209,27 +28630,27 @@ function resolveStandaloneOptions(argv, home = homedir11(), cwd = process.cwd())
     if (argument !== "--data" && argument !== "--state") throw new Error(`Unknown standalone option: ${argument}`);
     const value = argv[index + 1];
     if (!value || value.startsWith("--")) throw new Error(`${argument} needs a directory path.`);
-    if (argument === "--data") overrides2.dataRoot = resolve16(cwd, value);
-    else overrides2.stateDir = resolve16(cwd, value);
+    if (argument === "--data") overrides2.dataRoot = resolve20(cwd, value);
+    else overrides2.stateDir = resolve20(cwd, value);
     given.add(argument);
     index += 1;
   }
   if (!isAbsolute13(home) && !(given.has("--data") && given.has("--state"))) {
     throw new Error(`The home folder "${home}" is not an absolute path, so the default data and state folders cannot be placed. Set HOME to your home folder, or pass --data and --state with absolute folders.`);
   }
-  const devRoot = isAbsolute13(home) ? join78(home, ".xingular-harness-dev") : null;
-  const devData = devRoot ? join78(devRoot, "data") : null;
-  const devState = devRoot ? join78(devRoot, "state") : null;
+  const devRoot = isAbsolute13(home) ? join79(home, ".xingular-harness-dev") : null;
+  const devData = devRoot ? join79(devRoot, "data") : null;
+  const devState = devRoot ? join79(devRoot, "state") : null;
   const development = !!devRoot && (overrides2.dataRoot === devData || overrides2.stateDir === devState);
   const resolvedProfile = isAbsolute13(home) ? resolveInteractiveProfile({
     home,
     ...development ? {
-      configPath: join78(devRoot, "profile.json"),
+      configPath: join79(devRoot, "profile.json"),
       legacyDefaults: {
         dataRoot: devData,
         stateDir: devState,
         defaultVariantScope: "default",
-        secretBackend: { kind: "file", path: join78(devState, "secrets.json") }
+        secretBackend: { kind: "file", path: join79(devState, "secrets.json") }
       }
     } : {},
     overrides: overrides2
@@ -28238,9 +28659,9 @@ function resolveStandaloneOptions(argv, home = homedir11(), cwd = process.cwd())
     dataRoot: overrides2.dataRoot,
     stateDir: overrides2.stateDir,
     defaultVariantScope: "default",
-    secretBackend: { kind: "file", path: join78(overrides2.stateDir, "secrets.json") }
+    secretBackend: { kind: "file", path: join79(overrides2.stateDir, "secrets.json") }
   };
-  const profile = development ? { ...resolvedProfile, secretBackend: { kind: "file", path: join78(resolvedProfile.stateDir, "secrets.json") } } : resolvedProfile;
+  const profile = development ? { ...resolvedProfile, secretBackend: { kind: "file", path: join79(resolvedProfile.stateDir, "secrets.json") } } : resolvedProfile;
   return {
     profile,
     paths: {
@@ -28321,14 +28742,14 @@ async function runStandaloneTerminal(argv, dependencies = {}) {
   if (!(dependencies.stdinIsTTY ?? process.stdin.isTTY) || !(dependencies.stdoutIsTTY ?? process.stdout.isTTY)) {
     throw new Error("The interactive Harness terminal needs a TTY. Run it from a terminal, or use `xagent serve` for a host process.");
   }
-  let cwd = resolve16(dependencies.cwd ?? process.cwd());
+  let cwd = resolve20(dependencies.cwd ?? process.cwd());
   const { paths: paths2, profile } = resolveStandaloneOptions(argv, dependencies.home, cwd);
   const secrets = await interactiveProfileSecretStore(profile, dependencies.hostSecretStore);
   const makeHarness = dependencies.createHarness ?? createHarness;
   const harness = makeHarness({ dataRoot: paths2.dataRoot, stateDir: paths2.stateDir, productName: DEFAULT_PRODUCT_NAME, secrets });
   const newSessionId = dependencies.createSessionId ?? randomUUID19;
   let current2 = { sessionId: newSessionId(), accountId: null, nativeSessionId: null };
-  const logFile = join78(paths2.stateDir, "harness.log");
+  const logFile = join79(paths2.stateDir, "harness.log");
   setLogSink((text11) => {
     try {
       appendFileSync2(logFile, `${(/* @__PURE__ */ new Date()).toISOString()} ${text11}
@@ -28350,7 +28771,7 @@ async function runStandaloneTerminal(argv, dependencies = {}) {
       worktreeId = worktree.id;
     }
     for (; ; ) {
-      const sessionFolder = join78(paths2.dataRoot, "sessions", "terminal", createHash16("sha256").update(cwd).digest("hex"));
+      const sessionFolder = join79(paths2.dataRoot, "sessions", "terminal", createHash16("sha256").update(cwd).digest("hex"));
       const launch = await harness.terminals.prepare({ ...current2, cwd, sessionFolder, variant: { scope: variantScope }, ...worktreeId ? { run: { worktreeId } } : {} });
       const code = await spawnFrontend(paths2.remoteControl ? { ...launch, env: { ...launch.env, [REMOTE_CONTROL_ENV]: "1" } } : launch, cwd, dependencies.spawn);
       const next = harness.terminals.takeRelaunch(current2.sessionId);
@@ -28374,7 +28795,7 @@ async function runStandaloneTerminal(argv, dependencies = {}) {
 
 // src/worktrees/cli.ts
 import { homedir as homedir12 } from "node:os";
-import { join as join79, resolve as resolve17 } from "node:path";
+import { join as join80, resolve as resolve21 } from "node:path";
 var WORKTREE_USAGE = `Usage: xagent worktree <command> [--state <dir>]
 
   list                       Worktrees of the repository you are in
@@ -28409,11 +28830,11 @@ async function findWorktree(worktrees, cwd, key, removed = false) {
 }
 async function runWorktreeCli(argv, dependencies = {}) {
   const write4 = dependencies.write ?? ((text11) => void process.stdout.write(text11));
-  const cwd = resolve17(dependencies.cwd ?? process.cwd());
+  const cwd = resolve21(dependencies.cwd ?? process.cwd());
   const args = [];
-  let stateDir = join79(dependencies.home ?? homedir12(), ".xingular-harness", "state");
+  let stateDir = join80(dependencies.home ?? homedir12(), ".xingular-harness", "state");
   for (let index = 0; index < argv.length; index += 1) {
-    if (argv[index] === "--state") stateDir = resolve17(argv[++index] ?? stateDir);
+    if (argv[index] === "--state") stateDir = resolve21(argv[++index] ?? stateDir);
     else args.push(argv[index]);
   }
   const [command, ...rest] = args;
@@ -28497,7 +28918,7 @@ ${status.changes} changed path(s), ${status.ahead} commit(s) since it started.
       return result.failed.length ? 1 : 0;
     }
     case "adopt": {
-      const record3 = await worktrees.adopt(resolve17(cwd, positional[0] ?? ""));
+      const record3 = await worktrees.adopt(resolve21(cwd, positional[0] ?? ""));
       write4(`${describe5(record3)}
 `);
       return 0;
@@ -28579,11 +29000,11 @@ function serveCommand(argv) {
     process.stderr.write("serve needs --state <dir>.\n");
     return Promise.resolve(2);
   }
-  const stateDir = resolve18(stateArgument);
+  const stateDir = resolve22(stateArgument);
   const peer = new RpcPeer(stdioTransport());
   const options2 = {
     stateDir,
-    dataRoot: values2.data?.[0] ? resolve18(values2.data[0]) : null,
+    dataRoot: values2.data?.[0] ? resolve22(values2.data[0]) : null,
     productName: values2.name?.[0],
     builtins: values2.builtins,
     ...switches.has("host-secrets") ? { secrets: remoteSecrets(peer) } : {},
@@ -28593,12 +29014,12 @@ function serveCommand(argv) {
   const harness = createHarness(options2);
   if (switches.has("host-tools")) harness.sessions.provide(remoteTools(peer));
   attach3(harness, peer);
-  return new Promise((resolve19) => {
+  return new Promise((resolve23) => {
     let closing = false;
     const shutdown = () => {
       if (closing) return;
       closing = true;
-      void Promise.race([harness.close(), new Promise((done) => setTimeout(done, 5e3))]).then(() => resolve19(0));
+      void Promise.race([harness.close(), new Promise((done) => setTimeout(done, 5e3))]).then(() => resolve23(0));
     };
     peer.handle("harness.shutdown", () => void setImmediate(shutdown));
     process.stdin.on("end", shutdown);