@xingular/harness 1.2.0 → 1.3.1-unstable.0

package/dist/terminal-opentui.js

@@ -12,7 +12,7 @@ import { execFile as execFile2, spawn as spawn4 } from "child_process";
 import { existsSync as existsSync11 } from "fs";
 import { mkdtemp as mkdtemp2, readFile as readFile2, rm as rm2, writeFile } from "fs/promises";
 import { tmpdir as tmpdir3 } from "os";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 import { randomUUID as randomUUID4 } from "crypto";
 import { promisify as promisify2 } from "util";
 import {
@@ -20,7 +20,7 @@ import {
   initTheme,
   resizeImage
 } from "@earendil-works/pi-coding-agent";
-import { matchesKey as matchesKey16 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey18 } from "@earendil-works/pi-tui";
 
 // src/terminal/client.ts
 import { createConnection } from "net";
@@ -334,9 +334,20 @@ function pageFrame({ title, meta, body, footer, width, rows, theme, headerLine }
     footerRow(footer, width, theme)
   ].slice(0, rows);
 }
+function inspectorListWidth(width) {
+  return width < 88 ? undefined : Math.max(32, Math.floor((width - 3) * 0.4));
+}
+function splitColumns(left, right, leftWidth, width, rows, theme) {
+  const rightWidth = Math.max(0, width - leftWidth - 3);
+  return Array.from({ length: Math.max(0, Math.trunc(rows)) }, (_, index) => {
+    const leftLine = truncateToWidth(left[index] ?? "", leftWidth, "");
+    const rightLine = truncateToWidth(right[index] ?? "", rightWidth, "");
+    return leftLine + " ".repeat(Math.max(0, leftWidth - visibleWidth(leftLine))) + theme.fg("dim", " \u2502 ") + rightLine;
+  });
+}
 
 // src/terminal/tui/commands.ts
-import { isAbsolute as isAbsolute2, relative as relative2, resolve } from "path";
+import { isAbsolute as isAbsolute3, relative as relative2, resolve } from "path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 
 // src/commands/registry.ts
