@xingular/harness 1.3.1-unstable.2 → 1.3.1-unstable.3

package/dist/terminal-opentui.js

@@ -70,18 +70,18 @@ function putIdle(path, stream) {
   entries.add(entry);
   idle.set(path, entries);
 }
-function request(connection, body, what, timeoutMs) {
+function request(connection, body, what, timeoutMs, signal) {
   const reused = takeIdle(connection.socket);
-  return attempt(connection, body, what, timeoutMs, reused).catch((error) => {
+  return attempt(connection, body, what, timeoutMs, reused, signal).catch((error) => {
     if (reused && error instanceof StaleConnection)
-      return attempt(connection, body, what, timeoutMs, undefined);
+      return attempt(connection, body, what, timeoutMs, undefined, signal);
     throw error;
   });
 }
 
 class StaleConnection extends Error {
 }
-function attempt(connection, body, what, timeoutMs, reused) {
+function attempt(connection, body, what, timeoutMs, reused, signal) {
   return new Promise((resolve, reject) => {
     const stream = reused ?? createConnection(connection.socket);
     let buffer = "";
@@ -115,6 +115,7 @@ function attempt(connection, body, what, timeoutMs, reused) {
         return;
       settled = true;
       clearTimeout(timer);
+      signal?.removeEventListener("abort", onAbort);
       stream.off("connect", send);
       stream.off("data", onData);
       stream.off("error", onError);
@@ -131,6 +132,15 @@ function attempt(connection, body, what, timeoutMs, reused) {
       stream.destroy();
       finish(() => reject(new SocketError("timeout", `The harness did not answer ${what}.`)));
     }, timeoutMs);
+    const onAbort = () => {
+      stream.destroy();
+      finish(() => reject(new SocketError("aborted", `${what} was cancelled.`)));
+    };
+    if (signal?.aborted) {
+      onAbort();
+      return;
+    }
+    signal?.addEventListener("abort", onAbort, { once: true });
     stream.on("data", onData);
     stream.on("error", onError);
     stream.on("close", onClose);
@@ -140,8 +150,8 @@ function attempt(connection, body, what, timeoutMs, reused) {
       stream.on("connect", send);
   });
 }
-function socketCall(connection, call, params = {}, timeoutMs = 120000, control) {
-  return request(connection, { call, params, ...control ? { control } : {} }, call, timeoutMs);
+function socketCall(connection, call, params = {}, timeoutMs = 120000, control, signal) {
+  return request(connection, { call, params, ...control ? { control } : {} }, call, timeoutMs, signal);
 }
 function terminalCall(event, data = {}, timeoutMs = 600000) {
   return request(connectionFromEnv(), { event, data }, event, timeoutMs);
@@ -165,10 +175,10 @@ function claimTerminalControl(connection = connectionFromEnv()) {
   }
   return claim;
 }
-async function controlCall(call, params = {}, timeoutMs = 120000) {
+async function controlCall(call, params = {}, timeoutMs = 120000, signal) {
   const connection = connectionFromEnv();
   const control = await claimTerminalControl(connection);
-  return socketCall(connection, call, params, timeoutMs, control);
+  return signal ? socketCall(connection, call, params, timeoutMs, control, signal) : socketCall(connection, call, params, timeoutMs, control);
 }
 
 // src/terminal/tui/chrome.ts
@@ -584,19 +594,10 @@ function lines(text) {
 }
 var compareText = (left, right) => left < right ? -1 : left > right ? 1 : 0;
 
-// src/wiki/notes.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readdirSync, readFileSync as readFileSync2, renameSync as renameSync2, rmSync as rmSync2, statSync as statSync2 } from "fs";
-import { dirname as dirname2, join as join3, relative, sep as sep2 } from "path";
-
-// src/core/changes.ts
-var listeners = new Set;
-function noteChange(change) {
-  for (const listener of listeners) {
-    try {
-      listener(change);
-    } catch {}
-  }
-}
+// src/tools/defaultSkills.ts
+import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync2, statSync as statSync2 } from "fs";
+import { dirname as dirname2, join as join3 } from "path";
+import { fileURLToPath } from "url";
 
 // src/core/frontmatter.ts
 import { parse as parseYaml, stringify } from "yaml";
@@ -625,6 +626,17 @@ function parse(text) {
     return null;
   }
 }
+function bodyOf(text) {
+  const parts = split(text);
+  if (!parts)
+    return text;
+  try {
+    parseYaml(parts.yaml);
+    return parts.body;
+  } catch {
+    return text;
+  }
+}
 function serialize(front, body) {
   let yaml;
   try {
@@ -639,6 +651,57 @@ ${body.trimEnd()}
 `;
 }
 
+// src/tools/defaultSkills.ts
+var SKILL_NAME = /^[a-z0-9][a-z0-9_-]*$/;
+function defaultSkillPath() {
+  let dir = dirname2(fileURLToPath(import.meta.url));
+  for (;; ) {
+    const path = join3(dir, "builtin", "skills", "plugin-authoring", "SKILL.md");
+    if (existsSync2(path))
+      return path;
+    const parent = dirname2(dir);
+    if (parent === dir)
+      throw new Error("The bundled plugin-authoring skill is missing.");
+    dir = parent;
+  }
+}
+function defaultSkillPaths(variantDir) {
+  return variantDir && existsSync2(join3(variantDir, "skills", "plugin-authoring", "SKILL.md")) ? [] : [defaultSkillPath()];
+}
+function readSkillFile(variantDir, name) {
+  const wanted = name.trim().replace(/^skills\//, "").replace(/`/g, "");
+  if (!SKILL_NAME.test(wanted))
+    return null;
+  const variant = variantDir ? join3(variantDir, "skills", wanted, "SKILL.md") : null;
+  const builtin = wanted === "plugin-authoring" && defaultSkillPaths(variantDir).length ? defaultSkillPath() : null;
+  const path = variant && existsSync2(variant) && statSync2(variant).isFile() ? variant : builtin;
+  if (!path)
+    return null;
+  const baseDir = dirname2(path);
+  const scripts = join3(baseDir, "scripts");
+  return {
+    name: wanted,
+    path,
+    baseDir,
+    body: bodyOf(readFileSync2(path, "utf8")),
+    helpers: existsSync2(scripts) ? readdirSync(scripts) : []
+  };
+}
+
+// src/wiki/notes.ts
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readdirSync as readdirSync2, readFileSync as readFileSync3, renameSync as renameSync2, rmSync as rmSync2, statSync as statSync3 } from "fs";
+import { dirname as dirname3, join as join4, relative, sep as sep2 } from "path";
+
+// src/core/changes.ts
+var listeners = new Set;
+function noteChange(change) {
+  for (const listener of listeners) {
+    try {
+      listener(change);
+    } catch {}
+  }
+}
+
 // src/core/secrets.ts
 var SECRET_MARKERS = ["-----BEGIN", "sk-ant-", "sk-proj-", "ghp_", "github_pat_", "AKIA", "xoxb-"];
 function looksSecret(text) {
@@ -649,10 +712,10 @@ function looksSecret(text) {
 var LEGACY_FOLDERS = ["blocks", "facts", "raw", "revisions", "inbox", "operations", "trash"];
 var MAX_NOTE = 400000;
 function wikiDir(root) {
-  return join3(root, "wiki");
+  return join4(root, "wiki");
 }
 function historyDir(root) {
-  return join3(root, "wiki-history");
+  return join4(root, "wiki-history");
 }
 function cleanPath(path) {
   const clean = String(path ?? "").trim().replace(/\\/g, "/").replace(/^\/+|\/+$/g, "").replace(/\.md$/i, "");
@@ -670,7 +733,7 @@ function cleanPath(path) {
   return clean;
 }
 function fileOf(root, path) {
-  return join3(wikiDir(root), `${cleanPath(path)}.md`);
+  return join4(wikiDir(root), `${cleanPath(path)}.md`);
 }
 function projectOfPath(path) {
   const parts = path.split("/");
@@ -695,17 +758,17 @@ function safeParse(text) {
 function walk(dir, into) {
   let names;
   try {
-    names = readdirSync(dir);
+    names = readdirSync2(dir);
   } catch {
     return;
   }
   for (const name of names.sort()) {
     if (name.startsWith("."))
       continue;
-    const path = join3(dir, name);
+    const path = join4(dir, name);
     let isDir = false;
     try {
-      isDir = statSync2(path).isDirectory();
+      isDir = statSync3(path).isDirectory();
     } catch {
       continue;
     }
@@ -718,16 +781,16 @@ function walk(dir, into) {
 function paths(root) {
   const wiki = wikiDir(root);
   const files = [];
-  if (existsSync2(join3(wiki, "home.md")))
-    files.push(join3(wiki, "home.md"));
-  walk(join3(wiki, "library"), files);
-  walk(join3(wiki, "projects"), files);
+  if (existsSync3(join4(wiki, "home.md")))
+    files.push(join4(wiki, "home.md"));
+  walk(join4(wiki, "library"), files);
+  walk(join4(wiki, "projects"), files);
   return files.map((file) => relative(wiki, file).split(sep2).join("/").replace(/\.md$/, ""));
 }
 function summary(root, path) {
   const file = fileOf(root, path);
-  const text = readFileSync2(file, "utf8");
-  return { path, title: titleOf(path, text), project: projectOfPath(path), updatedAt: statSync2(file).mtime.toISOString(), size: text.length };
+  const text = readFileSync3(file, "utf8");
+  return { path, title: titleOf(path, text), project: projectOfPath(path), updatedAt: statSync3(file).mtime.toISOString(), size: text.length };
 }
 function list(root, options = {}) {
   return paths(root).filter((path) => options.project === undefined || projectOfPath(path) === options.project).map((path) => summary(root, path));
@@ -779,7 +842,7 @@ function graph(root) {
   const titles = new Map(nodes.map((node) => [node.title.toLowerCase(), node.path]));
   const edges = [];
   for (const node of nodes) {
-    const body = readFileSync2(fileOf(root, node.path), "utf8");
+    const body = readFileSync3(fileOf(root, node.path), "utf8");
     for (const to of linksIn(body, node.path, known, titles))
       edges.push({ from: node.path, to });
   }
@@ -788,9 +851,9 @@ function graph(root) {
 function read(root, path) {
   const clean = cleanPath(path);
   const file = fileOf(root, clean);
-  if (!existsSync2(file))
+  if (!existsSync3(file))
     throw notFound(`The note ${clean}`);
-  const text = readFileSync2(file, "utf8");
+  const text = readFileSync3(file, "utf8");
   const { nodes, edges } = graph(root);
   const known = new Set(nodes.map((node) => node.path));
   const titles = new Map(nodes.map((node) => [node.title.toLowerCase(), node.path]));
@@ -813,16 +876,16 @@ function write(root, path, body, options = {}) {
   if (project && !projectsOrNone(root).some((known) => known.slug === project))
     throw invalid(`There is no project with the slug ${project}.`);
   const file = fileOf(root, clean);
-  if (existsSync2(file)) {
-    const current = statSync2(file).mtime.toISOString();
+  if (existsSync3(file)) {
+    const current = statSync3(file).mtime.toISOString();
     if (options.expectedUpdatedAt && options.expectedUpdatedAt !== current)
       throw new HarnessError("conflict", "The note changed since it was opened. Reload it and try again.");
-    const previous = readFileSync2(file, "utf8");
+    const previous = readFileSync3(file, "utf8");
     if (previous === body)
       return read(root, clean);
-    atomicWrite(join3(historyDir(root), clean, `${now().replace(/[:.]/g, "-")}.md`), previous);
+    atomicWrite(join4(historyDir(root), clean, `${now().replace(/[:.]/g, "-")}.md`), previous);
   }
-  mkdirSync2(dirname2(file), { recursive: true });
+  mkdirSync2(dirname3(file), { recursive: true });
   atomicWrite(file, body);
   noteChange({ wiki: wikiDir(root), id: clean, path: file, text: body, actor: options.actor ?? "user", reason: options.reason ?? "Saved" });
   return read(root, clean);
@@ -830,15 +893,15 @@ function write(root, path, body, options = {}) {
 function remove(root, path) {
   const clean = cleanPath(path);
   const file = fileOf(root, clean);
-  if (!existsSync2(file))
+  if (!existsSync3(file))
     throw notFound(`The note ${clean}`);
-  atomicWrite(join3(historyDir(root), clean, `${now().replace(/[:.]/g, "-")}.md`), readFileSync2(file, "utf8"));
+  atomicWrite(join4(historyDir(root), clean, `${now().replace(/[:.]/g, "-")}.md`), readFileSync3(file, "utf8"));
   rmSync2(file);
 }
 function versions(root, path) {
-  const dir = join3(historyDir(root), cleanPath(path));
+  const dir = join4(historyDir(root), cleanPath(path));
   try {
-    return readdirSync(dir).filter((name) => name.endsWith(".md")).sort().reverse().map((name) => ({ id: name.replace(/\.md$/, ""), savedAt: statSync2(join3(dir, name)).mtime.toISOString() }));
+    return readdirSync2(dir).filter((name) => name.endsWith(".md")).sort().reverse().map((name) => ({ id: name.replace(/\.md$/, ""), savedAt: statSync3(join4(dir, name)).mtime.toISOString() }));
   } catch {
     return [];
   }
@@ -846,10 +909,10 @@ function versions(root, path) {
 function version(root, path, id) {
   if (!/^[0-9A-Za-z-]+$/.test(id))
     throw invalid("Invalid version.");
-  const file = join3(historyDir(root), cleanPath(path), `${id}.md`);
-  if (!existsSync2(file))
+  const file = join4(historyDir(root), cleanPath(path), `${id}.md`);
+  if (!existsSync3(file))
     throw notFound("That version");
-  return readFileSync2(file, "utf8");
+  return readFileSync3(file, "utf8");
 }
 function search(root, query, options = {}) {
   const words = [...new Set(String(query ?? "").toLowerCase().split(/[^\p{L}\p{N}]+/u).filter((word) => word.length > 1))].slice(0, 16);
@@ -857,7 +920,7 @@ function search(root, query, options = {}) {
     return [];
   const hits = [];
   for (const path of paths(root)) {
-    const text = readFileSync2(fileOf(root, path), "utf8");
+    const text = readFileSync3(fileOf(root, path), "utf8");
     const lower = text.toLowerCase();
     const title = titleOf(path, text);
     let score = 0;
@@ -887,15 +950,15 @@ function search(root, query, options = {}) {
 }
 function ensureLayout(root, productName) {
   const wiki = wikiDir(root);
-  mkdirSync2(join3(wiki, "library"), { recursive: true });
-  mkdirSync2(join3(wiki, "projects"), { recursive: true });
-  if (!existsSync2(join3(wiki, "home.md")))
-    atomicWrite(join3(wiki, "home.md"), `# Home
+  mkdirSync2(join4(wiki, "library"), { recursive: true });
+  mkdirSync2(join4(wiki, "projects"), { recursive: true });
+  if (!existsSync3(join4(wiki, "home.md")))
+    atomicWrite(join4(wiki, "home.md"), `# Home
 
 Notes about your projects for ${productName}. Link notes with [[library/name]] or [[projects/<slug>/name]].
 `);
   for (const project of projectsOrNone(root))
-    mkdirSync2(join3(wiki, "projects", project.slug), { recursive: true });
+    mkdirSync2(join4(wiki, "projects", project.slug), { recursive: true });
 }
 
 // src/world/untrusted.ts
@@ -953,6 +1016,7 @@ var contextSnapshotPayload = z.object({
   systemPrompt: z.string().max(1e5),
   contextUpdate: z.string().max(1e5).optional(),
   tools: z.array(z.object({ name: z.string(), description: z.string().max(2000), parameters: z.unknown() })).max(120),
+  compaction: z.object({ enabled: z.boolean(), reserveTokens: z.number().nonnegative() }).optional(),
   systemPromptTruncated: z.boolean().optional(),
   contextUpdateTruncated: z.boolean().optional(),
   toolsTruncated: z.boolean().optional()
@@ -1491,9 +1555,28 @@ function sessionNameTool(current) {
 
 // src/prompt/compile.ts
 var SESSION_STATE_BUDGET = 1000;
-var SECTION_ORDER = { harnessIdentity: 5, system: 25, sessionState: 30, guardrails: 40, memory: 45, references: 50, subagents: 64, scripts: 66, wiki: 80, tools: 90, reporting: 95 };
+var REQUIRED_SKILLS_BUDGET = 12000;
+var REQUIRED_SKILLS_POINTER = "Some required skill text was omitted to fit. Load the rest with skill_load.";
+var SECTION_ORDER = { harnessIdentity: 5, system: 25, sessionState: 30, guardrails: 40, memory: 45, references: 50, requiredSkills: 52, subagents: 64, scripts: 66, wiki: 80, tools: 90, reporting: 95 };
 var NATIVE_GROUP = ["read", "grep", "find", "ls", "edit", "write", "bash"];
 var CONNECTION_TOOLS = ["mcp_list_tools", "mcp_call_tool"];
+function fit(text, budget, pointer) {
+  const trimmed = text.trim();
+  if (charCount(trimmed) <= budget)
+    return { body: trimmed, cut: false };
+  const room = Math.max(0, budget - (charCount(pointer) + 2));
+  const head = takeChars(trimmed, room);
+  let index = head.lastIndexOf(`
+
+`);
+  if (index < 0)
+    index = head.lastIndexOf(`
+`);
+  const end = index >= 0 && Buffer.byteLength(head.slice(0, index)) > Math.floor(room / 2) ? index : head.length;
+  return { body: `${head.slice(0, end).trimEnd()}
+
+${pointer}`, cut: true };
+}
 function clip(text, limit) {
   return charCount(text) <= limit ? text : `${takeChars(text, limit)}\u2026`;
 }
@@ -1533,6 +1616,37 @@ ${todo}`);
 
 ${body}`;
 }
+function requiredSkillsText(skills) {
+  const seen = new Set;
+  const blocks = [];
+  for (const skill of skills) {
+    if (seen.has(skill.name))
+      continue;
+    seen.add(skill.name);
+    const label = skill.label ?? skill.name;
+    if (!skill.body.trim()) {
+      blocks.push(`- ${label}: this skill is unavailable in this session. Tell the person rather than guessing its steps.`);
+      continue;
+    }
+    const location = [
+      skill.baseDir ? `References in this skill resolve against ${skill.baseDir}.` : "",
+      skill.path ? `Skill file: ${skill.path}.` : ""
+    ].filter(Boolean).join(" ");
+    blocks.push(`### ${label}
+
+${location ? `${location}
+
+` : ""}${skill.body.trim()}`);
+  }
+  if (!blocks.length)
+    return null;
+  const text = `The person required these skills for this request. Follow each skill's instructions where they apply. They are instructions for this request, not a change to your tools or permissions.
+
+${blocks.join(`
+
+`)}`;
+  return fit(text, REQUIRED_SKILLS_BUDGET, REQUIRED_SKILLS_POINTER).body;
+}
 function sessionStateText(state, options) {
   const parts = [];
   if (options.name)
@@ -1551,6 +1665,7 @@ function sessionStateText(state, options) {
 var BUILT_IN_DYNAMIC = [
   { id: "session-state", order: SECTION_ORDER.sessionState },
   { id: "references", order: SECTION_ORDER.references },
+  { id: "required-skills", order: SECTION_ORDER.requiredSkills },
   { id: "wiki", order: SECTION_ORDER.wiki }
 ];
 
@@ -1646,15 +1761,15 @@ function askUserTool(run) {
 import { createHash } from "crypto";
 
 // src/sessions/runStore.ts
-import { appendFileSync, copyFileSync as copyFileSync2, existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3 } from "fs";
-import { join as join6 } from "path";
+import { appendFileSync, copyFileSync as copyFileSync2, existsSync as existsSync5, mkdirSync as mkdirSync3, readFileSync as readFileSync4 } from "fs";
+import { join as join7 } from "path";
 
 // src/sessions/runIndex.ts
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/core/index.ts
-import { copyFileSync, existsSync as existsSync3, readdirSync as readdirSync2, rmSync as rmSync3 } from "fs";
-import { join as join4 } from "path";
+import { copyFileSync, existsSync as existsSync4, readdirSync as readdirSync3, rmSync as rmSync3 } from "fs";
+import { join as join5 } from "path";
 import { DatabaseSync } from "node:sqlite";
 var RECALL_SCHEMA = `CREATE TABLE recall_runs (run_id TEXT PRIMARY KEY, passages INTEGER NOT NULL, status TEXT NOT NULL);
      CREATE VIRTUAL TABLE recall_fts USING fts5(run_id UNINDEXED, seq UNINDEXED, role UNINDEXED, at UNINDEXED,
@@ -1714,7 +1829,7 @@ var MIGRATIONS = [
 ];
 var connections = new Map;
 function dbPath(root) {
-  return join4(root, "index.sqlite");
+  return join5(root, "index.sqlite");
 }
 function sqlError(error) {
   return new HarnessError("index_error", error instanceof Error ? error.message : String(error), "Settings \u2192 Projects and Storage \u2192 Repair index.");
@@ -1750,7 +1865,7 @@ function migrate(path, migrations) {
   if (current >= migrations.length)
     return database;
   const backup = `${path.replace(/\.sqlite$/, "")}.sqlite.bak-v${current}`;
-  const hadFile = existsSync3(path) && current > 0;
+  const hadFile = existsSync4(path) && current > 0;
   if (hadFile) {
     try {
       database.exec("PRAGMA wal_checkpoint(TRUNCATE);");
@@ -1798,7 +1913,7 @@ function all(database, sql, ...params) {
 }
 function runFolders(root) {
   try {
-    return readdirSync2(join4(root, "runs"));
+    return readdirSync3(join5(root, "runs"));
   } catch {
     return [];
   }
@@ -1809,7 +1924,7 @@ function readAllRuns(root) {
   const records = [];
   for (const name of runFolders(root)) {
     try {
-      const parsed = runRecordSchema.safeParse(upgradeRunRecord(readJson(join5(root, "runs", name, "run.json"))));
+      const parsed = runRecordSchema.safeParse(upgradeRunRecord(readJson(join6(root, "runs", name, "run.json"))));
       if (parsed.success)
         records.push(parsed.data);
     } catch {}
@@ -1819,9 +1934,9 @@ function readAllRuns(root) {
 
 // src/sessions/runStore.ts
 function runDir(root, runId) {
-  return join6(root, "runs", safeId(runId));
+  return join7(root, "runs", safeId(runId));
 }
-var recordPath = (root, runId) => join6(runDir(root, runId), "run.json");
+var recordPath = (root, runId) => join7(runDir(root, runId), "run.json");
 function readRecord(path) {
   const parsed = runRecordSchema.safeParse(upgradeRunRecord(readJson(path)));
   return parsed.success ? parsed.data : null;
@@ -1861,7 +1976,7 @@ function storedEvent(line) {
 function readEvents(root, runId) {
   let text;
   try {
-    text = readFileSync3(join6(runDir(root, runId), "events.jsonl"), "utf8");
+    text = readFileSync4(join7(runDir(root, runId), "events.jsonl"), "utf8");
   } catch (error) {
     if (error.code === "ENOENT")
       return [];
@@ -2197,6 +2312,8 @@ function reported(parentRunId, results, spawned) {
   return { text: JSON.stringify({ results: included, ...results.length > included.length ? { remaining: results.slice(included.length).map((result) => result.runId) } : {} }), details: { [SUBAGENT_RECEIPT]: receipt } };
 }
 function subagentTools(service, parentRunId) {
+  const quota = service.quota(parentRunId);
+  const budget = `This run allows at most ${quota.children} children: ${Object.entries(quota.profiles).map(([name, value]) => `${value} ${name}`).join(", ")}, ${quota.other} of any other profile and ${quota.unprofiled} unprofiled; a refused spawn means do the work yourself.`;
   const execute = (fn) => async (input) => {
     try {
       return await fn(input);
@@ -2209,7 +2326,7 @@ 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. 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.",
+    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. " + budget,
     planModeSafe: (input) => service.planSpawnRefusal(parentRunId, input) === null,
     parameters: (Type) => Type.Object({
       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"` })),
@@ -3244,8 +3361,8 @@ function browserPluginPart(engine) {
 }
 
 // src/annotations/store.ts
-import { existsSync as existsSync5, lstatSync, mkdirSync as mkdirSync4, readdirSync as readdirSync3, rmSync as rmSync4 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync6, lstatSync, mkdirSync as mkdirSync4, readdirSync as readdirSync4, rmSync as rmSync4 } from "fs";
+import { join as join8 } from "path";
 var MAX_NOTES = 1e4;
 var MAX_HISTORY = 100;
 var codepoints = (value) => Array.from(value).length;
@@ -3378,17 +3495,17 @@ function visibleTo(note, caller) {
   return note.grants.some((grant) => grant.principal.sessionId && grant.principal.sessionId === caller.sessionId || grant.principal.agentId && grant.principal.agentId === caller.agentId);
 }
 function notesDir(root) {
-  return join7(root, "annotations");
+  return join8(root, "annotations");
 }
 function folder(root) {
   const dir = notesDir(root);
-  if (existsSync5(dir) && (lstatSync(dir).isSymbolicLink() || !lstatSync(dir).isDirectory()))
+  if (existsSync6(dir) && (lstatSync(dir).isSymbolicLink() || !lstatSync(dir).isDirectory()))
     throw new HarnessError("invalid_data", "Note storage must be a plain folder.");
   mkdirSync4(dir, { recursive: true });
   return dir;
 }
 function file(root, id) {
-  return join7(folder(root), `${safeId(id)}.json`);
+  return join8(folder(root), `${safeId(id)}.json`);
 }
 function validNote(note, id) {
   if (!note || note.id !== id || note.author !== "user" || !Number.isSafeInteger(note.version) || note.version < 1 || !Array.isArray(note.grants) || !Array.isArray(note.history)) {
@@ -3414,7 +3531,7 @@ function upgradeDelivery(note) {
 }
 function read2(root, id) {
   const path = file(root, id);
-  if (!existsSync5(path))
+  if (!existsSync6(path))
     throw notFound("Note");
   if (lstatSync(path).isSymbolicLink())
     throw new HarnessError("invalid_data", "Note records must not be links.");
@@ -3422,7 +3539,7 @@ function read2(root, id) {
 }
 function all2(root) {
   const notes = [];
-  for (const name of readdirSync3(folder(root))) {
+  for (const name of readdirSync4(folder(root))) {
     if (!name.endsWith(".json"))
       continue;
     try {
@@ -3465,7 +3582,7 @@ function create(root, input) {
   const target = validateTarget(input?.target);
   const body = normalizeBody(input?.body);
   const tags = normalizeTags(input?.tags);
-  if (readdirSync3(folder(root)).filter((name) => name.endsWith(".json")).length >= MAX_NOTES) {
+  if (readdirSync4(folder(root)).filter((name) => name.endsWith(".json")).length >= MAX_NOTES) {
     throw new HarnessError("annotation_limit", `At most ${MAX_NOTES} notes may be kept.`);
   }
   const at = now();
@@ -3531,7 +3648,7 @@ function importNotes(root, notes) {
       if (!id)
         throw invalid("A note needs an id.");
       safeId(id);
-      if (existsSync5(file(root, id))) {
+      if (existsSync6(file(root, id))) {
         skipped.push({ id, reason: "exists" });
         continue;
       }
@@ -4739,7 +4856,7 @@ function hubServerMethods(harness) {
 }
 
 // src/refine/runner.ts
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 
 // src/variant/surface.ts
 var SYSTEM_PROMPT = "systemprompt.md";
@@ -4795,10 +4912,10 @@ var CONFORMANCE_BLOCK = `2. CONFORMANCE. Is it ONLY what was asked for? Where th
 
 // src/refine/runner.ts
 function refineDir(root, id) {
-  return join8(root, "refine", safeId(id));
+  return join9(root, "refine", safeId(id));
 }
 function readSummary(root, id) {
-  return readJson(join8(refineDir(root, id), "summary.json"));
+  return readJson(join9(refineDir(root, id), "summary.json"));
 }
 
 // src/refine/serverMethods.ts
@@ -4979,15 +5096,15 @@ function historyServerMethods(harness) {
 }
 
 // src/agents/profiles.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, readdirSync as readdirSync5, readFileSync as readFileSync5, rmSync as rmSync5, statSync as statSync3 } from "fs";
-import { basename as basename2, dirname as dirname3, join as join10 } from "path";
+import { existsSync as existsSync8, mkdirSync as mkdirSync5, readdirSync as readdirSync6, readFileSync as readFileSync6, rmSync as rmSync5, statSync as statSync4 } from "fs";
+import { basename as basename2, dirname as dirname4, join as join11 } from "path";
 
 // src/core/effort.ts
 var EFFORTS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
 
 // src/variant/materialise.ts
-import { existsSync as existsSync6, readdirSync as readdirSync4, readFileSync as readFileSync4 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync7, readdirSync as readdirSync5, readFileSync as readFileSync5 } from "fs";
+import { join as join10 } from "path";
 function frontmatter(text, field) {
   const m = new RegExp(`^${field}:\\s*(.+)$`, "m").exec(text.slice(0, 600));
   return m?.[1]?.trim() ?? null;
@@ -4999,10 +5116,10 @@ function bodyAfterFrontmatter(text) {
 function subagentOf(dir, name) {
   if (!/^[a-z0-9][a-z0-9_-]*$/.test(name))
     return null;
-  const path = join9(dir, "sub_agents", name, "AGENT.md");
-  if (!existsSync6(path))
+  const path = join10(dir, "sub_agents", name, "AGENT.md");
+  if (!existsSync7(path))
     return null;
-  const text = readFileSync4(path, "utf8");
+  const text = readFileSync5(path, "utf8");
   return { name, description: frontmatter(text, "description") ?? "", instructions: bodyAfterFrontmatter(text) };
 }
 
@@ -5109,16 +5226,16 @@ var PROFILE_COLORS = ["blue", "green", "yellow", "red", "magenta", "cyan", "oran
 function projectRoot(cwd) {
   let dir = cwd;
   for (;; ) {
-    if (existsSync7(join10(dir, ".git")))
+    if (existsSync8(join11(dir, ".git")))
       return dir;
-    const parent = dirname3(dir);
+    const parent = dirname4(dir);
     if (parent === dir)
       return cwd;
     dir = parent;
   }
 }
 function profileDirs(root, cwd) {
-  return { global: join10(root, "agents"), project: cwd ? join10(projectRoot(cwd), ".xingular", "agents") : null };
+  return { global: join11(root, "agents"), project: cwd ? join11(projectRoot(cwd), ".xingular", "agents") : null };
 }
 function stringList(value, field) {
   if (value === undefined || value === null)
@@ -5203,25 +5320,25 @@ function profileText(profile) {
   return serialize(front, profile.instructions);
 }
 function readFolder(dir, source, into, problems) {
-  if (!dir || !existsSync7(dir))
+  if (!dir || !existsSync8(dir))
     return;
-  for (const file of readdirSync5(dir).filter((entry) => entry.endsWith(".md")).sort()) {
-    const path = join10(dir, file);
+  for (const file of readdirSync6(dir).filter((entry) => entry.endsWith(".md")).sort()) {
+    const path = join11(dir, file);
     const name = file.slice(0, -3);
     try {
-      if (!statSync3(path).isFile())
+      if (!statSync4(path).isFile())
         continue;
-      into.set(name, parseProfile(readFileSync5(path, "utf8"), name, source, path));
+      into.set(name, parseProfile(readFileSync6(path, "utf8"), name, source, path));
     } catch (error) {
       problems.push({ name, source, path, error: error instanceof Error ? error.message : String(error) });
     }
   }
 }
 function variantDefinitions(variantDir) {
-  const folder = variantDir ? join10(variantDir, "sub_agents") : null;
-  if (!folder || !existsSync7(folder))
+  const folder = variantDir ? join11(variantDir, "sub_agents") : null;
+  if (!folder || !existsSync8(folder))
     return [];
-  return readdirSync5(folder).sort().flatMap((name) => {
+  return readdirSync6(folder).sort().flatMap((name) => {
     const definition = RESERVED_PROFILE_NAMES.includes(name) ? null : subagentOf(variantDir, name);
     if (!definition)
       return [];
@@ -5236,7 +5353,7 @@ function variantDefinitions(variantDir) {
       model: null,
       effort: null,
       source: "variant",
-      path: join10(folder, name, "AGENT.md")
+      path: join11(folder, name, "AGENT.md")
     }];
   });
 }
@@ -5299,7 +5416,7 @@ function listProfiles(root, cwd, variantDir, packageProfiles = []) {
       profiles.set(definition.name, definition);
   for (const path of packageProfiles) {
     try {
-      const profile = parsePackageProfile(readFileSync5(path, "utf8"), path);
+      const profile = parsePackageProfile(readFileSync6(path, "utf8"), path);
       if (!profiles.has(profile.name))
         profiles.set(profile.name, profile);
       else
@@ -5342,8 +5459,8 @@ function createProfile(root, cwd, input) {
   if (input.scope !== "global" && input.scope !== "project")
     throw invalid("scope must be global or project.");
   const dir = scopeDir(root, cwd, input.scope);
-  const path = join10(dir, `${name}.md`);
-  if (existsSync7(path))
+  const path = join11(dir, `${name}.md`);
+  if (existsSync8(path))
     throw invalid(`There is already a ${input.scope} profile named ${name}.`);
   let source = { ...TEMPLATE, name };
   if (input.from) {
@@ -5362,8 +5479,8 @@ function removeProfile(root, cwd, input) {
     throw invalid("That is not a profile name.");
   if (input.scope !== "global" && input.scope !== "project")
     throw invalid("scope must be global or project.");
-  const path = join10(scopeDir(root, cwd, input.scope), `${input.name}.md`);
-  if (!existsSync7(path))
+  const path = join11(scopeDir(root, cwd, input.scope), `${input.name}.md`);
+  if (!existsSync8(path))
     throw notFound(`The ${input.scope} profile ${input.name}`);
   rmSync5(path);
 }
@@ -5430,9 +5547,9 @@ function sideQuestionServerMethods(harness) {
 
 // src/core/path.ts
 import { execFileSync } from "child_process";
-import { accessSync, constants, statSync as statSync4 } from "fs";
+import { accessSync, constants, statSync as statSync5 } from "fs";
 import { homedir } from "os";
-import { delimiter, extname, isAbsolute as isAbsolute2, join as join11 } from "path";
+import { delimiter, extname, isAbsolute as isAbsolute2, join as join12 } from "path";
 var resolved = null;
 function searchPath() {
   const platform = process.platform;
@@ -5453,7 +5570,7 @@ function searchPath() {
   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(...[".local/bin", ".bun/bin", ".npm-global/bin", ".cargo/bin"].map((folder) => join12(home, folder)));
     entries.push("/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin");
   }
   const path = [...new Set(entries.filter(Boolean))].join(separator);
@@ -5469,7 +5586,7 @@ function pathSeparator(platform) {
 function isExecutable(path) {
   try {
     accessSync(path, process.platform === "win32" ? constants.F_OK : constants.X_OK);
-    return statSync4(path).isFile();
+    return statSync5(path).isFile();
   } catch {
     return false;
   }
@@ -5486,7 +5603,7 @@ function findBinary(name) {
   }
   for (const directory of searchPath().split(pathSeparator(platform))) {
     for (const candidateName of names) {
-      const candidate = join11(directory, candidateName);
+      const candidate = join12(directory, candidateName);
       if (isExecutable(candidate))
         return candidate;
     }
@@ -5632,7 +5749,7 @@ function connectedAppServerMethods(harness) {
 }
 
 // src/tools/dispatch.ts
-import { existsSync as existsSync9, readdirSync as readdirSync6, readFileSync as readFileSync6 } from "fs";
+import { existsSync as existsSync9, readdirSync as readdirSync7, readFileSync as readFileSync7 } from "fs";
 import { join as join16 } from "path";
 
 // src/accounts/store.ts
@@ -5844,10 +5961,10 @@ function readTool2(env, context, params) {
 
 // src/plugins/proposals.ts
 import { createHash as createHash2, randomUUID as randomUUID2 } from "crypto";
-import { dirname as dirname4, join as join14 } from "path";
+import { dirname as dirname5, join as join15 } from "path";
 
 // src/pi/runtime.ts
-import { join as join12 } from "path";
+import { join as join13 } from "path";
 import { pathToFileURL } from "url";
 var PINNED_PI_VERSION = "1.4.0";
 var HTTP_DISPATCHER_CHUNK = "dist/bundle/chunks/chunk-MM3LKT73.js";
@@ -5876,10 +5993,10 @@ function createPiLoader(importPi, importDispatcher) {
     return loading;
   };
 }
-var loadPi = createPiLoader(() => import("@earendil-works/pi-coding-agent"), async (packageDir) => await import(pathToFileURL(join12(packageDir, HTTP_DISPATCHER_CHUNK)).href));
+var loadPi = createPiLoader(() => import("@earendil-works/pi-coding-agent"), async (packageDir) => await import(pathToFileURL(join13(packageDir, HTTP_DISPATCHER_CHUNK)).href));
 
 // src/plugins/manifest.ts
-import { basename as basename3, join as join13 } from "path";
+import { basename as basename3, join as join14 } from "path";
 import { z as z3 } from "zod";
 var connectorTemplateSchema = z3.object({
   id: z3.string().regex(/^[a-z0-9-]+$/),
@@ -5919,14 +6036,14 @@ var PLUGIN_MANIFESTS = ["plugin.json", ".claude-plugin/plugin.json", ".codex-plu
 var text6 = (value) => typeof value === "string" && value.trim() ? value.trim() : null;
 function pluginJson(packageRoot) {
   for (const file of PLUGIN_MANIFESTS) {
-    const found = readJsonOr(join13(packageRoot, file), null);
+    const found = readJsonOr(join14(packageRoot, file), null);
     if (found && typeof found === "object" && !Array.isArray(found))
       return found;
   }
   return {};
 }
 function packageManifest(packageRoot) {
-  const manifest = readJsonOr(join13(packageRoot, "package.json"), {});
+  const manifest = readJsonOr(join14(packageRoot, "package.json"), {});
   const plugin = text6(manifest.name) ? {} : pluginJson(packageRoot);
   const own = manifest.harness && typeof manifest.harness === "object" && !Array.isArray(manifest.harness) ? manifest.harness : {};
   const pluginName = text6(plugin.name);
@@ -5951,8 +6068,8 @@ var SKIPPED = new Set(["node_modules", ".git"]);
 var MAX_FILES = 100;
 var MAX_FILE_BYTES = 256 * 1024;
 var MAX_TOTAL_BYTES = 1024 * 1024;
-var dir = (root) => join14(root, "plugin-proposals");
-var pathOf = (root, id) => join14(dir(root), `${safeId(id)}.json`);
+var dir = (root) => join15(root, "plugin-proposals");
+var pathOf = (root, id) => join15(dir(root), `${safeId(id)}.json`);
 function validate2(name, description, input) {
   if (typeof name !== "string" || !/^[a-z0-9][a-z0-9_-]{0,63}$/.test(name))
     throw invalid("Plugin name must be lowercase letters, digits, underscores or hyphens.");
@@ -5999,26 +6116,6 @@ function create2(root, name, description, files) {
   return proposal;
 }
 
-// src/tools/defaultSkills.ts
-import { existsSync as existsSync8 } from "fs";
-import { dirname as dirname5, join as join15 } from "path";
-import { fileURLToPath } from "url";
-function defaultSkillPath() {
-  let dir = dirname5(fileURLToPath(import.meta.url));
-  for (;; ) {
-    const path = join15(dir, "builtin", "skills", "plugin-authoring", "SKILL.md");
-    if (existsSync8(path))
-      return path;
-    const parent = dirname5(dir);
-    if (parent === dir)
-      throw new Error("The bundled plugin-authoring skill is missing.");
-    dir = parent;
-  }
-}
-function defaultSkillPaths(variantDir) {
-  return variantDir && existsSync8(join15(variantDir, "skills", "plugin-authoring", "SKILL.md")) ? [] : [defaultSkillPath()];
-}
-
 // src/tools/dispatch.ts
 function str(params, key) {
   const value = params[key];
@@ -6077,25 +6174,24 @@ ${tail}` : ""}`;
   }
 }
 function loadSkill(variantDir, name) {
-  const skills = variantDir && existsSync9(join16(variantDir, "skills")) ? readdirSync6(join16(variantDir, "skills"), { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync9(join16(variantDir, "skills", entry.name, "SKILL.md"))).map((entry) => entry.name).sort() : [];
-  const defaults = defaultSkillPaths(variantDir);
-  if (defaults.length)
+  const skills = variantDir && existsSync9(join16(variantDir, "skills")) ? readdirSync7(join16(variantDir, "skills"), { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync9(join16(variantDir, "skills", entry.name, "SKILL.md"))).map((entry) => entry.name).sort() : [];
+  if (!skills.includes("plugin-authoring") && defaultSkillPaths(variantDir).length)
     skills.push("plugin-authoring");
   skills.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.";
-  if (!/^[a-z0-9][a-z0-9_-]*$/.test(wanted))
+  if (!SKILL_NAME.test(wanted))
     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(", ")}.` : ""}`;
-  if (wanted === "plugin-authoring" && defaults.length)
-    return readFileSync6(defaults[0], "utf8");
-  const dir = join16(variantDir, "skills", wanted);
-  const helpers = existsSync9(join16(dir, "scripts")) ? readdirSync6(join16(dir, "scripts")) : [];
-  return `${readFileSync6(join16(dir, "SKILL.md"), "utf8")}${helpers.length ? `
+  const skill = readSkillFile(variantDir, wanted);
+  if (!skill)
+    return `There is no skill named ${wanted}.${skills.length ? ` Your skills: ${skills.join(", ")}.` : ""}`;
+  const helperNote = skill.helpers.length ? `
 
-(This skill's helpers are in ${join16(dir, "scripts")}: ${helpers.join(", ")}.)` : ""}`;
+(This skill's helpers are in ${join16(skill.baseDir, "scripts")}: ${skill.helpers.join(", ")}.)` : "";
+  return `${readFileSync7(skill.path, "utf8")}${helperNote}`;
 }
 
 // src/tools/harnessTools.ts
@@ -6286,6 +6382,7 @@ var VARIANT_PLUGIN = {
     { id: "memory", name: "Memory", description: "c3: durable facts about this kind of work." },
     { id: "subagents", name: "Subagents", description: "c5: the list of this variant's subagents." },
     { id: "scripts", name: "Scripts", description: "c7: where this variant's scripts are." },
+    { id: "required-skills", name: "Required skills", description: "Skills the person named as required for one request." },
     { id: "reporting", name: "Reporting", description: "Fixed foundation text, not part of the variant: how the final reply is shaped." }
   ],
   tools: tools(SKILL_TOOLS)
@@ -6692,7 +6789,80 @@ import { matchesKey as matchesKey4, truncateToWidth as truncateToWidth4 } from "
 import { fuzzyFilter, matchesKey as matchesKey3, parseColor as parseColor2, truncateToWidth as truncateToWidth3, visibleWidth as visibleWidth4 } from "@earendil-works/pi-tui";
 
 // src/terminal/tui/search.ts
-import { Input, matchesKey as matchesKey2, truncateToWidth as truncateToWidth2, visibleWidth as visibleWidth3 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey2, truncateToWidth as truncateToWidth2, visibleWidth as visibleWidth3 } from "@earendil-works/pi-tui";
+
+// src/terminal/tui/mouseReport.ts
+import { Input } from "@earendil-works/pi-tui";
+var MOUSE_REPORT_TAIL_WINDOW_MS = 200;
+var REPORT = /^<\d{1,3};\d{1,4};\d{1,4}[Mm]$/;
+var PARTIAL = /^<\d{0,3}(;\d{0,4}){0,2}$/;
+var WHOLE = /^(?:\x1b\[)?<\d{1,3};\d{1,4};\d{1,4}[Mm]$/;
+var SGR_REPORT = /\x1b\[<\d+;\d+;\d+[Mm]|\\u001b\[<\d+;\d+;\d+[Mm]|\\x1b\[<\d+;\d+;\d+[Mm]/g;
+var X10_REPORT = /\x1b\[M[\u0020-\u00ff]{3}/g;
+
+class MouseReportTail {
+  text = "";
+  startedAt = 0;
+  push(sequence, nowMs = Date.now()) {
+    if (WHOLE.test(sequence)) {
+      this.reset();
+      return { report: sequence.replace(/^\x1b\[/, ""), inserted: "" };
+    }
+    if (sequence.length !== 1) {
+      this.reset();
+      return;
+    }
+    if (sequence === "<") {
+      this.text = "<";
+      this.startedAt = nowMs;
+      return;
+    }
+    if (!this.text)
+      return;
+    if (nowMs - this.startedAt > MOUSE_REPORT_TAIL_WINDOW_MS) {
+      this.reset();
+      return;
+    }
+    const next = this.text + sequence;
+    if (REPORT.test(next)) {
+      const inserted = this.text;
+      this.reset();
+      return { report: next, inserted };
+    }
+    if (!PARTIAL.test(next)) {
+      this.reset();
+      return;
+    }
+    this.text = next;
+    return;
+  }
+  reset() {
+    this.text = "";
+    this.startedAt = 0;
+  }
+}
+
+class MouseSafeInput extends Input {
+  mouseTail = new MouseReportTail;
+  handleInput(data) {
+    super.handleInput(data);
+    const match = this.mouseTail.push(data);
+    if (!match)
+      return;
+    const value = this.getValue();
+    if (value.endsWith(match.report))
+      this.setValue(value.slice(0, -match.report.length));
+  }
+  setValue(value) {
+    this.mouseTail.reset();
+    super.setValue(value);
+  }
+}
+function stripMouseReports(text) {
+  return text.replace(SGR_REPORT, "").replace(X10_REPORT, "");
+}
+
+// src/terminal/tui/search.ts
 var SEARCH_GLYPH = "\u2315";
 var SEARCH_PLACEHOLDER = "Type to search";
 var SEARCH_FIELD_ROWS = 5;
@@ -6709,7 +6879,7 @@ class SearchField {
   input;
   constructor(theme, placeholder = SEARCH_PLACEHOLDER) {
     this.theme = theme;
-    this.input = new Input({ prompt: "", placeholder, placeholderStyle: (text) => this.theme().fg("dim", text) });
+    this.input = new MouseSafeInput({ prompt: "", placeholder, placeholderStyle: (text) => this.theme().fg("dim", text) });
   }
   get value() {
     return this.input.getValue();
@@ -11278,7 +11448,7 @@ var payloadOf2 = (event) => event.payload && typeof event.payload === "object" ?
 var stringOf2 = (value) => typeof value === "string" ? value : undefined;
 var numberOf2 = (value) => typeof value === "number" && Number.isFinite(value) ? value : undefined;
 function safe2(value) {
-  return stripTerminalSequences4(value).replace(/[\x00-\x08\x0b-\x1f\x7f]/g, " ");
+  return stripTerminalSequences4(stripMouseReports(value)).replace(/[\x00-\x08\x0b-\x1f\x7f]/g, " ");
 }
 function timeOf2(value) {
   const parsed = Date.parse(value);
@@ -11514,8 +11684,8 @@ class TrajectoryPage {
     return this.events.map((event) => ({
       id: String(event.sequence),
       label: `${timeOf2(event.timestamp)}  ${event.type}`,
-      detail: eventDescription(event),
-      searchText: `${event.timestamp} ${event.type} ${eventDescription(event)} ${safe2(JSON.stringify(payloadOf2(event)))}`,
+      detail: safe2(eventDescription(event)),
+      searchText: `${event.timestamp} ${event.type} ${safe2(eventDescription(event))} ${safe2(JSON.stringify(payloadOf2(event)))}`,
       data: event
     }));
   }
@@ -11654,7 +11824,7 @@ class TrajectoryPage {
     if (rows >= 4)
       lines.push(theme.fg("muted", usageLine(this.events)));
     if (rows >= 6)
-      lines.push(theme.fg("dim", this.run.goal ? `Prompt: ${this.run.goal.replace(/\s+/g, " ").slice(0, 140)}` : "Prompt text unavailable"));
+      lines.push(theme.fg("dim", this.run.goal ? `Prompt: ${safe2(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) => truncateToWidth14(line, width, ""));
@@ -11961,7 +12131,7 @@ class WorktreesPage {
 }
 
 // src/terminal/tui/pages/annotatePage.ts
-import { Input as Input2, matchesKey as matchesKey15, truncateToWidth as truncateToWidth16, visibleWidth as visibleWidth10 } from "@earendil-works/pi-tui";
+import { matchesKey as matchesKey15, truncateToWidth as truncateToWidth16, visibleWidth as visibleWidth10 } from "@earendil-works/pi-tui";
 
 // src/terminal/tui/annotateCommand.ts
 function normalizeAddress(text) {
@@ -12233,7 +12403,7 @@ class AnnotatePage {
     return "Load the bridge script in the app (shown at the top), then reload the app.";
   }
   openField(kind) {
-    const input = new Input2({ prompt: "", placeholder: FIELDS[kind].placeholder, placeholderStyle: (text) => this.options.theme().fg("dim", text) });
+    const input = new MouseSafeInput({ prompt: "", placeholder: FIELDS[kind].placeholder, placeholderStyle: (text) => this.options.theme().fg("dim", text) });
     this.field = { kind, input };
     this.syncFocus();
     this.options.changed();
@@ -14378,15 +14548,6 @@ class ResumeSessionsPage {
   }
 }
 
-// src/terminal/tui/skillInvocation.ts
-function expandSkillInvocation(text, skills) {
-  const trimmed = text.trimStart();
-  const match = /^\$(\S+)(?=\s|$)/.exec(trimmed);
-  if (!match || !skills.has(match[1]))
-    return text;
-  return `/skill:${match[1]}${trimmed.slice(match[0].length)}`;
-}
-
 // src/terminal/commandHelp.ts
 function formatTerminalCommandLabel(name, aliases) {
   return aliases?.length ? `${name} (${aliases.join(", ")})` : name;
@@ -14478,7 +14639,6 @@ function createTerminalCommands(host) {
       return [];
     return session.resourceLoader.getSkills().skills.map((skill) => ({ name: skill.name, description: skill.description }));
   };
-  const expandSkill = (text) => expandSkillInvocation(text, new Set(skills().map((skill) => skill.name)));
   async function openPage(id, options = {}) {
     let close = () => {};
     const page = createCommandPage(host, id, { ...options, close: () => close() });
@@ -14930,7 +15090,7 @@ function createTerminalCommands(host) {
     }
     return true;
   }
-  return { execute, completions, skills, expandSkill, legacyAliases };
+  return { execute, completions, skills, legacyAliases };
 }
 
 // src/sessions/planMode.ts
@@ -15072,7 +15232,7 @@ function parseProposedPlan(text) {
   };
 }
 // src/terminal/tui/dialogs.ts
-import { Editor, Input as Input3, matchesKey as matchesKey18, stripTerminalSequences as stripTerminalSequences11, truncateToWidth as truncateToWidth22, visibleWidth as visibleWidth14, wrapTextWithAnsi as wrapTextWithAnsi14 } from "@earendil-works/pi-tui";
+import { Editor, matchesKey as matchesKey18, stripTerminalSequences as stripTerminalSequences11, truncateToWidth as truncateToWidth22, visibleWidth as visibleWidth14, wrapTextWithAnsi as wrapTextWithAnsi14 } from "@earendil-works/pi-tui";
 function selectTheme(theme) {
   return {
     selectedPrefix: (text) => selectionText(theme, text),
@@ -15083,7 +15243,7 @@ function selectTheme(theme) {
   };
 }
 
-class SecretInput extends Input3 {
+class SecretInput extends MouseSafeInput {
   render(width) {
     const lines = super.render(width);
     if (!this.getValue())
@@ -15357,7 +15517,7 @@ class TerminalDialogs {
   }
   input(title, placeholder, opts, secret = false) {
     return this.show((done) => {
-      const InputType = secret ? SecretInput : Input3;
+      const InputType = secret ? SecretInput : MouseSafeInput;
       const input = new InputType({ prompt: secret ? "" : "> ", placeholder, placeholderStyle: (text) => this.theme().fg("dim", text) });
       input.onSubmit = done;
       input.onEscape = () => done(undefined);
@@ -15449,7 +15609,7 @@ class TerminalDialogs {
 }
 
 // src/terminal/tui/keybindings.ts
-import { readFileSync as readFileSync7 } from "fs";
+import { readFileSync as readFileSync8 } from "fs";
 import { join as join17 } from "path";
 import { KeybindingsManager, TUI_KEYBINDINGS } from "@earendil-works/pi-tui";
 var actions = {
@@ -15469,7 +15629,7 @@ var actions = {
   "app.thinking.toggle": "ctrl+t",
   "app.editor.external": "ctrl+g",
   "app.message.copy": "ctrl+x",
-  "app.message.followUp": ["super+enter", "ctrl+enter", "alt+enter"],
+  "app.message.steer": ["super+enter", "ctrl+enter", "alt+enter"],
   "app.message.dequeue": "alt+up",
   "app.clipboard.pasteImage": process.platform === "darwin" ? ["ctrl+v", "alt+v"] : "ctrl+v",
   "app.session.toggleNamedFilter": "ctrl+n",
@@ -15507,7 +15667,7 @@ var HARNESS_KEYBINDINGS = {
 function readBindings(agentDir) {
   let bindings = {};
   try {
-    const source = JSON.parse(readFileSync7(join17(agentDir, "keybindings.json"), "utf8"));
+    const source = JSON.parse(readFileSync8(join17(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")));
     }
@@ -15576,6 +15736,7 @@ import { closeSync as closeSync2, existsSync as existsSync11, openSync as openSy
 import { isAbsolute as isAbsolute5, join as join21, relative as relative4, resolve as resolve4, sep as sep5 } from "path";
 
 // src/terminal/piExtension.ts
+import { readFileSync as readFileSync9 } from "fs";
 import { createBashTool, createEditTool, createPowerShellTool, createWriteTool } from "@earendil-works/pi-coding-agent";
 import { Type as Type2 } from "typebox";
 
@@ -15740,8 +15901,35 @@ function parseInitialBashCommand(input) {
   return outside ? { command: input.slice(outside[0].length).trim(), workspaceWriteScope: "outside" } : { command: input, workspaceWriteScope: "workspace" };
 }
 
+// src/terminal/tui/skillInvocation.ts
+var SKILL_TOKEN = /(?:^|[\s(])\$([^\s$]*)$/;
+var SKILL_INVOCATION = /(?:^|[\s(])\$([A-Za-z0-9][A-Za-z0-9_-]*)(?=[\s.,;:!?)]|$)/gu;
+function skillTokenAt(text, caret) {
+  const match = SKILL_TOKEN.exec(text.slice(0, caret));
+  if (!match)
+    return null;
+  const query = match[1] ?? "";
+  return { query, from: caret - query.length - 1, to: caret };
+}
+function skillInvocationMatches(text) {
+  const found = [];
+  for (const match of text.matchAll(SKILL_INVOCATION)) {
+    const from = match.index + match[0].indexOf("$");
+    found.push({ name: match[1], from, to: from + 1 + match[1].length });
+  }
+  return found;
+}
+function skillInvocations(text, skills) {
+  const found = [];
+  for (const match of skillInvocationMatches(text)) {
+    if (skills.has(match.name) && !found.includes(match.name))
+      found.push(match.name);
+  }
+  return found;
+}
+
 // src/core/workspace.ts
-import { lstatSync as lstatSync2, realpathSync, statSync as statSync5 } from "fs";
+import { lstatSync as lstatSync2, realpathSync, statSync as statSync6 } from "fs";
 import { homedir as homedir2 } from "os";
 import { basename as basename6, dirname as dirname7, isAbsolute as isAbsolute4, join as join19, relative as relative3, resolve as resolve2, sep as sep4 } from "path";
 function resolveWritePath(candidate, cwd = process.cwd()) {
@@ -15751,7 +15939,7 @@ function resolveWritePath(candidate, cwd = process.cwd()) {
 }
 function isWithinWorkspace(workspaceRoot, canonicalCandidate) {
   const canonicalRoot = realpathSync(workspaceRoot);
-  if (!statSync5(canonicalRoot).isDirectory())
+  if (!statSync6(canonicalRoot).isDirectory())
     throw invalid("The workspace root must be a directory.");
   const fromRoot = relative3(canonicalRoot, canonicalCandidate);
   return fromRoot === "" || fromRoot !== ".." && !fromRoot.startsWith(`..${sep4}`) && !isAbsolute4(fromRoot);
@@ -15760,7 +15948,7 @@ function verifyWorkspaceRoot(workspaceRoot) {
   const canonicalRoot = realpathSync(workspaceRoot);
   if (dirname7(canonicalRoot) === canonicalRoot)
     throw invalid("The filesystem root cannot be used as an active project workspace.");
-  if (canonicalRoot !== resolve2(workspaceRoot) || !statSync5(canonicalRoot).isDirectory()) {
+  if (canonicalRoot !== resolve2(workspaceRoot) || !statSync6(canonicalRoot).isDirectory()) {
     throw invalid("The active project workspace changed after this run began.");
   }
   return canonicalRoot;
@@ -15811,7 +15999,7 @@ function inspectWorkspaceWrite(workspaceRoot, cwd, tool, input) {
 import { Type } from "typebox";
 
 // src/core/shell.ts
-import { accessSync as accessSync2, constants as constants2, statSync as statSync6 } from "fs";
+import { accessSync as accessSync2, constants as constants2, statSync as statSync7 } 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 {}
@@ -15864,7 +16052,7 @@ function isWslLauncher(path, env) {
 function isFile(path) {
   try {
     accessSync2(path, constants2.F_OK);
-    return statSync6(path).isFile();
+    return statSync7(path).isFile();
   } catch {
     return false;
   }
@@ -15874,7 +16062,7 @@ function isFile(path) {
 import { AsyncLocalStorage } from "async_hooks";
 import { spawn } from "child_process";
 import { randomUUID as randomUUID3 } from "crypto";
-import { accessSync as accessSync3, constants as constants3, existsSync as existsSync10, lstatSync as lstatSync3, mkdtempSync, realpathSync as realpathSync2, readdirSync as readdirSync7, rmSync as rmSync6, statSync as statSync7 } from "fs";
+import { accessSync as accessSync3, constants as constants3, existsSync as existsSync10, lstatSync as lstatSync3, mkdtempSync, realpathSync as realpathSync2, readdirSync as readdirSync8, rmSync as rmSync6, statSync as statSync8 } from "fs";
 import { tmpdir } from "os";
 import { join as join20 } from "path";
 import { spawnSync } from "child_process";
@@ -15896,7 +16084,7 @@ function systemExecutable(candidates) {
   for (const candidate of candidates) {
     try {
       accessSync3(candidate, constants3.X_OK);
-      if (statSync7(candidate).isFile())
+      if (statSync8(candidate).isFile())
         return candidate;
     } catch {}
   }
@@ -16133,7 +16321,7 @@ function assertNoExternalHardlinks(workspaceRoot) {
   const visit = (directory) => {
     let entries;
     try {
-      entries = readdirSync7(directory, { withFileTypes: true });
+      entries = readdirSync8(directory, { withFileTypes: true });
     } catch (error) {
       throw new Error(`Workspace hard-link inspection failed at ${directory}; Bash was not run: ${error instanceof Error ? error.message : String(error)}`);
     }
@@ -16268,7 +16456,7 @@ function withWorkspaceWriteScope(tool, note = "") {
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
 import { spawn as spawn2 } from "child_process";
 import { createHash as createHash3 } from "crypto";
-import { constants as fsConstants, realpathSync as realpathSync3, statSync as statSync8 } from "fs";
+import { constants as fsConstants, realpathSync as realpathSync3, statSync as statSync9 } from "fs";
 import { access, readFile } from "fs/promises";
 import { dirname as dirname8, resolve as resolve3 } from "path";
 var writeAuthorization = new AsyncLocalStorage2;
@@ -16342,7 +16530,7 @@ function nearestExistingDirectory(path) {
   while (true) {
     try {
       const canonical = realpathSync3(current);
-      if (!statSync8(canonical).isDirectory())
+      if (!statSync9(canonical).isDirectory())
         throw new Error(`Write scope is not a directory: ${canonical}`);
       return canonical;
     } catch (error) {
@@ -16734,6 +16922,32 @@ async function piExtension_default(pi, planRun, getSession) {
     if (notice)
       return { message: { customType: SUBAGENT_RESULTS, content: notice.text, display: false, details: { [SUBAGENT_RECEIPT]: notice.receipt } } };
   });
+  pi.on("before_agent_start", async (event) => {
+    if (event.messageType !== "user" || /^\s*!/u.test(event.prompt))
+      return;
+    if (pi.getSettings?.().enableSkillCommands === false)
+      return;
+    const skills = (pi.getCommands?.() ?? []).filter((command) => command.source === "skill").map((command) => ({
+      name: command.name.replace(/^skill:/, ""),
+      path: command.sourceInfo.path,
+      ...command.sourceInfo.baseDir ? { baseDir: command.sourceInfo.baseDir } : {}
+    }));
+    if (!skills.length)
+      return;
+    const names = skillInvocations(event.prompt, new Set(skills.map((skill) => skill.name)));
+    if (!names.length)
+      return;
+    const entries = names.map((name) => {
+      const skill = skills.find((candidate) => candidate.name === name);
+      try {
+        return { name, path: skill.path, baseDir: skill.baseDir, body: bodyOf(readFileSync9(skill.path, "utf8")) };
+      } catch {
+        return { name, path: skill.path, body: "" };
+      }
+    });
+    const content = requiredSkillsText(entries);
+    return content ? { message: { customType: "xingular-required-skills", content, display: false, details: { skills: names } } } : undefined;
+  });
   pi.on("before_agent_start", async (event, ctx) => {
     if (event.messageType !== "user")
       return;
@@ -17111,7 +17325,7 @@ class ModeChoices {
       this.quiet -= 1;
     }
   }
-  async apply(session, mode, modelFor) {
+  async apply(session, mode, modelFor, fallback) {
     const choice = this.resolve(mode);
     await this.quietly(async () => {
       const model = choice.model ? modelFor(choice.model) : undefined;
@@ -17120,8 +17334,7 @@ class ModeChoices {
           await session.setModel(model, { persist: false });
         } catch {}
       }
-      if (choice.effort)
-        session.setThinkingLevel(choice.effort, { persist: false });
+      session.setThinkingLevel(choice.effort ?? fallback, { persist: false });
     });
   }
   async record(mode, patch) {
@@ -17271,7 +17484,11 @@ async function createTerminalRuntime(args, host) {
   const modeChoices = new ModeChoices(choiceStore);
   const recordingMode = () => planRun.active ? "plan" : currentMode;
   const modelFor = (reference) => resolveCliModel({ cliModel: reference, modelRuntime }).model;
-  const applyMode = () => modeChoices.apply(native.session, currentMode, modelFor);
+  const defaultEffort = (session) => {
+    const model = session.model;
+    return (model ? session.settingsManager.getModelThinkingLevel(model.provider, model.id) : undefined) ?? session.settingsManager.getDefaultThinkingLevel() ?? "medium";
+  };
+  const applyMode = () => modeChoices.apply(native.session, currentMode, modelFor, defaultEffort(native.session));
   const restoreChoice = async (session, previous) => {
     if (previous.model && (session.model?.provider !== previous.model.provider || session.model?.id !== previous.model.id)) {
       await session.setModel(previous.model, { persist: false }).catch(() => {
@@ -17467,7 +17684,7 @@ async function createTerminalRuntime(args, host) {
       planRun.active = true;
       try {
         session.setActiveToolsByName(allowedTools);
-        await modeChoices.apply(session, "plan", modelFor);
+        await modeChoices.apply(session, "plan", modelFor, defaultEffort(session));
         await session.prompt(text, { expandPromptTemplates: false, ...images?.length ? { images } : {} });
       } finally {
         planRun.active = false;
@@ -19860,6 +20077,7 @@ class OpenTuiApplication {
   host = new PiDialogHost(() => this.change());
   transcript = new TranscriptModel;
   listeners = new Set;
+  animationListeners = new Set;
   cleanup = [];
   statuses = new Map;
   widgets = new Map;
@@ -19884,8 +20102,10 @@ class OpenTuiApplication {
   editorFactory;
   customEditor;
   draft = "";
+  mouseTail = new MouseReportTail;
   draftEpoch = 0;
   draftCursorOffset = null;
+  paletteCaret = null;
   attachments = new ComposerAttachments;
   insertion = null;
   fileCompletion = null;
@@ -19930,8 +20150,9 @@ class OpenTuiApplication {
   done = new Promise((resolve) => {
     this.finish = resolve;
   });
-  pendingPolling = false;
   pendingBusy = false;
+  decisionWatch;
+  pendingRequests = [];
   pendingAbort;
   pendingId;
   dismissedDecisions = new Set;
@@ -19955,14 +20176,17 @@ class OpenTuiApplication {
     const target = raw ? linkTarget(raw, { base: this.runtime?.cwd }) : null;
     const next = target ? `${target.kind}:${"url" in target ? target.url : ("address" in target) ? target.address : target.path}` : raw;
     const entered = next !== this.hoveredLink;
+    if (!entered && !next)
+      return;
     if (!entered && x === this.hoveredAt.x && y === this.hoveredAt.y)
       return;
     this.hoveredLink = next;
     this.hoveredLinkId = next ? this.renderer?.getLinkIdAt(x, y) ?? 0 : 0;
     this.hoveredAt = { x, y };
-    if (entered)
+    if (entered) {
       this.renderer?.setMousePointer(next ? "pointer" : "default");
-    this.change();
+      this.change();
+    }
     this.renderer?.requestRender();
   }
   activateLinkAt(x, y, modifiers = {}) {
@@ -20003,6 +20227,29 @@ class OpenTuiApplication {
       this.listeners.delete(listener);
     };
   }
+  subscribeAnimation(listener) {
+    this.animationListeners.add(listener);
+    return () => {
+      this.animationListeners.delete(listener);
+    };
+  }
+  animationView() {
+    return {
+      working: this.working(),
+      subagents: subagentRoster(this.subagents, Math.max(20, this.host.columns - 4), this.workingSpinnerFrame(this.startedAt ?? Date.now()))
+    };
+  }
+  animate() {
+    if (this.startedAt !== null || this.compacting) {
+      for (const listener of this.animationListeners) {
+        try {
+          listener();
+        } catch {}
+      }
+    }
+    if (this.sideQuestion?.state === "thinking")
+      this.change();
+  }
   get hasFailure() {
     return !!this.failure;
   }
@@ -20255,16 +20502,18 @@ class OpenTuiApplication {
       this.initialized = true;
       this.refresh();
       this.refreshSubagents(true);
+      const decisionWatch = new AbortController;
+      this.decisionWatch = decisionWatch;
+      this.cleanup.push(() => decisionWatch.abort());
+      this.watchDecisions(decisionWatch.signal);
       let lastSubagentPoll = 0;
       const tick = setInterval(() => {
-        if (this.startedAt !== null || this.compacting || this.sideQuestion?.state === "thinking")
-          this.change();
+        this.animate();
         const now = Date.now();
         if (this.startedAt !== null && now - lastSubagentPoll >= 1000) {
           lastSubagentPoll = now;
           this.refreshSubagents();
         }
-        this.decisions();
       }, 100);
       const git = setInterval(() => {
         this.refreshBranch();
@@ -20570,20 +20819,37 @@ class OpenTuiApplication {
     this.transcript.invalidate();
     this.change();
   }
-  async decisions() {
-    if (this.pendingPolling || !this.runtime || this.stopped)
-      return;
-    this.pendingPolling = true;
-    let requests;
-    try {
-      requests = await this.runtime.pending();
-    } catch (error) {
-      if (!this.stopped)
+  async watchDecisions(signal) {
+    let revision;
+    while (!signal.aborted && !this.stopped) {
+      try {
+        const snapshot = await controlCall("terminal.pending.wait", { revision }, 25000, signal);
+        revision = snapshot.revision;
+        this.decisions(snapshot.requests);
+      } catch (error) {
+        if (signal.aborted || this.stopped)
+          return;
         this.notify(error instanceof Error ? error.message : String(error), "error");
-      return;
-    } finally {
-      this.pendingPolling = false;
+        revision = undefined;
+        await new Promise((resolve) => {
+          const timer = setTimeout(done, 1000);
+          function done() {
+            clearTimeout(timer);
+            signal.removeEventListener("abort", done);
+            resolve();
+          }
+          signal.addEventListener("abort", done, { once: true });
+          if (signal.aborted)
+            done();
+        });
+      }
     }
+  }
+  async decisions(requests) {
+    if (!this.runtime || this.stopped)
+      return;
+    requests ??= await this.runtime.pending();
+    this.pendingRequests = requests;
     if (this.pendingId && !requests.some((request) => request.requestId === this.pendingId))
       this.pendingAbort?.abort();
     if (this.pendingBusy)
@@ -20624,6 +20890,11 @@ class OpenTuiApplication {
       this.pendingBusy = false;
       this.pendingId = undefined;
       this.pendingAbort = undefined;
+      if (!this.stopped && this.pendingRequests.some((item) => !this.dismissedDecisions.has(item.requestId))) {
+        setTimeout(() => {
+          this.decisions(this.pendingRequests);
+        }, 100);
+      }
     }
   }
   async showQuestionDock(questions, signal) {
@@ -20916,7 +21187,7 @@ class OpenTuiApplication {
     if (this.paletteSuppressed)
       return null;
     const slash = /^\/([^\s]*)$/u.exec(this.draft);
-    const skill = /^\$([^\s]*)$/u.exec(this.draft);
+    const skill = this.bashMode ? null : skillTokenAt(this.draft, this.paletteCaret ?? this.draft.length);
     if (!this.paletteOpen && (this.bashMode || !slash && !skill))
       return null;
     let items = [];
@@ -20929,7 +21200,7 @@ class OpenTuiApplication {
     } catch {
       return null;
     }
-    const filter = this.paletteOpen ? this.paletteFilter : skill?.[1] ?? slash?.[1] ?? "";
+    const filter = this.paletteOpen ? this.paletteFilter : skill?.query ?? slash?.[1] ?? "";
     const matched = matchPalette(items, filter);
     if (!matched.length)
       return null;
@@ -20994,6 +21265,14 @@ class OpenTuiApplication {
     this.paletteOpen = false;
     this.paletteSuppressed = true;
     this.paletteIndex = 0;
+    const token = this.bashMode ? null : skillTokenAt(this.draft, this.paletteCaret ?? this.draft.length);
+    if (token) {
+      const tail = this.draft.slice(token.to);
+      const suffix = tail === "" ? " " : /^[\s.,;:!?)]/u.test(tail) ? "" : " ";
+      const inserted = `${item.prefix ?? "$"}${item.name}${suffix}`;
+      this.setDraftExternal(`${this.draft.slice(0, token.from)}${inserted}${tail}`, token.from + inserted.length);
+      return true;
+    }
     const text = `${item.prefix ?? "/"}${item.name} `;
     this.setDraftExternal(text, text.length);
     return true;
@@ -21007,7 +21286,7 @@ class OpenTuiApplication {
     this.draftEpoch += 1;
     this.change();
   }
-  setDraft(value) {
+  setDraft(value, caret) {
     if (this.paletteOpen) {
       this.paletteFilter = value.startsWith("/") && !/\s/u.test(value) ? value.slice(1) : value;
       this.paletteIndex = 0;
@@ -21015,15 +21294,20 @@ class OpenTuiApplication {
       this.change();
       return;
     }
+    let nextCaret = caret;
     let modeChanged = false;
     if (!this.bashMode) {
       const bash = splitBashDraft(value);
       if (bash.bashMode) {
         modeChanged = true;
         this.applyComposerMode("bash");
+        if (nextCaret !== undefined)
+          nextCaret = Math.max(0, nextCaret - (value.length - bash.body.length));
       }
       value = bash.body;
     }
+    if (nextCaret !== undefined)
+      this.paletteCaret = nextCaret;
     if (value === this.draft) {
       if (modeChanged)
         this.change();
@@ -21042,12 +21326,14 @@ class OpenTuiApplication {
     this.change();
   }
   setDraftExternal(value, cursorOffset, preserveBashMode = false) {
+    this.mouseTail.reset();
     this.resetHistoryBrowse();
     const bash = preserveBashMode ? { body: value, bashMode: this.bashMode } : splitBashDraft(value);
     this.invalidateFileCompletion();
     this.applyComposerMode(bash.bashMode ? "bash" : this.planMode ? "plan" : "normal");
     const body = bash.body;
     this.draft = body;
+    this.paletteCaret = null;
     this.attachments.retain(body);
     this.draftCursorOffset = cursorOffset ?? null;
     this.draftEpoch += 1;
@@ -21073,6 +21359,7 @@ class OpenTuiApplication {
     this.invalidateFileCompletion();
     this.applyComposerMode("bash");
     this.draft = body;
+    this.paletteCaret = null;
     this.draftCursorOffset = null;
     this.draftEpoch += 1;
     this.paletteSuppressed = false;
@@ -21088,11 +21375,13 @@ class OpenTuiApplication {
     this.change();
   }
   clearDraft() {
+    this.mouseTail.reset();
     this.resetHistoryBrowse();
     this.invalidateFileCompletion();
     this.applyComposerMode(this.planMode ? "plan" : "normal");
     this.draft = "";
     this.attachments.clear();
+    this.paletteCaret = null;
     this.draftCursorOffset = null;
     this.draftEpoch += 1;
     this.paletteSuppressed = false;
@@ -21136,7 +21425,8 @@ class OpenTuiApplication {
     this.input(() => this.onSubmitPrompt());
   }
   onSubmitPrompt() {
-    this.submit(this.bashMode ? `!${this.draft}` : this.draft, false);
+    this.mouseTail.reset();
+    this.submit(this.bashMode ? `!${this.draft}` : this.draft, true);
   }
   async runBash(text) {
     const command = /^\s*!\s*([\s\S]+)$/u.exec(text)?.[1]?.trim();
@@ -21203,16 +21493,15 @@ class OpenTuiApplication {
           this.enqueuePlan(text, images);
           return;
         }
-        const expanded = this.commands.expandSkill(text);
         if (this.planBarrierOpen) {
-          this.deferredInputs.push({ kind: "prompt", text: expanded, followUp, images });
+          this.deferredInputs.push({ kind: "prompt", text, followUp, images });
           this.notify("Message queued to run after the current response.");
           this.change();
           return;
         }
         if (!this.session.isIdle)
           this.notify(followUp ? "Follow-up message queued." : "Steering message queued.");
-        await this.runtime.submit(expanded, followUp, images);
+        await this.runtime.submit(text, followUp, images);
       } finally {
         if (command)
           this.commandBusy = false;
@@ -21353,6 +21642,7 @@ class OpenTuiApplication {
     this.applyComposerMode(mode);
     this.draft = parsed.body;
     this.attachments.clearForDraft(this.draft);
+    this.paletteCaret = null;
     this.draftCursorOffset = this.draft.length;
     this.draftEpoch += 1;
     this.paletteSuppressed = true;
@@ -21607,9 +21897,9 @@ class OpenTuiApplication {
       const hidden = !this.session.settingsManager.getHideThinkingBlock();
       this.session.settingsManager.setHideThinkingBlock(hidden);
       this.transcript.setThinkingHidden(hidden);
-    } else if (is("app.message.followUp")) {
+    } else if (is("app.message.steer")) {
       const editor = this.customEditor;
-      this.submit(editor?.getExpandedText?.() ?? (this.bashMode ? `!${this.draft}` : this.draft), true);
+      this.submit(editor?.getExpandedText?.() ?? (this.bashMode ? `!${this.draft}` : this.draft), false);
     } else if (is("app.message.dequeue")) {
       const pending = this.session.clearQueue();
       const deferred = this.deferredInputs.map((input) => input.kind === "plan" ? `/plan ${input.text}` : input.text);
@@ -21634,11 +21924,29 @@ class OpenTuiApplication {
       this.attempt(() => this.commands.execute("/new"));
     else if (data === "?" && this.draft === "")
       this.notify(this.hotkeys());
+    else if (this.dropMouseReportTail(key, data))
+      return true;
     else if (!this.extensionShortcut(data))
       return false;
     this.change();
     return true;
   }
+  dropMouseReportTail(key, data) {
+    const match = this.mouseTail.push(data);
+    if (!match)
+      return false;
+    if (!match.inserted) {
+      this.change();
+      return true;
+    }
+    const caret = key.cursorOffset ?? this.draft.length;
+    const start = caret - match.inserted.length;
+    const at = start >= 0 && this.draft.slice(start, caret) === match.inserted ? start : this.draft.endsWith(match.inserted) ? this.draft.length - match.inserted.length : -1;
+    if (at < 0)
+      return false;
+    this.setDraftExternal(this.draft.slice(0, at) + this.draft.slice(at + match.inserted.length), at);
+    return true;
+  }
   hotkeys() {
     return [
       "Tab files/folders \xB7 Shift+Tab plan mode",
@@ -21647,7 +21955,7 @@ class OpenTuiApplication {
       "Ctrl+L model",
       "Ctrl+N new session",
       "\u2191/\u2193 at either draft endpoint browse older/newer history \xB7 Ctrl+\u2191/\u2193 anywhere",
-      "Enter send or steer \xB7 Cmd/Ctrl/Alt+Enter queue \xB7 Esc dismisses btw or stops reply",
+      "Enter send or queue \xB7 Cmd/Ctrl/Alt+Enter steer \xB7 Esc dismisses btw or stops reply",
       "Ctrl+C clear or quit \xB7 Ctrl+D quit",
       "PgUp/PgDn transcript"
     ].join(`
@@ -21844,6 +22152,7 @@ class OpenTuiApplication {
   insert(text) {
     if (!text)
       return;
+    this.mouseTail.reset();
     if (this.customEditor?.getExpandedText) {
       const editor = this.customEditor;
       if (editor.insertTextAtCursor) {
@@ -21910,6 +22219,8 @@ class OpenTuiApplication {
         }
       };
       this.stopped = true;
+      this.mouseTail.reset();
+      this.decisionWatch?.abort();
       protect(() => this.renderer?.setMousePointer("default"));
       this.hoveredLink = null;
       if (this.toastTimer)
@@ -23043,32 +23354,40 @@ function bufferOffset(text, index) {
     offset += visibleWidth16(line) + (position < lines.length - 1 ? 1 : 0);
   return offset;
 }
-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);
-  if (!range) {
-    for (const mark of marks)
-      target.extmarks.delete(mark.id);
-    return;
+function indexForBufferOffset(text, offset) {
+  let cells = 0;
+  let index = 0;
+  for (const character of text) {
+    if (cells >= offset)
+      return index;
+    cells += character === `
+` ? 1 : visibleWidth16(character);
+    index += character.length;
   }
-  const start = bufferOffset(target.plainText, range.start);
-  const end = start + visibleWidth16(target.plainText.slice(range.start, range.end));
-  if (marks.length === 1 && marks[0].start === start && marks[0].end === end)
+  return text.length;
+}
+function skillInvocationRanges(text, names) {
+  return skillInvocationMatches(text).filter((match) => names.includes(match.name)).map((match) => ({ start: match.from, end: match.to }));
+}
+function syncTextMarks(target, ranges, typeId, styleId) {
+  const expected = ranges.map((range) => {
+    const start = bufferOffset(target.plainText, range.start);
+    return { start, end: start + visibleWidth16(target.plainText.slice(range.start, range.end)) };
+  });
+  const marks = target.extmarks.getAllForTypeId(typeId).sort((left, right) => left.start - right.start);
+  if (marks.length === expected.length && expected.every((range, index) => marks[index].start === range.start && marks[index].end === range.end))
     return;
   for (const mark of marks)
     target.extmarks.delete(mark.id);
-  target.extmarks.create({ start, end, virtual: true, styleId, typeId });
+  for (const range of expected)
+    target.extmarks.create({ start: range.start, end: range.end, virtual: true, styleId, typeId });
 }
 function syncSlashCommandMark(target, names, typeId, styleId) {
-  syncTextMark(target, leadingSlashCommandRange(target.plainText, names), typeId, styleId);
+  const range = leadingSlashCommandRange(target.plainText, names);
+  syncTextMarks(target, range ? [range] : [], typeId, styleId);
 }
 function syncSkillInvocationMark(target, names, typeId, styleId) {
-  syncTextMark(target, leadingSkillInvocationRange(target.plainText, names), typeId, styleId);
+  syncTextMarks(target, skillInvocationRanges(target.plainText, names), typeId, styleId);
 }
 function syncAttachmentMarks(target, labels, typeId, styleId) {
   const byId = new Map(labels.map((label) => [label.id, label]));
@@ -23695,8 +24014,9 @@ function TranscriptItemView(props) {
   }
   if (item.kind === "plan") {
     return (() => {
-      var _el$23 = _$createElement2("box"), _el$24 = _$createElement2("text"), _el$25 = _$createTextNode2(`Plan \xB7 `), _el$26 = _$createElement2("markdown");
+      var _el$23 = _$createElement2("box"), _el$24 = _$createElement2("text"), _el$25 = _$createElement2("box"), _el$26 = _$createElement2("markdown");
       _$insertNode2(_el$23, _el$24);
+      _$insertNode2(_el$23, _el$25);
       _$insertNode2(_el$23, _el$26);
       _$setProp2(_el$23, "border", ["left"]);
       _$setProp2(_el$23, "flexDirection", "column");
@@ -23705,7 +24025,6 @@ function TranscriptItemView(props) {
       _$setProp2(_el$23, "paddingTop", 1);
       _$setProp2(_el$23, "paddingBottom", 1);
       _$setProp2(_el$23, "flexShrink", 0);
-      _$insertNode2(_el$24, _el$25);
       _$setProp2(_el$24, "wrapMode", "word");
       _$insert2(_el$24, () => item.title, null);
       _$insert2(_el$24, _$createComponent2(Show2, {
@@ -23718,14 +24037,16 @@ function TranscriptItemView(props) {
               return t.dim;
             },
             attributes: 0,
-            children: " \xB7 streaming\u2026"
+            children: " streaming\u2026"
           });
         }
       }), null);
+      _$setProp2(_el$25, "height", 1);
+      _$setProp2(_el$25, "flexShrink", 0);
       _$setProp2(_el$26, "bg", "transparent");
       _$setProp2(_el$26, "conceal", true);
       _$effect2((_p$) => {
-        var { planMode: _v$16, panel: _v$17, planMode: _v$18 } = t, _v$19 = TextAttributes2.BOLD, _v$20 = addHeadingOneSpacing(item.body), _v$21 = item.streaming, _v$22 = props.syntax, _v$23 = t.text, _v$24 = {
+        var { planMode: _v$16, panel: _v$17, planMode: _v$18 } = t, _v$19 = TextAttributes2.BOLD | TextAttributes2.UNDERLINE, _v$20 = addHeadingOneSpacing(item.body), _v$21 = item.streaming, _v$22 = props.syntax, _v$23 = t.text, _v$24 = {
           borderColor: t.dim,
           cellPaddingX: 1
         };
@@ -24685,7 +25006,7 @@ function Prompt(props) {
     } finally {
       syncing = false;
     }
-    props.app.setDraft(area.plainText);
+    props.app.setDraft(area.plainText, indexForBufferOffset(area.plainText, area.cursorOffset));
   };
   createEffect2(() => {
     view().attachments;
@@ -25347,6 +25668,15 @@ function OpenTuiRoot(props) {
   const [state, setState] = createStore(props.app.view());
   const off = props.app.subscribe(() => setState(reconcile(props.app.view())));
   onCleanup2(off);
+  const offAnimation = props.app.subscribeAnimation(() => {
+    const animation = props.app.animationView();
+    setState("working", reconcile({
+      ...animation.working,
+      sessionName: state.working.sessionName
+    }));
+    setState("subagents", reconcile(animation.subagents));
+  });
+  onCleanup2(offAnimation);
   useSelectionHandler((selection) => {
     const selectedText = terminalSelectionText(selection);
     if (selectedText !== undefined)
@@ -25497,7 +25827,7 @@ function OpenTuiRoot(props) {
     if (key.eventType !== "press" || !key.sequence)
       return;
     if (prompt?.focused)
-      props.app.setDraft(prompt.plainText);
+      props.app.setDraft(prompt.plainText, indexForBufferOffset(prompt.plainText, prompt.cursorOffset));
     const current = view();
     const page = Math.max(1, Math.floor((dimensions().height - 8) / 2));
     if (!current.overlay && !current.questionDock && (key.name === "pageup" || key.name === "pagedown" || key.ctrl && (key.name === "home" || key.name === "end"))) {