@@ -357,6 +368,7 @@ var CORE_COMMANDS = [
   { name: "compact", args: "[instructions]", description: "Compact the context", group: "Session", kind: "session", methods: ["sessions.run"] },
   { name: "copy", description: "Copy the last reply", group: "Inspect", kind: "local", methods: ["sessions.lastReply"] },
   { name: "export", args: "[path.html|path.jsonl]", description: "Export this branch to HTML or JSONL", group: "Inspect", kind: "session", methods: ["sessions.export", "sessions.run"] },
+  { name: "todo", aliases: ["checklist"], description: "Show the current todo list", group: "Inspect", kind: "session", methods: ["runs.todo"] },
   { name: "trajectory", args: "[run-id]", description: "Inspect recorded runs for this session", group: "Inspect", kind: "page", methods: ["runs.list", "runs.events"] },
   { name: "reload", description: "Reload trusted resources and keybindings", group: "Harness", kind: "session", methods: ["sessions.reload"] },
   { name: "accounts", description: "Sign in, switch, check and remove Pi accounts", group: "Harness", kind: "page", methods: ["accounts.list"] },
@@ -366,8 +378,8 @@ var CORE_COMMANDS = [
   { name: "connections", description: "Manage local and remote MCP connections", group: "Harness", kind: "page" },
   { name: "mcp", description: "Open Connections in the Harness browser", group: "Harness", kind: "page" },
   { name: "tools", description: "Inspect available tools, owners and approvals", group: "Harness", kind: "page" },
-  { name: "plugins", description: "Switch plugins on or off and trust their code", group: "Harness", kind: "page", methods: ["plugins.inventory"] },
-  { name: "hub", description: "Browse and install reviewed skills, plugins and documents", group: "Harness", kind: "page" },
+  { name: "plugins", description: "Manage local plugins, packages, trust and settings", group: "Harness", kind: "page", methods: ["plugins.list", "plugins.attach", "plugins.detach", "plugins.trust", "plugins.untrust", "plugins.configure", "plugins.install", "plugins.update", "plugins.remove", "hub.list"] },
+  { name: "hub", description: "Browse the Community catalog and manage Hub installs", group: "Harness", kind: "page", methods: ["hub.list", "hub.install", "hub.uninstall"] },
   { name: "components", description: "Browse skills, prompts and rules for this Harness scope", group: "Harness", kind: "page" },
   { name: "settings", description: "Session, terminal and browser settings", group: "Harness", kind: "page" },
   { name: "doctor", description: "Check account, model, tools and runtime readiness", group: "Harness", kind: "page", methods: ["doctor.start", "doctor.read"] },
@@ -922,6 +934,7 @@ var runEventTypeSchema = z.enum([
   "extension.notice",
   "reaction.added",
   "agent.message",
+  "todo.updated",
   "checklist.updated",
   "checkpoint",
   "heartbeat",
@@ -1060,9 +1073,9 @@ var extensionNoticePayload = z.object({
   text: z.string(),
   extension: z.string().optional()
 });
-var checklistItemSchema = z.object({ text: z.string().min(1).max(500), status: z.enum(["pending", "in_progress", "completed"]) }).strict();
-var MAX_CHECKLIST_ITEMS = 50;
-var checklistPayload = z.object({ items: z.array(checklistItemSchema).max(MAX_CHECKLIST_ITEMS) }).strict();
+var todoItemSchema = z.object({ text: z.string().min(1).max(500), status: z.enum(["pending", "in_progress", "completed"]) }).strict();
+var MAX_TODO_ITEMS = 50;
+var todoPayload = z.object({ items: z.array(todoItemSchema).max(MAX_TODO_ITEMS) }).strict();
 var MAX_CHECKPOINT_SUMMARY = 1200;
 var MAX_CHECKPOINT_DONE = 20;
 var MAX_CHECKPOINT_EVIDENCE = 5;
@@ -1184,7 +1197,8 @@ var runEventPayloadSchemas = {
   "extension.notice": extensionNoticePayload,
   "reaction.added": reactionAddedPayload,
   "agent.message": agentMessagePayload,
-  "checklist.updated": checklistPayload,
+  "todo.updated": todoPayload,
+  "checklist.updated": todoPayload,
   checkpoint: checkpointPayload,
   heartbeat: heartbeatPayload,
   "artifact.added": artifactPayload,
@@ -1239,7 +1253,9 @@ var runRecordSchema = z.object({
   variantScope: text.optional(),
   variantVersion: text.optional(),
   profile: text.optional(),
-  title: text.optional()
+  title: text.optional(),
+  model: text.optional(),
+  effort: text.optional()
 });
 function upgradeRunRecord(raw) {
   if (!raw || typeof raw !== "object")
@@ -1255,43 +1271,45 @@ function isActiveStatus(status) {
   return ACTIVE_STATUSES.includes(status);
 }
 
-// src/tools/checklist.ts
-var CHECKLIST_WRITE = "checklist_write";
+// src/tools/todo.ts
+var TODO_WRITE = "todo_write";
+var TODO_GUIDANCE = "If the work has several distinct steps or will take more than one tool call, call todo_write before your first other tool call with the steps you know so far, and keep the list current as steps start and finish. " + "Before your final reply, write one final update: mark every fully completed step completed and leave unfinished or blocked steps accurate. Never mark unfinished work completed. " + "The person follows your work from it, and a subagent\u2019s todo list shows as its progress in the person\u2019s list of subagents.";
+var TODO_EVENTS = new Set(["todo.updated", "checklist.updated"]);
 var MARK = { pending: "[ ]", in_progress: "[~]", completed: "[x]" };
-function describeChecklist(items) {
+function describeTodo(items) {
   if (!items.length)
-    return "The checklist is empty.";
+    return "The todo list is empty.";
   return items.map((item) => `${MARK[item.status]} ${item.text}`).join(`
 `);
 }
-function checklistTool(run) {
+function todoTool(run) {
   return {
-    name: CHECKLIST_WRITE,
-    label: "Write the checklist",
-    description: "Keep a checklist of the steps of the current work. The user watches this list to follow your progress, so write it early and keep it current. Send the whole list every time; it replaces the previous one. " + "Use it whenever the work has several distinct steps or will take several tool calls, when the user gives several things to do, and when a subagent brief asks for more than one thing. Do not use it for a single, simple step or for conversation. " + "Statuses: pending, in_progress, completed. Keep exactly one step in_progress while you work, mark a step completed as soon as it is done (not in batches), and add steps you discover. " + "Before your final response, write one final checklist update: mark every fully completed step completed, and leave unfinished or blocked steps in their accurate pending or in_progress status. Never mark unfinished work completed. " + "Only mark a step completed when it is fully done; if something blocks it, keep it in_progress and add a step for the blocker.",
+    name: TODO_WRITE,
+    label: "Write the todo list",
+    description: `Keep a todo list of the steps of the current work. The user watches this list to follow your progress. ${TODO_GUIDANCE} ` + "Send the whole list every time; it replaces the previous one. Do not use it for a single, simple step or for conversation. " + "Statuses: pending, in_progress, completed. Keep exactly one step in_progress while you work, mark a step completed as soon as it is done (not in batches), and add steps you discover. " + "Only mark a step completed when it is fully done; if something blocks it, keep it in_progress and add a step for the blocker.",
     parameters: (Type) => Type.Object({
       items: Type.Array(Type.Object({
         text: Type.String({ description: "One step, as a short imperative line" }),
         status: Type.Union([Type.Literal("pending"), Type.Literal("in_progress"), Type.Literal("completed")])
-      }), { maxItems: MAX_CHECKLIST_ITEMS })
+      }), { maxItems: MAX_TODO_ITEMS })
     }),
     readOnly: true,
     planModeSafe: () => true,
     execute: async (input) => {
       if (!Array.isArray(input.items))
-        return "Send items: the whole checklist as an array.";
-      if (input.items.length > MAX_CHECKLIST_ITEMS)
-        return `Keep the checklist to ${MAX_CHECKLIST_ITEMS} steps or fewer.`;
+        return "Send items: the whole todo list as an array.";
+      if (input.items.length > MAX_TODO_ITEMS)
+        return `Keep the todo list to ${MAX_TODO_ITEMS} steps or fewer.`;
       const items = [];
       for (const raw of input.items) {
         const entry = raw;
-        const parsed = checklistItemSchema.safeParse({ text: typeof entry?.text === "string" ? entry.text.trim() : entry?.text, status: entry?.status });
+        const parsed = todoItemSchema.safeParse({ text: typeof entry?.text === "string" ? entry.text.trim() : entry?.text, status: entry?.status });
         if (!parsed.success)
           return "Every step needs text of 1 to 500 characters and a status of pending, in_progress or completed.";
         items.push(parsed.data);
       }
-      run.emit("checklist.updated", { items });
-      return describeChecklist(items);
+      run.emit("todo.updated", { items });
+      return describeTodo(items);
     }
   };
 }
@@ -1411,11 +1429,12 @@ function checkpointTool(run, slice) {
 
 // src/tools/sessionName.ts
 var SESSION_NAME = "session_name";
+var SESSION_GUIDANCE = "If the request needs tools or changes state \u2014 not a greeting, thanks, or a short conversational reply \u2014 call session_name once before your first other tool call, naming the work from the request. " + "Use one short imperative sentence of at most six words. Revise the name only when the overall objective changes; keep the current name when it does not.";
 function sessionNameTool(current) {
   return {
     name: SESSION_NAME,
     label: "Name the session",
-    description: "Set or revise this session\u2019s name. Name meaningful work early, then revise the name when the overall objective changes; greetings alone need no name. " + 'Use one short imperative sentence describing the objective, at most six words, such as "Add web browser integrations". ' + "You may revise a manually assigned name. Keep a useful current name when the objective is unchanged. This only names your own session.",
+    description: `Set or revise this session\u2019s name. ${SESSION_GUIDANCE} ` + 'For example, "Add web browser integrations". You may revise a manually assigned name. This only names your own session.',
     parameters: (Type) => Type.Object({ name: Type.String({ description: "One short sentence describing the objective, at most six words" }) }),
     planModeSafe: () => true,
     execute: async (input) => {
@@ -1445,7 +1464,7 @@ function clip(text, limit) {
   return charCount(text) <= limit ? text : `${takeChars(text, limit)}\u2026`;
 }
 function renderCompactionCheckpoint(input) {
-  if (!input.checklist.length && !input.planInstructions)
+  if (!input.todo.length && !input.planInstructions)
     return null;
   const parts = [
     "This is current state from the active run after context compaction, not a new user request. Continue the same request. Do not infer that omitted details or decisions were settled.",
@@ -1456,20 +1475,20 @@ ${clip(input.goal.trim(), 1000)}` : "",
 
 ${clip(input.planInstructions, 4000)}` : ""
   ].filter(Boolean);
-  if (input.checklist.length) {
-    const active = input.checklist.filter((item) => item.status !== "completed");
-    const completed = input.checklist.filter((item) => item.status === "completed");
-    const checklist = [
+  if (input.todo.length) {
+    const active = input.todo.filter((item) => item.status !== "completed");
+    const completed = input.todo.filter((item) => item.status === "completed");
+    const todo = [
       active.length ? `### In progress and pending
-${clip(describeChecklist(active), 2500)}` : "",
+${clip(describeTodo(active), 2500)}` : "",
       completed.length ? `### Completed (${completed.length})
-${clip(describeChecklist(completed), 500)}` : ""
+${clip(describeTodo(completed), 500)}` : ""
     ].filter(Boolean).join(`
 
 `);
-    parts.push(`## Current checklist
+    parts.push(`## Current todo list
 
-${checklist}`);
+${todo}`);
   }
   const body = clip(parts.join(`
 
@@ -1815,9 +1834,9 @@ function snapshot(root, runId) {
 // src/sessions/workSlice.ts
 var DEFAULT_SLICE_POLICY = {
   enabled: true,
-  maxToolCalls: 160,
-  maxMinutes: 40,
-  maxNewTokens: 320000,
+  maxToolCalls: 320,
+  maxMinutes: 60,
+  maxNewTokens: 0,
   maxSlices: 8,
   continue: true
 };
@@ -1909,37 +1928,57 @@ function canonical(value, depth = 0) {
 }
 var signature = (name, input) => `${name}\x00${createHash("sha256").update(canonical(input ?? null)).digest("hex")}`;
 var clip2 = (value, limit) => value.length <= limit ? value : `${value.slice(0, limit - 1)}\u2026`;
-function handoffRequest(limit, state) {
-  return clip2(`This reply reached its work-slice limit (${limit}; step ${state.steps}). Call checkpoint_write now with what is done, the single next step, anything blocking, the files you touched and the checks that matter. Then tell the user in a few lines where you stopped. Do not call other tools.`, 600);
+function handoffRequest(limit, state, checkpointAvailable = true) {
+  const handoff = checkpointAvailable ? "Call checkpoint_write now with what is done, the single next step, anything blocking, the files you touched and the checks that matter. Then tell the user in a few lines where you stopped." : "Stop using tools and return a concise partial research report with findings, blockers and the next useful research step. The Harness records an evidence-derived checkpoint.";
+  return clip2(`This reply reached its work-slice limit (${limit}; step ${state.steps}). ${handoff} Do not call other tools.`, 600);
 }
-function stalledNote(reason) {
-  return clip2(`You are repeating work: ${reason}. Do not repeat it. Choose a different approach, read what the earlier attempt returned, or call checkpoint_write with the blocker so the next slice can decide.`, 600);
+function stalledNote(reason, checkpointAvailable = true) {
+  const handoff = checkpointAvailable ? "Choose a different approach, read what the earlier attempt returned, or call checkpoint_write with the blocker so the next slice can decide." : "Do not use more tools. Return concise findings and blockers in your final response; the Harness records an evidence-derived checkpoint.";
+  return clip2(`You are repeating work: ${reason}. Do not repeat it. ${handoff}`, 600);
 }
 function workSliceGuard(options) {
   const { policy, state } = options;
   const calls = new Map;
+  const checkCalls = new Set;
   const edits = new Map;
   const failures = new Map;
-  let stepsSinceProgress = 0;
   let nudged = false;
+  const checkpointAvailable = () => typeof options.checkpointAvailable === "function" ? options.checkpointAvailable() : options.checkpointAvailable !== false;
   const resetRepetition = () => {
     calls.clear();
+    checkCalls.clear();
     edits.clear();
     failures.clear();
-    stepsSinceProgress = 0;
     nudged = false;
   };
   const end = (kind, limit) => {
     state.endedBy = kind;
     state.endedByLimit = limit;
     options.onEnd?.(kind, limit);
-    const reason = kind === "stuck" ? stalledNote(limit) : kind === "compaction-thrash" ? handoffRequest("three context compactions in one reply", state) : handoffRequest(limit, state);
+    const canCheckpoint = checkpointAvailable();
+    const reason = kind === "stuck" ? stalledNote(limit, canCheckpoint) : kind === "compaction-thrash" ? handoffRequest("three context compactions in one reply", state, canCheckpoint) : handoffRequest(limit, state, canCheckpoint);
     return { block: true, terminate: true, reason };
   };
+  const nudge = (reason) => {
+    if (nudged)
+      return end("stuck", reason);
+    nudged = true;
+    const canCheckpoint = checkpointAvailable();
+    if (!canCheckpoint) {
+      state.endedBy = "stuck";
+      state.endedByLimit = reason;
+    }
+    return { block: true, reason: stalledNote(reason, canCheckpoint) };
+  };
   const repeated = (name, input) => {
     if (POLLING_TOOLS.has(name))
       return null;
     const key = signature(name, input);
+    if (name === "bash") {
+      const command = input && typeof input === "object" ? String(input.command ?? "") : "";
+      if (command && looksLikeCheck(command))
+        checkCalls.add(key);
+    }
     const count = (calls.get(key) ?? 0) + 1;
     calls.set(key, count);
     if (count < 3)
@@ -1969,9 +2008,19 @@ function workSliceGuard(options) {
     pi.on("tool_result", (event) => {
       if (event.toolName === "checkpoint_write" && !event.isError) {
         state.checkpointWritten = true;
-        stepsSinceProgress = 0;
         nudged = false;
       }
+      if ((event.toolName === "edit" || event.toolName === "write") && event.isError === false) {
+        const path = event.input && typeof event.input === "object" ? String(event.input.path ?? "") : "";
+        if (path) {
+          edits.set(path, (edits.get(path) ?? 0) + 1);
+          failures.clear();
+          for (const key of checkCalls)
+            calls.delete(key);
+          checkCalls.clear();
+          nudged = false;
+        }
+      }
       if (event.toolName !== "bash")
         return;
       const command = event.input && typeof event.input === "object" ? String(event.input.command ?? "") : "";
@@ -1984,16 +2033,18 @@ function workSliceGuard(options) {
       failures.delete(command);
       edits.clear();
       calls.clear();
-      stepsSinceProgress = 0;
+      checkCalls.clear();
       nudged = false;
     });
     pi.on("tool_call", (event) => {
       const name = event.toolName;
       state.steps += 1;
       state.lastTool = name;
-      const handoff = HANDOFF_TOOLS.has(name);
+      const canCheckpoint = checkpointAvailable();
+      const handoff = canCheckpoint && HANDOFF_TOOLS.has(name);
       if (state.endedBy) {
-        return handoff ? undefined : { block: true, terminate: true, reason: "This reply is over. Its checkpoint is recorded; nothing else runs." };
+        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 ? undefined : { block: true, terminate: true, reason };
       }
       if (state.compactions >= 3) {
         if (handoff) {
@@ -2008,38 +2059,27 @@ function workSliceGuard(options) {
         state.endedBy = "budget";
         state.endedByLimit = limit;
         state.refusedAt ??= state.steps;
-        stepsSinceProgress = 0;
-        return handoff ? undefined : { block: true, reason: handoffRequest(limit, state) };
+        return handoff ? undefined : { block: true, reason: handoffRequest(limit, state, canCheckpoint) };
       }
       if (handoff)
         return;
+      if (name === "todo_write")
+        return;
       const edit = name === "edit" || name === "write";
       const path = edit && event.input && typeof event.input === "object" ? String(event.input.path ?? "") : "";
       if (edit && path) {
-        const count = (edits.get(path) ?? 0) + 1;
-        edits.set(path, count);
-        stepsSinceProgress = 0;
+        const count = edits.get(path) ?? 0;
         if (count >= 4) {
           const reason = `${path} was edited ${count} times with no passing check between`;
-          if (nudged)
-            return end("stuck", reason);
-          nudged = true;
-          return { block: true, reason: stalledNote(reason) };
+          return nudge(reason);
         }
-      } else {
-        stepsSinceProgress += 1;
       }
       const repeat = repeated(name, event.input);
       const failure = failing(name, event.input);
-      const noProgress = stepsSinceProgress >= 25 ? `${stepsSinceProgress} steps with no file change and no passing check` : null;
-      const reason = repeat ?? failure ?? noProgress;
+      const reason = repeat ?? failure;
       if (!reason)
         return;
-      if (nudged)
-        return end("stuck", reason);
-      nudged = true;
-      stepsSinceProgress = 0;
-      return { block: true, reason: stalledNote(reason) };
+      return nudge(reason);
     });
   };
 }
@@ -2119,20 +2159,22 @@ function subagentTools(service, parentRunId) {
   return [{
     name: SPAWN_SUBAGENT,
     label: "Start a subagent",
-    description: "Start a fresh child run for independent work. Delegate substantial, bounded tasks that benefit from a separate context, not simple lookups, tiny edits or tightly coupled steps. Prefer a named specialist profile; omit agent only when no profile fits. Plan mode permits only eligible read-only research profiles. Give a short title and a self-contained brief: the child has no conversation history and no more capabilities than you. Returns its run ID immediately by default so you can continue other useful work. Results arrive automatically before you finish. Use wait_subagents when you need results before proceeding, or wait: true for an inline result. Avoid overlapping write assignments. Stopping you stops your children.",
+    description: "Start a fresh child run for independent work. Delegate substantial, bounded tasks that benefit from a separate context, not simple lookups, tiny edits or tightly coupled steps. Prefer a named specialist profile; omit agent only when no profile fits. Plan mode permits only eligible read-only research profiles. Give a short title and a self-contained brief: the child has no conversation history and no more capabilities than you. The optional tools field only narrows the profile and parent intersection; in plan mode, omit it unless you need a stricter subset. Returns its run ID immediately by default so you can continue other useful work. Results arrive automatically before you finish. Use wait_subagents when you need results before proceeding, or wait: true for an inline result. Avoid overlapping write assignments. Stopping you stops your children. To resume a child that stopped before finishing (interrupted or failed), pass continue with its run ID and no title, agent or tools: it reopens that child's own conversation with the same profile and tools, and brief becomes an optional extra instruction.",
     planModeSafe: (input) => service.planSpawnRefusal(parentRunId, input) === null,
     parameters: (Type) => Type.Object({
-      title: Type.String({ description: `A short imperative title for the roster, at most ${MAX_SUBAGENT_TITLE_WORDS} words, such as "Map the auth flow"` }),
-      brief: Type.String({ description: "A self-contained task: goal, relevant context or paths, non-goals, expected result, and acceptance or verification. The child cannot see this conversation." }),
+      title: Type.Optional(Type.String({ description: `Required for a new child: a short imperative title for the roster, at most ${MAX_SUBAGENT_TITLE_WORDS} words, such as "Map the auth flow"` })),
+      brief: Type.Optional(Type.String({ description: "Required for a new child: a self-contained task: goal, relevant context or paths, non-goals, expected result, and acceptance or verification. The child cannot see this conversation. With continue, an optional extra instruction." })),
+      continue: Type.Optional(Type.String({ description: "The run ID of one of your subagents that stopped before finishing, to continue it from where it stopped instead of starting a fresh child" })),
       agent: Type.Optional(Type.String({ description: "The name of a specialist profile from your Subagents list; omit only when no listed profile fits (omitting starts an unprofiled copy)" })),
-      tools: Type.Optional(Type.Array(Type.String())),
+      tools: Type.Optional(Type.Array(Type.String({ description: "Only request a stricter subset of the profile and parent tools. In plan mode, omit this field to inherit the safe available research intersection." }))),
       wait: Type.Optional(Type.Boolean({ description: "Wait for the child and return its result; default false" }))
     }),
     execute: execute(async (input) => {
-      const title = subagentTitle(input.title);
-      if (!title)
+      const resume = input.continue === undefined ? undefined : input.continue;
+      const title = resume === undefined ? subagentTitle(input.title) : undefined;
+      if (resume === undefined && !title)
         throw invalid(`Give the subagent a title of at most ${MAX_SUBAGENT_TITLE_WORDS} words, with no control characters.`);
-      const child = await service.spawn({ parentRunId, brief: input.brief, title, agent: input.agent, tools: input.tools, wait: input.wait });
+      const child = await service.spawn({ parentRunId, brief: input.brief, title, agent: input.agent, tools: input.tools, wait: input.wait, ...resume === undefined ? {} : { continue: resume } });
       if (input.wait === true)
         return reported(parentRunId, service.results({ parentRunId, runIds: [child.runId] }), [child.runId]);
       return { text: JSON.stringify(child), details: { [SUBAGENT_RECEIPT]: { version: 1, ownerRunId: parentRunId, spawned: [child.runId] } } };
@@ -4925,7 +4967,7 @@ var PLAN_RESEARCH_TOOLS = new Set([
   "grep",
   "find",
   "ls",
-  "checklist_write",
+  "todo_write",
   "session_name",
   "history_search",
   "history_read",
@@ -4955,7 +4997,7 @@ var PLAN_RESEARCH_EVIDENCE_TOOLS = new Set([
 
 // src/agents/builtin.ts
 var RECALL = ["history_search", "history_read", "trajectory_search", "trajectory_read", "wiki_search", "wiki_read", "wiki_list", "skill_load"];
-var PROGRESS = ["checklist_write", "session_name"];
+var PROGRESS = ["todo_write", "session_name"];
 var WEB = ["web_search", "web_fetch"];
 var BUILTIN_PROFILES = [
   {
@@ -4965,7 +5007,7 @@ var BUILTIN_PROFILES = [
     instructions: [
       "You carry out one piece of work from your brief, end to end.",
       "- Read the code you change first and follow the conventions you find.",
-      "- Keep a checklist with checklist_write when the brief has more than one step, and name your session with session_name.",
+      "- Keep a todo list with todo_write when the brief has more than one step, and name your session with session_name.",
       "- Make the change, then check it: run the relevant tests, type checks or commands.",
       "- Stay inside the brief. If something outside it blocks you, stop and say so instead of widening the change.",
       "- Finish with a short report: what you changed (files), how you checked it, and anything left open."
@@ -4984,7 +5026,7 @@ var BUILTIN_PROFILES = [
     instructions: [
       "You answer a question about the code, files or history in your brief. You never change anything.",
       "- Search broadly first, then read the parts that matter.",
-      "- Keep a checklist with checklist_write when the search has several parts, and name your session with session_name.",
+      "- Keep a todo list with todo_write when the search has several parts, and name your session with session_name.",
       "- Cite what you found as path:line.",
       "- Return conclusions, not file dumps: what you found, where, and how sure you are."
     ].join(`
@@ -5016,6 +5058,8 @@ var BUILTIN_PROFILES = [
 
 // src/agents/profiles.ts
 var PROFILE_NAME = /^[a-z0-9][a-z0-9_-]*$/;
+var RESERVED_PROFILE_NAMES = ["main"];
+var reservedRefusal = (name) => `${name} is reserved for the main agent; choose another profile name.`;
 var PROFILE_COLORS = ["blue", "green", "yellow", "red", "magenta", "cyan", "orange", "purple"];
 function projectRoot(cwd) {
   let dir = cwd;
@@ -5067,6 +5111,8 @@ function formatVariant(variant) {
 function parseProfile(text, name, source, path) {
   if (!PROFILE_NAME.test(name))
     throw invalid("A profile name uses lowercase letters, digits, - and _, and starts with a letter or digit.");
+  if (RESERVED_PROFILE_NAMES.includes(name))
+    throw invalid(reservedRefusal(name));
   const parsed = parse(text);
   if (!parsed)
     throw invalid("The profile needs a frontmatter block between --- lines.");
@@ -5131,7 +5177,7 @@ function variantDefinitions(variantDir) {
   if (!folder || !existsSync7(folder))
     return [];
   return readdirSync5(folder).sort().flatMap((name) => {
-    const definition = subagentOf(variantDir, name);
+    const definition = RESERVED_PROFILE_NAMES.includes(name) ? null : subagentOf(variantDir, name);
     if (!definition)
       return [];
     return [{
@@ -5189,6 +5235,8 @@ function createProfile(root, cwd, input) {
   const name = typeof input.name === "string" ? input.name.trim() : "";
   if (!PROFILE_NAME.test(name))
     throw invalid("A profile name uses lowercase letters, digits, - and _, and starts with a letter or digit.");
+  if (RESERVED_PROFILE_NAMES.includes(name))
+    throw invalid(reservedRefusal(name));
   if (input.scope !== "global" && input.scope !== "project")
     throw invalid("scope must be global or project.");
   const dir = scopeDir(root, cwd, input.scope);
@@ -5278,6 +5326,72 @@ function sideQuestionServerMethods(harness) {
   };
 }
 
+// src/core/path.ts
+import { execFileSync } from "child_process";
+import { accessSync, constants, statSync as statSync4 } from "fs";
+import { homedir } from "os";
+import { delimiter, extname, isAbsolute as isAbsolute2, join as join11 } from "path";
+var resolved = null;
+function searchPath() {
+  const platform = process.platform;
+  const pathKey = pathVariableName(process.env);
+  const inherited = process.env[pathKey] ?? "";
+  if (resolved?.platform === platform && resolved.inherited === inherited)
+    return resolved.path;
+  const separator = pathSeparator(platform);
+  const entries = [];
+  if (platform !== "win32") {
+    try {
+      const output = execFileSync(process.env.SHELL || "/bin/zsh", ["-ilc", 'printf %s "$PATH"'], { encoding: "utf8", timeout: 5000, stdio: ["ignore", "pipe", "ignore"] });
+      entries.push(...(output.split(`
+`).filter(Boolean).at(-1) ?? "").split(separator));
+    } catch {}
+  }
+  entries.push(...inherited.split(separator));
+  if (platform !== "win32") {
+    const home = homedir();
+    if (home)
+      entries.push(...[".local/bin", ".bun/bin", ".npm-global/bin", ".cargo/bin"].map((folder) => join11(home, folder)));
+    entries.push("/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin");
+  }
+  const path = [...new Set(entries.filter(Boolean))].join(separator);
+  resolved = { platform, inherited, path };
+  return path;
+}
+function pathVariableName(environment) {
+  return Object.keys(environment).find((name) => name.toLowerCase() === "path") ?? "PATH";
+}
+function pathSeparator(platform) {
+  return platform === "win32" ? ";" : delimiter;
+}
+function isExecutable(path) {
+  try {
+    accessSync(path, process.platform === "win32" ? constants.F_OK : constants.X_OK);
+    return statSync4(path).isFile();
+  } catch {
+    return false;
+  }
+}
+function findBinary(name) {
+  const platform = process.platform;
+  const suffixes = platform === "win32" && !extname(name) ? (process.env.PATHEXT || ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean) : [];
+  const names = [name, ...suffixes.map((suffix) => `${name}${suffix}`)];
+  if (isAbsolute2(name)) {
+    for (const candidate of names)
+      if (isExecutable(candidate))
+        return candidate;
+    return null;
+  }
+  for (const directory of searchPath().split(pathSeparator(platform))) {
+    for (const candidateName of names) {
+      const candidate = join11(directory, candidateName);
+      if (isExecutable(candidate))
+        return candidate;
+    }
+  }
+  return null;
+}
+
 // src/mcp/types.ts
 import { z as z2 } from "zod";
 var MCP_OAUTH_PORT = 47823;
@@ -5417,7 +5531,7 @@ function connectedAppServerMethods(harness) {
 
 // src/tools/dispatch.ts
 import { existsSync as existsSync8, readdirSync as readdirSync6, readFileSync as readFileSync6 } from "fs";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 
 // src/accounts/store.ts
 function scrub(text) {
@@ -5680,7 +5794,7 @@ ${tail}` : ""}`;
   }
 }
 function loadSkill(variantDir, name) {
-  const skills = variantDir && existsSync8(join11(variantDir, "skills")) ? readdirSync6(join11(variantDir, "skills"), { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync8(join11(variantDir, "skills", entry.name, "SKILL.md"))).map((entry) => entry.name).sort() : [];
+  const skills = variantDir && existsSync8(join12(variantDir, "skills")) ? readdirSync6(join12(variantDir, "skills"), { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync8(join12(variantDir, "skills", entry.name, "SKILL.md"))).map((entry) => entry.name).sort() : [];
   const wanted = name.trim().replace(/^skills\//, "").replace(/`/g, "");
   if (!wanted)
     return skills.length ? `Your skills: ${skills.join(", ")}. Load one with skill_load and its name.` : "You have no skills.";
@@ -5688,11 +5802,11 @@ function loadSkill(variantDir, name) {
     throw invalid("A skill name is lowercase letters, digits, _ or -.");
   if (!skills.includes(wanted))
     return `There is no skill named ${wanted}.${skills.length ? ` Your skills: ${skills.join(", ")}.` : ""}`;
-  const dir = join11(variantDir, "skills", wanted);
-  const helpers = existsSync8(join11(dir, "scripts")) ? readdirSync6(join11(dir, "scripts")) : [];
-  return `${readFileSync6(join11(dir, "SKILL.md"), "utf8")}${helpers.length ? `
+  const dir = join12(variantDir, "skills", wanted);
+  const helpers = existsSync8(join12(dir, "scripts")) ? readdirSync6(join12(dir, "scripts")) : [];
+  return `${readFileSync6(join12(dir, "SKILL.md"), "utf8")}${helpers.length ? `
 
-(This skill's helpers are in ${join11(dir, "scripts")}: ${helpers.join(", ")}.)` : ""}`;
+(This skill's helpers are in ${join12(dir, "scripts")}: ${helpers.join(", ")}.)` : ""}`;
 }
 
 // src/tools/harnessTools.ts
@@ -5896,7 +6010,7 @@ var WIKI_PLUGIN = {
 };
 var HISTORY_PLUGIN = { id: "history", title: "History", description: "Search earlier conversations and inspect recorded run trajectories.", required: "Earlier runs are how an agent picks up where work stopped.", tools: tools([...RECALL_TOOLS, ...TRAJECTORY_TOOLS]), toolGroups: ["History"] };
 var ASK_USER_PLUGIN = { id: "ask-user", title: "Ask the user", description: "Lets the agent stop and ask a question with choices.", required: "An agent must be able to stop and ask you.", tools: [{ name: ASK_USER }] };
-var CHECKLIST_PLUGIN = { id: "checklist", title: "Checklist", description: "Lets the agent keep a checklist of the steps of its work, recorded with the run so progress can be shown and picked up again.", required: "Progress of longer work is kept through it.", tools: [{ name: CHECKLIST_WRITE, description: "Write the checklist" }] };
+var TODO_PLUGIN = { id: "todo", title: "Todo", description: "Lets the agent keep a todo list of the steps of its work, recorded with the run so progress can be shown and picked up again.", required: "Progress of longer work is kept through it.", tools: [{ name: TODO_WRITE, description: "Write the todo list" }] };
 var CHECKPOINT_PLUGIN = { id: "checkpoint", title: "Checkpoint", description: "Lets a bounded reply record a handoff at a work-slice boundary so the next slice starts from it.", required: "A reply that stops at its budget leaves the state the next one resumes from.", tools: [{ name: CHECKPOINT_WRITE, description: "Write the handoff checkpoint" }] };
 var CONNECTED_APPS_PLUGIN = {
   id: "connected-apps",
@@ -5945,7 +6059,7 @@ var BUILTIN_PLUGIN_REGISTRY = createBuiltinPluginRegistry([
     serverMethods: historyServerMethods
   },
   { descriptor: ASK_USER_PLUGIN, toolOrder: 40, tools: (context) => context.harnessTools && context.allowedTools.includes(ASK_USER) ? [askUserTool(context.run)] : [] },
-  { descriptor: CHECKLIST_PLUGIN, toolOrder: 50, tools: (context) => context.harnessTools ? [checklistTool(context.run)] : [] },
+  { descriptor: TODO_PLUGIN, toolOrder: 50, tools: (context) => context.harnessTools ? [todoTool(context.run)] : [] },
   { descriptor: CHECKPOINT_PLUGIN, toolOrder: 51, tools: (context) => context.harnessTools && context.allowedTools.includes(CHECKPOINT_WRITE) ? [checkpointTool(context.run, () => sliceOf(context.env.root, context.runId))] : [] },
   {
     descriptor: CONNECTED_APPS_PLUGIN,
@@ -6027,10 +6141,10 @@ function promptCommandAvailable(name, taken, extensionCommands = new Set) {
 }
 
 // src/plugins/commandPrefix.ts
-import { basename as basename3, dirname as dirname4, extname } from "path";
+import { basename as basename3, dirname as dirname4, extname as extname2 } from "path";
 
 // src/plugins/manifest.ts
-import { basename as basename2, join as join12 } from "path";
+import { basename as basename2, join as join13 } from "path";
 import { z as z3 } from "zod";
 var connectorTemplateSchema = z3.object({
   id: z3.string().regex(/^[a-z0-9-]+$/),
@@ -6067,7 +6181,7 @@ function inside(path) {
   }
 }
 function packageManifest(packageRoot) {
-  const manifest = readJsonOr(join12(packageRoot, "package.json"), {});
+  const manifest = readJsonOr(join13(packageRoot, "package.json"), {});
   const own = manifest.harness && typeof manifest.harness === "object" && !Array.isArray(manifest.harness) ? manifest.harness : {};
   return {
     name: typeof manifest.name === "string" && manifest.name ? manifest.name : basename2(packageRoot),
@@ -6099,7 +6213,7 @@ function pluginCommandPrefix(source) {
   const synthetic = /^<[^:>]+:([^>]+)>$/.exec(source.path);
   if (synthetic)
     return slug(synthetic[1]);
-  const file = basename3(source.path, extname(source.path));
+  const file = basename3(source.path, extname2(source.path));
   return slug(file === "index" ? basename3(dirname4(source.path)) : file);
 }
 
@@ -6284,20 +6398,23 @@ class PageOverlay {
       contentWidth: contentWidth(width),
       centered
     };
-    const escapeHint = page.ownsNavigation ? "Esc back/close" : "Esc close";
-    const fullFooter = page.ownsNavigation ? `${escapeHint} \xB7 ${page.hint()}` : [
-      page.hint(),
+    const pageHint = page.hint();
+    const returnsToPage = pageHint.split(" \xB7 ").includes("Esc back");
+    const escapeHint = page.ownsNavigation ? "Esc back/close" : returnsToPage ? "Esc back" : "Esc close";
+    const fullFooter = page.ownsNavigation ? `${escapeHint} \xB7 ${pageHint}` : [
+      pageHint,
       tabs.length > 1 ? "Tab/Shift+Tab sections" : "",
-      escapeHint
+      returnsToPage ? "" : escapeHint
     ].filter(Boolean).join(" \xB7 ");
     const footerWidth = Math.max(0, width - CHROME_PAD * 2);
-    const primaryHint = page.hint().split(" \xB7 ")[0] ?? "";
+    const primaryHint = pageHint.split(" \xB7 ")[0] ?? "";
     const compactFooter = [
       primaryHint,
       !page.ownsNavigation && tabs.length > 1 ? "Tab/\u21E7Tab" : "",
       escapeHint
     ].filter(Boolean).join(" \xB7 ");
-    const footer = visibleWidth2(fullFooter) <= footerWidth ? fullFooter : compactFooter;
+    const navigationFooter = [!page.ownsNavigation && tabs.length > 1 ? "Tab/\u21E7Tab" : "", escapeHint].filter(Boolean).join(" \xB7 ");
+    const footer = visibleWidth2(fullFooter) <= footerWidth ? fullFooter : visibleWidth2(compactFooter) <= footerWidth ? compactFooter : visibleWidth2(navigationFooter) <= footerWidth ? navigationFooter : escapeHint;
     return pageFrame({
       title: "",
       headerLine: tabStrip(tabs, page.activeTab(), inner, theme, "top", this.hoveredTab),
@@ -9002,12 +9119,13 @@ class BrowserPage {
     if (row.hub) {
       const entry = row.hub;
       const installed = this.snapshot?.hub?.installed.some((receipt) => receipt.entry.id === entry.id && receipt.entry.version === entry.version);
-      actions.push({ id: "preview", label: "Preview reviewed content", run: async () => {
-        const page = await this.options.call("terminal.browser.hubPreview", { id: entry.id, version: entry.version });
-        this.showContent(page.content + (page.done ? "" : `
+      if (entry.delivery.kind !== "pi-package")
+        actions.push({ id: "preview", label: "Preview reviewed content", run: async () => {
+          const page = await this.options.call("terminal.browser.hubPreview", { id: entry.id, version: entry.version });
+          this.showContent(page.content + (page.done ? "" : `
 
 [Preview limited to first page.]`));
-      } });
+        } });
       if (!installed)
         actions.push({ id: "install", label: `Install ${entry.version}`, run: async () => {
           if (!await this.options.ui.confirm(`Install ${entry.title}?`, `${entry.description}
@@ -9585,8 +9703,760 @@ The resource is saved for review. Installing grants no attachment, code trust or
   }
 }
 
+// src/plugins/surfaces.ts
+function surfaceBadge(surfaces) {
+  if (!surfaces)
+    return "";
+  return surfaces.terminal === "unavailable" ? "app only" : "better in the app";
+}
+function describePlugin(plugin) {
+  const description = plugin.description || "No description.";
+  return plugin.surfaces ? `${description} ${plugin.surfaces.note}` : description;
+}
+
+// src/terminal/tui/pages/pluginsPage.ts
+import { matchesKey as matchesKey9, truncateToWidth as truncateToWidth9, wrapTextWithAnsi as wrapTextWithAnsi4 } from "@earendil-works/pi-tui";
+var SECTIONS2 = [
+  { id: "plugins", title: "Plugins" },
+  { id: "trust", title: "Trust" },
+  { id: "packages", title: "Packages" }
+];
+var SETTINGS_ROW = "settings:";
+var PACKAGE_ROW = "package:";
+var INSTALL_PACKAGE = "action:install-package";
+var isSwitch = (setting) => setting.min === 0 && setting.max === 1;
+var settingValueText = (setting) => isSwitch(setting) ? setting.value === 1 ? "on" : "off" : `${setting.value.toLocaleString("en-US")}${setting.value === setting.default ? " \xB7 default" : ""}`;
+var settingsOf = (plugin) => plugin.settings ?? [];
+
+class PluginsPage {
+  options;
+  presentation = "fullscreen";
+  plugins;
+  section = "plugins";
+  projectId = null;
+  hubManagedIds = new Set;
+  error;
+  restart = false;
+  busy = false;
+  disposed = false;
+  list;
+  pointerLayout;
+  settingsFor = null;
+  saved = false;
+  settingsList;
+  constructor(options) {
+    this.options = options;
+    this.list = new FilterList({
+      theme: options.theme,
+      search: "always",
+      noun: ["item", "items"],
+      empty: "There is nothing to switch or trust here yet.",
+      onActivate: (row) => {
+        this.open(row.id);
+      }
+    });
+    this.settingsList = new FilterList({
+      theme: options.theme,
+      search: "always",
+      noun: ["setting", "settings"],
+      empty: "This plugin has no settings.",
+      onActivate: (row) => {
+        this.change(row.id);
+      },
+      onCancel: () => this.back()
+    });
+  }
+  get focused() {
+    return this.list.focused;
+  }
+  set focused(value) {
+    this.list.focused = value;
+    this.settingsList.focused = value;
+  }
+  activate() {
+    this.reload();
+  }
+  dispose() {
+    this.disposed = true;
+  }
+  tabs() {
+    const plugin = this.settingsPlugin();
+    return plugin ? [{ id: "settings", title: `Plugins \u203A ${safeText(plugin.title)}` }] : SECTIONS2;
+  }
+  activeTab() {
+    return this.settingsPlugin() ? "settings" : this.section;
+  }
+  hint() {
+    if (this.settingsPlugin())
+      return this.settingsList.query ? "Enter change \xB7 Esc clear" : "Enter change \xB7 Esc back";
+    return this.list.query ? "Enter actions \xB7 Esc clear" : "Enter actions \xB7 type to search";
+  }
+  settingsPlugin() {
+    return this.settingsFor ? this.plugins?.find((plugin) => plugin.id === this.settingsFor) : undefined;
+  }
+  async reload() {
+    try {
+      const { call } = this.options;
+      this.projectId = (await call("plugins.session").catch(() => ({ projectId: null }))).projectId;
+      this.plugins = await call("plugins.list");
+      this.error = undefined;
+      this.hubManagedIds = new Set;
+      try {
+        const overview = await call("hub.list");
+        this.hubManagedIds = new Set(overview.installed.filter((receipt) => receipt.entry.delivery.kind === "pi-package").flatMap((receipt) => receipt.resourceIds));
+      } catch {}
+    } catch (error) {
+      this.error = error instanceof Error ? error.message : String(error);
+    }
+    if (this.disposed)
+      return;
+    this.fill();
+    this.options.changed();
+  }
+  fill() {
+    if (this.settingsFor && !this.settingsPlugin())
+      this.settingsFor = null;
+    this.list.setRows(this.rows());
+    const plugin = this.settingsPlugin();
+    if (plugin)
+      this.settingsList.setRows(settingsOf(plugin).map((setting) => ({
+        id: setting.key,
+        label: safeText(setting.label),
+        detail: settingValueText(setting),
+        tone: isSwitch(setting) ? setting.value === 1 ? "success" : "dim" : "muted",
+        searchText: `${setting.label} ${setting.description}`
+      })));
+  }
+  rows() {
+    if (this.section === "packages")
+      return [
+        ...(this.plugins ?? []).filter((plugin) => plugin.install).map((plugin) => {
+          const source = plugin.install.kind === "folder" ? "local folder" : "package";
+          const hub = this.hubManagedIds.has(plugin.id);
+          return { id: `${PACKAGE_ROW}${plugin.id}`, group: safeText(plugin.title), label: "Manage package", detail: `${source} \xB7 ${hub ? "Hub" : "local"} \xB7 ${plugin.version ?? plugin.install.source}`, tone: "muted", searchText: `${plugin.title} ${plugin.install.source} ${plugin.version ?? ""} package ${hub ? "Hub" : "local"}` };
+        }),
+        { id: INSTALL_PACKAGE, group: "Packages", label: "Install package\u2026", detail: "Folder, npm or Git", tone: "accent", searchText: "install add package plugin npm Git folder" }
+      ];
+    const menu = this.menu();
+    const out = [];
+    const placed = new Set;
+    const settingsRow = (plugin) => {
+      const count = settingsOf(plugin).length;
+      placed.add(plugin.id);
+      return { id: `${SETTINGS_ROW}${plugin.id}`, group: safeText(plugin.title), label: "Settings", detail: `${count} ${count === 1 ? "setting" : "settings"} \u203A`, tone: "muted", searchText: `${plugin.title} settings ${settingsOf(plugin).map((setting) => setting.label).join(" ")}` };
+    };
+    menu.forEach((row, index) => {
+      out.push(this.toRow(row));
+      const last = menu[index + 1]?.plugin.id !== row.plugin.id;
+      if (this.section === "plugins" && last && settingsOf(row.plugin).length)
+        out.push(settingsRow(row.plugin));
+    });
+    if (this.section === "plugins") {
+      for (const plugin of this.plugins ?? [])
+        if (settingsOf(plugin).length && !placed.has(plugin.id))
+          out.push(settingsRow(plugin));
+    }
+    return out;
+  }
+  menu() {
+    const rows = menuRows(this.plugins ?? [], this.projectId);
+    if (this.section === "trust")
+      return rows.filter((row) => row.whole && Boolean(row.plugin.code));
+    if (this.section === "packages")
+      return [];
+    return rows.filter((row) => rowActions(row, this.projectId).some((action) => action.startsWith("Switch ")));
+  }
+  key(row) {
+    return `${row.whole ? "plugin" : "item"}:${row.id}`;
+  }
+  toRow(row) {
+    const kind = row.whole ? row.note : row.note.replace(/ in .*$/, "");
+    return {
+      id: this.key(row),
+      group: safeText(row.plugin.title),
+      label: row.whole ? "Whole plugin" : safeText(row.name),
+      detail: `${row.on ? "on" : "off"}${kind ? ` \xB7 ${kind}` : ""}${row.whole && surfaceBadge(row.plugin.surfaces) ? ` \xB7 ${surfaceBadge(row.plugin.surfaces)}` : ""}`,
+      tone: row.on ? "success" : "dim",
+      searchText: `${row.name} ${row.plugin.title} ${row.note}`
+    };
+  }
+  async open(id) {
+    if (id.startsWith(SETTINGS_ROW)) {
+      this.settingsFor = id.slice(SETTINGS_ROW.length);
+      this.saved = false;
+      this.fill();
+      this.options.changed();
+      return;
+    }
+    if (id === INSTALL_PACKAGE) {
+      await this.installPackage();
+      return;
+    }
+    if (id.startsWith(PACKAGE_ROW)) {
+      const plugin = this.plugins?.find((candidate) => candidate.id === id.slice(PACKAGE_ROW.length));
+      if (plugin?.install)
+        await this.managePackage(plugin);
+      return;
+    }
+    const row = this.menu().find((candidate) => this.key(candidate) === id);
+    if (!row || this.busy)
+      return;
+    this.busy = true;
+    try {
+      const action = await this.options.ui.select(`${row.plugin.title}: ${describePlugin(row.plugin)}`, rowActions(row, this.projectId));
+      if (action && action !== BACK3 && await applyPluginAction(this.options.ui, this.options.call, row, action))
+        this.restart = true;
+    } finally {
+      this.busy = false;
+    }
+    await this.reload();
+  }
+  async installPackage() {
+    if (this.busy)
+      return;
+    this.busy = true;
+    try {
+      const source = await this.options.ui.input("Install local plugin package", "npm:package@version, Git address, or absolute folder path");
+      if (!source?.trim())
+        return;
+      const confirmed = await this.options.ui.confirm("Install package?", `${source.trim()} will be installed without running package code. It arrives switched off and code remains untrusted until reviewed.`);
+      if (!confirmed)
+        return;
+      await this.options.call("plugins.install", { source: source.trim() });
+      this.restart = true;
+      this.options.ui.notify("Installed switched off. Changes apply when this session restarts.", "info");
+      await this.reload();
+    } catch (error) {
+      this.options.ui.notify(error instanceof Error ? error.message : String(error), "error");
+    } finally {
+      this.busy = false;
+      if (!this.disposed)
+        this.options.changed();
+    }
+  }
+  async managePackage(plugin) {
+    if (this.busy || !plugin.install)
+      return;
+    const hubManaged = this.hubManagedIds.has(plugin.id);
+    const actions = [
+      ...hubManaged || plugin.install.kind === "folder" ? [] : ["Update package"],
+      hubManaged ? "Uninstall Hub version" : "Remove package",
+      BACK3
+    ];
+    this.busy = true;
+    try {
+      const action = await this.options.ui.select(`${plugin.title}: ${plugin.install.source}`, actions);
+      if (!action || action === BACK3)
+        return;
+      if (action === "Update package") {
+        const confirmed = await this.options.ui.confirm(`Update ${plugin.title}?`, "Fetches a newer package version without running its scripts. Changed code remains subject to trust review.");
+        if (!confirmed)
+          return;
+        await this.options.call("plugins.update", { pluginId: plugin.id });
+        this.options.ui.notify("Updated. Changes apply when this session restarts.", "info");
+      } else {
+        const title = hubManaged ? `Uninstall ${plugin.title} from Hub?` : `Remove ${plugin.title}?`;
+        const message = hubManaged ? "This removes the exact Hub receipt and only its recorded package resources." : "This removes the installed package. A local folder is moved to the Harness trash.";
+        if (!await this.options.ui.confirm(title, message))
+          return;
+        await this.options.call("plugins.remove", { pluginId: plugin.id });
+        this.options.ui.notify(hubManaged ? "Hub package uninstalled." : "Package removed.", "info");
+      }
+      this.restart = true;
+      await this.reload();
+    } catch (error) {
+      this.options.ui.notify(error instanceof Error ? error.message : String(error), "error");
+    } finally {
+      this.busy = false;
+      if (!this.disposed)
+        this.options.changed();
+    }
+  }
+  back() {
+    this.settingsFor = null;
+    this.saved = false;
+    this.fill();
+  }
+  async change(key) {
+    const plugin = this.settingsPlugin();
+    const setting = plugin && settingsOf(plugin).find((candidate) => candidate.key === key);
+    if (!plugin || !setting || this.busy)
+      return;
+    this.busy = true;
+    try {
+      let value;
+      if (isSwitch(setting))
+        value = setting.value === 1 ? 0 : 1;
+      else {
+        const answer = await this.options.ui.input(`${setting.label} (${setting.min.toLocaleString("en-US")}\u2013${setting.max.toLocaleString("en-US")})`, String(setting.value));
+        if (answer === undefined || !answer.trim())
+          return;
+        const typed = answer.trim().replace(/[,_]/g, "");
+        value = Number(typed);
+        if (!/^-?\d+$/.test(typed) || value < setting.min || value > setting.max) {
+          this.options.ui.notify(`${setting.label} must be a whole number from ${setting.min.toLocaleString("en-US")} to ${setting.max.toLocaleString("en-US")}.`, "error");
+          return;
+        }
+      }
+      const fresh = await this.options.call("plugins.configure", { pluginId: plugin.id, settings: { [setting.key]: value } });
+      if (Array.isArray(fresh))
+        this.plugins = fresh;
+      else
+        await this.reload();
+      this.saved = true;
+      this.fill();
+    } catch (error) {
+      this.options.ui.notify(error instanceof Error ? error.message : String(error), "error");
+    } finally {
+      this.busy = false;
+      if (!this.disposed)
+        this.options.changed();
+    }
+  }
+  handleMouse(event) {
+    const layout = this.pointerLayout;
+    if (!layout)
+      return;
+    if (event.x < 0 || event.x >= layout.width || event.y < layout.top || event.y >= layout.top + layout.rows)
+      return { handled: true, render: false };
+    return layout.list.handleMouse({ ...event, y: event.y - layout.top });
+  }
+  handleInput(data) {
+    if (this.settingsPlugin()) {
+      if (matchesKey9(data, "tab") || matchesKey9(data, "shift+tab"))
+        return true;
+      return this.settingsList.handleInput(data);
+    }
+    if (matchesKey9(data, "tab") || matchesKey9(data, "shift+tab")) {
+      if (!this.list.query) {
+        const direction = matchesKey9(data, "shift+tab") ? -1 : 1;
+        const current = SECTIONS2.findIndex((section) => section.id === this.section);
+        this.section = SECTIONS2[(current + direction + SECTIONS2.length) % SECTIONS2.length].id;
+        this.fill();
+      }
+      return true;
+    }
+    return this.list.handleInput(data);
+  }
+  selectedPlugin() {
+    const selectedId = this.list.selected?.id;
+    return selectedId?.startsWith(SETTINGS_ROW) ? this.plugins?.find((candidate) => `${SETTINGS_ROW}${candidate.id}` === selectedId) : selectedId?.startsWith(PACKAGE_ROW) ? this.plugins?.find((candidate) => `${PACKAGE_ROW}${candidate.id}` === selectedId) : this.menu().find((candidate) => this.key(candidate) === selectedId)?.plugin;
+  }
+  pluginInspector(plugin, width, rows) {
+    const theme = this.options.theme();
+    if (width < 1 || rows < 1)
+      return [];
+    if (!plugin) {
+      const action = this.list.selected?.id === INSTALL_PACKAGE;
+      return [theme.fg("muted", action ? "Add a package from npm, Git, or a local folder." : "Select a plugin to inspect it.")].slice(0, rows).map((line) => truncateToWidth9(line, width, ""));
+    }
+    const selectedId = this.list.selected?.id;
+    const row = this.menu().find((candidate) => this.key(candidate) === selectedId);
+    const title = row ? row.whole ? row.plugin.title : row.name : plugin.title;
+    const lines = [theme.bold(safeText(title))];
+    if (title !== plugin.title)
+      lines.push(theme.fg("dim", `Part of ${safeText(plugin.title)}`));
+    lines.push("", ...wrapTextWithAnsi4(safeText(describePlugin(plugin)), width));
+    if (row) {
+      const status = this.section === "trust" && row.whole ? plugin.trust === "trusted" ? "Code trusted" : "Code not trusted" : row.on ? "Enabled" : "Disabled";
+      lines.push("", theme.fg(row.on ? "success" : "dim", status));
+    }
+    if (plugin.code) {
+      lines.push(theme.fg("muted", `Code trust: ${plugin.trust === "trusted" ? "trusted" : "not trusted"}`));
+      lines.push(theme.fg("muted", `Fingerprint: ${plugin.code.hash.slice(0, 12)}`));
+    }
+    if (plugin.install) {
+      lines.push("", theme.fg("muted", `Package: ${this.hubManagedIds.has(plugin.id) ? "Hub receipt" : "local"}`));
+      lines.push(...wrapTextWithAnsi4(theme.fg("dim", safeText(plugin.install.source)), width));
+    }
+    if (settingsOf(plugin).length)
+      lines.push("", theme.fg("muted", `${settingsOf(plugin).length} settings`));
+    return lines.slice(0, rows).map((line) => truncateToWidth9(line, width, ""));
+  }
+  render(width, rows) {
+    const theme = this.options.theme();
+    if (width < 1 || rows < 1)
+      return [];
+    if (!this.plugins) {
+      this.pointerLayout = undefined;
+      return [theme.fg(this.error ? "error" : "dim", this.error ? `Could not read plugins: ${this.error}` : "Reading plugins\u2026")];
+    }
+    const plugin = this.settingsPlugin();
+    if (plugin)
+      return this.renderSettings(plugin, width, rows);
+    const note = this.restart ? [theme.fg("warning", "Saved. Changes apply when this session restarts.")] : [];
+    const paneWidth = inspectorListWidth(width);
+    if (paneWidth !== undefined) {
+      const bodyRows = Math.max(0, rows - note.length);
+      const rightWidth = Math.max(0, width - paneWidth - 3);
+      const listLines = this.list.render(paneWidth, bodyRows);
+      this.pointerLayout = { list: this.list, width: paneWidth, top: note.length, rows: listLines.length };
+      return [...note, ...splitColumns(listLines, this.pluginInspector(this.selectedPlugin(), rightWidth, bodyRows), paneWidth, width, bodyRows, theme)].slice(0, rows).map((line) => truncateToWidth9(line, width, ""));
+    }
+    const selected = this.selectedPlugin();
+    const detail = selected && rows >= 8 ? wrapTextWithAnsi4(safeText(describePlugin(selected)), width).slice(0, 3) : [];
+    const listRows = Math.max(2, rows - note.length - (detail.length ? detail.length + 1 : 0));
+    const listLines = this.list.render(width, listRows);
+    this.pointerLayout = { list: this.list, width, top: note.length, rows: Math.min(listLines.length, Math.max(0, rows - note.length)) };
+    const lines = [...note, ...listLines];
+    if (detail.length)
+      lines.push("", ...detail.map((line) => theme.fg("muted", line)));
+    return lines.slice(0, rows).map((line) => truncateToWidth9(line, width, ""));
+  }
+  renderSettings(plugin, width, rows) {
+    const theme = this.options.theme();
+    const setting = settingsOf(plugin).find((candidate) => candidate.key === this.settingsList.selected?.id);
+    const range = setting && !isSwitch(setting) ? [`From ${setting.min.toLocaleString("en-US")} to ${setting.max.toLocaleString("en-US")} \xB7 default ${setting.default.toLocaleString("en-US")}`] : [];
+    const note = this.saved ? [theme.fg("success", "Saved.")] : [];
+    const paneWidth = inspectorListWidth(width);
+    if (paneWidth !== undefined) {
+      const bodyRows = Math.max(0, rows - note.length);
+      const rightWidth = Math.max(0, width - paneWidth - 3);
+      const listLines = this.settingsList.render(paneWidth, bodyRows);
+      const details = setting ? [theme.bold(safeText(setting.label)), "", ...wrapTextWithAnsi4(safeText(setting.description), rightWidth), "", ...range.map((line) => theme.fg("muted", line)), theme.fg("dim", `Current value: ${settingValueText(setting)}`)] : [theme.fg("muted", "Select a setting to review its value and description.")];
+      this.pointerLayout = { list: this.settingsList, width: paneWidth, top: note.length, rows: listLines.length };
+      return [...note, ...splitColumns(listLines, details, paneWidth, width, bodyRows, theme)].slice(0, rows).map((line) => truncateToWidth9(line, width, ""));
+    }
+    const detail = setting && rows >= 8 ? [...wrapTextWithAnsi4(safeText(setting.description), width).slice(0, 3), ...range] : [];
+    const listRows = Math.max(2, rows - note.length - (detail.length ? detail.length + 1 : 0));
+    const listLines = this.settingsList.render(width, listRows);
+    this.pointerLayout = { list: this.settingsList, width, top: note.length, rows: Math.min(listLines.length, Math.max(0, rows - note.length)) };
+    const lines = [...note, ...listLines];
+    if (detail.length)
+      lines.push("", ...detail.map((line) => theme.fg("muted", line)));
+    return lines.slice(0, rows).map((line) => truncateToWidth9(line, width, ""));
+  }
+}
+
+// src/terminal/tui/pages/hubPage.ts
+import { matchesKey as matchesKey10, truncateToWidth as truncateToWidth10, wrapTextWithAnsi as wrapTextWithAnsi5 } from "@earendil-works/pi-tui";
+
+// src/terminal/hubMenu.ts
+function hubSummary(entry) {
+  return `${entry.description}
+
+Publisher: ${entry.publisher}
+License: ${entry.license}
+Source: ${entry.sourceUrl}
+
+${entry.delivery.kind === "document" ? "Saved as data for a compatible application. Nothing is created or enabled." : "Installed switched off. Code remains untrusted and approvals remain unchanged."}`;
+}
+async function installHubEntry(ui, call, entry) {
+  if (!await ui.confirm(`Install ${entry.title} ${entry.version}?`, hubSummary(entry)))
+    return;
+  try {
+    const receipt = await call("hub.install", { id: entry.id, version: entry.version });
+    ui.notify(receipt.document ? "Saved in this library for a compatible application." : "Installed, switched off. Use /plugins to review and attach it. Changes apply after restarting the session.", "info");
+  } catch (error) {
+    ui.notify(error instanceof Error ? error.message : String(error), "error");
+  }
+}
+
+// src/terminal/tui/pages/hubPage.ts
+var SECTIONS3 = [
+  { id: "catalog", title: "Catalog" },
+  { id: "installed", title: "Installed" }
+];
+var REFRESH = "action:refresh";
+var installedId = (id, version) => `installed:${id}@${version}`;
+
+class HubPage {
+  options;
+  presentation = "fullscreen";
+  catalog;
+  section = "catalog";
+  error;
+  refreshError;
+  refreshing = false;
+  previewTitle;
+  previewText;
+  previewOffset = 0;
+  previewRows = 1;
+  busy = false;
+  disposed = false;
+  list;
+  pointerLayout;
+  constructor(options) {
+    this.options = options;
+    this.list = new FilterList({
+      theme: options.theme,
+      search: "always",
+      noun: ["entry", "entries"],
+      empty: "No Community entries have been published yet.",
+      onActivate: (row) => {
+        this.activateRow(row.id);
+      }
+    });
+  }
+  get focused() {
+    return this.list.focused;
+  }
+  set focused(value) {
+    this.list.focused = value;
+  }
+  activate() {
+    this.refreshOnOpen();
+  }
+  dispose() {
+    this.disposed = true;
+  }
+  tabs() {
+    return SECTIONS3;
+  }
+  activeTab() {
+    return this.section;
+  }
+  hint() {
+    if (this.previewText !== undefined)
+      return "\u2191\u2193 scroll \xB7 PgUp/PgDn page \xB7 Esc back";
+    if (this.list.query)
+      return "Enter open \xB7 Esc clear";
+    if (this.section === "installed")
+      return "Enter manage receipt \xB7 type to search";
+    const selectedId = this.list.selected?.id;
+    const entry = this.catalog?.entries.find((candidate) => candidate.channel === "community" && candidate.id + "@" + candidate.version === selectedId);
+    if (entry?.delivery.kind === "pi-package")
+      return "Enter install exact version \xB7 type to search";
+    return entry ? "Enter preview or install \xB7 type to search" : "Enter refresh catalog \xB7 type to search";
+  }
+  async refreshOnOpen() {
+    await this.load(false);
+    if (!this.disposed)
+      await this.load(true);
+  }
+  async load(refresh) {
+    if (refresh) {
+      this.refreshing = true;
+      this.options.changed();
+    }
+    try {
+      const catalog = await this.options.call("hub.list", refresh ? { refresh: true } : {});
+      this.catalog = catalog;
+      this.error = undefined;
+      if (refresh) {
+        this.refreshError = catalog.error ?? undefined;
+        if (catalog.error)
+          this.options.ui.notify(`${catalog.error} Using ${catalog.origin} content.`, "warning");
+      } else if (catalog.error) {
+        this.refreshError = catalog.error;
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (refresh)
+        this.refreshError = message;
+      else if (!this.catalog)
+        this.error = message;
+    } finally {
+      this.refreshing = false;
+    }
+    if (this.disposed)
+      return;
+    this.fill();
+    this.options.changed();
+  }
+  fill() {
+    this.list.setRows(this.rows());
+  }
+  rows() {
+    if (this.section === "installed") {
+      const receipts = this.catalog?.installed ?? [];
+      return [
+        ...receipts.map((receipt) => ({
+          id: installedId(receipt.entry.id, receipt.entry.version),
+          label: safeText(receipt.entry.title),
+          group: safeText(receipt.entry.category),
+          detail: `${receipt.entry.channel} \xB7 ${receipt.state ?? "installed"} \xB7 ${receipt.entry.version}`,
+          tone: receipt.state === "installed" ? "success" : "warning",
+          searchText: `${receipt.entry.title} ${receipt.entry.category} ${receipt.entry.id} ${receipt.entry.publisher} ${receipt.entry.channel} ${receipt.state ?? ""}`
+        })),
+        { id: REFRESH, label: "\u27F3 Refresh catalog", group: "Actions", tone: "accent" }
+      ];
+    }
+    const entries = (this.catalog?.entries ?? []).filter((entry) => entry.channel === "community").sort((left, right) => left.category.localeCompare(right.category));
+    return [
+      ...entries.map((entry) => ({
+        id: entry.id + "@" + entry.version,
+        label: safeText(entry.title),
+        group: safeText(entry.category),
+        detail: entry.version,
+        tone: "muted",
+        searchText: `${entry.title} ${entry.category} ${entry.id} ${entry.publisher} ${entry.tags.join(" ")}`
+      })),
+      { id: REFRESH, label: "\u27F3 Refresh catalog", group: "Actions", tone: "accent" }
+    ];
+  }
+  async activateRow(id) {
+    if (this.busy)
+      return;
+    this.busy = true;
+    try {
+      if (id === REFRESH) {
+        await this.load(true);
+        return;
+      }
+      if (id.startsWith("installed:")) {
+        const receipt = this.catalog?.installed.find((candidate) => installedId(candidate.entry.id, candidate.entry.version) === id);
+        if (receipt)
+          await this.manageReceipt(receipt);
+        return;
+      }
+      const entry = this.catalog?.entries.find((candidate) => candidate.channel === "community" && candidate.id + "@" + candidate.version === id);
+      if (entry) {
+        const installAction = `Install exact version ${entry.version}`;
+        const actions = entry.delivery.kind === "pi-package" ? [installAction, "Back"] : ["Preview reviewed content", installAction, "Back"];
+        const action = await this.options.ui.select(`${safeText(entry.title)} \xB7 ${entry.version}`, actions);
+        if (action === "Preview reviewed content")
+          await this.previewEntry(entry);
+        else if (action === installAction) {
+          await installHubEntry(this.options.ui, this.options.call, entry);
+          await this.load(false);
+        }
+      }
+    } finally {
+      this.busy = false;
+    }
+  }
+  async previewEntry(entry) {
+    if (entry.delivery.kind === "pi-package")
+      return;
+    try {
+      const page = await this.options.call("terminal.browser.hubPreview", { id: entry.id, version: entry.version });
+      this.previewTitle = safeText(entry.title);
+      this.previewText = page.content + (page.done ? "" : `
+
+[Preview limited to first page.]`);
+      this.previewOffset = 0;
+      this.pointerLayout = undefined;
+      this.options.changed();
+    } catch (error) {
+      this.options.ui.notify(error instanceof Error ? error.message : String(error), "error");
+    }
+  }
+  async manageReceipt(receipt) {
+    const action = await this.options.ui.select(`${receipt.entry.title} \xB7 ${receipt.entry.channel} \xB7 ${receipt.entry.version}`, ["Uninstall this version", "Back"]);
+    if (action !== "Uninstall this version")
+      return;
+    const confirmed = await this.options.ui.confirm(`Uninstall ${receipt.entry.title}?`, `This removes only resources recorded by the ${receipt.entry.channel} receipt ${receipt.entry.id}@${receipt.entry.version} and revokes their attachment choices.`);
+    if (!confirmed)
+      return;
+    try {
+      await this.options.call("hub.uninstall", { id: receipt.entry.id, version: receipt.entry.version });
+      this.options.ui.notify(`Uninstalled ${receipt.entry.title} ${receipt.entry.version}.`, "info");
+      await this.load(false);
+    } catch (error) {
+      this.options.ui.notify(error instanceof Error ? error.message : String(error), "error");
+    }
+  }
+  status() {
+    const catalog = this.catalog;
+    const error = this.refreshError ?? catalog.error;
+    const lastRefresh = catalog.refreshedAt ? ` \xB7 last refreshed ${catalog.refreshedAt}` : "";
+    if (this.refreshing)
+      return { text: `${catalog.origin} catalog \xB7 refreshing\u2026${lastRefresh}`, tone: "muted" };
+    if (error)
+      return { text: `${catalog.origin} catalog \xB7 refresh failed: ${error}${lastRefresh}`, tone: "warning" };
+    return { text: `${catalog.origin} catalog${catalog.refreshedAt ? ` \xB7 refreshed ${catalog.refreshedAt}` : ""}`, tone: "dim" };
+  }
+  handleMouse(event) {
+    if (this.previewText !== undefined)
+      return { handled: true, render: false };
+    const layout = this.pointerLayout;
+    if (!layout)
+      return;
+    if (event.x < 0 || event.x >= layout.width || event.y < layout.top || event.y >= layout.top + layout.rows)
+      return { handled: true, render: false };
+    return this.list.handleMouse({ ...event, y: event.y - layout.top });
+  }
+  handleInput(data) {
+    if (this.previewText !== undefined) {
+      if (matchesKey10(data, "escape")) {
+        this.previewTitle = undefined;
+        this.previewText = undefined;
+        this.previewOffset = 0;
+        this.options.changed();
+        return true;
+      }
+      const page = Math.max(1, this.previewRows);
+      const delta = matchesKey10(data, "down") ? 1 : matchesKey10(data, "up") ? -1 : matchesKey10(data, "pageDown") ? page : matchesKey10(data, "pageUp") ? -page : 0;
+      if (matchesKey10(data, "home"))
+        this.previewOffset = 0;
+      else if (matchesKey10(data, "end"))
+        this.previewOffset = Number.MAX_SAFE_INTEGER;
+      else
+        this.previewOffset += delta;
+      this.options.changed();
+      return true;
+    }
+    if (matchesKey10(data, "tab") || matchesKey10(data, "shift+tab")) {
+      if (!this.list.query) {
+        this.section = this.section === "catalog" ? "installed" : "catalog";
+        this.fill();
+      }
+      return true;
+    }
+    return this.list.handleInput(data);
+  }
+  entryInspector(entry, installed, width, rows) {
+    const theme = this.options.theme();
+    if (width < 1 || rows < 1)
+      return [];
+    if (!entry)
+      return [theme.fg("muted", "Select an entry to review its publisher, license, and version.")].slice(0, rows);
+    const lines = [theme.bold(safeText(entry.title)), "", ...wrapTextWithAnsi5(safeText(entry.description), width), ""];
+    lines.push(`Category: ${safeText(entry.category)}`, `Publisher: ${safeText(entry.publisher)}`, `License: ${safeText(entry.license)}`, `Version: ${safeText(entry.version)}`, `Channel: ${safeText(entry.channel)}`, `ID: ${safeText(entry.id)}`);
+    lines.push("", ...wrapTextWithAnsi5(theme.fg("dim", `Source: ${safeText(entry.sourceUrl)}`), width));
+    if (installed)
+      lines.push("", `Installed: ${safeText(installed.installedAt)}`, `Receipt: ${safeText(installed.state ?? "installed")} \xB7 ${safeText(installed.entry.channel)}`);
+    if (entry.delivery.kind === "pi-package")
+      lines.push("", theme.fg("warning", "Package code stays switched off and untrusted until reviewed."));
+    return lines.slice(0, rows).map((line) => truncateToWidth10(line, width, ""));
+  }
+  render(width, rows) {
+    const theme = this.options.theme();
+    if (width < 1 || rows < 1)
+      return [];
+    if (this.previewText !== undefined) {
+      const content = this.previewText.split(`
+`).flatMap((line) => wrapTextWithAnsi5(safeText(line), width));
+      this.previewRows = Math.max(1, rows - 1);
+      this.previewOffset = Math.min(this.previewOffset, Math.max(0, content.length - this.previewRows));
+      const header = theme.bold(`Preview \xB7 ${this.previewTitle ?? "Hub entry"} \xB7 ${this.previewOffset + 1}/${Math.max(1, content.length)}`);
+      return [header, ...content.slice(this.previewOffset, this.previewOffset + this.previewRows)].slice(0, rows).map((line) => truncateToWidth10(line, width, ""));
+    }
+    if (!this.catalog) {
+      this.pointerLayout = undefined;
+      return [theme.fg(this.error ? "error" : "dim", this.error ? "Could not read the catalog: " + safeText(this.error) : "Reading the catalog\u2026")];
+    }
+    const selectedId = this.list.selected?.id;
+    const installed = this.section === "installed" ? this.catalog.installed.find((receipt) => installedId(receipt.entry.id, receipt.entry.version) === selectedId) : undefined;
+    const entry = installed?.entry ?? this.catalog.entries.find((candidate) => candidate.channel === "community" && candidate.id + "@" + candidate.version === selectedId);
+    const status = this.status();
+    const statusLine = theme.fg(status.tone, truncateToWidth10(safeText(status.text), width, ""));
+    const paneWidth = inspectorListWidth(width);
+    if (paneWidth !== undefined) {
+      const bodyRows = Math.max(0, rows - 1);
+      const rightWidth = Math.max(0, width - paneWidth - 3);
+      const listLines = this.list.render(paneWidth, bodyRows);
+      this.pointerLayout = { width: paneWidth, top: 1, rows: listLines.length };
+      return [statusLine, ...splitColumns(listLines, this.entryInspector(entry, installed, rightWidth, bodyRows), paneWidth, width, bodyRows, theme)].slice(0, rows).map((line) => truncateToWidth10(line, width, ""));
+    }
+    const detail = entry && rows >= 9 ? [
+      ...wrapTextWithAnsi5(safeText(entry.description), width).slice(0, 3),
+      `${entry.publisher} \xB7 ${entry.license} \xB7 ${entry.id}`,
+      ...installed ? [`Installed ${installed.installedAt} \xB7 ${installed.entry.channel} \xB7 ${installed.state ?? "installed"}`] : []
+    ] : [];
+    const detailHeight = detail.length ? detail.length + 1 : 0;
+    const listLines = this.list.render(width, Math.max(1, rows - 1 - detailHeight));
+    this.pointerLayout = { width, top: 1, rows: Math.min(listLines.length, Math.max(0, rows - 1)) };
+    const lines = [statusLine, ...listLines];
+    if (detail.length)
+      lines.push("", ...detail.map((line) => theme.fg("muted", safeText(line))));
+    return lines.slice(0, rows).map((line) => truncateToWidth10(line, width, ""));
+  }
+}
+
 // src/terminal/tui/pages/logPage.ts
-import { matchesKey as matchesKey9, stripTerminalSequences as stripTerminalSequences3, truncateToWidth as truncateToWidth9, wrapTextWithAnsi as wrapTextWithAnsi4 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey11, stripTerminalSequences as stripTerminalSequences3, truncateToWidth as truncateToWidth11, wrapTextWithAnsi as wrapTextWithAnsi6 } from "@earendil-works/pi-tui";
 var payloadOf = (event) => event.payload && typeof event.payload === "object" ? event.payload : {};
 var stringOf = (value) => typeof value === "string" ? value : undefined;
 var numberOf = (value) => typeof value === "number" && Number.isFinite(value) ? value : undefined;
@@ -9739,25 +10609,25 @@ class LogPage {
   }
   handleInput(data) {
     const page = Math.max(1, this.rows - 1);
-    if (matchesKey9(data, "tab"))
+    if (matchesKey11(data, "tab"))
       this.changeSource(1);
-    else if (matchesKey9(data, "shift+tab"))
+    else if (matchesKey11(data, "shift+tab"))
       this.changeSource(-1);
-    else if (matchesKey9(data, "home")) {
+    else if (matchesKey11(data, "home")) {
       this.offset = 0;
       this.atEnd = false;
-    } else if (matchesKey9(data, "end"))
+    } else if (matchesKey11(data, "end"))
       this.atEnd = true;
-    else if (matchesKey9(data, "up")) {
+    else if (matchesKey11(data, "up")) {
       this.offset = Math.max(0, this.currentOffset() - 1);
       this.atEnd = false;
-    } else if (matchesKey9(data, "down")) {
+    } else if (matchesKey11(data, "down")) {
       this.offset = this.currentOffset() + 1;
       this.atEnd = false;
-    } else if (matchesKey9(data, "pageUp")) {
+    } else if (matchesKey11(data, "pageUp")) {
       this.offset = Math.max(0, this.currentOffset() - page);
       this.atEnd = false;
-    } else if (matchesKey9(data, "pageDown")) {
+    } else if (matchesKey11(data, "pageDown")) {
       this.offset = this.currentOffset() + page;
       this.atEnd = false;
     } else
@@ -9774,7 +10644,7 @@ class LogPage {
     const bodyRows = Math.max(0, rows - 2);
     this.rows = Math.max(1, bodyRows);
     const lines = safe(section.text).split(`
-`).flatMap((line) => line ? wrapTextWithAnsi4(line, width) : [""]);
+`).flatMap((line) => line ? wrapTextWithAnsi6(line, width) : [""]);
     this.maxOffset = Math.max(0, lines.length - bodyRows);
     if (this.atEnd)
       this.offset = this.maxOffset;
@@ -9782,13 +10652,13 @@ class LogPage {
       this.offset = Math.max(0, Math.min(this.maxOffset, this.offset));
     const last = Math.min(lines.length, this.offset + bodyRows);
     const position = theme.fg("dim", `lines ${lines.length ? this.offset + 1 : 0}-${last}/${lines.length}`);
-    return [position, ...lines.slice(this.offset, last)].slice(0, rows).map((line) => truncateToWidth9(line, width, ""));
+    return [position, ...lines.slice(this.offset, last)].slice(0, rows).map((line) => truncateToWidth11(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/permissionsPage.ts
-import { matchesKey as matchesKey10, truncateToWidth as truncateToWidth10, wrapTextWithAnsi as wrapTextWithAnsi5 } from "@earendil-works/pi-tui";
-var SECTIONS2 = [
+import { matchesKey as matchesKey12, truncateToWidth as truncateToWidth12, wrapTextWithAnsi as wrapTextWithAnsi7 } from "@earendil-works/pi-tui";
+var SECTIONS4 = [
   { id: "overview", title: "Overview" },
   { id: "tools", title: "Tools" }
 ];
@@ -9832,7 +10702,7 @@ class PermissionsPage {
     this.disposed = true;
   }
   tabs() {
-    return SECTIONS2;
+    return SECTIONS4;
   }
   activeTab() {
     return this.section;
@@ -9908,7 +10778,7 @@ class PermissionsPage {
     return this.list.handleMouse(event);
   }
   handleInput(data) {
-    if (matchesKey10(data, "tab") || matchesKey10(data, "shift+tab")) {
+    if (matchesKey12(data, "tab") || matchesKey12(data, "shift+tab")) {
       if (!this.list.query) {
         this.section = this.section === "overview" ? "tools" : "overview";
         this.fill();
@@ -9923,16 +10793,16 @@ class PermissionsPage {
       return [];
     if (!this.state)
       return [theme.fg(this.error ? "error" : "dim", this.error ? `Could not read permissions: ${this.error}` : "Reading permissions\u2026")];
-    const note = this.section === "overview" && rows >= 8 ? wrapTextWithAnsi5(NOTE, width).slice(0, 2) : [];
+    const note = this.section === "overview" && rows >= 8 ? wrapTextWithAnsi7(NOTE, width).slice(0, 2) : [];
     const lines = this.list.render(width, Math.max(1, rows - (note.length ? note.length + 1 : 0)));
     if (note.length)
       lines.push("", ...note.map((line) => theme.fg("dim", line)));
-    return lines.slice(0, rows).map((line) => truncateToWidth10(line, width, ""));
+    return lines.slice(0, rows).map((line) => truncateToWidth12(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/settingsPage.ts
-import { matchesKey as matchesKey11, truncateToWidth as truncateToWidth11, wrapTextWithAnsi as wrapTextWithAnsi6 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey13, truncateToWidth as truncateToWidth13, wrapTextWithAnsi as wrapTextWithAnsi8 } from "@earendil-works/pi-tui";
 var CATEGORIES = [
   { id: "appearance", title: "Appearance" },
   { id: "model", title: "Model" },
@@ -10020,11 +10890,11 @@ class SettingsPage {
     return this.list.handleMouse(event);
   }
   handleInput(data) {
-    if (matchesKey11(data, "tab") || matchesKey11(data, "shift+tab")) {
+    if (matchesKey13(data, "tab") || matchesKey13(data, "shift+tab")) {
       const categories = this.categories();
       if (!this.list.query && categories.length > 1) {
         const at = Math.max(0, categories.findIndex((category) => category.id === this.category));
-        this.category = categories[(at + (matchesKey11(data, "shift+tab") ? -1 : 1) + categories.length) % categories.length].id;
+        this.category = categories[(at + (matchesKey13(data, "shift+tab") ? -1 : 1) + categories.length) % categories.length].id;
         this.fill();
       }
       return true;
@@ -10045,16 +10915,16 @@ class SettingsPage {
     const lines = this.list.render(width, Math.max(2, rows - 1 - reserved));
     if (descriptionRows) {
       lines.push("");
-      const wrapped = description ? wrapTextWithAnsi6(safeText(description), Math.max(1, width)) : [];
+      const wrapped = description ? wrapTextWithAnsi8(safeText(description), Math.max(1, width)) : [];
       for (let index = 0;index < descriptionRows; index++)
         lines.push(theme.fg("muted", wrapped[index] ?? ""));
     }
-    return lines.slice(0, rows).map((line) => truncateToWidth11(line, width, ""));
+    return lines.slice(0, rows).map((line) => truncateToWidth13(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/trajectoryPage.ts
-import { matchesKey as matchesKey12, stripTerminalSequences as stripTerminalSequences4, truncateToWidth as truncateToWidth12, visibleWidth as visibleWidth9, wrapTextWithAnsi as wrapTextWithAnsi7 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey14, stripTerminalSequences as stripTerminalSequences4, truncateToWidth as truncateToWidth14, visibleWidth as visibleWidth9, wrapTextWithAnsi as wrapTextWithAnsi9 } from "@earendil-works/pi-tui";
 var ACTIVE = new Set(["queued", "running", "waiting_for_approval", "waiting_for_input"]);
 var payloadOf2 = (event) => event.payload && typeof event.payload === "object" ? event.payload : {};
 var stringOf2 = (value) => typeof value === "string" ? value : undefined;
@@ -10115,7 +10985,7 @@ function durationLine(run) {
   return `${(Math.max(0, end - start) / 1000).toFixed(1)} s \xB7 ${timeOf2(run.startedAt)}`;
 }
 var bySequence = (left, right) => left.sequence - right.sequence;
-var SECTIONS3 = [
+var SECTIONS5 = [
   { id: "runs", title: "Runs" },
   { id: "events", title: "Events" }
 ];
@@ -10178,7 +11048,7 @@ class TrajectoryPage {
     this.eventList.focused = value;
   }
   tabs() {
-    return SECTIONS3;
+    return SECTIONS5;
   }
   activeTab() {
     return this.section;
@@ -10386,10 +11256,10 @@ class TrajectoryPage {
     return this.eventList.handleMouse({ ...event, y: event.y - this.listStart });
   }
   handleInput(data) {
-    if (matchesKey12(data, "tab") || matchesKey12(data, "shift+tab")) {
-      const at = SECTIONS3.findIndex((section) => section.id === this.section);
-      const delta = matchesKey12(data, "shift+tab") ? -1 : 1;
-      this.section = SECTIONS3[(at + delta + SECTIONS3.length) % SECTIONS3.length].id;
+    if (matchesKey14(data, "tab") || matchesKey14(data, "shift+tab")) {
+      const at = SECTIONS5.findIndex((section) => section.id === this.section);
+      const delta = matchesKey14(data, "shift+tab") ? -1 : 1;
+      this.section = SECTIONS5[(at + delta + SECTIONS5.length) % SECTIONS5.length].id;
       return true;
     }
     if (this.section === "runs")
@@ -10402,11 +11272,11 @@ class TrajectoryPage {
       this.changeRun(-1);
       return true;
     }
-    if (matchesKey12(data, "pageUp")) {
+    if (matchesKey14(data, "pageUp")) {
       this.detailOffset = Math.max(0, this.detailOffset - 8);
       return true;
     }
-    if (matchesKey12(data, "pageDown")) {
+    if (matchesKey14(data, "pageDown")) {
       this.detailOffset += 8;
       return true;
     }
@@ -10439,7 +11309,7 @@ class TrajectoryPage {
       lines.push(theme.fg("dim", this.run.goal ? `Prompt: ${this.run.goal.replace(/\s+/g, " ").slice(0, 140)}` : "Prompt text unavailable"));
     if (this.error)
       lines.push(theme.fg("error", `Read error: ${this.error}`));
-    return lines.slice(0, Math.min(rows, 5)).map((line) => truncateToWidth12(line, width, ""));
+    return lines.slice(0, Math.min(rows, 5)).map((line) => truncateToWidth14(line, width, ""));
   }
   detailLines(width, rows) {
     if (rows < 1)
@@ -10447,10 +11317,10 @@ class TrajectoryPage {
     const event = this.selectedEvent;
     const theme = this.options.theme();
     const heading = theme.bold(theme.fg("accent", event ? `Event JSON \xB7 ${event.type} \xB7 #${event.sequence}` : "Event JSON"));
-    const json = event ? wrapTextWithAnsi7(safe2(this.eventJson(event)), Math.max(1, width)) : [this.events.length ? "No event selected" : this.loading ? "Loading recorded events\u2026" : "No recorded events"];
+    const json = event ? wrapTextWithAnsi9(safe2(this.eventJson(event)), Math.max(1, width)) : [this.events.length ? "No event selected" : this.loading ? "Loading recorded events\u2026" : "No recorded events"];
     const visibleRows = Math.max(0, rows - 1);
     this.detailOffset = Math.min(this.detailOffset, Math.max(0, json.length - visibleRows));
-    return [heading, ...json.slice(this.detailOffset, this.detailOffset + visibleRows).map((line) => this.options.theme().fg("dim", line))].slice(0, rows).map((line) => truncateToWidth12(line, width, ""));
+    return [heading, ...json.slice(this.detailOffset, this.detailOffset + visibleRows).map((line) => this.options.theme().fg("dim", line))].slice(0, rows).map((line) => truncateToWidth14(line, width, ""));
   }
   render(width, rows) {
     const theme = this.options.theme();
@@ -10466,7 +11336,7 @@ class TrajectoryPage {
       const list = this.runList.render(width, Math.max(0, rows - lines.length));
       this.listEnd = this.listStart + list.length;
       lines.push(...list);
-      return lines.slice(0, rows).map((line) => truncateToWidth12(line, width, ""));
+      return lines.slice(0, rows).map((line) => truncateToWidth14(line, width, ""));
     }
     if (!this.run) {
       this.listStart = this.listEnd = 0;
@@ -10491,7 +11361,7 @@ class TrajectoryPage {
       this.listEnd = this.listStart + events.length - 1;
       this.detailsStart = paneStart;
       const pane = Array.from({ length: Math.max(events.length, details.length) }, (_, index) => {
-        const left = truncateToWidth12(events[index] ?? "", leftWidth, "");
+        const left = truncateToWidth14(events[index] ?? "", leftWidth, "");
         const gap = " ".repeat(Math.max(0, leftWidth - visibleWidth9(left)));
         return left + gap + theme.fg("dim", " \u2502 ") + (details[index] ?? "");
       });
@@ -10511,12 +11381,12 @@ class TrajectoryPage {
       const detailRows = Math.max(0, rows - lines.length);
       lines.push(...this.detailLines(width, detailRows));
     }
-    return lines.slice(0, rows).map((line) => truncateToWidth12(line, width, ""));
+    return lines.slice(0, rows).map((line) => truncateToWidth14(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/worktreesPage.ts
-import { truncateToWidth as truncateToWidth13, wrapTextWithAnsi as wrapTextWithAnsi8 } from "@earendil-works/pi-tui";
+import { truncateToWidth as truncateToWidth15, wrapTextWithAnsi as wrapTextWithAnsi10 } from "@earendil-works/pi-tui";
 var TABS = [{ id: "worktrees", title: "Worktrees" }];
 var WORKTREE_ACTIONS = {
   switch: "Switch this terminal here (new conversation)",
@@ -10735,15 +11605,15 @@ class WorktreesPage {
     if (!this.overview)
       return [theme.fg("dim", "Reading worktrees\u2026")];
     if (!this.overview.repo) {
-      return wrapTextWithAnsi8(`Worktrees need a git repository. ${this.overview.reason ?? ""}`.trim(), width).slice(0, rows).map((line) => theme.fg("dim", line));
+      return wrapTextWithAnsi10(`Worktrees need a git repository. ${this.overview.reason ?? ""}`.trim(), width).slice(0, rows).map((line) => theme.fg("dim", line));
     }
-    const header = truncateToWidth13(theme.fg("dim", `Repository ${this.overview.repo}`), width, "");
-    return [header, "", ...this.list.render(width, Math.max(1, rows - 2))].slice(0, rows).map((line) => truncateToWidth13(line, width, ""));
+    const header = truncateToWidth15(theme.fg("dim", `Repository ${this.overview.repo}`), width, "");
+    return [header, "", ...this.list.render(width, Math.max(1, rows - 2))].slice(0, rows).map((line) => truncateToWidth15(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/notesPage.ts
-import { truncateToWidth as truncateToWidth14 } from "@earendil-works/pi-tui";
+import { truncateToWidth as truncateToWidth16 } from "@earendil-works/pi-tui";
 var TABS2 = [{ id: "notes", title: "Web annotations" }];
 var NOTE_KINDS = { page: "The whole page", text: "Text I select in the window", element: "An element I click in the window" };
 var NOTE_ACTIONS = {
@@ -10958,12 +11828,12 @@ class NotesPage {
       return [theme.fg("error", `Could not read web annotations: ${this.error}`)];
     if (!this.notes)
       return [theme.fg("dim", "Reading web annotations\u2026")];
-    return this.list.render(width, rows).slice(0, rows).map((line) => truncateToWidth14(line, width, ""));
+    return this.list.render(width, rows).slice(0, rows).map((line) => truncateToWidth16(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/annotatePage.ts
-import { truncateToWidth as truncateToWidth15 } from "@earendil-works/pi-tui";
+import { truncateToWidth as truncateToWidth17 } from "@earendil-works/pi-tui";
 var TABS3 = [{ id: "annotate", title: "Annotate" }];
 var ANNOTATE_ACTIONS = {
   reveal: "Show it in the window",
@@ -11295,7 +12165,7 @@ class AnnotatePage {
     if (this.error)
       lines.push(theme.fg("error", this.error));
     lines.push("");
-    return lines.map((line) => truncateToWidth15(line, width, ""));
+    return lines.map((line) => truncateToWidth17(line, width, ""));
   }
   render(width, rows) {
     const theme = this.options.theme();
@@ -11305,12 +12175,12 @@ class AnnotatePage {
     if (!this.notes)
       return [...header, theme.fg("dim", "Reading page notes\u2026")].slice(0, rows);
     const body = this.list.render(width, Math.max(1, rows - header.length));
-    return [...header, ...body].slice(0, rows).map((line) => truncateToWidth15(line, width, ""));
+    return [...header, ...body].slice(0, rows).map((line) => truncateToWidth17(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/subagentsPage.ts
-import { matchesKey as matchesKey13, stripTerminalSequences as stripTerminalSequences7, truncateToWidth as truncateToWidth18, wrapTextWithAnsi as wrapTextWithAnsi9 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey15, stripTerminalSequences as stripTerminalSequences7, truncateToWidth as truncateToWidth20, wrapTextWithAnsi as wrapTextWithAnsi11 } from "@earendil-works/pi-tui";
 
 // src/terminal/subagentMonitor.ts
 var ACTIVE_SUBAGENT_STATUSES = new Set(["queued", "running", "waiting_for_approval", "waiting_for_input"]);
@@ -11373,6 +12243,8 @@ function profileColor(theme, name) {
       return theme.primary;
     case "purple":
       return theme.purple;
+    case "main":
+      return theme.primary;
     default:
       return theme.accent;
   }
@@ -11415,7 +12287,7 @@ function toolColor(theme, status) {
 }
 
 // src/terminal/opentui/subagentsWidget.ts
-import { stripTerminalSequences as stripTerminalSequences5, truncateToWidth as truncateToWidth16, visibleWidth as visibleWidth10 } from "@earendil-works/pi-tui";
+import { stripTerminalSequences as stripTerminalSequences5, truncateToWidth as truncateToWidth18, visibleWidth as visibleWidth10 } from "@earendil-works/pi-tui";
 
 // src/terminal/tui/workingStatus.ts
 var WORKING_VERBS = [
@@ -11647,7 +12519,7 @@ function formatWorkingDuration(durationMs) {
 var MAX_VISIBLE_ROWS = 3;
 var GAP = "  ";
 function cut(text, width) {
-  return stripTerminalSequences5(truncateToWidth16(text, width, "\u2026"));
+  return stripTerminalSequences5(truncateToWidth18(text, width, "\u2026"));
 }
 function safe3(text) {
   return stripTerminalSequences5(text).replace(/[\x00-\x1f\x7f]/g, " ").replace(/\s+/g, " ").trim();
@@ -11669,20 +12541,21 @@ function mark2(status, frame) {
       return { mark: frame, tone: "warning" };
   }
 }
-function subagentTasks(checklist) {
-  return checklist && checklist.total > 0 ? `${checklist.done} of ${checklist.total} tasks` : null;
+function subagentTasks(todo) {
+  return todo && todo.total > 0 ? `${todo.done} of ${todo.total} tasks` : null;
 }
 function subagentRoster(items, width, frame = getWorkingSpinnerFrames()[0] ?? "") {
-  if (!items.length || width < 1)
+  const children = items.filter((item) => item.relation !== "main");
+  if (!children.length || width < 1)
     return null;
-  const ordered = [...items].sort((left, right) => {
+  const ordered = [...children].sort((left, right) => {
     const active = Number(ACTIVE_SUBAGENT_STATUSES.has(right.status)) - Number(ACTIVE_SUBAGENT_STATUSES.has(left.status));
     return active || left.startedAt.localeCompare(right.startedAt) || left.id.localeCompare(right.id);
   });
   const rows = ordered.slice(0, MAX_VISIBLE_ROWS).map((item) => {
     const status = mark2(item.status, frame);
     const profile = cut(safe3(item.profile?.name ?? "") || "subagent", Math.max(1, Math.min(24, width - 2)));
-    const tasks = subagentTasks(item.checklist);
+    const tasks = subagentTasks(item.todo);
     const used = 2 + visibleWidth10(profile) + GAP.length + (tasks ? GAP.length + tasks.length : 0);
     const title = cut(safe3(item.title) || "Subagent", Math.max(1, width - used));
     return { id: item.id, mark: status.mark, tone: status.tone, profile, color: item.profile?.color ?? null, title, tasks };
@@ -11693,7 +12566,7 @@ function subagentRoster(items, width, frame = getWorkingSpinnerFrames()[0] ?? ""
 
 // src/terminal/tui/status.ts
 import { basename as basename4, sep as sep3 } from "path";
-import { parseColor as parseColor3, stripTerminalSequences as stripTerminalSequences6, truncateToWidth as truncateToWidth17, visibleWidth as visibleWidth11 } from "@earendil-works/pi-tui";
+import { parseColor as parseColor3, stripTerminalSequences as stripTerminalSequences6, truncateToWidth as truncateToWidth19, visibleWidth as visibleWidth11 } from "@earendil-works/pi-tui";
 
 // src/terminal/tui/theme.ts
 import { Theme } from "@earendil-works/pi-coding-agent";
@@ -11953,9 +12826,9 @@ function rowSubtitle(item, width) {
   const available = Math.max(1, width - 2);
   const verbose = width >= 96;
   const account = clean2(item.accountLabel ?? "") || "\u2014";
-  const model = truncateToWidth18(effectiveModel(item), 24, "\u2026");
+  const model = truncateToWidth20(effectiveModel(item), 24, "\u2026");
   const details = verbose ? [`acct ${account}`, `model ${model}`, `eff ${item.effort ?? "\u2014"}`, usageSummary(item)].join(" \xB7 ") : [`a:${account}`, `m:${model}`, `e:${item.effort ?? "\u2014"}`, usageSummary(item)].join(" \xB7 ");
-  return truncateToWidth18(details, available, "\u2026");
+  return truncateToWidth20(details, available, "\u2026");
 }
 
 class SubagentsPage {
@@ -11989,8 +12862,9 @@ class SubagentsPage {
   }
   rows(width = 80, now = this.options.now?.() ?? Date.now()) {
     const ordered = [...this.options.snapshot()].sort((left, right) => {
+      const main = Number(right.relation === "main") - Number(left.relation === "main");
       const active = Number(ACTIVE_SUBAGENT_STATUSES.has(right.status)) - Number(ACTIVE_SUBAGENT_STATUSES.has(left.status));
-      return active || left.startedAt.localeCompare(right.startedAt) || left.id.localeCompare(right.id);
+      return main || active || left.startedAt.localeCompare(right.startedAt) || left.id.localeCompare(right.id);
     });
     return ordered.map((item) => {
       const profile = clean2(item.profile?.name ?? "") || "subagent";
@@ -12015,31 +12889,32 @@ class SubagentsPage {
   render(width, rows) {
     const items = this.rows(width, this.options.now?.() ?? Date.now());
     this.list.setRows(items);
-    const active = items.filter((item) => item.data && ACTIVE_SUBAGENT_STATUSES.has(item.data.status)).length;
+    const children = items.filter((item) => item.data?.relation !== "main");
+    const active = children.filter((item) => item.data && ACTIVE_SUBAGENT_STATUSES.has(item.data.status)).length;
     const selected = this.list.selected?.data;
-    const header = headerRow("Subagents", `${active} active \xB7 ${items.length} total`, width, this.options.theme());
+    const header = headerRow("Subagents", `${active} active \xB7 ${children.length} total`, width, this.options.theme());
     const bodyRows = Math.max(0, rows - 7);
     const listRows = Math.max(1, Math.min(this.list.height, Math.floor(bodyRows * 0.6)));
     const output = [header, "", ...this.list.render(width, listRows), ""];
     if (selected) {
       const theme = this.options.theme();
       const detailIndent = " ".repeat(CHROME_PAD * 2);
-      const detailLines = (text) => wrapTextWithAnsi9(theme.fg("text", clean2(text)), Math.max(1, width - detailIndent.length)).map((line) => `${detailIndent}${line}`);
+      const detailLines = (text) => wrapTextWithAnsi11(theme.fg("text", clean2(text)), Math.max(1, width - detailIndent.length)).map((line) => `${detailIndent}${line}`);
       output.push(neutralRule(width, theme));
       output.push(padded(theme.fg("muted", `Profile: ${clean2(selected.profile?.name ?? "") || "copy of the parent"}`), width));
       output.push(padded(theme.fg("accent", "Task"), width));
-      output.push(...detailLines(selected.goal || "Subagent"));
-      output.push(padded(theme.fg("muted", `Status: ${[selected.status.replaceAll("_", " "), subagentTasks(selected.checklist), terminalSubagentDuration(selected)].filter(Boolean).join(" \xB7 ")}`), width));
+      output.push(...detailLines(selected.goal || (selected.relation === "main" ? "Main agent" : "Subagent")));
+      output.push(padded(theme.fg("muted", `Status: ${[selected.status.replaceAll("_", " "), subagentTasks(selected.todo), terminalSubagentDuration(selected)].filter(Boolean).join(" \xB7 ")}`), width));
       output.push(padded(theme.fg("accent", "Current activity"), width));
       output.push(...detailLines(selected.activity));
     } else {
       output.push(padded(this.options.theme().fg("muted", "The selected subagent\u2019s task and current activity appear here."), width));
     }
-    return output.slice(0, Math.max(0, rows)).map((line) => truncateToWidth18(line, width, ""));
+    return output.slice(0, Math.max(0, rows)).map((line) => truncateToWidth20(line, width, ""));
   }
   handleInput(data) {
     this.list.setRows(this.rows());
-    if (matchesKey13(data, "enter"))
+    if (matchesKey15(data, "enter"))
       return this.list.handleInput(data);
     if (this.list.handleInput(data)) {
       this.options.changed();
@@ -12050,7 +12925,7 @@ class SubagentsPage {
 }
 
 // src/terminal/tui/pages/agentsPage.ts
-import { stripTerminalSequences as stripTerminalSequences8, truncateToWidth as truncateToWidth19, wrapTextWithAnsi as wrapTextWithAnsi10 } from "@earendil-works/pi-tui";
+import { stripTerminalSequences as stripTerminalSequences8, truncateToWidth as truncateToWidth21, wrapTextWithAnsi as wrapTextWithAnsi12 } from "@earendil-works/pi-tui";
 var AGENT_ACTIONS = {
   edit: "Edit in your editor",
   copy: "Copy to a new profile",
@@ -12244,7 +13119,7 @@ class AgentsPage {
       const profile = selected.profile;
       const field = (label, value) => padded(`${theme.fg("muted", `${label}: `)}${theme.fg("text", clean3(value))}`, width);
       output.push(padded(theme.fg("accent", `${profile.name} \xB7 ${profile.color}`), width));
-      output.push(...wrapTextWithAnsi10(theme.fg("text", clean3(profile.description)), textWidth));
+      output.push(...wrapTextWithAnsi12(theme.fg("text", clean3(profile.description)), textWidth));
       output.push(field("Tools", profile.tools?.join(", ") ?? "all of the parent's"));
       output.push(field("Plugins", profile.plugins?.join(", ") ?? "all of the parent's"));
       output.push(field("Variant", formatVariant(profile.variant) ?? "the parent's"));
@@ -12252,7 +13127,7 @@ class AgentsPage {
       output.push(field("File", profile.path ?? "built in"));
       output.push(padded(theme.fg("accent", "Instructions"), width));
       output.push(...profile.instructions.split(`
-`).flatMap((line) => wrapTextWithAnsi10(theme.fg("muted", clean3(line)), textWidth)));
+`).flatMap((line) => wrapTextWithAnsi12(theme.fg("muted", clean3(line)), textWidth)));
     } else if (selected?.kind === "problem") {
       output.push(padded(theme.fg("error", selected.problem.error), width));
       output.push(padded(theme.fg("muted", selected.problem.path), width));
@@ -12260,12 +13135,12 @@ class AgentsPage {
       const dirs = this.overview.dirs;
       output.push(padded(theme.fg("muted", `Your profiles live in ${dirs.global}${dirs.project ? ` and ${dirs.project}` : ""}. A project profile wins over a global one, and both over a built-in one.`), width));
     }
-    return output.slice(0, rows).map((line) => truncateToWidth19(line, width, ""));
+    return output.slice(0, rows).map((line) => truncateToWidth21(line, width, ""));
   }
 }
 
 // src/terminal/tui/pages/usagePage.ts
-import { matchesKey as matchesKey14, stripTerminalSequences as stripTerminalSequences9, truncateToWidth as truncateToWidth20, visibleWidth as visibleWidth12, wrapTextWithAnsi as wrapTextWithAnsi11 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey16, stripTerminalSequences as stripTerminalSequences9, truncateToWidth as truncateToWidth22, visibleWidth as visibleWidth12, wrapTextWithAnsi as wrapTextWithAnsi13 } from "@earendil-works/pi-tui";
 var PERIODS = [
   { key: "1", period: "today", label: "today" },
   { key: "2", period: "7d", label: "7d" },
@@ -12378,7 +13253,7 @@ function bar(percent, width, theme, rejected = false) {
 function spread(left, right, width) {
   if (!right)
     return left;
-  const rightText = truncateToWidth20(right, Math.max(0, width - visibleWidth12(left) - 2), "");
+  const rightText = truncateToWidth22(right, Math.max(0, width - visibleWidth12(left) - 2), "");
   return left + " ".repeat(Math.max(1, width - visibleWidth12(left) - visibleWidth12(rightText))) + rightText;
 }
 
@@ -12472,17 +13347,17 @@ class UsagePage {
   }
   handleInput(data) {
     const page = Math.max(1, this.scrollRows - 1);
-    if (matchesKey14(data, "up"))
+    if (matchesKey16(data, "up"))
       this.offset = Math.max(0, this.offset - 1);
-    else if (matchesKey14(data, "down"))
+    else if (matchesKey16(data, "down"))
       this.offset = Math.min(this.maxOffset, this.offset + 1);
-    else if (matchesKey14(data, "pageUp"))
+    else if (matchesKey16(data, "pageUp"))
       this.offset = Math.max(0, this.offset - page);
-    else if (matchesKey14(data, "pageDown"))
+    else if (matchesKey16(data, "pageDown"))
       this.offset = Math.min(this.maxOffset, this.offset + page);
-    else if (matchesKey14(data, "home"))
+    else if (matchesKey16(data, "home"))
       this.offset = 0;
-    else if (matchesKey14(data, "end"))
+    else if (matchesKey16(data, "end"))
       this.offset = this.maxOffset;
     else if (data === "r") {
       if (this.tab === "limits")
@@ -12509,7 +13384,7 @@ class UsagePage {
     const scope = SCOPES2.find((entry) => entry.scope === summary.scope)?.label ?? summary.scope;
     const period = PERIODS.find((entry) => entry.period === summary.period)?.label ?? summary.period;
     header.push(theme.bold(theme.fg("accent", `${scope} \xB7 ${period}`)));
-    header.push(...wrapTextWithAnsi11(theme.fg("muted", usageLine2(summary.totals)), width));
+    header.push(...wrapTextWithAnsi13(theme.fg("muted", usageLine2(summary.totals)), width));
     const details = [
       summary.totals.cacheHitPercent === null ? null : `${summary.totals.cacheHitPercent}% cache hits`,
       `TTFT ${duration(summary.totals.avgTtftMs)}`,
@@ -12517,9 +13392,9 @@ class UsagePage {
       summary.totals.estimatedCostUsd ? `${money(summary.totals.estimatedCostUsd)} estimated` : null
     ].filter((entry) => Boolean(entry));
     if (details.length)
-      header.push(...wrapTextWithAnsi11(theme.fg("dim", details.join(" \xB7 ")), width));
+      header.push(...wrapTextWithAnsi13(theme.fg("dim", details.join(" \xB7 ")), width));
     if (this.error)
-      header.push(...wrapTextWithAnsi11(theme.fg("error", this.error), width));
+      header.push(...wrapTextWithAnsi13(theme.fg("error", this.error), width));
     const body = [""];
     const total = tokensOf(summary.totals);
     const gap = () => {
@@ -12531,7 +13406,7 @@ class UsagePage {
       const spark = summary.byDay.slice(-14).map((day) => BARS[Math.min(BARS.length - 1, Math.round((day.inputTokens + day.cacheReadTokens + day.outputTokens) / max * (BARS.length - 1)))]).join("");
       body.push(theme.fg("accent", spark));
       for (const day of summary.byDay.slice(-3).reverse()) {
-        body.push(...wrapTextWithAnsi11(theme.fg("muted", `  ${day.day}  ${count(day.inputTokens + day.cacheReadTokens + day.outputTokens)} tokens \xB7 ${count(day.requests)} requests \xB7 ${money(day.costUsd)}`), width));
+        body.push(...wrapTextWithAnsi13(theme.fg("muted", `  ${day.day}  ${count(day.inputTokens + day.cacheReadTokens + day.outputTokens)} tokens \xB7 ${count(day.requests)} requests \xB7 ${money(day.costUsd)}`), width));
       }
     }
     const section = (rows) => {
@@ -12540,7 +13415,7 @@ class UsagePage {
       gap();
       for (const row of rows) {
         const line = `  ${oneLine2(row.label)}  ${share2(tokensOf(row), total)}  ${count(tokensOf(row))} tokens \xB7 ${count(row.requests)} requests \xB7 ${money(row.costUsd)}`;
-        body.push(...wrapTextWithAnsi11(theme.fg("muted", line), width));
+        body.push(...wrapTextWithAnsi13(theme.fg("muted", line), width));
       }
     };
     section(summary.byModel);
@@ -12561,7 +13436,7 @@ class UsagePage {
       return { header, body: [] };
     }
     if (this.error)
-      header.push(...wrapTextWithAnsi11(theme.fg("error", this.error), width));
+      header.push(...wrapTextWithAnsi13(theme.fg("error", this.error), width));
     const body = [];
     const barWidth = Math.max(8, Math.min(16, Math.floor(width / 6)));
     for (const account of report.accounts) {
@@ -12577,11 +13452,11 @@ class UsagePage {
         const source = provider.source === "provider" ? "" : provider.source;
         const meta = [source, ago(provider.observedAt)].filter(Boolean).join(" \xB7 ");
         const tone = provider.source === "unavailable" ? "warning" : "muted";
-        body.push(...wrapTextWithAnsi11(theme.fg(tone, `  ${provider.provider}${meta ? ` \xB7 ${meta}` : ""}${provider.reason ? ` \xB7 ${oneLine2(provider.reason)}` : ""}`), width));
+        body.push(...wrapTextWithAnsi13(theme.fg(tone, `  ${provider.provider}${meta ? ` \xB7 ${meta}` : ""}${provider.reason ? ` \xB7 ${oneLine2(provider.reason)}` : ""}`), width));
         for (const limit of provider.limits) {
           body.push("");
           const reset = until(limit.resetsAt);
-          body.push(...wrapTextWithAnsi11(spread(theme.bold(`  ${oneLine2(limit.label)}`), theme.fg("dim", reset), width), width));
+          body.push(...wrapTextWithAnsi13(spread(theme.bold(`  ${oneLine2(limit.label)}`), theme.fg("dim", reset), width), width));
           const used = limit.usedPercent ?? null;
           const remainingPercent = limit.remainingPercent ?? (used === null ? limit.remaining !== null && limit.remaining !== undefined && limit.limit !== null && limit.limit !== undefined && limit.limit > 0 ? Math.max(0, Math.min(100, limit.remaining / limit.limit * 100)) : null : Math.max(0, Math.min(100, 100 - used)));
           const rejected = limit.status === "rejected";
@@ -12589,7 +13464,7 @@ class UsagePage {
           const absolute = limit.remaining !== null && limit.remaining !== undefined ? `${limit.unit === "usd" ? money(limit.remaining) : limit.unit === "currency" ? `${limit.remaining.toFixed(2)} ${limit.detail ?? ""}`.trim() : count(limit.remaining)} left` : limit.limit !== null && limit.limit !== undefined ? `limit ${count(limit.limit)}${limit.unit && limit.unit !== "percent" ? ` ${limit.unit}` : ""}` : "";
           const value = remainingPercent === null ? absolute || "\u2014" : `${Math.round(remainingPercent)}% left`;
           const suffix = remainingPercent !== null && absolute ? `  ${theme.fg("dim", absolute)}` : "";
-          body.push(...wrapTextWithAnsi11(`  ${bar(remainingPercent, barWidth, theme, rejected)}  ${theme.fg(tone, value)}${suffix}`, width));
+          body.push(...wrapTextWithAnsi13(`  ${bar(remainingPercent, barWidth, theme, rejected)}  ${theme.fg(tone, value)}${suffix}`, width));
         }
       }
     }
@@ -12599,7 +13474,7 @@ class UsagePage {
     if (local) {
       if (body.length)
         body.push("");
-      body.push(...wrapTextWithAnsi11(theme.fg("dim", `7d \xB7 ${count(local.inputTokens + local.cacheReadTokens + local.outputTokens)} tokens \xB7 ${count(local.requests)} requests \xB7 ${money(local.costUsd)}`), width));
+      body.push(...wrapTextWithAnsi13(theme.fg("dim", `7d \xB7 ${count(local.inputTokens + local.cacheReadTokens + local.outputTokens)} tokens \xB7 ${count(local.requests)} requests \xB7 ${money(local.costUsd)}`), width));
     }
     return { header, body };
   }
@@ -12612,7 +13487,7 @@ class UsagePage {
     this.scrollRows = Math.max(1, bodyRows);
     this.maxOffset = Math.max(0, body.length - bodyRows);
     this.offset = Math.max(0, Math.min(this.offset, this.maxOffset));
-    return [...header, ...body.slice(this.offset, this.offset + bodyRows)].slice(0, rows).map((line) => truncateToWidth20(line, width, ""));
+    return [...header, ...body.slice(this.offset, this.offset + bodyRows)].slice(0, rows).map((line) => truncateToWidth22(line, width, ""));
   }
 }
 
@@ -12786,19 +13661,31 @@ function createCommandPage(host, id, options = {}) {
         notify,
         changed: host.changed
       });
+    case "plugins":
+      return new PluginsPage({
+        theme,
+        call: host.control,
+        changed: host.changed,
+        ui: { select: host.ui.select.bind(host.ui), confirm: host.ui.confirm.bind(host.ui), notify, input: host.ui.input.bind(host.ui) }
+      });
+    case "hub":
+      return new HubPage({
+        theme,
+        call: host.control,
+        changed: host.changed,
+        ui: { select: host.ui.select.bind(host.ui), confirm: host.ui.confirm.bind(host.ui), notify }
+      });
     case "harness":
     case "skills":
     case "connections":
     case "tools":
-    case "plugins":
-    case "hub":
     case "components":
       return new BrowserPage({
         theme,
         call: host.control,
         changed: host.changed,
-        section: id === "harness" || id === "hub" ? "overview" : id === "components" ? "library" : id,
-        source: id === "hub" ? "discover" : "installed",
+        section: id === "harness" ? "overview" : id === "components" ? "library" : id,
+        source: "installed",
         ui: {
           select: host.ui.select.bind(host.ui),
           confirm: host.ui.confirm.bind(host.ui),
@@ -13410,7 +14297,7 @@ function createTerminalCommands(host) {
           }
           const target = resolve(host.cwd(), path);
           const within = relative2(host.sessionDirectory(), target);
-          if (within === ".." || within.startsWith("../") || within.startsWith("..\\") || isAbsolute2(within)) {
+          if (within === ".." || within.startsWith("../") || within.startsWith("..\\") || isAbsolute3(within)) {
             throw new Error("Resume sessions from this account history folder.");
           }
           await host.runtime().switchSession(target);
@@ -13519,6 +14406,14 @@ function createTerminalCommands(host) {
         case "trajectory":
           await openPage("trajectory", { runId: argument });
           break;
+        case "todo": {
+          const items = await host.todo();
+          if (!items.length)
+            notify("No todo list in this reply yet. The agent writes one with todo_write for multi-step work.");
+          else
+            host.showTodo(items);
+          break;
+        }
         case "subagents":
           await openPage("subagents");
           break;
@@ -13609,7 +14504,7 @@ var PLAN_READ_ONLY_TOOLS = new Set([
   "find",
   "ls",
   SESSION_NAME,
-  CHECKLIST_WRITE,
+  TODO_WRITE,
   ASK_USER,
   "ask_user_question",
   GET_CAPABILITIES,
@@ -13737,7 +14632,7 @@ function parseProposedPlan(text) {
   };
 }
 // src/terminal/tui/dialogs.ts
-import { Editor, Input as Input2, matchesKey as matchesKey15, stripTerminalSequences as stripTerminalSequences11, truncateToWidth as truncateToWidth21, visibleWidth as visibleWidth13, wrapTextWithAnsi as wrapTextWithAnsi12 } from "@earendil-works/pi-tui";
+import { Editor, Input as Input2, matchesKey as matchesKey17, stripTerminalSequences as stripTerminalSequences11, truncateToWidth as truncateToWidth23, visibleWidth as visibleWidth13, wrapTextWithAnsi as wrapTextWithAnsi14 } from "@earendil-works/pi-tui";
 function selectTheme(theme) {
   return {
     selectedPrefix: (text) => selectionText(theme, text),
@@ -13810,7 +14705,7 @@ class SearchableSelect {
     return this.list.handleMouse(event);
   }
   handleInput(data) {
-    if (matchesKey15(data, "ctrl+c")) {
+    if (matchesKey17(data, "ctrl+c")) {
       this.cancel();
       return;
     }
@@ -13827,7 +14722,7 @@ class SearchableSelect {
       this.list.handleInput(data === "j" ? "\x1B[B" : "\x1B[A");
   }
   render(width) {
-    return this.list.render(Math.max(4, width), this.windowRows() + this.searchRows()).map((line) => truncateToWidth21(line, width, ""));
+    return this.list.render(Math.max(4, width), this.windowRows() + this.searchRows()).map((line) => truncateToWidth23(line, width, ""));
   }
 }
 
@@ -13883,8 +14778,8 @@ class DialogPanel {
     return mouseAware.handleMouse?.({ ...event, y: row });
   }
   handleInput(data) {
-    if (this.detailTotal > this.detailRows && (matchesKey15(data, "pageUp") || matchesKey15(data, "pageDown"))) {
-      const delta = matchesKey15(data, "pageUp") ? -1 : 1;
+    if (this.detailTotal > this.detailRows && (matchesKey17(data, "pageUp") || matchesKey17(data, "pageDown"))) {
+      const delta = matchesKey17(data, "pageUp") ? -1 : 1;
       this.detailOffset = Math.max(0, Math.min(this.detailTotal - this.detailRows, this.detailOffset + delta * Math.max(1, this.detailRows)));
       return;
     }
@@ -13895,7 +14790,7 @@ class DialogPanel {
       return [];
     const theme = this.theme();
     const inner = this.centered ? centerDialogContentWidth(width) : contentWidth(width);
-    const details = this.message ? wrapTextWithAnsi12(stripTerminalSequences11(this.message).replace(/[\x00-\x08\x0b-\x1f\x7f]/g, "").replace(/\t/g, "    "), inner) : [];
+    const details = this.message ? wrapTextWithAnsi14(stripTerminalSequences11(this.message).replace(/[\x00-\x08\x0b-\x1f\x7f]/g, "").replace(/\t/g, "    "), inner) : [];
     const content = this.content.render(inner);
     const frameRows = this.centered ? CENTER_DIALOG_PAD * 2 + 2 : CHROME_ROWS;
     const maxHeight = this.maxRows ? Math.max(3, Math.floor(this.maxRows())) : details.length + content.length + frameRows;
@@ -14042,9 +14937,9 @@ class TerminalDialogs {
           editor.focused = value;
         },
         invalidate: () => editor.invalidate(),
-        render: (width) => editor.render(Math.max(4, width)).map((line) => truncateToWidth21(line, width, "")),
+        render: (width) => editor.render(Math.max(4, width)).map((line) => truncateToWidth23(line, width, "")),
         handleInput: (data) => {
-          if (matchesKey15(data, "escape") || matchesKey15(data, "ctrl+c"))
+          if (matchesKey17(data, "escape") || matchesKey17(data, "ctrl+c"))
             done(undefined);
           else
             editor.handleInput(data);
@@ -14114,7 +15009,7 @@ class TerminalDialogs {
 
 // src/terminal/tui/keybindings.ts
 import { readFileSync as readFileSync7 } from "fs";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 import { KeybindingsManager, TUI_KEYBINDINGS } from "@earendil-works/pi-tui";
 var actions = {
   "app.commands": "ctrl+k",
@@ -14171,7 +15066,7 @@ var HARNESS_KEYBINDINGS = {
 function readBindings(agentDir) {
   let bindings = {};
   try {
-    const source = JSON.parse(readFileSync7(join13(agentDir, "keybindings.json"), "utf8"));
+    const source = JSON.parse(readFileSync7(join14(agentDir, "keybindings.json"), "utf8"));
     if (source && typeof source === "object" && !Array.isArray(source)) {
       bindings = Object.fromEntries(Object.entries(source).filter(([, value]) => typeof value === "string" || Array.isArray(value) && value.every((key) => typeof key === "string")));
     }
@@ -14186,11 +15081,11 @@ function terminalKeybindings(agentDir) {
 }
 
 // src/terminal/tui/piAdapter.ts
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 import { pathToFileURL as pathToFileURL2 } from "url";
 
 // src/pi/runtime.ts
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 import { pathToFileURL } from "url";
 var PINNED_PI_VERSION = "1.4.0";
 var HTTP_DISPATCHER_CHUNK = "dist/bundle/chunks/chunk-MM3LKT73.js";
@@ -14219,7 +15114,7 @@ function createPiLoader(importPi, importDispatcher) {
     return loading;
   };
 }
-var loadPi = createPiLoader(() => import("@earendil-works/pi-coding-agent"), async (packageDir) => await import(pathToFileURL(join14(packageDir, HTTP_DISPATCHER_CHUNK)).href));
+var loadPi = createPiLoader(() => import("@earendil-works/pi-coding-agent"), async (packageDir) => await import(pathToFileURL(join15(packageDir, HTTP_DISPATCHER_CHUNK)).href));
 
 // src/terminal/tui/piAdapter.ts
 var adapter;
@@ -14234,10 +15129,10 @@ function loadPiAdapter() {
     assertPiAdapterVersion(pi.VERSION);
     const root = pi.getPackageDir();
     const [theme, renderers, clipboard, images] = await Promise.all([
-      import(pathToFileURL2(join15(root, "dist/modes/interactive/theme/theme.js")).href),
-      import(pathToFileURL2(join15(root, "dist/core/tools/renderers/index.js")).href),
-      import(pathToFileURL2(join15(root, "dist/utils/clipboard.js")).href),
-      import(pathToFileURL2(join15(root, "dist/utils/clipboard-image.js")).href)
+      import(pathToFileURL2(join16(root, "dist/modes/interactive/theme/theme.js")).href),
+      import(pathToFileURL2(join16(root, "dist/core/tools/renderers/index.js")).href),
+      import(pathToFileURL2(join16(root, "dist/utils/clipboard.js")).href),
+      import(pathToFileURL2(join16(root, "dist/utils/clipboard-image.js")).href)
     ]);
     if (typeof theme.setThemeInstance !== "function" || typeof renderers.withBuiltInRenderers !== "function" || typeof clipboard.readClipboardText !== "function" || typeof clipboard.readClipboardFilePaths !== "function" || typeof images.readClipboardImage !== "function" || typeof images.extensionForImageMimeType !== "function") {
       throw new Error("The pinned Pi terminal adapter no longer exposes its required presentation hooks.");
@@ -14271,10 +15166,10 @@ import {
   SettingsManager
 } from "@earendil-works/pi-coding-agent";
 import { closeSync as closeSync2, existsSync as existsSync10, openSync as openSync2, readSync, realpathSync as realpathSync4 } from "fs";
-import { isAbsolute as isAbsolute4, join as join18, relative as relative4, resolve as resolve4, sep as sep5 } from "path";
+import { isAbsolute as isAbsolute5, join as join19, relative as relative4, resolve as resolve4, sep as sep5 } from "path";
 
 // src/terminal/piExtension.ts
-import { createBashTool, createEditTool, createWriteTool } from "@earendil-works/pi-coding-agent";
+import { createBashTool, createEditTool, createPowerShellTool, createWriteTool } from "@earendil-works/pi-coding-agent";
 import { Type as Type2 } from "typebox";
 
 // src/core/commandBudget.ts
@@ -14324,13 +15219,13 @@ async function withCommandBudget(run, abort, seconds) {
 
 // src/sessions/compactionCheckpoint.ts
 var COMPACTION_CHECKPOINT_EXTENSION = "compaction-checkpoint";
-function validatedChecklist(value) {
-  if (!Array.isArray(value) || value.length > MAX_CHECKLIST_ITEMS)
+function validatedTodo(value) {
+  if (!Array.isArray(value) || value.length > MAX_TODO_ITEMS)
     return null;
   const items = [];
   for (const valueItem of value) {
     const item = valueItem;
-    const parsed = checklistItemSchema.safeParse({
+    const parsed = todoItemSchema.safeParse({
       text: typeof item?.text === "string" ? item.text.trim() : item?.text,
       status: item?.status
     });
@@ -14343,12 +15238,12 @@ function validatedChecklist(value) {
 function compactionCheckpoint(options = {}) {
   return (pi) => {
     let goal = "";
-    let checklist = validatedChecklist(options.initialChecklist ?? []) ?? [];
+    let todo = validatedTodo(options.initialTodo ?? []) ?? [];
     let lastCompactionKey = null;
     let compacted = false;
     const reset = () => {
       goal = "";
-      checklist = validatedChecklist(options.initialChecklist ?? []) ?? [];
+      todo = validatedTodo(options.initialTodo ?? []) ?? [];
       lastCompactionKey = null;
       compacted = false;
     };
@@ -14356,16 +15251,16 @@ function compactionCheckpoint(options = {}) {
       if (event.messageType !== "user")
         return;
       goal = event.prompt;
-      checklist = validatedChecklist(options.initialChecklist ?? []) ?? [];
+      todo = validatedTodo(options.initialTodo ?? []) ?? [];
       lastCompactionKey = null;
       compacted = false;
     });
     pi.on("tool_result", (event) => {
-      if (event.toolName !== CHECKLIST_WRITE || event.isError)
+      if (event.toolName !== TODO_WRITE || event.isError)
         return;
-      const items = validatedChecklist(event.input.items);
+      const items = validatedTodo(event.input.items);
       if (items)
-        checklist = items;
+        todo = items;
     });
     pi.on("context", (event) => {
       const summary = event.messages.findLast((message) => message.role === "compactionSummary");
@@ -14380,7 +15275,7 @@ function compactionCheckpoint(options = {}) {
       }
       if (!compacted)
         return;
-      const content = renderCompactionCheckpoint({ goal, checklist, planInstructions });
+      const content = renderCompactionCheckpoint({ goal, todo, planInstructions });
       if (!content)
         return;
       return {
@@ -14439,26 +15334,26 @@ function parseInitialBashCommand(input) {
 }
 
 // src/core/workspace.ts
-import { lstatSync as lstatSync2, realpathSync, statSync as statSync4 } from "fs";
-import { homedir } from "os";
-import { basename as basename5, dirname as dirname5, isAbsolute as isAbsolute3, join as join16, relative as relative3, resolve as resolve2, sep as sep4 } from "path";
+import { lstatSync as lstatSync2, realpathSync, statSync as statSync5 } from "fs";
+import { homedir as homedir2 } from "os";
+import { basename as basename5, dirname as dirname5, isAbsolute as isAbsolute4, join as join17, relative as relative3, resolve as resolve2, sep as sep4 } from "path";
 function resolveWritePath(candidate, cwd = process.cwd()) {
-  const expanded = candidate === "~" ? homedir() : candidate.startsWith("~/") || candidate.startsWith("~\\") ? join16(homedir(), candidate.slice(2)) : candidate;
-  const absoluteCandidate = isAbsolute3(expanded) ? resolve2(expanded) : resolve2(cwd, expanded);
+  const expanded = candidate === "~" ? homedir2() : candidate.startsWith("~/") || candidate.startsWith("~\\") ? join17(homedir2(), candidate.slice(2)) : candidate;
+  const absoluteCandidate = isAbsolute4(expanded) ? resolve2(expanded) : resolve2(cwd, expanded);
   return canonicalizeTarget(absoluteCandidate);
 }
 function isWithinWorkspace(workspaceRoot, canonicalCandidate) {
   const canonicalRoot = realpathSync(workspaceRoot);
-  if (!statSync4(canonicalRoot).isDirectory())
+  if (!statSync5(canonicalRoot).isDirectory())
     throw invalid("The workspace root must be a directory.");
   const fromRoot = relative3(canonicalRoot, canonicalCandidate);
-  return fromRoot === "" || fromRoot !== ".." && !fromRoot.startsWith(`..${sep4}`) && !isAbsolute3(fromRoot);
+  return fromRoot === "" || fromRoot !== ".." && !fromRoot.startsWith(`..${sep4}`) && !isAbsolute4(fromRoot);
 }
 function verifyWorkspaceRoot(workspaceRoot) {
   const canonicalRoot = realpathSync(workspaceRoot);
   if (dirname5(canonicalRoot) === canonicalRoot)
     throw invalid("The filesystem root cannot be used as an active project workspace.");
-  if (canonicalRoot !== resolve2(workspaceRoot) || !statSync4(canonicalRoot).isDirectory()) {
+  if (canonicalRoot !== resolve2(workspaceRoot) || !statSync5(canonicalRoot).isDirectory()) {
     throw invalid("The active project workspace changed after this run began.");
   }
   return canonicalRoot;
@@ -14508,23 +15403,93 @@ function inspectWorkspaceWrite(workspaceRoot, cwd, tool, input) {
 // src/core/workspaceBashTool.ts
 import { Type } from "typebox";
 
+// src/core/shell.ts
+import { accessSync as accessSync2, constants as constants2, statSync as statSync6 } from "fs";
+import { win32 } from "path";
+var POWERSHELL_ARGS = ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command"];
+var POWERSHELL_UTF8 = `try { [Console]::OutputEncoding=[System.Text.Encoding]::UTF8 } catch {}
+`;
+var cached2;
+function hostShell() {
+  if (cached2 === undefined)
+    cached2 = resolveShell(process.platform);
+  return cached2;
+}
+function resolveShell(platform, lookup = {}) {
+  const env = lookup.env ?? process.env;
+  const exists = lookup.exists ?? isFile;
+  const onPath = lookup.onPath ?? findBinary;
+  if (platform !== "win32") {
+    const executable = ["/bin/bash", "/usr/bin/bash"].find((candidate) => exists(candidate));
+    return executable ? { kind: "bash", executable, args: ["-c"] } : null;
+  }
+  const gitBash = [env.ProgramFiles, env["ProgramFiles(x86)"]].filter((folder) => Boolean(folder)).map((folder) => win32.join(folder, "Git", "bin", "bash.exe")).find((candidate) => exists(candidate));
+  if (gitBash)
+    return { kind: "bash", executable: gitBash, args: ["-c"] };
+  const bashOnPath = onPath("bash.exe");
+  if (bashOnPath && !isWslLauncher(bashOnPath, env))
+    return { kind: "bash", executable: bashOnPath, args: ["-c"] };
+  const existing = (folder, ...parts) => {
+    if (!folder)
+      return null;
+    const candidate = win32.join(folder, ...parts);
+    return exists(candidate) ? candidate : null;
+  };
+  const powershell = onPath("pwsh.exe") ?? existing(env.ProgramFiles, "PowerShell", "7", "pwsh.exe") ?? onPath("powershell.exe") ?? existing(env.SystemRoot, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
+  return powershell ? { kind: "powershell", executable: powershell, args: POWERSHELL_ARGS } : null;
+}
+function shellArguments(shell, command) {
+  return [...shell.args, shell.kind === "powershell" ? `${POWERSHELL_UTF8}${command}` : command];
+}
+function shellLabel(shell) {
+  if (shell.kind === "powershell")
+    return "PowerShell";
+  return /\\git\\/iu.test(shell.executable) ? "Git Bash" : "Bash";
+}
+function isWslLauncher(path, env) {
+  const normalized = win32.normalize(path).toLowerCase();
+  const systemRoot = env.SystemRoot;
+  if (systemRoot) {
+    return ["System32", "Sysnative"].some((folder) => normalized === win32.join(systemRoot, folder, "bash.exe").toLowerCase());
+  }
+  return /^[a-z]:\\windows\\(?:system32|sysnative)\\bash\.exe$/u.test(normalized);
+}
+function isFile(path) {
+  try {
+    accessSync2(path, constants2.F_OK);
+    return statSync6(path).isFile();
+  } catch {
+    return false;
+  }
+}
+
 // src/core/workspaceSandbox.ts
 import { AsyncLocalStorage } from "async_hooks";
 import { spawn } from "child_process";
 import { randomUUID as randomUUID2 } from "crypto";
-import { accessSync, constants, existsSync as existsSync9, lstatSync as lstatSync3, mkdtempSync, realpathSync as realpathSync2, readdirSync as readdirSync7, rmSync as rmSync6, statSync as statSync5 } from "fs";
+import { accessSync as accessSync3, constants as constants3, existsSync as existsSync9, lstatSync as lstatSync3, mkdtempSync, realpathSync as realpathSync2, readdirSync as readdirSync7, rmSync as rmSync6, statSync as statSync7 } from "fs";
 import { tmpdir } from "os";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
+import { spawnSync } from "child_process";
 var MARKER_PREFIX = "__XINGULAR_WORKSPACE_SANDBOX_STARTED_";
 var bashWriteScope = new AsyncLocalStorage;
 function runWithWorkspaceWriteScope(scope, action) {
   return bashWriteScope.run(scope, action);
 }
+var WINDOWS_UNSANDBOXED_REASON = "Windows has no workspace write-boundary sandbox, so this command would run without one. It will not run until this one-call request is approved.";
+var SANDBOX_BACKENDS = {
+  darwin: ["/usr/bin/sandbox-exec"],
+  linux: ["/usr/bin/bwrap", "/bin/bwrap"]
+};
+function workspaceSandboxBackend(platform = process.platform) {
+  const candidates = SANDBOX_BACKENDS[platform];
+  return candidates ? systemExecutable(candidates) : null;
+}
 function systemExecutable(candidates) {
   for (const candidate of candidates) {
     try {
-      accessSync(candidate, constants.X_OK);
-      if (statSync5(candidate).isFile())
+      accessSync3(candidate, constants3.X_OK);
+      if (statSync7(candidate).isFile())
         return candidate;
     } catch {}
   }
@@ -14536,6 +15501,16 @@ function shellPath() {
     throw new Error("The workspace write-boundary sandbox requires Bash, but no Bash executable was found.");
   return shell;
 }
+function requireShell(resolve) {
+  const shell = resolve();
+  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.");
+  }
+  return shell;
+}
+function unconfinedCommand(shell, command) {
+  return { executable: shell.executable, args: shellArguments(shell, command), marker: "" };
+}
 function sbplString(value) {
   return `"${value.replaceAll("\\", "\\\\").replaceAll('"', "\\\"").replaceAll(`
 `, "\\n")}"`;
@@ -14579,13 +15554,13 @@ ${command}`;
     return readOnlySandboxCommand(platform, realpathSync2(readOnlyTempRoot), cwd, shell, wrappedCommand, marker);
   const writeRoots = [...new Set([workspaceRoot, ...additionalWriteRoots].map((root) => realpathSync2(root)))].sort((left, right) => left.length - right.length);
   if (platform === "darwin") {
-    const executable = systemExecutable(["/usr/bin/sandbox-exec"]);
+    const executable = workspaceSandboxBackend(platform);
     if (!executable)
       throw new Error("Workspace write-boundary sandbox unavailable: sandbox-exec was not found. Bash was not run.");
     return { executable, args: ["-p", macSandboxProfile(writeRoots), shell, "-c", wrappedCommand], marker };
   }
   if (platform === "linux") {
-    const executable = systemExecutable(["/usr/bin/bwrap", "/bin/bwrap"]);
+    const executable = workspaceSandboxBackend(platform);
     if (!executable)
       throw new Error("Workspace write-boundary sandbox unavailable: install bubblewrap (bwrap). Bash was not run.");
     return {
@@ -14615,13 +15590,13 @@ ${command}`;
 }
 function readOnlySandboxCommand(platform, tempRoot, cwd, shell, wrappedCommand, marker) {
   if (platform === "darwin") {
-    const executable = systemExecutable(["/usr/bin/sandbox-exec"]);
+    const executable = workspaceSandboxBackend(platform);
     if (!executable)
       throw new Error("Read-only Bash sandbox unavailable: sandbox-exec was not found. Bash was not run.");
     return { executable, args: ["-p", macReadOnlyProfile(tempRoot), shell, "-c", wrappedCommand], marker };
   }
   if (platform === "linux") {
-    const executable = systemExecutable(["/usr/bin/bwrap", "/bin/bwrap"]);
+    const executable = workspaceSandboxBackend(platform);
     if (!executable)
       throw new Error("Read-only Bash sandbox unavailable: install bubblewrap (bwrap). Bash was not run.");
     return {
@@ -14656,7 +15631,11 @@ function readOnlySandboxCommand(platform, tempRoot, cwd, shell, wrappedCommand,
   throw new Error(`Read-only Bash sandbox unavailable on ${platform}. Bash was not run.`);
 }
 function killProcess(child) {
-  if (child.pid && process.platform !== "win32") {
+  if (child.pid && process.platform === "win32") {
+    spawnSync("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+    return;
+  }
+  if (child.pid) {
     try {
       process.kill(-child.pid, "SIGKILL");
       return;
@@ -14793,9 +15772,12 @@ function createWorkspaceBashOperations(workspaceRoot, options = {}) {
       if (!isWithinWorkspace(root, canonicalCwd))
         throw new Error("The Bash working directory is outside the active project workspace.");
       const scope = options.workspaceWriteScope?.() ?? bashWriteScope.getStore() ?? "workspace";
+      const platform = options.platform ?? process.platform;
+      const shell = options.shell ?? hostShell;
       if (scope === "read-only") {
-        const platform = options.platform ?? process.platform;
-        const tempRoot = realpathSync2(mkdtempSync(join17(tmpdir(), "harness-read-only-bash-")));
+        if (platform === "win32")
+          throw new Error("Plan-mode Bash needs a read-only sandbox, which Windows does not have. Bash was not run.");
+        const tempRoot = realpathSync2(mkdtempSync(join18(tmpdir(), "harness-read-only-bash-")));
         try {
           const spec = workspaceSandboxCommand(platform, root, canonicalCwd, command, [], tempRoot);
           const env = { ...execOptions.env ?? process.env, TMPDIR: tempRoot };
@@ -14812,11 +15794,12 @@ function createWorkspaceBashOperations(workspaceRoot, options = {}) {
         bypass = false;
       }
       if (bypass) {
-        const result = await runProcess({ executable: shellPath(), args: ["-c", command], marker: "" }, canonicalCwd, execOptions, null);
+        const result = await runProcess(unconfinedCommand(requireShell(shell), command), canonicalCwd, execOptions, null);
         return { exitCode: result.exitCode };
       }
-      if (scope === "outside") {
-        const reason = "This command requests filesystem writes outside the active project workspace. It will not run until this one-call request is approved.";
+      if (scope === "outside" || platform === "win32") {
+        const resolved = requireShell(shell);
+        const reason = scope === "outside" ? "This command requests filesystem writes outside the active project workspace. It will not run until this one-call request is approved." : WINDOWS_UNSANDBOXED_REASON;
         let approved = false;
         try {
           approved = await options.requestWorkspaceWriteScope?.({ command, cwd: canonicalCwd, workspaceRoot: root, reason }) ?? false;
@@ -14825,14 +15808,14 @@ function createWorkspaceBashOperations(workspaceRoot, options = {}) {
         }
         if (!approved)
           throw new Error(`${reason} Bash was not run.`);
-        execOptions.onData(Buffer.from(`
+        if (scope === "outside")
+          execOptions.onData(Buffer.from(`
 [Outside-workspace writes approved for this command; running once.]
 `));
-        const result = await runProcess({ executable: shellPath(), args: ["-c", command], marker: "" }, canonicalCwd, execOptions, null);
+        const result = await runProcess(unconfinedCommand(resolved, command), canonicalCwd, execOptions, null);
         return { exitCode: result.exitCode };
       }
       assertNoExternalHardlinks(root);
-      const platform = options.platform ?? process.platform;
       const spec = workspaceSandboxCommand(platform, root, canonicalCwd, command);
       const result = await runProcess(spec, canonicalCwd, execOptions, spec.marker);
       return { exitCode: result.exitCode };
@@ -14841,12 +15824,17 @@ function createWorkspaceBashOperations(workspaceRoot, options = {}) {
 }
 
 // src/core/workspaceBashTool.ts
-function withWorkspaceWriteScope(tool) {
+function createWorkspaceShellTool(pi, cwd, operations, shell = hostShell(), platform = process.platform) {
+  const native = shell?.kind === "powershell" ? { ...pi.createPowerShellTool(cwd, { operations }), name: "bash" } : pi.createBashTool(cwd, { operations });
+  const note = platform === "win32" && shell ? ` On this machine commands run in ${shellLabel(shell)}. Windows has no workspace sandbox, so each command asks for approval unless Full Permission is on, and plan mode cannot run commands.` : "";
+  return withWorkspaceWriteScope(native, note);
+}
+function withWorkspaceWriteScope(tool, note = "") {
   const native = tool;
   const execute = native.execute.bind(tool);
   return {
     ...tool,
-    description: `${native.description} Workspace writes are the default. Set workspaceWriteScope to "outside" to request approval before broader writes. Commands run for ${DEFAULT_COMMAND_TIMEOUT_SECONDS} seconds unless timeout says otherwise; above ${COMMAND_TIMEOUT_CEILING_SECONDS} seconds a reason is required, and ${COMMAND_TIMEOUT_MAX_SECONDS} seconds is the maximum.`,
+    description: `${native.description}${note} Workspace writes are the default. Set workspaceWriteScope to "outside" to request approval before broader writes. Commands run for ${DEFAULT_COMMAND_TIMEOUT_SECONDS} seconds unless timeout says otherwise; above ${COMMAND_TIMEOUT_CEILING_SECONDS} seconds a reason is required, and ${COMMAND_TIMEOUT_MAX_SECONDS} seconds is the maximum.`,
     parameters: Type.Object({
       command: Type.String({ description: "Shell command to execute" }),
       timeout: Type.Optional(Type.Number({ description: `Timeout in seconds (default ${DEFAULT_COMMAND_TIMEOUT_SECONDS})` })),
@@ -14873,7 +15861,7 @@ function withWorkspaceWriteScope(tool) {
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
 import { spawn as spawn2 } from "child_process";
 import { createHash as createHash2 } from "crypto";
-import { constants as fsConstants, realpathSync as realpathSync3, statSync as statSync6 } from "fs";
+import { constants as fsConstants, realpathSync as realpathSync3, statSync as statSync8 } from "fs";
 import { access, readFile } from "fs/promises";
 import { dirname as dirname6, resolve as resolve3 } from "path";
 var writeAuthorization = new AsyncLocalStorage2;
@@ -14922,6 +15910,23 @@ try {
   throw error
 }
 `;
+function atomicWriteLaunch(platform, root, additionalRoots) {
+  if (platform === "win32") {
+    const env = {};
+    for (const name of ["SystemRoot", "windir", "TEMP", "TMP", "USERPROFILE"]) {
+      if (process.env[name])
+        env[name] = process.env[name];
+    }
+    return { executable: process.execPath, args: ["-e", atomicWriteScript], env };
+  }
+  const command = `exec ${shellQuote(process.execPath)} -e ${shellQuote(atomicWriteScript)}`;
+  const spec = workspaceSandboxCommand(platform, root, root, command, additionalRoots);
+  return {
+    executable: spec.executable,
+    args: spec.args,
+    env: { PATH: "/usr/bin:/bin", ...process.env.HOME ? { HOME: process.env.HOME } : {} }
+  };
+}
 function shellQuote(value) {
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
@@ -14930,7 +15935,7 @@ function nearestExistingDirectory(path) {
   while (true) {
     try {
       const canonical = realpathSync3(current);
-      if (!statSync6(canonical).isDirectory())
+      if (!statSync8(canonical).isDirectory())
         throw new Error(`Write scope is not a directory: ${canonical}`);
       return canonical;
     } catch (error) {
@@ -14962,17 +15967,12 @@ async function runAtomicWrite(authorization, path, content) {
     throw new Error("The write authorization no longer matches the active workspace target.");
   }
   const additionalRoots = outside ? [nearestExistingDirectory(canonicalPath)] : [];
-  const command = `exec ${shellQuote(process.execPath)} -e ${shellQuote(atomicWriteScript)}`;
-  const spec = workspaceSandboxCommand(process.platform, root, root, command, additionalRoots);
-  const env = {
-    PATH: "/usr/bin:/bin",
-    ...process.env.HOME ? { HOME: process.env.HOME } : {}
-  };
+  const launch = atomicWriteLaunch(process.platform, root, additionalRoots);
   await new Promise((resolvePromise, rejectPromise) => {
-    const child = spawn2(spec.executable, spec.args, {
+    const child = spawn2(launch.executable, launch.args, {
       cwd: root,
       detached: process.platform !== "win32",
-      env,
+      env: launch.env,
       stdio: ["pipe", "pipe", "pipe"],
       windowsHide: true
     });
@@ -15095,6 +16095,7 @@ async function piExtension_default(pi, planRun, getSession) {
   let context = null;
   let nativeSubagents = false;
   let subagentParent = false;
+  let stoppedChildren = null;
   let timer = null;
   let polling = false;
   let failure;
@@ -15179,14 +16180,14 @@ async function piExtension_default(pi, planRun, getSession) {
     },
     workspaceWriteScope: () => planRun?.active ? "read-only" : undefined
   });
-  pi.registerTool(withWorkspaceWriteScope(createBashTool(process.cwd(), { operations: workspaceBash })));
+  pi.registerTool(createWorkspaceShellTool({ createBashTool, createPowerShellTool }, process.cwd(), workspaceBash));
   pi.registerTool(withWorkspaceWriteAuthorization(createWriteTool(process.cwd(), { operations: workspaceWriteOperations }), writeAuthorizations));
   pi.registerTool(withWorkspaceWriteAuthorization(createEditTool(process.cwd(), { operations: workspaceEditOperations }), writeAuthorizations));
   compactionCheckpoint({ planInstructions: () => planRun?.active ? PLAN_INSTRUCTIONS : null })(pi);
   const slicePolicy = parseWorkSlice(undefined);
   const sliceState = createSliceState(slicePolicy);
   if (slicePolicy.enabled)
-    workSliceGuard({ policy: slicePolicy, state: sliceState })(pi);
+    workSliceGuard({ policy: slicePolicy, state: sliceState, checkpointAvailable: () => !planRun?.active || planRun.allowedTools.has(CHECKPOINT_WRITE) })(pi);
   pi.on("context", (event) => {
     const messages = pruneToolImages(event.messages);
     return messages === event.messages ? undefined : { messages };
@@ -15195,7 +16196,7 @@ async function piExtension_default(pi, planRun, getSession) {
     context = ctx;
     if (timer)
       clearInterval(timer);
-    await terminalCall("ready", { nativeSessionId: ctx.sessionManager.getSessionFile() });
+    await terminalCall("ready", { nativeSessionId: ctx.sessionManager.getSessionFile(), owners: subagentHistory(ctx.sessionManager.getBranch?.() ?? []).owners });
     timer = setInterval(() => {
       if (polling || !context)
         return;
@@ -15223,15 +16224,19 @@ async function piExtension_default(pi, planRun, getSession) {
     usage = emptyUsage();
     reasoningTokens = undefined;
     costReported = false;
-    const begun = await terminalCall("begin", { text: event.messageType === "user" ? event.prompt : "" });
+    const begun = await terminalCall("begin", { text: event.messageType === "user" ? event.prompt : "", model: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : null, effort: pi.getThinkingLevel?.() ?? null });
     workspaceRoot = typeof begun.workspaceRoot === "string" ? begun.workspaceRoot : null;
     if (!workspaceRoot)
       throw new Error("The active project workspace could not be resolved; the turn was not started.");
+    pi.appendEntry(SUBAGENT_OWNER, { runId: begun.runId });
+    stoppedChildren = null;
     if (nativeSubagents) {
-      pi.appendEntry(SUBAGENT_OWNER, { runId: begun.runId });
       const snapshot = await controlCall("terminal.subagents.register", { tools: pi.getActiveTools(), model: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : null, effort: pi.getThinkingLevel(), plan: planRun?.active === true, history: subagentHistory(ctx.sessionManager.getBranch()) });
       if (planRun && Array.isArray(snapshot.connectors))
         planRun.connectors = snapshot.connectors;
+      if (planRun && snapshot.subagentProfiles)
+        planRun.subagentProfiles = snapshot.subagentProfiles;
+      stoppedChildren = snapshot.notice ?? null;
       subagentParent = true;
     }
     if (planRun && event.messageType === "user") {
@@ -15294,6 +16299,12 @@ async function piExtension_default(pi, planRun, getSession) {
     const instruction = refusal ? `The user's initial Bash command was not run. Reason: ${refusal}. Do not claim that it ran; explain the limitation and ask how to proceed.` : "The user\u2019s initial Bash command has already run. Read its native Bash result and explain what it shows. Do not run the same command again unless the user explicitly asks.";
     return { message: { customType: "xingular-initial-bash", content: instruction, display: false, details: {} } };
   });
+  pi.on("before_agent_start", async () => {
+    const notice = stoppedChildren;
+    stoppedChildren = null;
+    if (notice)
+      return { message: { customType: SUBAGENT_RESULTS, content: notice.text, display: false, details: { [SUBAGENT_RECEIPT]: notice.receipt } } };
+  });
   const deliverChildren = async (event, ctx, settle) => {
     if (!nativeSubagents || settle && event.outcome !== "completed" || ctx.signal?.aborted)
       return;
@@ -15467,17 +16478,17 @@ async function piExtension_default(pi, planRun, getSession) {
     }
   });
   let recorded = Promise.resolve();
-  const checklist = checklistTool({ emit: (_type, payload) => {
-    recorded = terminalCall("checklist", payload);
+  const todo = todoTool({ emit: (_type, payload) => {
+    recorded = terminalCall("todo", payload);
   } });
   pi.registerTool({
-    name: checklist.name,
-    label: checklist.label,
-    description: checklist.description,
-    parameters: Type2.Unsafe(checklist.parameters(Type2)),
+    name: todo.name,
+    label: todo.label,
+    description: todo.description,
+    parameters: Type2.Unsafe(todo.parameters(Type2)),
     async execute(_id, input) {
       recorded = Promise.resolve();
-      const result = await checklist.execute(input);
+      const result = await todo.execute(input);
       await recorded;
       return { content: [{ type: "text", text: typeof result === "string" ? result : result.text }], details: undefined };
     }
@@ -15698,7 +16709,7 @@ function parseTerminalArguments(args) {
 }
 function assertTerminalHistoryPath(path, sessionDirectory) {
   const within = relative4(realpathSync4(sessionDirectory), realpathSync4(path));
-  if (!within || within === ".." || within.startsWith(`..${sep5}`) || isAbsolute4(within)) {
+  if (!within || within === ".." || within.startsWith(`..${sep5}`) || isAbsolute5(within)) {
     throw new Error("Resume only from this terminal history folder. Use /import for another native session file in this working folder.");
   }
 }
@@ -15726,7 +16737,7 @@ function assertTerminalSessionScope(path, cwd, cwdOverride) {
   } catch {
     throw new Error("This file does not have a readable native session header.");
   }
-  if (header.type !== "session" || !header.cwd || !isAbsolute4(header.cwd)) {
+  if (header.type !== "session" || !header.cwd || !isAbsolute5(header.cwd)) {
     throw new Error("The native session must record its original absolute working folder.");
   }
   if (realpathSync4(header.cwd) !== realpathSync4(cwd)) {
@@ -15737,7 +16748,7 @@ async function createTerminalRuntime(args, host) {
   const prepared = parseTerminalArguments(args);
   const cwd = realpathSync4(process.cwd());
   const agentDirValue = process.env.PI_CODING_AGENT_DIR;
-  if (!agentDirValue || !isAbsolute4(agentDirValue))
+  if (!agentDirValue || !isAbsolute5(agentDirValue))
     throw new Error("The Harness terminal requires its isolated account directory.");
   const agentDir = realpathSync4(agentDirValue);
   const sessionDirectory = realpathSync4(resolve4(cwd, prepared.sessionDir));
@@ -15751,7 +16762,7 @@ async function createTerminalRuntime(args, host) {
   const identity = await controlCall("accounts.session").catch(() => null);
   const account = identity && typeof identity.accountId === "string" && typeof identity.label === "string" ? Object.freeze({ accountId: identity.accountId, label: identity.label }) : null;
   await loadPiAdapter();
-  const modelRuntime = await ModelRuntime.create({ authPath: join18(agentDir, "auth.json"), modelsPath: join18(agentDir, "models.json") });
+  const modelRuntime = await ModelRuntime.create({ authPath: join19(agentDir, "auth.json"), modelsPath: join19(agentDir, "models.json") });
   observeProviderResponses(modelRuntime, (provider, response) => {
     const headers = limitHeaders(response.headers);
     if (!Object.keys(headers).length)
@@ -16143,7 +17154,7 @@ async function createTerminalRuntime(args, host) {
 }
 
 // src/terminal/tui/sideQuestion.ts
-import { truncateToWidth as truncateToWidth22, visibleWidth as visibleWidth14, wrapTextWithAnsi as wrapTextWithAnsi13 } from "@earendil-works/pi-tui";
+import { truncateToWidth as truncateToWidth24, visibleWidth as visibleWidth14, wrapTextWithAnsi as wrapTextWithAnsi15 } from "@earendil-works/pi-tui";
 var QUESTION_ROWS = 2;
 var ANSWER_ROWS = 8;
 var MAX_CLIENT_CONTEXT_CHARS = 300000;
@@ -16352,17 +17363,17 @@ class SideQuestion {
     const spinner = this.current === "thinking" ? spinnerFrameAt(Date.now() - this.startedAt, getWorkingSpinnerFrames(process.env.TERM), SPINNER_INTERVAL_MS) : "";
     const marker = `${spinner ? `${spinner} ` : ""}/btw`;
     const markerWidth = visibleWidth14(marker) + 1;
-    const asked = wrapTextWithAnsi13(safeText(this.question), Math.max(1, inner - markerWidth));
+    const asked = wrapTextWithAnsi15(safeText(this.question), Math.max(1, inner - markerWidth));
     const question = asked.slice(0, QUESTION_ROWS).map((line, index) => {
       const prefix = index === 0 ? `${theme.bold(theme.fg("accent", marker))} ` : " ".repeat(markerWidth);
       return prefix + theme.fg("muted", line);
     });
     if (asked.length > QUESTION_ROWS)
-      question[QUESTION_ROWS - 1] = truncateToWidth22(question[QUESTION_ROWS - 1], inner - 1, "") + theme.fg("muted", "\u2026");
+      question[QUESTION_ROWS - 1] = truncateToWidth24(question[QUESTION_ROWS - 1], inner - 1, "") + theme.fg("muted", "\u2026");
     const text = this.current === "failed" ? `${this.answerText ? `${this.answerText}
 ` : ""}${this.error ?? "The side question failed."}` : this.answerText;
     const wrapped = text ? text.split(`
-`).flatMap((line) => line ? wrapTextWithAnsi13(safeText(line), inner) : [""]) : [];
+`).flatMap((line) => line ? wrapTextWithAnsi15(safeText(line), inner) : [""]) : [];
     const maxOffset = Math.max(0, wrapped.length - ANSWER_ROWS);
     this.answerOffset = Math.min(this.answerOffset, maxOffset);
     const shown = wrapped.slice(this.answerOffset, this.answerOffset + ANSWER_ROWS).map((line) => this.current === "failed" ? theme.fg("error", line) : line);
@@ -16375,7 +17386,7 @@ class SideQuestion {
       ...shown.length ? ["", ...shown.map((line) => padded(line, width))] : [],
       "",
       footerRow(`${textHint}Ctrl+X copy \xB7 /btw or Esc dismiss`, width, theme)
-    ].map((line) => truncateToWidth22(line, width, ""));
+    ].map((line) => truncateToWidth24(line, width, ""));
   }
 }
 
@@ -16578,7 +17589,7 @@ import { execFile } from "child_process";
 import { chmod, mkdtemp, open, rm, stat as stat2 } from "fs/promises";
 import { randomUUID as randomUUID3 } from "crypto";
 import { tmpdir as tmpdir2 } from "os";
-import { basename as basename6, join as join19 } from "path";
+import { basename as basename6, join as join20 } from "path";
 import { promisify } from "util";
 var exec = promisify(execFile);
 var PNG_SIGNATURE = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
@@ -16611,14 +17622,14 @@ async function stageClipboardFiles(paths, options = {}) {
     return { paths };
   let directory;
   try {
-    directory = await mkdtemp(join19(options.tempRoot ?? tmpdir2(), "harness-clipboard-"));
+    directory = await mkdtemp(join20(options.tempRoot ?? tmpdir2(), "harness-clipboard-"));
     const stagedPaths = [];
     for (const [index, path] of paths.entries()) {
       if (!isHeicPath(path)) {
         stagedPaths.push(path);
         continue;
       }
-      const output = join19(directory, `${index}-${randomUUID3()}.png`);
+      const output = join20(directory, `${index}-${randomUUID3()}.png`);
       try {
         await (options.convert ?? convertWithSips)(path, output);
         await chmod(output, 384);
@@ -17154,7 +18165,7 @@ function asTui(host) {
 
 // src/terminal/opentui/attachments.ts
 import { fileURLToPath } from "url";
-import { extname as extname2 } from "path";
+import { extname as extname3 } from "path";
 var LARGE_PASTE_LINES = 3;
 var LARGE_PASTE_CHARACTERS = 800;
 var IMAGE_EXTENSIONS = {
@@ -17167,7 +18178,7 @@ var IMAGE_EXTENSIONS = {
   ".heif": "image/heif"
 };
 function imageMimeTypeForPath(path) {
-  return IMAGE_EXTENSIONS[extname2(path).toLowerCase()];
+  return IMAGE_EXTENSIONS[extname3(path).toLowerCase()];
 }
 function lineCount(text) {
   return text.split(/\r\n|\r|\n/u).length;
@@ -17372,15 +18383,15 @@ function toolOutput(message) {
   }
   return clip6(text);
 }
-var CHECKLIST_STATUSES = new Set(["pending", "in_progress", "completed"]);
-function checklistEntries(args) {
+var TODO_STATUSES = new Set(["pending", "in_progress", "completed"]);
+function todoEntries(args) {
   const items = args?.items;
   if (!Array.isArray(items))
     return null;
   const entries = [];
   for (const item of items) {
     const entry = item;
-    if (!entry || typeof entry.text !== "string" || !entry.text.trim() || typeof entry.status !== "string" || !CHECKLIST_STATUSES.has(entry.status))
+    if (!entry || typeof entry.text !== "string" || !entry.text.trim() || typeof entry.status !== "string" || !TODO_STATUSES.has(entry.status))
       return null;
     entries.push({ text: ansiLabel(entry.text.trim(), 500), status: entry.status });
   }
@@ -17389,8 +18400,8 @@ function checklistEntries(args) {
 function sameTranscriptItem(left, right) {
   if (left.kind !== right.kind)
     return false;
-  if (left.kind === "checklist" && right.kind === "checklist") {
-    return left.id === right.id && left.toolCallId === right.toolCallId && left.status === right.status && JSON.stringify(left.items) === JSON.stringify(right.items);
+  if (left.kind === "todo" && right.kind === "todo") {
+    return left.id === right.id && left.origin === right.origin && left.toolCallId === right.toolCallId && left.status === right.status && JSON.stringify(left.items) === JSON.stringify(right.items);
   }
   const leftFields = Object.entries(left);
   const rightValues = right;
@@ -17519,6 +18530,11 @@ class TranscriptModel {
     this.addNotice(sequence, true, { kind: "command-help", id: `command-help-${sequence}`, groups });
     this.invalidate();
   }
+  todo(items) {
+    const sequence = this.nextNotice++;
+    this.addNotice(sequence, true, { kind: "todo", id: `todo-${sequence}`, origin: "command", items });
+    this.invalidate();
+  }
   addNotice(sequence, multiline, item) {
     const messages = this.session?.messages ?? [];
     this.notices.push({ afterMessageCount: messages.length, anchor: messages.at(-1), sequence, multiline, item });
@@ -17664,9 +18680,9 @@ class TranscriptModel {
           const status = result ? result.isError === true ? "error" : "ok" : pending.has(block.id) ? "running" : "pending";
           const resultImageCount = result ? imageCount(result.content) : 0;
           const id = `m${index}.c${textIndex++}`;
-          const checklist = block.name === "checklist_write" && result?.isError !== true ? checklistEntries(block.arguments) : null;
-          if (checklist) {
-            items.push({ kind: "checklist", id, toolCallId: block.id, status, items: checklist });
+          const todo = (block.name === "todo_write" || block.name === "checklist_write") && result?.isError !== true ? todoEntries(block.arguments) : null;
+          if (todo) {
+            items.push({ kind: "todo", id, origin: "tool", toolCallId: block.id, status, items: todo });
             continue;
           }
           items.push({
@@ -17782,7 +18798,7 @@ function matchPalette(items, filter) {
 
 // src/terminal/opentui/pathCompletion.ts
 import { readdir } from "fs/promises";
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 import { resolve as resolve5 } from "path";
 function consume(character, state) {
   if (state.escaped) {
@@ -17847,7 +18863,7 @@ async function completeFilePaths(text, cursorOffset, cwd, limit = 8) {
   const slash = Math.max(typedPrefix.lastIndexOf("/"), typedPrefix.lastIndexOf("\\"));
   const parent = slash < 0 ? "" : typedPrefix.slice(0, slash + 1);
   const namePrefix = typedPrefix.slice(slash + 1);
-  const diskParent = parent.startsWith("~/") ? resolve5(homedir2(), parent.slice(2)) : resolve5(cwd, parent || ".");
+  const diskParent = parent.startsWith("~/") ? resolve5(homedir3(), parent.slice(2)) : resolve5(cwd, parent || ".");
   const separator = parent.endsWith("\\") ? "\\" : "/";
   const caseSensitive = process.platform !== "win32";
   const compare = (value) => caseSensitive ? value : value.toLocaleLowerCase();
@@ -18289,6 +19305,7 @@ class OpenTuiApplication {
   ui;
   commands;
   slashCommandNames;
+  skillNames;
   sideQuestion;
   keybindings;
   themeValue;
@@ -18455,6 +19472,10 @@ class OpenTuiApplication {
     this.transcript.commandHelp(groups);
     this.change();
   }
+  showTodo(items) {
+    this.transcript.todo(items);
+    this.change();
+  }
   showToast(message) {
     if (this.stopped)
       return;
@@ -18622,6 +19643,8 @@ class OpenTuiApplication {
         control: (method, params) => controlCall(method, params ?? {}),
         changed: this.change,
         showHelp: (groups) => this.showHelp(groups),
+        todo: async () => (await controlCall("terminal.todo")).todo,
+        showTodo: (items) => this.showTodo(items),
         logs: {
           read: () => readHarnessLogSnapshot(() => controlCall("terminal.logs.info"), (snapshotSize, offset) => controlCall("terminal.logs.read", { snapshotSize, offset }))
         },
@@ -18640,9 +19663,11 @@ class OpenTuiApplication {
         this.keybindings?.reload();
         this.resetActiveWorkingStatus();
         this.refresh();
+        this.refreshSubagents(true);
       }));
       this.initialized = true;
       this.refresh();
+      this.refreshSubagents(true);
       let lastSubagentPoll = 0;
       const tick = setInterval(() => {
         if (this.startedAt !== null || this.compacting || this.sideQuestion?.state === "thinking")
@@ -18714,8 +19739,9 @@ class OpenTuiApplication {
     this.subagentsPolling = true;
     try {
       if (!settled && !this.session.getActiveToolNames().includes("spawn_subagent")) {
-        if (this.subagents.length) {
-          this.subagents = [];
+        const main = this.subagents.filter((item) => item.relation === "main");
+        if (main.length !== this.subagents.length) {
+          this.subagents = main;
           this.change();
         }
         return;
@@ -18800,6 +19826,7 @@ class OpenTuiApplication {
   }
   refresh() {
     this.slashCommandNames = undefined;
+    this.skillNames = undefined;
     if (!this.runtime)
       return;
     this.ui?.setThemes(this.session.resourceLoader.getThemes().themes);
@@ -18811,6 +19838,7 @@ class OpenTuiApplication {
   }
   resetPresentation() {
     this.slashCommandNames = undefined;
+    this.skillNames = undefined;
     this.resetHistoryBrowse();
     this.invalidateFileCompletion();
     this.sideQuestion?.dismiss();
@@ -18841,6 +19869,17 @@ class OpenTuiApplication {
     this.mountEditor(undefined);
     this.change();
   }
+  currentSkillNames() {
+    if (this.skillNames)
+      return this.skillNames;
+    if (!this.commands)
+      return [];
+    try {
+      return this.skillNames = this.commands.skills().map((skill) => skill.name);
+    } catch {
+      return this.skillNames = [];
+    }
+  }
   currentSlashCommandNames() {
     if (this.slashCommandNames)
       return this.slashCommandNames;
@@ -18853,8 +19892,8 @@ class OpenTuiApplication {
         for (const alias of command.aliases ?? [])
           names.add(alias);
       }
-      for (const skill of this.commands.skills())
-        names.add(`skill:${skill.name}`);
+      for (const skill of this.currentSkillNames())
+        names.add(`skill:${skill}`);
       for (const alias of this.commands.legacyAliases())
         names.add(alias);
     } catch {}
@@ -19229,7 +20268,7 @@ class OpenTuiApplication {
     this.session.setThinkingLevel(next);
   }
   extensionShortcut(data) {
-    const shortcut = [...this.session.extensionRunner.getShortcuts(this.keybindings.getResolvedBindings()).entries()].find(([key]) => matchesKey16(data, key));
+    const shortcut = [...this.session.extensionRunner.getShortcuts(this.keybindings.getResolvedBindings()).entries()].find(([key]) => matchesKey18(data, key));
     if (!shortcut)
       return false;
     this.attempt(() => shortcut[1].handler(this.session.extensionRunner.createContext()));
@@ -19821,6 +20860,28 @@ class OpenTuiApplication {
       return true;
     if (this.questionDock && ["note", "answer"].includes(this.questionDock.view.focus))
       return false;
+    const palette = this.paletteView();
+    const choice = this.planChoice.view;
+    if (choice && !palette) {
+      const action = this.planChoice.handle(key, this.draft === "");
+      if (action === "implement") {
+        this.implementPlan(choice.title);
+        return true;
+      }
+      if (action === "edit") {
+        this.editPlan();
+        return true;
+      }
+      if (action === "dismiss") {
+        this.planChoice.clear();
+        this.change();
+        return true;
+      }
+      if (action === "moved") {
+        this.change();
+        return true;
+      }
+    }
     if (!this.paletteOpen && key.ctrl && key.name === "up") {
       this.historyPrevious(key.cursorOffset);
       return true;
@@ -19849,7 +20910,6 @@ class OpenTuiApplication {
       this.moveComposerCursor(this.draft.length);
       return true;
     }
-    const palette = this.paletteView();
     if (palette) {
       if (key.name === "up") {
         this.paletteIndex = (palette.index - 1 + palette.items.length) % palette.items.length;
@@ -19874,27 +20934,6 @@ class OpenTuiApplication {
         return true;
       }
     }
-    const choice = this.planChoice.view;
-    if (choice && !palette) {
-      const action = this.planChoice.handle(key, this.draft === "");
-      if (action === "implement") {
-        this.implementPlan(choice.title);
-        return true;
-      }
-      if (action === "edit") {
-        this.editPlan();
-        return true;
-      }
-      if (action === "dismiss") {
-        this.planChoice.clear();
-        this.change();
-        return true;
-      }
-      if (action === "moved") {
-        this.change();
-        return true;
-      }
-    }
     if (!this.paletteOpen && !this.bashMode && this.draft.trim() === "" && data.startsWith("!")) {
       this.enterBashMode(data.slice(1));
       return true;
@@ -20020,7 +21059,7 @@ class OpenTuiApplication {
       "Ctrl+O expand details \xB7 Ctrl+T thinking",
       "Ctrl+L model",
       "Ctrl+N new session",
-      "\u2191/\u2193 at draft start/end browse history; line edges jump to characters \xB7 Ctrl+\u2191/\u2193 anywhere",
+      "\u2191/\u2193 at either draft endpoint browse older/newer history \xB7 Ctrl+\u2191/\u2193 anywhere",
       "Enter send or queue \xB7 Cmd+Enter steer \xB7 Esc dismisses btw or stops reply",
       "Ctrl+C clear or quit \xB7 Ctrl+D quit",
       "PgUp/PgDn transcript"
@@ -20103,6 +21142,7 @@ class OpenTuiApplication {
       items: transcript.items,
       hasUserMessages: transcript.hasUserMessages,
       slashCommandNames: this.currentSlashCommandNames(),
+      skillNames: this.currentSkillNames(),
       draft: this.paletteOpen ? this.paletteFilter : this.draft,
       draftEpoch: this.draftEpoch,
       draftCursorOffset: this.draftCursorOffset,
@@ -20246,8 +21286,8 @@ class OpenTuiApplication {
     }
   }
   async externalEditor() {
-    const directory = await mkdtemp2(join20(tmpdir3(), "harness-editor-"));
-    const file = join20(directory, "prompt.md");
+    const directory = await mkdtemp2(join21(tmpdir3(), "harness-editor-"));
+    const file = join21(directory, "prompt.md");
     try {
       await writeFile(file, this.customEditor?.getExpandedText?.() ?? this.draft, { mode: 384 });
       await this.editFile(file);
@@ -21353,22 +22393,33 @@ function bufferOffset(text, index) {
     offset += visibleWidth15(line) + (position < lines.length - 1 ? 1 : 0);
   return offset;
 }
-function syncSlashCommandMark(target, names, typeId, styleId) {
+function leadingSkillInvocationRange(text, names) {
+  const match = /^(\s*)\$(\S+)/u.exec(text);
+  if (!match || !names.includes(match[2]))
+    return;
+  return { start: match[1].length, end: match[0].length };
+}
+function syncTextMark(target, range, typeId, styleId) {
   const marks = target.extmarks.getAllForTypeId(typeId);
-  const command = leadingSlashCommandRange(target.plainText, names);
-  if (!command) {
+  if (!range) {
     for (const mark of marks)
       target.extmarks.delete(mark.id);
     return;
   }
-  const start = bufferOffset(target.plainText, command.start);
-  const end = start + visibleWidth15(target.plainText.slice(command.start, command.end));
+  const start = bufferOffset(target.plainText, range.start);
+  const end = start + visibleWidth15(target.plainText.slice(range.start, range.end));
   if (marks.length === 1 && marks[0].start === start && marks[0].end === end)
     return;
   for (const mark of marks)
     target.extmarks.delete(mark.id);
   target.extmarks.create({ start, end, virtual: true, styleId, typeId });
 }
+function syncSlashCommandMark(target, names, typeId, styleId) {
+  syncTextMark(target, leadingSlashCommandRange(target.plainText, names), typeId, styleId);
+}
+function syncSkillInvocationMark(target, names, typeId, styleId) {
+  syncTextMark(target, leadingSkillInvocationRange(target.plainText, names), typeId, styleId);
+}
 function syncAttachmentMarks(target, labels, typeId, styleId) {
   const byId = new Map(labels.map((label) => [label.id, label]));
   const marks = target.extmarks.getAllForTypeId(typeId);
@@ -21431,7 +22482,7 @@ function statusBarText(state) {
 }
 
 // src/terminal/opentui/workingLine.ts
-import { stripTerminalSequences as stripTerminalSequences13, truncateToWidth as truncateToWidth23, visibleWidth as visibleWidth16 } from "@earendil-works/pi-tui";
+import { stripTerminalSequences as stripTerminalSequences13, truncateToWidth as truncateToWidth25, visibleWidth as visibleWidth16 } from "@earendil-works/pi-tui";
 var SHIMMER_INTERVAL_MS = 120;
 var SHIMMER_RADIUS = 2;
 function workingLineParts(state, width) {
@@ -21462,7 +22513,7 @@ function workingLineParts(state, width) {
     return { prefix, label, suffix };
   let remaining = Math.max(0, Math.floor(width));
   const fit = (text) => {
-    const fitted = stripTerminalSequences13(truncateToWidth23(text, remaining, "\u2026", false));
+    const fitted = stripTerminalSequences13(truncateToWidth25(text, remaining, "\u2026", false));
     remaining = Math.max(0, remaining - visibleWidth16(fitted));
     return fitted;
   };
@@ -21656,21 +22707,21 @@ function toolStatusIcon(status) {
     return "\u25CB";
   return "\u2713";
 }
-function checklistMark(status) {
+function todoMark(status) {
   if (status === "completed")
     return "\u2713";
   if (status === "in_progress")
     return "\u25CF";
   return "\u25CB";
 }
-function checklistMarkColor(t, status) {
+function todoMarkColor(t, status) {
   if (status === "completed")
     return t.success;
   if (status === "in_progress")
     return t.warning;
   return t.dim;
 }
-function checklistProgress(done, total) {
+function todoProgress(done, total) {
   return total ? `${done} of ${total} done` : "empty";
 }
 function labelledRule(label, width) {
@@ -22027,7 +23078,7 @@ function TranscriptItemView(props) {
       return _el$23;
     })();
   }
-  if (item.kind === "checklist") {
+  if (item.kind === "todo") {
     const done = () => item.items.filter((entry) => entry.status === "completed").length;
     return (() => {
       var _el$27 = _$createElement2("box"), _el$28 = _$createElement2("text"), _el$29 = _$createElement2("box");
@@ -22037,12 +23088,19 @@ function TranscriptItemView(props) {
       _$setProp2(_el$27, "paddingLeft", 1);
       _$setProp2(_el$27, "flexShrink", 0);
       _$setProp2(_el$28, "wrapMode", "none");
-      _$insert2(_el$28, _$createComponent2(Span, {
-        get fg() {
-          return toolColor(t, item.status);
+      _$insert2(_el$28, _$createComponent2(Show2, {
+        get when() {
+          return _$memo2(() => item.origin === "tool")() && item.status;
         },
         get children() {
-          return toolStatusIcon(item.status);
+          return _$createComponent2(Span, {
+            get fg() {
+              return toolColor(t, item.status);
+            },
+            get children() {
+              return toolStatusIcon(item.status);
+            }
+          });
         }
       }), null);
       _$insert2(_el$28, _$createComponent2(Span, {
@@ -22052,14 +23110,14 @@ function TranscriptItemView(props) {
         get attributes() {
           return TextAttributes2.BOLD;
         },
-        children: " Checklist"
+        children: " Todo"
       }), null);
       _$insert2(_el$28, _$createComponent2(Span, {
         get fg() {
           return t.muted;
         },
         get children() {
-          return [" \xB7 ", _$memo2(() => checklistProgress(done(), item.items.length))];
+          return [" \xB7 ", _$memo2(() => todoProgress(done(), item.items.length))];
         }
       }), null);
       _$setProp2(_el$29, "flexDirection", "column");
@@ -22084,10 +23142,10 @@ function TranscriptItemView(props) {
           _$setProp2(_el$32, "wrapMode", "none");
           _$insert2(_el$32, _$createComponent2(Span, {
             get fg() {
-              return checklistMarkColor(t, entry.status);
+              return todoMarkColor(t, entry.status);
             },
             get children() {
-              return checklistMark(entry.status);
+              return todoMark(entry.status);
             }
           }));
           _$setProp2(_el$33, "width", 1);
@@ -22768,6 +23826,7 @@ function WorkingLine(props) {
 }
 var ATTACHMENT_MARK = "attachment";
 var SLASH_COMMAND_MARK = "slash-command";
+var SKILL_INVOCATION_MARK = "skill-invocation";
 function pastedText(bytes) {
   return new TextDecoder().decode(bytes).replace(/\x1b\[[0-?]*[ -/]*[@-~]/gu, "").replace(/\r\n?/gu, `
 `);
@@ -22786,6 +23845,11 @@ function syncMarks(area, view, syntax) {
     const typeId = area.extmarks.getTypeId(SLASH_COMMAND_MARK) ?? area.extmarks.registerType(SLASH_COMMAND_MARK);
     syncSlashCommandMark(area, view.bashMode ? [] : view.slashCommandNames, typeId, commandStyleId);
   }
+  const skillStyleId = syntax.getStyleId(SKILL_INVOCATION_MARK);
+  if (skillStyleId !== null) {
+    const typeId = area.extmarks.getTypeId(SKILL_INVOCATION_MARK) ?? area.extmarks.registerType(SKILL_INVOCATION_MARK);
+    syncSkillInvocationMark(area, view.bashMode ? [] : view.skillNames, typeId, skillStyleId);
+  }
   return changed;
 }
 function subagentToneColor(t, tone) {
@@ -22895,6 +23959,7 @@ function Prompt(props) {
   createEffect2(() => {
     view().attachments;
     view().slashCommandNames;
+    view().skillNames;
     view().bashMode;
     if (syncing)
       return;
@@ -22930,7 +23995,7 @@ function Prompt(props) {
   const plan = () => view().planMode;
   const composerFocused = () => {
     const current = view();
-    return !current.overlay && !current.customEditor;
+    return !current.overlay && !current.customEditor && !current.planChoice;
   };
   const composerColor = () => composerRuleColor(theme2, {
     bash: bash(),
@@ -23539,6 +24604,9 @@ function OpenTuiRoot(props) {
     },
     [SLASH_COMMAND_MARK]: {
       fg: theme2.accent
+    },
+    [SKILL_INVOCATION_MARK]: {
+      fg: theme2.accent
     }
   }, renderer.nativeScene);
   onCleanup2(() => {
@@ -23661,7 +24729,7 @@ function OpenTuiRoot(props) {
   });
   const composerBlocked = createMemo2(() => {
     const current = view();
-    return Boolean(current.overlay || current.customEditor || current.questionDock);
+    return Boolean(current.overlay || current.customEditor || current.questionDock || current.planChoice);
   });
   createEffect2(on2(composerBlocked, (blocked) => {
     if (!prompt)