agent.libx.js 0.94.22 → 0.94.24

package/dist/cli.js

@@ -254,12 +254,14 @@ var init_tools_structured = __esm({
         const ctxN = Math.max(0, Number(context ?? 0));
         const out = [];
         const matched = [];
+        let skipped = 0;
         for (const path of files) {
           ckAbort(ctx.signal);
           let content;
           try {
             content = await ctx.fs.readFile(path);
           } catch {
+            skipped++;
             continue;
           }
           const lines = content.split("\n");
@@ -274,8 +276,10 @@ var init_tools_structured = __esm({
           }
           if (fileHit) matched.push(path);
         }
-        if (filesOnly) return matched.length ? matched.join("\n") : "(no matches)";
-        return out.length ? out.join("\n") : "(no matches)";
+        const note = skipped ? `
+[skipped ${skipped} unreadable file${skipped === 1 ? "" : "s"}]` : "";
+        if (filesOnly) return (matched.length ? matched.join("\n") : "(no matches)") + note;
+        return (out.length ? out.join("\n") : "(no matches)") + note;
       }
     };
     SIG_RE = /^\s*(export\b|(?:export\s+)?(?:async\s+)?function\s+\*?\w|(?:export\s+)?(?:abstract\s+)?class\s+\w|(?:export\s+)?interface\s+\w|(?:export\s+)?type\s+\w|(?:export\s+)?enum\s+\w)/;
@@ -964,7 +968,7 @@ var init_tools = __esm({
     IMG_MIME = { png: "image/png", jpg: "image/jpeg", jpeg: "image/jpeg", gif: "image/gif", webp: "image/webp" };
     readTool = {
       name: "Read",
-      description: "Read a file. Text files return 1-indexed numbered lines (with optional `offset`/`limit` and a re-Read pointer for partial reads). Image files (png/jpg/jpeg/gif/webp) return the picture itself so you can SEE it. Always Read a file before Editing it.",
+      description: "Read a file. Text files return 1-indexed numbered lines (with optional `offset`/`limit` and a re-Read pointer for partial reads). Image files (png/jpg/jpeg/gif/webp) return the picture itself so you can SEE it. PDFs return their extracted text. Always Read a file before Editing it.",
       parameters: {
         type: "object",
         required: ["path"],
@@ -976,6 +980,12 @@ var init_tools = __esm({
       },
       async run({ path, offset, limit }, ctx) {
         const ext = String(path).toLowerCase().split(".").pop() ?? "";
+        if (ext === "pdf") {
+          if (!ctx.pdfText) return `[${path} is a PDF \u2014 text extraction isn't available in this environment (install poppler's pdftotext and run on disk).]`;
+          if (!await ctx.fs.exists(path)) return `Error: File not found: ${path}`;
+          const text = (await ctx.pdfText(ctx.fs.resolvePath(path))).trim();
+          return text ? numberLines(text, Math.max(0, offset ?? 0), limit) : `[${path}: no extractable text (scanned/image-only PDF?)]`;
+        }
         if (IMG_MIME[ext]) {
           const fs = ctx.fs;
           if (typeof fs.readFileBytes !== "function") {
@@ -1053,7 +1063,7 @@ var NodeDiskFilesystem;
 var init_NodeDiskFilesystem = __esm({
   "src/NodeDiskFilesystem.ts"() {
     "use strict";
-    NodeDiskFilesystem = class {
+    NodeDiskFilesystem = class _NodeDiskFilesystem {
       constructor(baseDir, opts = {}) {
         this.baseDir = baseDir;
         this.opts = { denySymlinks: true, ...opts };
@@ -1068,14 +1078,24 @@ var init_NodeDiskFilesystem = __esm({
       real(vpath) {
         return np.join(this.baseDir, "." + vpath);
       }
+      // Verified non-symlink DIRECTORY components, with a short TTL: tree walks (Glob/Grep) hit the same
+      // parents thousands of times; re-lstat'ing each per op is the dominant syscall cost. The 1s window
+      // is an accepted race only against an out-of-band symlink swap mid-walk (this FS can't create
+      // symlinks itself); leaf components are never cached.
+      verified = /* @__PURE__ */ new Map();
+      static VERIFY_TTL_MS = 1e3;
       /** Throw if any existing component of `real` is a symlink (escape vector). */
       async assertNoSymlink(real) {
         if (!this.opts.denySymlinks) return;
         const rel = np.relative(this.baseDir, real);
         if (rel === "" || rel.startsWith("..")) return;
+        const parts = rel.split(np.sep);
         let cur = this.baseDir;
-        for (const part of rel.split(np.sep)) {
-          cur = np.join(cur, part);
+        const now5 = Date.now();
+        for (let i = 0; i < parts.length; i++) {
+          cur = np.join(cur, parts[i]);
+          const isLeaf = i === parts.length - 1;
+          if (!isLeaf && (this.verified.get(cur) ?? 0) > now5) continue;
           let st;
           try {
             st = await fsp.lstat(cur);
@@ -1083,6 +1103,10 @@ var init_NodeDiskFilesystem = __esm({
             return;
           }
           if (st.isSymbolicLink()) throw new Error("File not found: symlink not permitted");
+          if (!isLeaf) {
+            if (this.verified.size > 1e4) this.verified.clear();
+            this.verified.set(cur, now5 + _NodeDiskFilesystem.VERIFY_TTL_MS);
+          }
         }
       }
       resolvePath(path, cwd) {
@@ -1418,10 +1442,10 @@ function sandboxArgv(command, cwd, opts = {}, platform2 = process.platform, tmpD
   return null;
 }
 async function findSandboxWrapper(platform2 = process.platform) {
-  const { existsSync: existsSync9 } = await import("fs");
-  if (platform2 === "darwin") return existsSync9("/usr/bin/sandbox-exec") ? "/usr/bin/sandbox-exec" : null;
+  const { existsSync: existsSync10 } = await import("fs");
+  if (platform2 === "darwin") return existsSync10("/usr/bin/sandbox-exec") ? "/usr/bin/sandbox-exec" : null;
   if (platform2 === "linux") {
-    for (const dir of (process.env.PATH ?? "/usr/bin:/bin").split(":")) if (dir && existsSync9(`${dir}/bwrap`)) return `${dir}/bwrap`;
+    for (const dir of (process.env.PATH ?? "/usr/bin:/bin").split(":")) if (dir && existsSync10(`${dir}/bwrap`)) return `${dir}/bwrap`;
     return null;
   }
   return null;
@@ -1689,8 +1713,8 @@ var init_tools_shell = __esm({
 
 // cli/cli.ts
 import { createInterface } from "readline/promises";
-import { existsSync as existsSync8, readFileSync as readFileSync5, appendFileSync, mkdirSync as mkdirSync7, writeFileSync as writeFileSync6, readdirSync as readdirSync2, statSync as statSync3, unlinkSync as unlinkSync2 } from "fs";
-import { homedir as homedir6, tmpdir as tmpdir2 } from "os";
+import { existsSync as existsSync9, readFileSync as readFileSync6, appendFileSync, mkdirSync as mkdirSync8, writeFileSync as writeFileSync8, readdirSync as readdirSync3, statSync as statSync3, unlinkSync as unlinkSync4 } from "fs";
+import { homedir as homedir8, tmpdir as tmpdir3 } from "os";
 
 // cli/clipboard.ts
 import { execFileSync } from "child_process";
@@ -1744,9 +1768,20 @@ close access f`;
   }
   return null;
 }
+function copyTextToClipboard(text, platform2 = process.platform) {
+  const candidates = platform2 === "darwin" ? [["pbcopy", []]] : platform2 === "linux" ? [["wl-copy", []], ["xclip", ["-selection", "clipboard"]]] : [];
+  for (const [cmd, args] of candidates) {
+    try {
+      execFileSync(cmd, args, { input: text, stdio: ["pipe", "ignore", "ignore"] });
+      return true;
+    } catch {
+    }
+  }
+  return false;
+}
 
 // cli/cli.ts
-import { join as join9, resolve as resolve3, basename as basename2, extname, dirname as dirname4 } from "path";
+import { join as join11, resolve as resolve3, basename as basename2, extname, dirname as dirname4 } from "path";
 import { AIClient, listModels, listProviders, getProviderFromModel, getModelInfo, resolveModel, isModelSupported, disposeCursorSessions } from "ai.libx.js";
 
 // src/llm.ts
@@ -2839,6 +2874,8 @@ var AgentOptions = class {
   permissions;
   /** Opt-in syntax guardrail: refuse to persist a syntactically-broken code-file write/edit. Default off. */
   lintOnWrite;
+  /** Optional PDF text extraction for Read on .pdf files (node hosts wire pdftotext); absent => Read explains. */
+  pdfText;
   /** Opt-in: after a write-class tool runs, run `command` over the VFS and append any failure to the tool result.
    *  `tools` defaults to ['Write','Edit','MultiEdit','ApplyEdits']. */
   autoTest;
@@ -2889,8 +2926,12 @@ var Agent = class _Agent {
   reprepare() {
     this.prepared = false;
   }
-  /** Inject tools into a running agent (e.g. dynamically mounted MCP servers). Takes effect on the next turn. */
+  /** Tools injected via addTools(); kept separate from options.tools so prepare() rebuilds don't drop them. */
+  injectedTools = [];
+  /** Inject tools into a running agent (e.g. dynamically mounted MCP servers). Takes effect on the next turn
+   *  and survives prepare() rebuilds (reprepare(), new conversations). */
   addTools(tools) {
+    this.injectedTools.push(...tools);
     this.activeTools.push(...tools);
   }
   /** Remove tools by name from a running agent. Returns the count removed. */
@@ -2898,6 +2939,7 @@ var Agent = class _Agent {
     const s = names instanceof Set ? names : new Set(names);
     const before = this.activeTools.length;
     this.activeTools = this.activeTools.filter((t) => !s.has(t.name));
+    this.injectedTools = this.injectedTools.filter((t) => !s.has(t.name));
     return before - this.activeTools.length;
   }
   constructor(options) {
@@ -2909,6 +2951,7 @@ var Agent = class _Agent {
     this.ctx = makeContext(this.options.fs, this.options.host);
     this.ctx.signal = this.options.signal;
     if (this.options.lintOnWrite) this.ctx.lint = checkSyntax;
+    if (this.options.pdfText) this.ctx.pdfText = this.options.pdfText;
     this.ctx.ai = this.options.ai;
     this.ctx.model = this.options.model;
     this.ctx.parkHuman = (p) => this.park(p);
@@ -2981,7 +3024,7 @@ var Agent = class _Agent {
     const plan = o.planMode ? planMode({ host: o.host }) : void 0;
     if (plan) tools = [...tools, plan.tool];
     this.activeHooks = composeHooks(o.hooks, plan?.hooks, o.permissions?.hooks());
-    this.activeTools = tools;
+    this.activeTools = [...tools, ...this.injectedTools];
     this.systemPromptCache = systemPrompt;
     this.prepared = true;
     return systemPrompt;
@@ -3116,7 +3159,15 @@ var Agent = class _Agent {
       } catch (err2) {
         if (err2?.code === "budget") return kill("budget");
         if (o.signal?.aborted || isAbortError(err2)) return kill("aborted");
-        log3.error(`chat() failed: ${err2?.message ?? err2}`, err2);
+        const body = err2?.body ?? err2?.response?.data ?? err2?.error;
+        let bodyStr;
+        try {
+          bodyStr = body && typeof body !== "string" ? JSON.stringify(body).slice(0, 2e3) : body;
+        } catch {
+          bodyStr = void 0;
+        }
+        if (bodyStr && err2 instanceof Error && !err2.message.includes(bodyStr)) err2.detail = bodyStr;
+        log3.error(`chat() failed: ${err2?.message ?? err2}${bodyStr ? ` \u2014 ${bodyStr}` : ""}`, err2);
         return { text: "", steps, finishReason: "error", messages: this.transcript, usage, usageEstimated, error: err2 };
       }
       if (o.signal?.aborted) return kill("aborted");
@@ -3347,20 +3398,28 @@ function stubOldToolResults(messages, keep) {
     return { ...x, content: `[${x.name ?? "tool"}${where ? ` ${where}` : ""} output elided \u2014 ${lines} lines; re-run the tool to view]` };
   });
 }
-var hasCallFor = (msgs, id) => msgs.some((m) => m.role === "assistant" && m.tool_calls?.some((tc) => tc.id === id));
+var callIdSet = (msgs) => {
+  const ids = /* @__PURE__ */ new Set();
+  for (const m of msgs) if (m.role === "assistant") for (const tc of m.tool_calls ?? []) ids.add(tc.id);
+  return ids;
+};
 function dropOrphanToolResults(messages) {
-  const ok = (m) => m.role !== "tool" || hasCallFor(messages, m.tool_call_id);
+  const ids = callIdSet(messages);
+  const ok = (m) => m.role !== "tool" || ids.has(m.tool_call_id ?? "");
   return messages.every(ok) ? messages : messages.filter(ok);
 }
 function fitTokenBudget(messages, maxTokens) {
-  if (estimateTokens(messages) <= maxTokens) return messages;
+  const per = messages.map((x) => estimateTokens([x]));
+  let total = per.reduce((a, b) => a + b, 0);
+  if (total <= maxTokens) return messages;
   const head = messages[0]?.role === "system" ? [messages[0]] : [];
-  let body = messages.slice(head.length);
-  while (body.length && estimateTokens([...head, ...body]) > maxTokens) body = body.slice(1);
-  while (body.length && body[0].role === "tool" && !hasCallFor(body, body[0].tool_call_id)) body = body.slice(1);
-  if (estimateTokens([...head, ...body]) > maxTokens)
-    log3.warn(`context ~${estimateTokens([...head, ...body])} tok still over maxContextTokens=${maxTokens} after trimming (system head can't be dropped)`);
-  return [...head, ...body];
+  let from = head.length;
+  while (from < messages.length && total > maxTokens) total -= per[from++];
+  const ids = callIdSet(messages.slice(from));
+  while (from < messages.length && messages[from].role === "tool" && !ids.has(messages[from].tool_call_id ?? "")) total -= per[from++];
+  if (total > maxTokens)
+    log3.warn(`context ~${total} tok still over maxContextTokens=${maxTokens} after trimming (system head can't be dropped)`);
+  return [...head, ...messages.slice(from)];
 }
 function compact(m, max, focus) {
   const hasSystem = m[0]?.role === "system";
@@ -3812,11 +3871,11 @@ var Scheduler = class {
     this.jobs.clear();
   }
 };
-function makeScheduleTools(scheduler) {
+function makeScheduleTools(scheduler, os) {
   return [
     {
       name: "ScheduleTask",
-      description: 'Schedule a prompt to fire automatically while this session is alive.\nModes:\n  \u2022 One-off:   {at: <epoch_ms>}        \u2014 fires once at that time, then done.\n  \u2022 Interval:  {everyMs: <ms>}          \u2014 fires repeatedly (\u22651s).\n  \u2022 Cron:      {cron: "min hr dom mon dow"} \u2014 standard 5-field cron.\nReturns the job id. Jobs only fire while the CLI session is running \u2014 they do NOT survive quitting.',
+      description: 'Schedule a prompt to fire automatically.\nModes:\n  \u2022 One-off:   {at: <epoch_ms>}        \u2014 fires once at that time, then done.\n  \u2022 Interval:  {everyMs: <ms>}          \u2014 fires repeatedly (\u22651s).\n  \u2022 Cron:      {cron: "min hr dom mon dow"} \u2014 standard 5-field cron.\nBackend: "session" fires while this CLI session is alive (default for recurring + near one-offs); "os" registers with the OS scheduler so the job survives quitting \u2014 it headless-resumes this session when it fires (auto-chosen for one-offs \u226530min out when available). Pass backend:"os" explicitly for recurring jobs that must outlive the session.',
       parameters: {
         type: "object",
         required: ["prompt", "trigger"],
@@ -3831,15 +3890,22 @@ function makeScheduleTools(scheduler) {
               cron: { type: "string" }
             }
           },
-          label: { type: "string", description: "Short label for display (optional)." }
+          label: { type: "string", description: "Short label for display (optional)." },
+          backend: { type: "string", enum: ["auto", "session", "os"], description: "Where the job lives (default auto)." }
         }
       },
-      async run({ prompt, trigger, label }) {
+      async run({ prompt, trigger, label, backend }) {
         try {
+          if (os && os.route(trigger, backend) === "os") {
+            const id2 = `os-${Date.now().toString(36)}`;
+            const mechanism = os.schedule({ id: id2, prompt, sessionId: os.sessionId, cwd: os.cwd, trigger, label });
+            return `Scheduled ${id2}${label ? ` (${label})` : ""} on the OS scheduler (${mechanism}) \u2014 survives quitting; fires \`agentx --resume ${os.sessionId}\` headless.`;
+          }
+          if (backend === "os") return "Error: no OS scheduler available on this platform \u2014 job not created (use the default in-session backend).";
           const id = scheduler.add({ prompt, trigger, label });
           const job = scheduler.get(id);
           const next = scheduler.nextFire(job);
-          return `Scheduled ${id}${label ? ` (${label})` : ""}. Next fire: ${next ? new Date(next).toLocaleString() : "now"}.`;
+          return `Scheduled ${id}${label ? ` (${label})` : ""}. Next fire: ${next ? new Date(next).toLocaleString() : "now"}. (In-session: does not survive quitting.)`;
         } catch (e) {
           return `Error: ${e?.message ?? e}`;
         }
@@ -3847,24 +3913,28 @@ function makeScheduleTools(scheduler) {
     },
     {
       name: "ScheduleList",
-      description: "List all scheduled jobs and their next fire time.",
+      description: "List all scheduled jobs (in-session + OS-backed) and their next fire time.",
       parameters: { type: "object", properties: {} },
       async run() {
+        const osJobs = os?.list() ?? [];
+        const osLines = osJobs.map((j) => `${j.id}  os  ${j.mechanism}${j.label ? "  " + j.label : ""}`);
         const jobs = scheduler.list();
-        if (!jobs.length) return "(no scheduled jobs)";
-        return jobs.map((j) => {
+        if (!jobs.length && !osLines.length) return "(no scheduled jobs)";
+        return [...osLines, ...jobs.map((j) => {
           const next = scheduler.nextFire(j);
           const trig = "at" in j.trigger ? `once @ ${new Date(j.trigger.at).toLocaleString()}` : "everyMs" in j.trigger ? `every ${(j.trigger.everyMs / 1e3).toFixed(0)}s` : `cron: ${j.trigger.cron}`;
           return `${j.id}  ${j.status}  ${trig}  runs:${j.runs}  next:${next ? new Date(next).toLocaleTimeString() : "\u2014"}${j.label ? "  " + j.label : ""}`;
-        }).join("\n");
+        })].join("\n");
       }
     },
     {
       name: "ScheduleCancel",
-      description: "Cancel a scheduled job by id.",
+      description: "Cancel a scheduled job by id (in-session or OS-backed).",
       parameters: { type: "object", required: ["id"], properties: { id: { type: "string" } } },
       async run({ id }) {
-        return scheduler.cancel(String(id)) ? `Cancelled ${id}.` : `Error: no scheduled job '${id}'. Use ScheduleList to see jobs.`;
+        const key = String(id);
+        if (key.startsWith("os-")) return os?.cancel(key) ? `Cancelled ${key} (OS job removed).` : `Error: no OS job '${key}'.`;
+        return scheduler.cancel(key) ? `Cancelled ${key}.` : `Error: no scheduled job '${key}'. Use ScheduleList to see jobs.`;
       }
     },
     {
@@ -4162,6 +4232,9 @@ var DuplexAgentOptions = class {
   askRelay = false;
   /** Parked questions auto-resolve empty after this long (callers map '' to deny/best-judgment). */
   askTimeoutMs = 12e4;
+  /** Max retained task records: oldest SETTLED tasks (and their activity tails) are evicted past this,
+   *  bounding memory over a long-lived session. Running tasks are never evicted. */
+  maxTaskRecords = 50;
   /** Host overrides for QuickLook lookups (keyed by `what`). The engine's defaults go through the
    *  (possibly jailed) fs — e.g. `.git/**` is deny-listed, so the CLI supplies 'branch' itself. */
   quickLook;
@@ -4452,6 +4525,11 @@ ${recent}` : brief) + verify;
     };
     const promise = new Agent(agentOpts).run(briefText).then((res) => this.maybeVerify(id, briefText, res, tier, agentOpts)).then((res) => this.onWorkerSettled(id, res)).catch((err2) => this.onWorkerFailed(id, err2));
     this.tasks.set(id, { id, label, status: "running", controller, promise, tail });
+    if (this.tasks.size > this.options.maxTaskRecords)
+      for (const [tid, rec] of this.tasks) {
+        if (this.tasks.size <= this.options.maxTaskRecords) break;
+        if (rec.status !== "running") this.tasks.delete(tid);
+      }
   }
   /** Fresh-context check of a successful Act task: a NEW agent (same model/fs/tools, but NO shared
    *  conversation context) re-reads the file state against the brief and fixes any gap. The fix lands
@@ -6052,15 +6130,101 @@ function defaultOpenBrowser(url) {
 
 // cli/core.ts
 import { randomUUID } from "crypto";
+import { execFile as execFile2 } from "child_process";
 import { resolve, basename, join as join3 } from "path";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
-import { platform, arch, release, userInfo, homedir, tmpdir } from "os";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2 } from "fs";
+import { platform, arch, release, userInfo, homedir as homedir2, tmpdir } from "os";
 init_tools_shell();
+
+// src/tools.notify.ts
+init_logging();
+import { execFile } from "child_process";
+var log13 = forComponent("notify");
+function makeNotifyTool(opts = {}) {
+  const platform2 = opts.platform ?? process.platform;
+  const run = opts.exec ?? execFile;
+  return {
+    name: "PushNotification",
+    description: "Show an OS desktop notification to the user (out-of-band alert \u2014 e.g. a long task finished, input is needed). Use sparingly: only for events the user would want to be interrupted for.",
+    parameters: {
+      type: "object",
+      required: ["message"],
+      properties: {
+        message: { type: "string", description: "notification body" },
+        title: { type: "string", description: 'notification title (default "agentx")' }
+      }
+    },
+    async run({ message, title }) {
+      const msg = String(message ?? "").slice(0, 256);
+      const head = String(title ?? "agentx").slice(0, 64);
+      if (!msg) return "Error: empty message";
+      const argv = platform2 === "darwin" ? ["osascript", ["-e", `display notification ${JSON.stringify(msg)} with title ${JSON.stringify(head)}`]] : platform2 === "linux" ? ["notify-send", [head, msg]] : null;
+      if (!argv) return `Notifications unavailable on ${platform2}.`;
+      return new Promise((resolve4) => {
+        run(argv[0], argv[1], { timeout: 5e3 }, (e) => {
+          if (e) {
+            log13.debug("notification failed", e);
+            resolve4(`Notification failed: ${e.message}`);
+          } else resolve4("Notification shown.");
+        });
+      });
+    }
+  };
+}
+
+// cli/core.ts
 import { BodDB as BodDB2 } from "@bod.ee/db";
+
+// cli/util.ts
+init_logging();
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { homedir } from "os";
+var log14 = forComponent("cli-util");
+function dotDirs(base, sub, opts = {}) {
+  const home = opts.home ?? homedir();
+  const dirs = [`${base}/.agent/${sub}`, `${base}/.claude/${sub}`, `${home}/.agent/${sub}`, `${home}/.claude/${sub}`];
+  return opts.existing ? dirs.filter((d) => existsSync2(d)) : dirs;
+}
+function truncate(s, n, suffix = "\u2026") {
+  const t = s ?? "";
+  return t.length > n ? t.slice(0, n) + suffix : t;
+}
+function sanitizeLabel(s, max = 60) {
+  return truncate(s.replace(/\s+/g, " ").trim(), max, "");
+}
+function parseJson(text, fallback, what = "json") {
+  try {
+    return JSON.parse(text);
+  } catch (e) {
+    log14.debug(`parseJson(${what}) failed: ${e.message}`);
+    return fallback;
+  }
+}
+function readJsonFile(path, fallback) {
+  if (!existsSync2(path)) return fallback;
+  let text;
+  try {
+    text = readFileSync2(path, "utf8");
+  } catch (e) {
+    log14.debug(`readJsonFile(${path}) unreadable: ${e.message}`);
+    return fallback;
+  }
+  return parseJson(text, fallback, path);
+}
+
+// cli/core.ts
 var DEFAULT_TOOLS = ["bash", "Read", "Edit", "Write", "Grep", "Glob", "MultiEdit", "ApplyEdits", "RepoMap", "TodoWrite"];
 function autoWebTools() {
   return ["WebFetch", "WebSearch"];
 }
+function pdfTextViaPoppler(path) {
+  return new Promise((res, rej) => {
+    execFile2("pdftotext", [path, "-"], { maxBuffer: 32 * 1024 * 1024, timeout: 3e4 }, (e, stdout) => {
+      if (e) rej(new Error(/ENOENT/.test(String(e.code ?? e.message)) ? "pdftotext not installed (brew/apt install poppler)" : e.message));
+      else res(stdout);
+    });
+  });
+}
 var SANDBOX_SKIP = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "build", ".next", "coverage", ".cache"]);
 async function hydrate(from, to, dir = "/") {
   let n = 0;
@@ -6155,33 +6319,27 @@ async function buildAgent(o) {
 ${notes.join("\n")}
 Reference files in them by their mount path (the left side).`;
   }
-  const dot = (sub) => existsSync2(`${cwd}/.agent/${sub}`) ? `${cwd}/.agent/${sub}` : void 0;
+  const dot = (sub) => existsSync3(`${cwd}/.agent/${sub}`) ? `${cwd}/.agent/${sub}` : void 0;
   const dots = (sub) => {
-    const home = homedir();
-    const dirs = [
-      dot(sub),
-      existsSync2(`${cwd}/.claude/${sub}`) ? `${cwd}/.claude/${sub}` : void 0,
-      existsSync2(`${home}/.agent/${sub}`) ? `${home}/.agent/${sub}` : void 0,
-      existsSync2(`${home}/.claude/${sub}`) ? `${home}/.claude/${sub}` : void 0
-    ].filter(Boolean);
+    const dirs = dotDirs(cwd, sub, { existing: true });
     return dirs.length ? dirs : void 0;
   };
   const memoryDir = (() => {
-    const home = homedir();
+    const home = homedir2();
     const projectDir = `${cwd}/.agent/memory`;
     const readDirs = [
-      existsSync2(projectDir) ? projectDir : void 0,
-      existsSync2(`${cwd}/.claude/memory`) ? `${cwd}/.claude/memory` : void 0,
-      existsSync2(`${home}/.agent/memory`) ? `${home}/.agent/memory` : void 0,
-      existsSync2(`${home}/.claude/memory`) ? `${home}/.claude/memory` : void 0
+      existsSync3(projectDir) ? projectDir : void 0,
+      existsSync3(`${cwd}/.claude/memory`) ? `${cwd}/.claude/memory` : void 0,
+      existsSync3(`${home}/.agent/memory`) ? `${home}/.agent/memory` : void 0,
+      existsSync3(`${home}/.claude/memory`) ? `${home}/.claude/memory` : void 0
     ].filter(Boolean);
     return readDirs[0] === projectDir ? readDirs : [projectDir, ...readDirs];
   })();
   const memoryUserDir = (() => {
-    const home = homedir();
+    const home = homedir2();
     return [
-      existsSync2(`${home}/.agent/memory`) ? `${home}/.agent/memory` : void 0,
-      existsSync2(`${home}/.claude/memory`) ? `${home}/.claude/memory` : void 0
+      existsSync3(`${home}/.agent/memory`) ? `${home}/.agent/memory` : void 0,
+      existsSync3(`${home}/.claude/memory`) ? `${home}/.claude/memory` : void 0
     ].find(Boolean) ?? `${home}/.agent/memory`;
   })();
   const memoryWriteDir = memoryDir[0];
@@ -6198,6 +6356,8 @@ Reference files in them by their mount path (the left side).`;
     ai: o.ai,
     fs,
     model: o.model ?? "anthropic/claude-sonnet-4-6",
+    // PDF reads (disk mode only — VFS paths aren't real files): poppler's pdftotext when installed.
+    ...!virtual ? { pdfText: pdfTextViaPoppler } : {},
     // Anchor cursor to the launch dir (its adapter defaults to TMPDIR otherwise) and forward the
     // host's MCP servers so the delegated cursor agent runs in the same environment. Gated to cursor:
     // openai/google adapters Object.assign providerOptions into the request body, so a blanket cwd
@@ -6240,6 +6400,7 @@ The filesystem root '/' is the real machine root \u2014 you have full filesystem
       const base = toolsByName([...o.tools ?? DEFAULT_TOOLS, ...autoWebTools()]);
       const tail = [...o.extraTools ?? []];
       if (scratch) tail.push(makeAskTool({ fs, ai: o.ai, model: o.scratchAskModel ?? o.model ?? "anthropic/claude-sonnet-4-6", dir: scratchDir }));
+      tail.push(makeNotifyTool());
       if (!realShell.length) return [...base, ...tail];
       const filtered = base.filter((t) => t.name !== "bash");
       return [...filtered, ...realShell, ...tail];
@@ -6291,11 +6452,11 @@ var trunc = (s, n) => (s == null ? "" : String(s).length > n ? String(s).slice(0
 // cli/voice.ts
 init_logging();
 import { spawn as spawn2, spawnSync } from "child_process";
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, statSync as statSync2 } from "fs";
-import { homedir as homedir2 } from "os";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, statSync as statSync2 } from "fs";
+import { homedir as homedir3 } from "os";
 import { dirname as dirname3, join as join4 } from "path";
 import { fileURLToPath } from "url";
-var log13 = forComponent("VoiceIO");
+var log15 = forComponent("VoiceIO");
 var now4 = () => performance.now();
 var Player = class {
   proc = null;
@@ -6309,7 +6470,7 @@ var Player = class {
       ["-loglevel", "quiet", "-nodisp", "-fflags", "nobuffer", "-flags", "low_delay", "-probesize", "32", "-f", "s16le", "-ar", String(TTS_SAMPLE_RATE), "-ch_layout", "mono", "-i", "-"],
       { stdio: ["pipe", "ignore", "ignore"] }
     );
-    this.proc.on("error", (e) => log13.warn(`ffplay error: ${e.message}`));
+    this.proc.on("error", (e) => log15.warn(`ffplay error: ${e.message}`));
     this.proc.stdin.on("error", () => {
     });
     this.bytesWritten = 0;
@@ -6344,28 +6505,28 @@ function detectFfmpegMic() {
   const devices = [...audio.matchAll(/\[(\d+)\] (.+)/g)].map(([, idx, name]) => ({ idx, name: name.trim() }));
   const mic = devices.find((d) => /microphone|built-in/i.test(d.name) && !/teams|blackhole|loopback/i.test(d.name)) ?? devices[0];
   if (!mic) throw new Error("no audio input device found");
-  log13.debug(`ffmpeg mic: [${mic.idx}] ${mic.name}`);
+  log15.debug(`ffmpeg mic: [${mic.idx}] ${mic.name}`);
   return `:${mic.idx}`;
 }
 function resolveAecBinary() {
   if (process.env.MIC_AEC === "0" || process.platform !== "darwin") return null;
   const src = join4(nativeDir(), "mic-aec.swift");
   const plist = join4(nativeDir(), "Info.plist");
-  if (!existsSync3(src)) return null;
-  const cacheDir = join4(homedir2(), ".agent", "cache");
+  if (!existsSync4(src)) return null;
+  const cacheDir = join4(homedir3(), ".agent", "cache");
   const bin = join4(cacheDir, "mic-aec");
-  if (existsSync3(bin) && statSync2(bin).mtimeMs >= statSync2(src).mtimeMs) return bin;
+  if (existsSync4(bin) && statSync2(bin).mtimeMs >= statSync2(src).mtimeMs) return bin;
   if (spawnSync("which", ["swiftc"]).status !== 0) return null;
   mkdirSync3(cacheDir, { recursive: true });
-  log13.info("compiling AEC mic helper (first run)\u2026");
+  log15.info("compiling AEC mic helper (first run)\u2026");
   const build = spawnSync("swiftc", ["-O", "-o", bin, src, "-Xlinker", "-sectcreate", "-Xlinker", "__TEXT", "-Xlinker", "__info_plist", "-Xlinker", plist], { encoding: "utf8" });
   if (build.status !== 0) {
-    log13.warn(`AEC build failed: ${build.stderr?.slice(0, 400)}`);
+    log15.warn(`AEC build failed: ${build.stderr?.slice(0, 400)}`);
     return null;
   }
   const sign = spawnSync("codesign", ["-fs", "-", bin], { encoding: "utf8" });
   if (sign.status !== 0) {
-    log13.warn(`codesign failed: ${sign.stderr?.slice(0, 200)}`);
+    log15.warn(`codesign failed: ${sign.stderr?.slice(0, 200)}`);
     return null;
   }
   return bin;
@@ -6384,16 +6545,16 @@ var NodeMicSource = class {
       this.proc = spawn2(this.bin, [], { stdio: ["ignore", "pipe", "ignore"] });
     } else {
       if (spawnSync("which", ["ffmpeg"]).status !== 0) throw new Error("voice I/O unavailable: no AEC helper and no ffmpeg on PATH");
-      log13.info("mic: raw capture (no AEC) \u2014 echo handled heuristically; headphones recommended");
+      log15.info("mic: raw capture (no AEC) \u2014 echo handled heuristically; headphones recommended");
       this.proc = spawn2(
         "ffmpeg",
         ["-loglevel", "error", "-f", "avfoundation", "-i", detectFfmpegMic(), "-ar", String(STT_SAMPLE_RATE), "-ac", "1", "-f", "s16le", "-"],
         { stdio: ["ignore", "pipe", "pipe"] }
       );
-      this.proc.stderr.on("data", (d) => log13.warn(`ffmpeg: ${String(d).trim()}`));
+      this.proc.stderr.on("data", (d) => log15.warn(`ffmpeg: ${String(d).trim()}`));
     }
     this.proc.on("exit", (c) => {
-      if (c && !this.stopped) log13.error(`mic capture exited (${c}) \u2014 check mic permission / MIC_DEVICE / MIC_AEC=0`);
+      if (c && !this.stopped) log15.error(`mic capture exited (${c}) \u2014 check mic permission / MIC_DEVICE / MIC_AEC=0`);
     });
     this.proc.stdout.on("data", (chunk) => onChunk(chunk));
   }
@@ -6427,11 +6588,11 @@ var AecDuplexAudio = class {
     this.proc.stdin.on("error", () => {
     });
     this.proc.on("exit", (c) => {
-      if (c && !this.stopped) log13.error(`aec duplex audio exited (${c}) \u2014 check mic permission / MIC_AEC=0`);
+      if (c && !this.stopped) log15.error(`aec duplex audio exited (${c}) \u2014 check mic permission / MIC_AEC=0`);
     });
     this.proc.stdout.on("data", (chunk) => onChunk(chunk));
     this.proc.stderr.on("data", (d) => {
-      for (const ln of String(d).split("\n")) if (ln.trim()) log13.debug(`mic-aec: ${ln.trim()}`);
+      for (const ln of String(d).split("\n")) if (ln.trim()) log15.debug(`mic-aec: ${ln.trim()}`);
     });
   }
   stop() {
@@ -6547,15 +6708,15 @@ var VoiceIO = class extends VoiceEngine {
 };
 
 // cli/config.ts
-import { homedir as homedir3 } from "os";
-import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
+import { homedir as homedir4 } from "os";
+import { existsSync as existsSync5, readFileSync as readFileSync3 } from "fs";
 import { join as join5 } from "path";
 import { pathToFileURL } from "url";
 var FILES = ["config.ts", "config.js", "config.mjs", "config.json"];
 async function loadFrom(dir) {
   for (const f of FILES) {
     const p = join5(dir, ".agent", f);
-    if (!existsSync4(p)) continue;
+    if (!existsSync5(p)) continue;
     try {
       const mod = await import(pathToFileURL(p).href, f.endsWith(".json") ? { with: { type: "json" } } : void 0);
       return mod.default ?? mod.config ?? mod;
@@ -6568,9 +6729,9 @@ async function loadFrom(dir) {
 }
 function loadSettings(dir) {
   const p = join5(dir, ".agent", "settings.json");
-  if (!existsSync4(p)) return {};
+  if (!existsSync5(p)) return {};
   try {
-    const raw = JSON.parse(readFileSync2(p, "utf8"));
+    const raw = JSON.parse(readFileSync3(p, "utf8"));
     const cfg = {};
     if (raw.mcpServers && typeof raw.mcpServers === "object") cfg.mcpServers = raw.mcpServers;
     if (raw.permissions && typeof raw.permissions === "object") cfg.permissions = raw.permissions;
@@ -6591,8 +6752,8 @@ function loadSettings(dir) {
   }
 }
 async function loadConfig(cwd) {
-  const userSettings = loadSettings(homedir3());
-  const user = await loadFrom(homedir3());
+  const userSettings = loadSettings(homedir4());
+  const user = await loadFrom(homedir4());
   const projectSettings = loadSettings(cwd);
   const project = await loadFrom(cwd);
   const merged = { ...userSettings, ...user, ...projectSettings, ...project };
@@ -6604,7 +6765,7 @@ async function loadConfig(cwd) {
 
 // cli/hooks-config.ts
 import { spawnSync as spawnSync2 } from "child_process";
-var log14 = forComponent("hooks");
+var log16 = forComponent("hooks");
 var escapeRegex = (s) => s.replace(/[.+^${}()|[\]\\]/g, "\\$&");
 function ruleMatches(rule, toolName) {
   if (!rule.tool || rule.tool === "*") return true;
@@ -6621,7 +6782,7 @@ function runCmd(rule, env) {
     });
     return { code: r.status ?? 1, out: ((r.stdout ?? "") + (r.stderr ?? "")).trim() };
   } catch (e) {
-    log14.debug(`hook command failed: ${rule.command}`, e);
+    log16.debug(`hook command failed: ${rule.command}`, e);
     return { code: 1, out: String(e?.message ?? e) };
   }
 }
@@ -6725,11 +6886,11 @@ function formatDiff(ops, opts = {}) {
 }
 
 // cli/session.ts
-import { existsSync as existsSync5, mkdirSync as mkdirSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync3, readdirSync, renameSync, symlinkSync, unlinkSync, readlinkSync } from "fs";
-import { homedir as homedir4 } from "os";
+import { existsSync as existsSync6, mkdirSync as mkdirSync4, readFileSync as readFileSync4, writeFileSync as writeFileSync3, readdirSync, renameSync, symlinkSync, unlinkSync, readlinkSync } from "fs";
+import { homedir as homedir5 } from "os";
 import { join as join6 } from "path";
-var log15 = forComponent("session");
-var globalDir = () => join6(homedir4(), ".agent", "sessions");
+var log17 = forComponent("session");
+var globalDir = () => join6(homedir5(), ".agent", "sessions");
 var SessionStore = class {
   dir;
   constructor(cwd) {
@@ -6741,10 +6902,10 @@ var SessionStore = class {
     const p = (n, w = 2) => String(n).padStart(w, "0");
     const slug2 = (cwd ?? process.cwd()).split("/").pop()?.replace(/[^A-Za-z0-9_-]/g, "") || "session";
     let id = `${d.getFullYear()}${p(d.getMonth() + 1)}${p(d.getDate())}-${p(d.getHours())}${p(d.getMinutes())}${p(d.getSeconds())}-${slug2}`;
-    if (existsSync5(this.dir) && existsSync5(join6(this.dir, `${id}.json`))) {
+    if (existsSync6(this.dir) && existsSync6(join6(this.dir, `${id}.json`))) {
       for (let i = 2; i <= 99; i++) {
         const c = `${id}-${i}`;
-        if (!existsSync5(join6(this.dir, `${c}.json`))) {
+        if (!existsSync6(join6(this.dir, `${c}.json`))) {
           id = c;
           break;
         }
@@ -6758,43 +6919,43 @@ var SessionStore = class {
   }
   save(data) {
     if (!this.safeId(data.meta.id)) throw new Error(`unsafe session id: ${data.meta.id}`);
-    if (!existsSync5(this.dir)) mkdirSync4(this.dir, { recursive: true });
+    if (!existsSync6(this.dir)) mkdirSync4(this.dir, { recursive: true });
     const path = join6(this.dir, `${data.meta.id}.json`);
     const tmp = `${path}.${process.pid}.tmp`;
     writeFileSync3(tmp, JSON.stringify(data));
     renameSync(tmp, path);
     try {
       const gd = globalDir();
-      if (!existsSync5(gd)) mkdirSync4(gd, { recursive: true });
+      if (!existsSync6(gd)) mkdirSync4(gd, { recursive: true });
       const link2 = join6(gd, `${data.meta.id}.json`);
-      if (!existsSync5(link2)) symlinkSync(path, link2);
+      if (!existsSync6(link2)) symlinkSync(path, link2);
     } catch {
     }
   }
   load(id) {
     if (!this.safeId(id)) {
-      log15.debug(`rejecting unsafe session id: ${id}`);
+      log17.debug(`rejecting unsafe session id: ${id}`);
       return void 0;
     }
     const path = join6(this.dir, `${id}.json`);
-    if (!existsSync5(path)) return void 0;
+    if (!existsSync6(path)) return void 0;
     try {
-      return JSON.parse(readFileSync3(path, "utf8"));
+      return JSON.parse(readFileSync4(path, "utf8"));
     } catch (e) {
-      log15.debug(`unreadable session ${id} \u2014 ignoring`, e);
+      log17.debug(`unreadable session ${id} \u2014 ignoring`, e);
       return void 0;
     }
   }
   /** All sessions' metadata, most-recently-updated first. */
   list() {
-    if (!existsSync5(this.dir)) return [];
+    if (!existsSync6(this.dir)) return [];
     const metas = [];
     for (const f of readdirSync(this.dir)) {
       if (!f.endsWith(".json")) continue;
       try {
-        metas.push(JSON.parse(readFileSync3(join6(this.dir, f), "utf8")).meta);
+        metas.push(JSON.parse(readFileSync4(join6(this.dir, f), "utf8")).meta);
       } catch (e) {
-        log15.debug(`skipping unreadable session file ${f}`, e);
+        log17.debug(`skipping unreadable session file ${f}`, e);
       }
     }
     return metas.sort((a, b) => b.updated - a.updated);
@@ -6810,12 +6971,12 @@ var SessionStore = class {
 };
 function globalSessionLoad(idOrPrefix) {
   const gd = globalDir();
-  if (!existsSync5(gd)) return void 0;
+  if (!existsSync6(gd)) return void 0;
   const exact = join6(gd, `${idOrPrefix}.json`);
-  if (existsSync5(exact)) {
+  if (existsSync6(exact)) {
     try {
       const target = readlinkSync(exact);
-      return JSON.parse(readFileSync3(target, "utf8"));
+      return JSON.parse(readFileSync4(target, "utf8"));
     } catch {
       return void 0;
     }
@@ -6826,7 +6987,7 @@ function globalSessionLoad(idOrPrefix) {
       const base = f.slice(0, -5);
       if (base.includes(idOrPrefix) || base.endsWith(idOrPrefix)) {
         const target = readlinkSync(join6(gd, f));
-        return JSON.parse(readFileSync3(target, "utf8"));
+        return JSON.parse(readFileSync4(target, "utf8"));
       }
     }
   } catch {
@@ -6835,20 +6996,20 @@ function globalSessionLoad(idOrPrefix) {
 }
 function globalSessionList() {
   const gd = globalDir();
-  if (!existsSync5(gd)) return [];
+  if (!existsSync6(gd)) return [];
   const metas = [];
   for (const f of readdirSync(gd)) {
     if (!f.endsWith(".json")) continue;
     try {
       const target = readlinkSync(join6(gd, f));
-      if (!existsSync5(target)) {
+      if (!existsSync6(target)) {
         try {
           unlinkSync(join6(gd, f));
         } catch {
         }
         continue;
       }
-      metas.push(JSON.parse(readFileSync3(target, "utf8")).meta);
+      metas.push(JSON.parse(readFileSync4(target, "utf8")).meta);
     } catch {
     }
   }
@@ -6873,7 +7034,7 @@ var CheckpointStack = class {
   current;
   /** Open a new turn frame (call right before sending a user turn). */
   begin(label) {
-    this.current = { label: label.replace(/\s+/g, " ").trim().slice(0, 60) || "(turn)", at: Date.now(), saved: /* @__PURE__ */ new Map() };
+    this.current = { label: sanitizeLabel(label) || "(turn)", at: Date.now(), saved: /* @__PURE__ */ new Map() };
     this.frames.push(this.current);
     if (this.frames.length > this.max) this.frames.shift();
   }
@@ -6901,6 +7062,24 @@ var CheckpointStack = class {
   list() {
     return this.frames.map((f, i) => ({ index: i, label: f.label, at: f.at, files: f.saved.size })).reverse();
   }
+  /** Unified-style diff of all session edits: each file's OLDEST saved content vs its current content. */
+  async diff() {
+    const base = /* @__PURE__ */ new Map();
+    for (const f of this.frames) for (const [path, prior] of f.saved) if (!base.has(path)) base.set(path, prior);
+    const parts = [];
+    for (const [path, prior] of base) {
+      let now5 = null;
+      try {
+        now5 = await this.fs.readFile(path);
+      } catch {
+      }
+      if ((prior ?? "") === (now5 ?? "")) continue;
+      const ops = diffLines(prior ?? "", now5 ?? "");
+      parts.push(`--- ${path}${prior == null ? " (new)" : now5 == null ? " (deleted)" : ""}
+${formatDiff(ops)}`);
+    }
+    return parts.join("\n");
+  }
   /**
    * Restore the working tree to BEFORE frame `index` — undo that frame and every later one.
    * Frames are replayed newest→oldest so the OLDEST saved content for a path wins (its true
@@ -6930,12 +7109,12 @@ var CheckpointStack = class {
 };
 
 // cli/gitCheckpoints.ts
-import { execFile } from "child_process";
+import { execFile as execFile3 } from "child_process";
 import { promisify } from "util";
-import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync5, existsSync as existsSync6 } from "fs";
+import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync5, existsSync as existsSync7 } from "fs";
 import { join as join7, resolve as resolve2, sep as sep2 } from "path";
-var log16 = forComponent("checkpoints");
-var exec = promisify(execFile);
+var log18 = forComponent("checkpoints");
+var exec = promisify(execFile3);
 var DEFAULT_EXCLUDE = [".agent/", ".git/", "node_modules/", "dist/", "build/", ".next/", "target/", ".venv/", "__pycache__/", "*.log"];
 var ShadowRepo = class {
   // undefined = unprobed; false = git/this root unusable
@@ -6961,14 +7140,14 @@ var ShadowRepo = class {
     if (this.ready !== void 0) return this.ready;
     try {
       await exec(this.git, ["--version"]);
-      if (!existsSync6(this.gitDir)) {
+      if (!existsSync7(this.gitDir)) {
         mkdirSync5(this.gitDir, { recursive: true });
         await this.run("init", "-q");
       }
       writeFileSync4(join7(this.gitDir, "info", "exclude"), this.exclude.join("\n") + "\n");
       this.ready = true;
     } catch (e) {
-      log16.debug(`git checkpoints unavailable for ${this.workTree}`, e);
+      log18.debug(`git checkpoints unavailable for ${this.workTree}`, e);
       this.ready = false;
     }
     return this.ready;
@@ -7001,6 +7180,14 @@ var ShadowRepo = class {
       return 0;
     }
   }
+  /** Unified diff between `sha` and the current work-tree (for `/diff`). */
+  async diffSince(sha) {
+    try {
+      return await this.run("diff", sha);
+    } catch {
+      return "";
+    }
+  }
   /** Restore the tree to `sha`; returns counts of reverted tracked files + removed untracked-new. */
   async resetTo(sha) {
     let restored = 0, deleted = 0;
@@ -7031,7 +7218,7 @@ var ShadowRepo = class {
       await this.run("gc", "--auto", "-q").catch(() => {
       });
     } catch (e) {
-      log16.debug("checkpoint prune failed", e);
+      log18.debug("checkpoint prune failed", e);
     }
   }
 };
@@ -7088,18 +7275,18 @@ var GitCheckpoints = class {
   use(sessionId) {
     if (sessionId === this.session) return;
     this.session = sessionId;
-    if (this.started) for (const r of this.repos) void r.point(this.ref()).catch((e) => log16.debug("re-point failed", e));
+    if (this.started) for (const r of this.repos) void r.point(this.ref()).catch((e) => log18.debug("re-point failed", e));
   }
   async begin(label) {
     if (!await this.start()) return;
-    const msg = label.replace(/\s+/g, " ").trim().slice(0, 72) || "(turn)";
+    const msg = sanitizeLabel(label, 72) || "(turn)";
     let slow;
     if (!this.snapshotted) slow = setTimeout(() => process.stderr.write("\x1B[2m  checkpointing initial workspace snapshot\u2026\x1B[0m\n"), 1500);
     for (const r of this.repos) {
       try {
         await r.commit(msg);
       } catch (e) {
-        log16.debug("checkpoint commit failed", e);
+        log18.debug("checkpoint commit failed", e);
       }
     }
     if (slow) clearTimeout(slow);
@@ -7123,6 +7310,16 @@ var GitCheckpoints = class {
   get size() {
     return this.caches[0]?.length ?? 0;
   }
+  /** Unified diff of everything this session changed: oldest session checkpoint → current tree, across all roots. */
+  async diff() {
+    if (!this.caches[0]?.length) await this.refresh();
+    const parts = [];
+    for (let i = 0; i < this.repos.length; i++) {
+      const base = this.caches[i]?.[0];
+      if (base) parts.push(await this.repos[i].diffSince(base.sha));
+    }
+    return parts.filter(Boolean).join("\n");
+  }
   async rewindTo(index) {
     if (!this.caches[0]?.length) await this.refresh();
     if (index < 0 || index >= (this.caches[0]?.length ?? 0)) throw new Error("no such checkpoint");
@@ -7156,8 +7353,8 @@ var GitCheckpointsOptions = class {
 };
 
 // cli/permissions.ts
-import { existsSync as existsSync7, readFileSync as readFileSync4, writeFileSync as writeFileSync5, mkdirSync as mkdirSync6 } from "fs";
-import { homedir as homedir5 } from "os";
+import { writeFileSync as writeFileSync5, mkdirSync as mkdirSync6 } from "fs";
+import { homedir as homedir6 } from "os";
 import { join as join8 } from "path";
 var RULE_RE = /^(\w+)(?:\((.+)\))?$/;
 function parseOne(raw, decision) {
@@ -7182,25 +7379,15 @@ function describeRule(r) {
 }
 var PERM_FILE = (cwd) => join8(cwd, ".agent", "permissions.json");
 function loadPersistedRules(cwd) {
-  const p = PERM_FILE(cwd);
-  if (!existsSync7(p)) return {};
-  try {
-    const j = JSON.parse(readFileSync4(p, "utf8"));
-    return { allow: j.allow ?? [], ask: j.ask ?? [], deny: j.deny ?? [] };
-  } catch {
-    return {};
-  }
+  const j = readJsonFile(PERM_FILE(cwd), null);
+  return j ? { allow: j.allow ?? [], ask: j.ask ?? [], deny: j.deny ?? [] } : {};
 }
-function loadClaudeSettings(cwd, home = homedir5()) {
+function loadClaudeSettings(cwd, home = homedir6()) {
   const files = [join8(home, ".claude", "settings.json"), join8(cwd, ".claude", "settings.json"), join8(cwd, ".claude", "settings.local.json")];
   let out = {};
   for (const p of files) {
-    if (!existsSync7(p)) continue;
-    try {
-      const perms = JSON.parse(readFileSync4(p, "utf8"))?.permissions;
-      if (perms) out = mergePerms(out, { allow: perms.allow, ask: perms.ask, deny: perms.deny }) ?? out;
-    } catch {
-    }
+    const perms = readJsonFile(p, null)?.permissions;
+    if (perms) out = mergePerms(out, { allow: perms.allow, ask: perms.ask, deny: perms.deny }) ?? out;
   }
   return out;
 }
@@ -7223,20 +7410,14 @@ function mergePerms(a, b) {
   }
   return Object.keys(out).length ? out : void 0;
 }
-var TRUST_FILE = join8(homedir5(), ".agent", "trusted.json");
+var TRUST_FILE = join8(homedir6(), ".agent", "trusted.json");
 function isTrusted(cwd, file = TRUST_FILE) {
-  try {
-    return existsSync7(file) && JSON.parse(readFileSync4(file, "utf8")).includes(cwd);
-  } catch {
-    return false;
-  }
+  const list = readJsonFile(file, []);
+  return Array.isArray(list) && list.includes(cwd);
 }
 function trustDir(cwd, file = TRUST_FILE) {
-  let list = [];
-  try {
-    if (existsSync7(file)) list = JSON.parse(readFileSync4(file, "utf8"));
-  } catch {
-  }
+  let list = readJsonFile(file, []);
+  if (!Array.isArray(list)) list = [];
   if (!list.includes(cwd)) list.push(cwd);
   try {
     mkdirSync6(join8(file, ".."), { recursive: true });
@@ -7291,14 +7472,18 @@ function completePath(listDir, ref) {
   for (const e of entries) {
     if (!fuzzy(base, e.name)) continue;
     if (e.name.startsWith(".") && !base.startsWith(".")) continue;
-    const rel = dir ? `${dir}/${e.name}` : e.name;
-    matched.push("@" + rel + (e.dir ? "/" : ""));
+    const rel = (dir ? `${dir}/${e.name}` : e.name) + (e.dir ? "/" : "");
+    matched.push(/\s/.test(rel) ? `@"${rel}"` : "@" + rel);
   }
   return rank(matched, "@" + (dir ? dir + "/" : "") + base);
 }
 
 // cli/lineEditor.ts
 import { emitKeypressEvents } from "readline";
+import { spawnSync as spawnSync3 } from "child_process";
+import { writeFileSync as writeFileSync6, readFileSync as readFileSync5, unlinkSync as unlinkSync2 } from "fs";
+import { tmpdir as tmpdir2 } from "os";
+import { join as join9 } from "path";
 
 // cli/bidi.ts
 var RTL_RE = /[\u0590-\u05ff\u0600-\u06ff\u0750-\u077f\u08a0-\u08ff\ufb1d-\ufdff\ufe70-\ufeff]/;
@@ -7429,8 +7614,61 @@ function applyBidi(buf, cursor) {
   return { text: out.join("\n"), cursor: visCursor };
 }
 
+// cli/stdinSource.ts
+import { PassThrough } from "stream";
+var cancelPump;
+var keyInput = (() => {
+  const bun = globalThis.Bun;
+  if (!bun || !process.stdin.isTTY) return process.stdin;
+  const pt = new PassThrough();
+  pt.isTTY = true;
+  pt.setRawMode = (mode) => {
+    process.stdin.setRawMode(mode);
+    return pt;
+  };
+  Object.defineProperty(pt, "isRaw", { get: () => process.stdin.isRaw });
+  let pump = () => {
+    pump = void 0;
+    const reader = bun.stdin.stream().getReader();
+    let stopped = false;
+    cancelPump = () => {
+      stopped = true;
+      void reader.cancel().catch(() => {
+      });
+    };
+    void (async () => {
+      try {
+        while (!stopped) {
+          const { value, done } = await reader.read();
+          if (done) break;
+          if (value?.length) pt.write(Buffer.from(value));
+        }
+      } catch {
+      }
+      pt.end();
+    })();
+  };
+  const ptResume = pt.resume.bind(pt);
+  pt.resume = () => {
+    pump?.();
+    return ptResume();
+  };
+  return pt;
+})();
+function releaseKeyInput() {
+  cancelPump?.();
+}
+
 // cli/lineEditor.ts
-var visibleWidth = (s) => s.replace(/\x1b\[[0-9;]*m/g, "").length;
+var cpWidth = (cp) => {
+  if (cp === 8205 || cp === 65039 || cp >= 768 && cp <= 879) return 0;
+  return cp >= 4352 && (cp <= 4447 || cp === 9001 || cp === 9002 || cp >= 11904 && cp <= 42191 && cp !== 12351 || cp >= 44032 && cp <= 55203 || cp >= 63744 && cp <= 64255 || cp >= 65072 && cp <= 65103 || cp >= 65280 && cp <= 65376 || cp >= 65504 && cp <= 65510 || cp >= 126976 && cp <= 129791 || cp >= 131072 && cp <= 262141) ? 2 : 1;
+};
+var visibleWidth = (s) => {
+  let w = 0;
+  for (const ch of s.replace(/\x1b\[[0-9;]*m/g, "")) w += cpWidth(ch.codePointAt(0));
+  return w;
+};
 var isPrintable = (str) => !!str && !/[\x00-\x1f\x7f]/.test(str);
 var EditorState = class _EditorState {
   // pending operator awaiting a motion (dd/dw/cc)
@@ -7564,6 +7802,17 @@ var EditorState = class _EditorState {
     this.histIdx = -1;
     this.refresh();
   }
+  // Code-point boundaries: cursor/delete ops must never split a surrogate pair (emoji = 2 code units;
+  // a half-pair in the buffer reaches the model as mojibake). Steps are by code POINT (lean — ZWJ
+  // families delete component-wise, which even many terminals do).
+  prevCp(i) {
+    if (i >= 2 && /[\uDC00-\uDFFF]/.test(this.buf[i - 1]) && /[\uD800-\uDBFF]/.test(this.buf[i - 2])) return i - 2;
+    return Math.max(0, i - 1);
+  }
+  nextCp(i) {
+    if (i <= this.buf.length - 2 && /[\uD800-\uDBFF]/.test(this.buf[i]) && /[\uDC00-\uDFFF]/.test(this.buf[i + 1])) return i + 2;
+    return Math.min(this.buf.length, i + 1);
+  }
   insert(s) {
     this.snapshot();
     this.buf = this.buf.slice(0, this.cursor) + s + this.buf.slice(this.cursor);
@@ -7574,22 +7823,23 @@ var EditorState = class _EditorState {
   backspace() {
     if (this.cursor === 0) return;
     this.snapshot();
-    this.buf = this.buf.slice(0, this.cursor - 1) + this.buf.slice(this.cursor);
-    this.cursor--;
+    const start = this.prevCp(this.cursor);
+    this.buf = this.buf.slice(0, start) + this.buf.slice(this.cursor);
+    this.cursor = start;
     this.histIdx = -1;
     this.refresh();
   }
   del() {
     if (this.cursor >= this.buf.length) return;
     this.snapshot();
-    this.buf = this.buf.slice(0, this.cursor) + this.buf.slice(this.cursor + 1);
+    this.buf = this.buf.slice(0, this.cursor) + this.buf.slice(this.nextCp(this.cursor));
     this.refresh();
   }
   left() {
-    if (this.cursor > 0) this.cursor--;
+    if (this.cursor > 0) this.cursor = this.prevCp(this.cursor);
   }
   right() {
-    if (this.cursor < this.buf.length) this.cursor++;
+    if (this.cursor < this.buf.length) this.cursor = this.nextCp(this.cursor);
   }
   home() {
     this.cursor = 0;
@@ -8073,6 +8323,30 @@ function createLineEditor(out) {
     if (cursorCol > 0) out.write(`\x1B[${cursorCol}C`);
     curRow = cursorRow;
   }
+  function externalEdit(s) {
+    const spec = process.env.VISUAL || process.env.EDITOR || "vi";
+    const [cmd, ...cargs] = spec.split(" ").filter(Boolean);
+    const file = join9(tmpdir2(), `agentx-edit-${process.pid}-${Date.now()}.md`);
+    try {
+      writeFileSync6(file, s.buf);
+      process.stdin.setRawMode(false);
+      out.write("\x1B[?2004l");
+      const r = spawnSync3(cmd, [...cargs, file], { stdio: "inherit" });
+      if (r.status === 0) {
+        const text = readFileSync5(file, "utf8").replace(/\n$/, "");
+        s.reset();
+        if (text) s.insert(text);
+      }
+    } catch {
+    } finally {
+      try {
+        unlinkSync2(file);
+      } catch {
+      }
+      process.stdin.setRawMode(true);
+      out.write("\x1B[?2004h");
+    }
+  }
   async function readLine(opts) {
     const maxVisible = opts.maxVisible ?? 8;
     if (!isTTY) return readPlainLine();
@@ -8080,9 +8354,9 @@ function createLineEditor(out) {
     curRow = 0;
     if (opts.initial) s.insert(opts.initial);
     s.refresh();
-    emitKeypressEvents(process.stdin);
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
+    emitKeypressEvents(keyInput);
+    keyInput.setRawMode(true);
+    keyInput.resume();
     out.write("\x1B[?2004h");
     const promptOf = () => typeof opts.prompt === "function" ? opts.prompt() : opts.prompt;
     render(s, promptOf(), maxVisible, opts.status);
@@ -8109,6 +8383,7 @@ function createLineEditor(out) {
         lastStatus = cur;
         redraw();
       }, opts.statusTickMs) : void 0;
+      let chordCtrlX = false;
       const onKey = (str, key) => {
         if (key?.ctrl && key.name === "l") {
           out.write("\x1B[2J\x1B[3J\x1B[H");
@@ -8116,6 +8391,19 @@ function createLineEditor(out) {
           redraw();
           return;
         }
+        if (key?.ctrl && key.name === "x" && !s.pasting) {
+          chordCtrlX = true;
+          return;
+        }
+        if (chordCtrlX) {
+          chordCtrlX = false;
+          if (key?.ctrl && key.name === "e") {
+            externalEdit(s);
+            curRow = 0;
+            redraw();
+            return;
+          }
+        }
         if (key?.name === "tab" && key.shift && opts.onCyclePosture) {
           opts.onCyclePosture();
           redraw();
@@ -8152,9 +8440,9 @@ function createLineEditor(out) {
           return;
         }
         if (key?.meta && key.name === "p" && opts.onPickModel) {
-          process.stdin.off("keypress", onKey);
+          keyInput.off("keypress", onKey);
           void opts.onPickModel().finally(() => {
-            process.stdin.on("keypress", onKey);
+            keyInput.on("keypress", onKey);
             curRow = 0;
             redraw();
           });
@@ -8163,6 +8451,7 @@ function createLineEditor(out) {
         const action = applyKey(s, key ?? {}, str);
         if (action === "submit") {
           finish();
+          opts.onSubmit?.();
           return resolve4(s.expand());
         }
         if (action === "eof") {
@@ -8190,15 +8479,14 @@ function createLineEditor(out) {
         activeRedraw = void 0;
         activeAbort = void 0;
         if (ticker) clearInterval(ticker);
-        process.stdin.off("keypress", onKey);
+        keyInput.off("keypress", onKey);
         process.removeListener("SIGWINCH", onResize);
-        out.write("\x1B[?2004l");
         s.closeMenu();
         s.end();
         render(s, promptOf(), maxVisible);
         out.write("\r\n");
       };
-      process.stdin.on("keypress", onKey);
+      keyInput.on("keypress", onKey);
     });
   }
   return {
@@ -8220,6 +8508,8 @@ function createLineEditor(out) {
     abort: () => activeAbort?.()
   };
 }
+var menusOpen = 0;
+var isMenuActive = () => menusOpen > 0;
 function selectMenu(out, opts) {
   if (!out.isTTY || !process.stdin.isTTY || !opts.items.length) return Promise.resolve(null);
   const maxVisible = opts.maxVisible ?? 10;
@@ -8278,18 +8568,20 @@ function selectMenu(out, opts) {
     prevLines++;
   };
   return new Promise((resolve4) => {
-    const wasRaw = !!process.stdin.isRaw;
-    emitKeypressEvents(process.stdin);
-    process.stdin.setRawMode(true);
-    process.stdin.resume();
+    const wasRaw = !!keyInput.isRaw;
+    menusOpen++;
+    emitKeypressEvents(keyInput);
+    keyInput.setRawMode(true);
+    keyInput.resume();
     draw();
     const finish = (val) => {
-      process.stdin.off("keypress", onKey);
+      menusOpen--;
+      keyInput.off("keypress", onKey);
       if (prevLines > 1) out.write(`\x1B[${prevLines - 1}A`);
       out.write("\r\x1B[J");
       if (!wasRaw) {
         try {
-          process.stdin.setRawMode(false);
+          keyInput.setRawMode(false);
         } catch {
         }
       }
@@ -8352,7 +8644,7 @@ function selectMenu(out, opts) {
         draw();
       }
     };
-    process.stdin.on("keypress", onKey);
+    keyInput.on("keypress", onKey);
   });
 }
 var INPUT_MODES = [
@@ -8372,26 +8664,35 @@ function wrapLayout(promptW, buf, cursor, cols) {
     rows.push(line);
     line = "";
   };
-  for (let i = 0; i <= buf.length; i++) {
+  for (let i = 0; i <= buf.length; ) {
+    const cp = i < buf.length ? buf.codePointAt(i) : -1;
+    const ch = cp >= 0 ? String.fromCodePoint(cp) : "";
+    const w = ch && ch !== "\n" ? cpWidth(cp) : 0;
+    if (w === 2 && col + w > width && col > 0) {
+      pushRow();
+      r++;
+      col = 0;
+    }
     if (i === cursor) {
       cursorRow = r;
       cursorCol = col;
     }
     if (i === buf.length) break;
-    const ch = buf[i];
     if (ch === "\n") {
       pushRow();
       r++;
       col = 0;
+      i++;
       continue;
     }
     line += ch;
-    col++;
+    col += w;
     if (col >= width) {
       pushRow();
       r++;
       col = 0;
     }
+    i += ch.length;
   }
   pushRow();
   return { rows, cursorRow, cursorCol };
@@ -8608,6 +8909,184 @@ var MarkdownStream = class {
   }
 };
 
+// cli/osScheduler.ts
+import { spawnSync as spawnSync4 } from "child_process";
+import { writeFileSync as writeFileSync7, mkdirSync as mkdirSync7, readdirSync as readdirSync2, unlinkSync as unlinkSync3, chmodSync, existsSync as existsSync8 } from "fs";
+import { homedir as homedir7 } from "os";
+import { join as join10 } from "path";
+var log19 = forComponent("os-sched");
+var OsScheduler = class {
+  options;
+  constructor(options) {
+    this.options = { ...new OsSchedulerOptions(), ...options };
+  }
+  get dir() {
+    return join10(this.options.home, ".agent", "sched");
+  }
+  label(id) {
+    return `cc.livx.agentx.sched-${id}`;
+  }
+  plistPath(id) {
+    return join10(this.options.home, "Library", "LaunchAgents", `${this.label(id)}.plist`);
+  }
+  run(cmd, args, input) {
+    return this.options.exec(cmd, args, input);
+  }
+  available() {
+    return this.options.platform === "darwin" || this.options.platform === "linux";
+  }
+  /** Register the job with the OS. Returns a human description of the mechanism used. Throws on failure. */
+  schedule(spec) {
+    if (!this.available()) throw new Error(`no OS scheduler on ${this.options.platform}`);
+    mkdirSync7(this.dir, { recursive: true });
+    const oneOff = "at" in spec.trigger;
+    const script = this.writeScript(spec, oneOff);
+    const mechanism = this.options.platform === "darwin" ? this.scheduleDarwin(spec, script) : this.scheduleLinux(spec, script, oneOff);
+    const meta = { ...spec, created: Date.now(), mechanism };
+    writeFileSync7(join10(this.dir, `${spec.id}.json`), JSON.stringify(meta, null, 2));
+    return mechanism;
+  }
+  cancel(id) {
+    const meta = readJsonFile(join10(this.dir, `${id}.json`), null);
+    if (!meta) return false;
+    try {
+      if (this.options.platform === "darwin") {
+        try {
+          this.run("launchctl", ["remove", this.label(id)]);
+        } catch {
+        }
+        try {
+          unlinkSync3(this.plistPath(id));
+        } catch {
+        }
+      } else if (meta.mechanism.startsWith("crontab")) {
+        const cur = (() => {
+          try {
+            return this.run("crontab", ["-l"]);
+          } catch {
+            return "";
+          }
+        })();
+        const next = cur.split("\n").filter((l) => !l.includes(`# agentx-sched-${id}`)).join("\n");
+        this.run("crontab", ["-"], next.trim() ? next.trimEnd() + "\n" : "");
+      } else if (meta.mechanism.startsWith("at:")) {
+        try {
+          this.run("atrm", [meta.mechanism.slice(3)]);
+        } catch {
+        }
+      }
+    } catch (e) {
+      log19.debug(`cancel ${id}`, e);
+    }
+    for (const f of [`${id}.json`, `${id}.sh`]) {
+      try {
+        unlinkSync3(join10(this.dir, f));
+      } catch {
+      }
+    }
+    return true;
+  }
+  list() {
+    if (!existsSync8(this.dir)) return [];
+    return readdirSync2(this.dir).filter((f) => f.endsWith(".json")).map((f) => readJsonFile(join10(this.dir, f), null)).filter(Boolean);
+  }
+  /** The per-job runner script: cd to the project, headless-resume the session, log, notify. */
+  writeScript(spec, oneOff) {
+    const p = join10(this.dir, `${spec.id}.sh`);
+    const q2 = (s) => `'${s.replace(/'/g, `'\\''`)}'`;
+    const cleanup = oneOff ? this.options.platform === "darwin" ? `launchctl remove ${this.label(spec.id)} 2>/dev/null; rm -f ${q2(this.plistPath(spec.id))} ${q2(join10(this.dir, `${spec.id}.json`))} ${q2(p)}
+` : `rm -f ${q2(join10(this.dir, `${spec.id}.json`))} ${q2(p)}
+` : "";
+    writeFileSync7(p, `#!/bin/sh
+# agentx scheduled job ${spec.id}${spec.label ? ` \u2014 ${spec.label}` : ""}
+cd ${q2(spec.cwd)} || exit 1
+${this.options.agentx} -p ${q2(spec.prompt)} --resume ${q2(spec.sessionId)} --yes >> ${q2(join10(this.dir, `${spec.id}.log`))} 2>&1
+${cleanup}`);
+    chmodSync(p, 493);
+    return p;
+  }
+  scheduleDarwin(spec, script) {
+    const t = spec.trigger;
+    let trigger;
+    if ("everyMs" in t) {
+      trigger = `<key>StartInterval</key><integer>${Math.max(60, Math.round(t.everyMs / 1e3))}</integer>`;
+    } else if ("at" in t) {
+      const d = new Date(t.at);
+      trigger = `<key>StartCalendarInterval</key><dict><key>Minute</key><integer>${d.getMinutes()}</integer><key>Hour</key><integer>${d.getHours()}</integer><key>Day</key><integer>${d.getDate()}</integer><key>Month</key><integer>${d.getMonth() + 1}</integer></dict>`;
+    } else {
+      const f = parseCron(t.cron);
+      const dict = [];
+      const put = (key, vals, full) => {
+        if (vals.length === full) return;
+        if (vals.length !== 1) throw new Error(`macOS launchd supports only single-value cron fields (got "${t.cron}") \u2014 use {everyMs} or a simpler cron`);
+        dict.push(`<key>${key}</key><integer>${vals[0]}</integer>`);
+      };
+      put("Minute", f.minute, 60);
+      put("Hour", f.hour, 24);
+      put("Day", f.dom, 31);
+      put("Month", f.month, 12);
+      put("Weekday", f.dow, 7);
+      trigger = `<key>StartCalendarInterval</key><dict>${dict.join("")}</dict>`;
+    }
+    const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0"><dict>
+<key>Label</key><string>${this.label(spec.id)}</string>
+<key>ProgramArguments</key><array><string>/bin/sh</string><string>${script}</string></array>
+${trigger}
+<key>RunAtLoad</key><false/>
+</dict></plist>
+`;
+    mkdirSync7(join10(this.options.home, "Library", "LaunchAgents"), { recursive: true });
+    writeFileSync7(this.plistPath(spec.id), plist);
+    this.run("launchctl", ["load", this.plistPath(spec.id)]);
+    return `launchd:${this.label(spec.id)}`;
+  }
+  scheduleLinux(spec, script, oneOff) {
+    const t = spec.trigger;
+    if (oneOff) {
+      const d = new Date("at" in t ? t.at : Date.now());
+      const stamp = `${String(d.getHours()).padStart(2, "0")}:${String(d.getMinutes()).padStart(2, "0")} ${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+      const out = this.run("at", [stamp], `/bin/sh ${script}
+`);
+      const jobId = /job (\d+)/.exec(out)?.[1] ?? "";
+      return `at:${jobId}`;
+    }
+    const expr = "cron" in t ? t.cron : `*/${Math.max(1, Math.round(t.everyMs / 6e4))} * * * *`;
+    parseCron(expr);
+    const cur = (() => {
+      try {
+        return this.run("crontab", ["-l"]);
+      } catch {
+        return "";
+      }
+    })();
+    this.run("crontab", ["-"], `${cur.trimEnd()}
+${expr} /bin/sh ${script} # agentx-sched-${spec.id}
+`.replace(/^\n/, ""));
+    return `crontab:${expr}`;
+  }
+};
+var OsSchedulerOptions = class {
+  platform = process.platform;
+  home = homedir7();
+  /** How the fired job invokes the CLI — a RAW shell snippet (may be `bun /path/cli.ts`). Default: `agentx` on PATH. */
+  agentx = "agentx";
+  /** Injectable executor for tests. Returns stdout+stderr merged — `at` reports "job N" on STDERR,
+   *  and the job id is what atrm needs for cancel. Throws on non-zero exit. */
+  exec = (cmd, args, input) => {
+    const r = spawnSync4(cmd, args, { input, encoding: "utf8" });
+    if (r.error) throw r.error;
+    if (r.status !== 0) throw new Error(`${cmd} exited ${r.status}: ${r.stderr || r.stdout}`);
+    return `${r.stdout ?? ""}${r.stderr ?? ""}`;
+  };
+};
+function routeTrigger(trigger, backendHint, now5 = Date.now()) {
+  if (backendHint === "os") return "os";
+  if (backendHint === "session") return "session";
+  return "at" in trigger && trigger.at - now5 >= 30 * 6e4 ? "os" : "session";
+}
+
 // cli/cli.ts
 var forceColor = process.env.FORCE_COLOR != null && process.env.FORCE_COLOR !== "" && process.env.FORCE_COLOR !== "0";
 var useColor = forceColor || !process.env.NO_COLOR && !!process.stdout.isTTY && !!process.stderr.isTTY;
@@ -8623,10 +9102,10 @@ var italic = C("3");
 var strike = C("9");
 var link = (text, url) => useColor ? `\x1B]8;;${url}\x1B\\${cyan(text)}\x1B]8;;\x1B\\` : `${text} (${url})`;
 var err = (s) => process.stderr.write(s);
-var log17 = forComponent("cli");
+var log20 = forComponent("cli");
 var VERSION = (() => {
   try {
-    return JSON.parse(readFileSync5(new URL("../package.json", import.meta.url), "utf8")).version ?? "?";
+    return JSON.parse(readFileSync6(new URL("../package.json", import.meta.url), "utf8")).version ?? "?";
   } catch {
     return "?";
   }
@@ -8639,12 +9118,19 @@ var spinner = /* @__PURE__ */ (() => {
   return {
     /** Anchor for the elapsed counter; runTurn sets it once per turn so tool-call stop/start cycles don't reset it. */
     turnStart: 0,
+    /** Mid-turn type-ahead, rendered as the frame's tail — the spinner repaints its row every 90ms,
+     *  so the typed text must live INSIDE the frame or it gets erased on the next tick. */
+    tail: void 0,
+    get active() {
+      return !!timer;
+    },
     start(label = "thinking\u2026") {
       if (!tty || timer) return;
       t0 = this.turnStart || Date.now();
       timer = setInterval(() => {
         const secs = Math.round((Date.now() - t0) / 1e3);
-        err("\r\x1B[2K" + dim(`  ${frames[i = (i + 1) % frames.length]} ${label} ${secs ? `${secs}s \xB7 ` : ""}esc to interrupt`));
+        const tail = this.tail?.();
+        err("\r\x1B[2K" + dim(`  ${frames[i = (i + 1) % frames.length]} ${label} ${secs ? `${secs}s \xB7 ` : ""}esc to interrupt`) + (tail ? "  " + tail : ""));
       }, 90);
     },
     stop() {
@@ -8662,7 +9148,9 @@ var setTermTitle = (t) => {
 var activeTurn = null;
 var exitRequested = false;
 var inputStash = [];
-var stashBuf = "";
+var stashEd = null;
+var stashText = () => stashEd?.buf ?? "";
+var dispatchPending = false;
 var latestTodos = [];
 function numFlag(raw, flag) {
   const n = Number(raw);
@@ -8818,7 +9306,7 @@ REPL shortcuts: !<cmd> runs a shell command inline \xB7 #<note> saves a memory \
 REPL slash commands: /help /version /tools /permissions /status /cost /context /transcript /doctor /cwd /model /reasoning /config /rename /compact /memory /rewind /undo /clear /sessions /resume /commands /skills /reload /mcp /init /export /paste /goal /exit (duplex: /act /think /tasks /voice /voice-model /think-model)
 REPL completion: type / (commands+skills) or @ (files) for a LIVE menu \u2014 \u2191/\u2193 select, \u23CE/Tab accept, Esc dismiss.
 REPL multi-line: Option/Alt+Enter inserts a newline, or end a line with \\ to continue. Esc cancels a running turn / clears the input line; double-Esc jumps back to edit a previous message.
-REPL shortcuts: Shift+Tab cycles permission posture (ask \u2192 accept-edits \u2192 plan) \xB7 Alt+T toggles reasoning \xB7 Alt+P switches model \xB7 Ctrl+O toggles verbose tool output \xB7 \u2192 or Tab accepts the dim history ghost-suggestion \xB7 Alt+S/Ctrl+S stash/unstash.
+REPL shortcuts: Shift+Tab cycles permission posture (ask \u2192 accept-edits \u2192 plan) \xB7 Alt+T toggles reasoning \xB7 Alt+P switches model \xB7 Ctrl+O toggles verbose tool output \xB7 Ctrl+X Ctrl+E edits the buffer in $EDITOR \xB7 \u2192 or Tab accepts the dim history ghost-suggestion \xB7 Alt+S/Ctrl+S stash/unstash.
 REPL stash: type while a turn is running \u2192 Enter queues it (auto-submits when the turn finishes). Alt+S (or Ctrl+S) with text stashes it; on an empty prompt pops the next entry for editing.
 REPL editing (emacs/readline): Ctrl-A/E line start/end \xB7 Ctrl-B/F char \xB7 Alt-B/F or Alt/Ctrl-\u2190/\u2192 word \xB7 Ctrl-W kill word \xB7 Ctrl-U/K kill to start/end \xB7 Ctrl-Y yank \xB7 Ctrl-_ undo \xB7 Alt-D kill word fwd \xB7 Ctrl-L clear screen. Set editorMode:'vim' (or /config) for modal vim editing.
 REPL paste: large/multi-line pastes collapse to a [Pasted text +N lines] preview (expands on send); a pasted image/file path attaches as [Image]/[File]; Ctrl-V or /paste grabs a clipboard image (macOS).`;
@@ -8838,11 +9326,11 @@ function resolveModelOrNewest(model) {
 var ENV_KEY_ALIASES = { google: ["GEMINI_API_KEY"] };
 function loadInstallEnv() {
   let dir = dirname4(import.meta.path);
-  for (let i = 0; i < 5 && !existsSync8(join9(dir, "package.json")); i++) dir = dirname4(dir);
+  for (let i = 0; i < 5 && !existsSync9(join11(dir, "package.json")); i++) dir = dirname4(dir);
   for (const name of [".env", ".env.local"]) {
-    const file = join9(dir, name);
-    if (!existsSync8(file)) continue;
-    for (const line of readFileSync5(file, "utf8").split("\n")) {
+    const file = join11(dir, name);
+    if (!existsSync9(file)) continue;
+    for (const line of readFileSync6(file, "utf8").split("\n")) {
       const m = line.match(/^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/);
       if (!m || m[1] in process.env) continue;
       let val = m[2].trim();
@@ -8919,7 +9407,7 @@ function makeHost(format = "text", opts) {
     async confirm(prompt) {
       const v = await selectMenu(process.stderr, { title: `? ${prompt}`, items: [{ label: "Yes", value: "y" }, { label: "No", value: "n" }], current: "n" });
       if (v !== null) return v === "y";
-      const io = createInterface({ input: process.stdin, output: process.stderr });
+      const io = createInterface({ input: keyInput, output: process.stderr });
       try {
         return /^y(es)?$/i.test((await io.question(yellow(`  ? ${prompt} [y/N] `))).trim());
       } finally {
@@ -8930,7 +9418,7 @@ function makeHost(format = "text", opts) {
       const title = `? ${q2.header ? "[" + q2.header + "] " : ""}${q2.question}`;
       const v = await selectMenu(process.stderr, { title, items: q2.options.map((o) => ({ label: o.label, value: o.label, desc: o.description })) });
       if (v !== null) return v;
-      const io = createInterface({ input: process.stdin, output: process.stderr });
+      const io = createInterface({ input: keyInput, output: process.stderr });
       try {
         const lines = [yellow("  " + title)];
         q2.options.forEach((o, i) => lines.push(`     ${i + 1}) ${o.label}${o.description ? dim(" \u2014 " + o.description) : ""}`));
@@ -9150,7 +9638,7 @@ function costOf(pricing, promptTokens = 0, completionTokens = 0, cacheCreationTo
 function turnCost(model, usage) {
   return costOf(getModelInfo(model)?.pricing, usage?.promptTokens ?? 0, usage?.completionTokens ?? 0, usage?.cacheCreationTokens ?? 0, usage?.cacheReadTokens ?? 0, model);
 }
-async function evaluateGoal(ai, condition, transcript, log18) {
+async function evaluateGoal(ai, condition, transcript, log21) {
   const recent = transcript.filter((m) => m.role === "assistant").slice(-8).map((m) => {
     const text = typeof m.content === "string" ? m.content : m.content.filter((p) => p.type === "text").map((p) => p.text).join(" ");
     return text.slice(0, 600);
@@ -9170,7 +9658,7 @@ ${recent}` }
     const match = r.content.match(/\{[\s\S]*\}/);
     if (match) return JSON.parse(match[0]);
   } catch (e) {
-    log18(dim(`  (goal evaluator error: ${e?.message ?? e})
+    log21(dim(`  (goal evaluator error: ${e?.message ?? e})
 `));
   }
   return { met: false, reason: "evaluation unclear" };
@@ -9247,7 +9735,7 @@ function makeAskResolver(cwd) {
       current: "allow"
     });
     if (v === null) {
-      const io = createInterface({ input: process.stdin, output: process.stderr });
+      const io = createInterface({ input: keyInput, output: process.stderr });
       try {
         return { decision: /^y(es)?$/i.test((await io.question(yellow(`  ? Allow ${call.name}${tgt}? [y/N] `))).trim()) ? "allow" : "deny" };
       } finally {
@@ -9357,19 +9845,22 @@ async function mountMcp(cfg, oauth) {
   return mounted;
 }
 async function closeMcp(mounted) {
-  await Promise.all(mounted.map((m) => m.client.close().catch((e) => log17.debug("mcp close failed", e))));
+  await Promise.all(mounted.map((m) => m.client.close().catch((e) => log20.debug("mcp close failed", e))));
 }
 var IMG_EXT = { ".png": "image/png", ".jpg": "image/jpeg", ".jpeg": "image/jpeg", ".gif": "image/gif", ".webp": "image/webp" };
-var untilde = (p) => p.startsWith("~/") ? join9(homedir6(), p.slice(2)) : p;
+function mentionRefs(line) {
+  return [...line.matchAll(/(?:^|\s)@(?:"([^"]+)"|(\S+))/g)].map((m) => m[1] ?? m[2].replace(/[?!.,;:)\]}'">]+$/, "")).filter(Boolean);
+}
+var untilde = (p) => p.startsWith("~/") ? join11(homedir8(), p.slice(2)) : p;
 function readImageParts(cwd, line) {
-  const refs = [...line.matchAll(/(?:^|\s)@(\S+)/g)].map((m) => m[1].replace(/[?!.,;:)\]}'">]+$/, "")).filter(Boolean);
+  const refs = mentionRefs(line);
   const parts = [];
   for (const ref of refs) {
     const mime = IMG_EXT[extname(ref).toLowerCase()];
     if (!mime) continue;
     const abs = ref.startsWith("~/") ? untilde(ref) : resolve3(cwd, ref);
     try {
-      parts.push(imagePart(`data:${mime};base64,${readFileSync5(abs).toString("base64")}`));
+      parts.push(imagePart(`data:${mime};base64,${readFileSync6(abs).toString("base64")}`));
     } catch {
     }
   }
@@ -9380,7 +9871,6 @@ function pastePathClassifier(cwd) {
     let t = text.trim();
     if (!t || t.includes("\n")) return null;
     t = t.replace(/\\ /g, " ").replace(/^['"]|['"]$/g, "");
-    if (/\s/.test(t)) return null;
     if (!/^(\/|~\/|\.\/|\.\.\/)/.test(t)) return null;
     const abs = t.startsWith("~/") ? untilde(t) : resolve3(cwd, t);
     try {
@@ -9389,7 +9879,7 @@ function pastePathClassifier(cwd) {
       return null;
     }
     const isImg = !!IMG_EXT[extname(abs).toLowerCase()];
-    return { display: isImg ? "Image" : `File ${basename2(abs)}`, ref: "@" + abs };
+    return { display: isImg ? "Image" : `File ${basename2(abs)}`, ref: /\s/.test(abs) ? `@"${abs}"` : "@" + abs };
   };
 }
 var mcpMentionResolver;
@@ -9397,7 +9887,7 @@ function setMcpMentionResolver(fn) {
   mcpMentionResolver = fn;
 }
 async function expandMentions(fs, line) {
-  const refs = [...line.matchAll(/(?:^|\s)@(\S+)/g)].map((m) => m[1].replace(/[?!.,;:)\]}'">]+$/, "")).filter(Boolean);
+  const refs = mentionRefs(line);
   if (!refs.length) return { text: line, loaded: [], missing: [] };
   const loaded = [], missing = [], blocks = [];
   for (const ref of refs) {
@@ -9405,7 +9895,7 @@ async function expandMentions(fs, line) {
     if (loaded.includes(ref) || missing.includes(ref)) continue;
     if (ref.includes(":") && mcpMentionResolver) {
       const body = await mcpMentionResolver(ref).catch((e) => {
-        log17.debug("mcp mention resolve failed", e);
+        log20.debug("mcp mention resolve failed", e);
         return null;
       });
       if (body != null) {
@@ -9583,25 +10073,25 @@ var AGENTS_MD_TEMPLATE = `# ${"${name}"}
 `;
 function initInstructions(cwd) {
   for (const f of ["AGENTS.md", "CLAUDE.md"]) {
-    if (existsSync8(join9(cwd, f))) {
+    if (existsSync9(join11(cwd, f))) {
       err(yellow(`  ${f} already exists \u2014 leaving it as-is
 `));
       return;
     }
   }
-  const path = join9(cwd, "AGENTS.md");
-  writeFileSync6(path, AGENTS_MD_TEMPLATE.replace("${name}", basename2(cwd)));
+  const path = join11(cwd, "AGENTS.md");
+  writeFileSync8(path, AGENTS_MD_TEMPLATE.replace("${name}", basename2(cwd)));
   err(green(`  created ${path}
 `) + dim("  edit it, then it auto-loads into every run.\n"));
 }
 function persistSetting(cwd, key, value) {
-  const path = join9(cwd, ".agent", "settings.json");
+  const path = join11(cwd, ".agent", "settings.json");
   try {
-    const obj = existsSync8(path) ? JSON.parse(readFileSync5(path, "utf8")) : {};
+    const obj = existsSync9(path) ? JSON.parse(readFileSync6(path, "utf8")) : {};
     if (obj[key] === value) return;
     obj[key] = value;
-    mkdirSync7(dirname4(path), { recursive: true });
-    writeFileSync6(path, JSON.stringify(obj, null, 2) + "\n");
+    mkdirSync8(dirname4(path), { recursive: true });
+    writeFileSync8(path, JSON.stringify(obj, null, 2) + "\n");
   } catch (e) {
     err(yellow(`  \u26A0 couldn't persist ${key} to ${path} \u2014 ${e?.message ?? e}
 `));
@@ -9617,14 +10107,14 @@ var isCancelTeardown = (e) => {
 function installCancelGuards(mounted) {
   process.on("unhandledRejection", (e) => {
     if (isCancelTeardown(e)) {
-      log17.debug("suppressed unhandledRejection (cursor stream cancel)", e);
+      log20.debug("suppressed unhandledRejection (cursor stream cancel)", e);
       return;
     }
-    log17.error("unhandledRejection", e);
+    log20.error("unhandledRejection", e);
   });
   process.on("uncaughtException", (e) => {
     if (isCancelTeardown(e)) {
-      log17.debug("suppressed uncaughtException (cursor stream cancel)", e);
+      log20.debug("suppressed uncaughtException (cursor stream cancel)", e);
       return;
     }
     console.error(e);
@@ -9633,7 +10123,7 @@ function installCancelGuards(mounted) {
   });
 }
 async function repl(args, ai, cfg, cwd) {
-  const oauth = new McpOAuth({ storePath: join9(cwd, ".agent", "mcp-auth.json") });
+  const oauth = new McpOAuth({ storePath: join11(cwd, ".agent", "mcp-auth.json") });
   const mounted = await mountMcp(cfg, oauth);
   const agent = await makeAgent(args, ai, cfg, mounted.flatMap((m) => m.tools));
   if (args.voice && !args.duplex) agent.options.tools = [...agent.options.tools ?? [], exitSessionTool(() => {
@@ -9653,7 +10143,19 @@ async function repl(args, ai, cfg, cwd) {
     },
     tickMs: 15e3
   });
-  agent.options.tools = [...agent.options.tools ?? [], ...makeScheduleTools(scheduler)];
+  const agentxInvocation = () => process.argv[1] ? `${process.execPath} ${resolve3(process.argv[1])}` : "agentx";
+  const osSched = new OsScheduler({ agentx: agentxInvocation() });
+  const osBackend = osSched.available() ? {
+    get sessionId() {
+      return session.meta.id;
+    },
+    cwd,
+    route: (t, hint) => routeTrigger(t, hint),
+    schedule: (spec) => osSched.schedule(spec),
+    cancel: (id) => osSched.cancel(id),
+    list: () => osSched.list()
+  } : void 0;
+  agent.options.tools = [...agent.options.tools ?? [], ...makeScheduleTools(scheduler, osBackend)];
   const duplex = args.duplex;
   let dx;
   let voiceIO;
@@ -9732,7 +10234,7 @@ async function repl(args, ai, cfg, cwd) {
           editorRef?.suspend();
           voiceEcho(e.message);
           return;
-        } else if (e.kind === "text_delta" && stashBuf) {
+        } else if (e.kind === "text_delta" && stashText()) {
           process.stdout.write("\r\x1B[K");
           base.notify(e);
           repaintStash();
@@ -9815,7 +10317,7 @@ async function repl(args, ai, cfg, cwd) {
       quickLook: {
         branch: () => {
           try {
-            const head = readFileSync5(join9(cwd, ".git", "HEAD"), "utf8").trim();
+            const head = readFileSync6(join11(cwd, ".git", "HEAD"), "utf8").trim();
             return head.startsWith("ref: refs/heads/") ? `branch: ${head.slice("ref: refs/heads/".length)}` : `detached HEAD at ${head.slice(0, 12)}`;
           } catch {
             return "not a git repository";
@@ -9937,9 +10439,9 @@ async function repl(args, ai, cfg, cwd) {
   };
   const pendingImages = [];
   const grabClipboardAttachment = () => {
-    const dir = join9(tmpdir2(), "agentx-pasted");
+    const dir = join11(tmpdir3(), "agentx-pasted");
     try {
-      mkdirSync7(dir, { recursive: true });
+      mkdirSync8(dir, { recursive: true });
     } catch {
     }
     const img = grabClipboardImage(dir, String(Date.now()));
@@ -9989,7 +10491,7 @@ async function repl(args, ai, cfg, cwd) {
     err(dim(`  \u23F0 ${scheduler.size} scheduled job(s) re-armed
 `));
   }
-  const checkpoints = args.vfs || args.boddb ? new CheckpointStack(agent.options.fs) : new GitCheckpoints({ workTree: cwd, gitDir: join9(cwd, ".agent", "checkpoints.git"), addDirs: args.addDirs, sessionId: session.meta.id });
+  const checkpoints = args.vfs || args.boddb ? new CheckpointStack(agent.options.fs) : new GitCheckpoints({ workTree: cwd, gitDir: join11(cwd, ".agent", "checkpoints.git"), addDirs: args.addDirs, sessionId: session.meta.id });
   const cpHooks = checkpoints.hooks?.();
   if (cpHooks) work.hooks = composeHooks(work.hooks, cpHooks);
   duplexPersist = () => {
@@ -10016,7 +10518,7 @@ async function repl(args, ai, cfg, cwd) {
   const fs = agent.options.fs;
   const fsBase = fs.getCwd() === "/" ? "" : fs.getCwd();
   const adot = (sub) => `${fsBase}/.agent/${sub}`;
-  const adots = (sub) => [adot(sub), `${fsBase}/.claude/${sub}`, `${homedir6()}/.agent/${sub}`, `${homedir6()}/.claude/${sub}`];
+  const adots = (sub) => dotDirs(fsBase, sub);
   const cmds = (await loadCommands(fs, adots("commands"))).commands;
   const skills = (await loadSkills(fs, adots("skills"))).skills;
   const refreshCatalogs = async () => {
@@ -10038,14 +10540,14 @@ ${lines.join("\n")}
 Added entries are loadable now via the Skill/SlashCommand tools; removed ones are gone even if still listed in the system prompt.
 </system-reminder>`;
   };
-  const histPath = join9(cwd, ".agent", "history");
-  const history = existsSync8(histPath) ? readFileSync5(histPath, "utf8").split("\n").filter(Boolean).reverse().slice(0, 500) : [];
+  const histPath = join11(cwd, ".agent", "history");
+  const history = existsSync9(histPath) ? readFileSync6(histPath, "utf8").split("\n").filter(Boolean).reverse().slice(0, 500) : [];
   const remember = (line) => {
     try {
-      mkdirSync7(join9(cwd, ".agent"), { recursive: true });
+      mkdirSync8(join11(cwd, ".agent"), { recursive: true });
       appendFileSync(histPath, line + "\n");
     } catch (e) {
-      log17.debug("history write failed", e);
+      log20.debug("history write failed", e);
     }
   };
   const ago = (t) => {
@@ -10115,7 +10617,7 @@ Added entries are loadable now via the Skill/SlashCommand tools; removed ones ar
       try {
         store.save(session);
       } catch (e) {
-        log17.debug("session save after rewind failed", e);
+        log20.debug("session save after rewind failed", e);
       }
       err(green("  \u27F2 jumped back") + dim(` \u2014 ${face.transcript.length} message(s) kept; edit + resend
 `));
@@ -10143,7 +10645,7 @@ Added entries are loadable now via the Skill/SlashCommand tools; removed ones ar
   const announcedTasks = /* @__PURE__ */ new Set();
   const turn = async (task) => {
     const delta = await refreshCatalogs().catch((e) => {
-      log17.debug("catalog refresh failed", e);
+      log20.debug("catalog refresh failed", e);
       return "";
     });
     if (delta) {
@@ -10338,8 +10840,8 @@ ${extra}` : body);
           const wasRaw = process.stdin.isTTY && process.stdin.isRaw;
           if (wasRaw) process.stdin.setRawMode(false);
           try {
-            const { spawnSync: spawnSync3 } = await import("child_process");
-            const r = spawnSync3("less", ["-R"], { input: text, stdio: ["pipe", "inherit", "inherit"] });
+            const { spawnSync: spawnSync5 } = await import("child_process");
+            const r = spawnSync5("less", ["-R"], { input: text, stdio: ["pipe", "inherit", "inherit"] });
             if (r.error) err(text);
           } finally {
             if (wasRaw) process.stdin.setRawMode(true);
@@ -10359,13 +10861,13 @@ ${extra}` : body);
         keys.length ? ok(`provider keys: ${keys.join(", ")}`) : bad("no provider keys set (ANTHROPIC_API_KEY / OPENAI_API_KEY / GOOGLE_API_KEY / GROQ_API_KEY)");
         const info = getModelInfo(work.model);
         info?.pricing ? ok(`model ${work.model} \u2014 priced (${info.pricing.inputCostPer1K}/${info.pricing.outputCostPer1K} per 1k in/out)`) : warn(`model ${work.model} \u2014 no pricing in the catalog (costs will show ~$0; verify the id)`);
-        const cfgFiles = ["ts", "js", "json"].flatMap((e) => [`${cwd}/.agent/config.${e}`, `${homedir6()}/.agent/config.${e}`]).filter((p) => existsSync8(p));
+        const cfgFiles = ["ts", "js", "json"].flatMap((e) => [`${cwd}/.agent/config.${e}`, `${homedir8()}/.agent/config.${e}`]).filter((p) => existsSync9(p));
         cfgFiles.length ? ok(`config: ${cfgFiles.join(", ")}`) : warn("no .agent/config.* found (project or ~) \u2014 running on defaults");
         try {
           const probe = `${cwd}/.agent/sessions/.doctor-probe`;
-          mkdirSync7(`${cwd}/.agent/sessions`, { recursive: true });
-          writeFileSync6(probe, "ok");
-          unlinkSync2(probe);
+          mkdirSync8(`${cwd}/.agent/sessions`, { recursive: true });
+          writeFileSync8(probe, "ok");
+          unlinkSync4(probe);
           ok(`session store writable (${cwd}/.agent/sessions)`);
         } catch (e) {
           bad(`session store not writable: ${e?.message ?? e}`);
@@ -10392,7 +10894,7 @@ ${extra}` : body);
       desc: "rescan skills/commands dirs and rebuild the system prompt (one cache miss) \u2014 picks up entries created mid-session",
       run: async () => {
         await refreshCatalogs().catch((e) => {
-          log17.debug("catalog refresh failed", e);
+          log20.debug("catalog refresh failed", e);
         });
         face.reprepare();
         err(green(`  \u2713 reloaded \u2014 ${skills.length} skill(s), ${cmds.length} command(s); system prompt rebuilds on next message
@@ -10658,6 +11160,47 @@ ${extra}` : body);
 `));
       }
     },
+    copy: {
+      desc: "copy the last reply to the clipboard \u2014 /copy code = last code block only",
+      run: (a) => {
+        const last = [...face.transcript].reverse().find((m) => m.role === "assistant" && contentText(m.content).trim());
+        if (!last) {
+          err(dim("  (nothing to copy yet)\n"));
+          return;
+        }
+        let text = contentText(last.content).trim();
+        if (a[0] === "code") {
+          const fences = [...text.matchAll(/```[^\n]*\n([\s\S]*?)```/g)];
+          if (!fences.length) {
+            err(dim("  (no code block in the last reply)\n"));
+            return;
+          }
+          text = fences[fences.length - 1][1].trimEnd();
+        }
+        err(dim(copyTextToClipboard(text) ? `  \u2713 copied ${text.length} chars
+` : "  no clipboard tool found (pbcopy/wl-copy/xclip)\n"));
+      }
+    },
+    diff: {
+      desc: "show all file changes this session (oldest checkpoint \u2192 now)",
+      run: async () => {
+        if (!checkpoints.diff) {
+          err(dim("  (diff not supported by this checkpoint backend)\n"));
+          return;
+        }
+        await checkpoints.refresh?.();
+        if (!checkpoints.size) {
+          err(dim("  (no checkpoints yet \u2014 make a turn first)\n"));
+          return;
+        }
+        const d = (await checkpoints.diff()).trim();
+        if (!d) {
+          err(dim("  (no file changes this session)\n"));
+          return;
+        }
+        err(d.split("\n").map((l) => l.startsWith("+") && !l.startsWith("+++") ? green(l) : l.startsWith("-") && !l.startsWith("---") ? red(l) : dim(l)).join("\n") + "\n");
+      }
+    },
     memory: {
       desc: "open the memory index in $EDITOR (.agent/memory/MEMORY.md)",
       run: async () => {
@@ -10688,8 +11231,8 @@ ${extra}` : body);
         const wasRaw = process.stdin.isTTY && process.stdin.isRaw;
         if (wasRaw) process.stdin.setRawMode(false);
         try {
-          const { spawnSync: spawnSync3 } = await import("child_process");
-          spawnSync3(ed, [idx], { stdio: "inherit" });
+          const { spawnSync: spawnSync5 } = await import("child_process");
+          spawnSync5(ed, [idx], { stdio: "inherit" });
         } finally {
           if (wasRaw) process.stdin.setRawMode(true);
         }
@@ -10764,7 +11307,7 @@ ${extra}` : body);
         if (a[0] === "new") {
           let name = a[1];
           if (!name) {
-            const io = createInterface({ input: process.stdin, output: process.stderr });
+            const io = createInterface({ input: keyInput, output: process.stderr });
             try {
               name = (await io.question(yellow("  agent name: "))).trim();
             } finally {
@@ -10806,7 +11349,7 @@ ${extra}` : body);
           try {
             for (const def of (await loadAgents(fs2, d)).agents) if (!seen.has(def.name)) seen.set(def.name, { def, from: d });
           } catch (e) {
-            log17.debug(`loadAgents(${d}) failed`, e);
+            log20.debug(`loadAgents(${d}) failed`, e);
           }
         }
         if (!seen.size) {
@@ -10898,7 +11441,7 @@ ${extra}` : body);
           if (idx >= 0) {
             const old = mounted.splice(idx, 1)[0];
             removeWorkTools(old.tools.map((t) => t.name));
-            await old.client.close().catch((e) => log17.debug("mcp close failed", e));
+            await old.client.close().catch((e) => log20.debug("mcp close failed", e));
           }
           try {
             const m = await mountMcpServer(name, conf);
@@ -10926,7 +11469,7 @@ ${extra}` : body);
           }
           const m = mounted.splice(idx, 1)[0];
           removeWorkTools(m.tools.map((t) => t.name));
-          await m.client.close().catch((e) => log17.debug("mcp close failed", e));
+          await m.client.close().catch((e) => log20.debug("mcp close failed", e));
           err(dim(`  removed "${name}"
 `));
           return;
@@ -11004,7 +11547,7 @@ ${extra}` : body);
         }
         a = [picked];
         if (picked === "add") {
-          const io = createInterface({ input: process.stdin, output: process.stderr });
+          const io = createInterface({ input: keyInput, output: process.stderr });
           try {
             const name = (await io.question(yellow("  name: "))).trim();
             const target = (await io.question(yellow("  command or url: "))).trim();
@@ -11058,11 +11601,11 @@ ${extra}` : body);
           return;
         }
         const md = exportMarkdown(session.meta, shown);
-        const name = a[0] ? extname(a[0]) ? a[0] : a[0] + ".md" : join9(".agent", "exports", `${session.meta.id}.md`);
+        const name = a[0] ? extname(a[0]) ? a[0] : a[0] + ".md" : join11(".agent", "exports", `${session.meta.id}.md`);
         const path = resolve3(cwd, name);
         try {
-          mkdirSync7(dirname4(path), { recursive: true });
-          writeFileSync6(path, md);
+          mkdirSync8(dirname4(path), { recursive: true });
+          writeFileSync8(path, md);
           err(green(`  \u2713 exported \u2192 ${path}
 `) + dim(`  ${shown.length} message(s) \xB7 ${md.length} chars
 `));
@@ -11125,9 +11668,9 @@ ${extra}` : body);
 `));
   const listDir = (absDir) => {
     try {
-      return readdirSync2(join9(cwd, absDir.replace(/^\/+/, "")), { withFileTypes: true }).map((d) => ({ name: d.name, dir: d.isDirectory() }));
+      return readdirSync3(join11(cwd, absDir.replace(/^\/+/, "")), { withFileTypes: true }).map((d) => ({ name: d.name, dir: d.isDirectory() }));
     } catch (e) {
-      log17.debug("completion readdir failed", absDir, e);
+      log20.debug("completion readdir failed", absDir, e);
       return null;
     }
   };
@@ -11141,30 +11684,36 @@ ${extra}` : body);
   editorRef = editor;
   let aborting = false;
   let pendingRewind = false;
+  const classifyPaste = pastePathClassifier(cwd);
   if (process.stdin.isTTY) {
-    const renderStashBuf = () => {
-      if (!stashBuf) return;
+    const sEd = new EditorState(() => ({ hits: [], token: "" }), [], classifyPaste, grabClipboardAttachment);
+    stashEd = sEd;
+    const inverse = (x) => `\x1B[7m${x}\x1B[0m`;
+    const stashView = () => {
+      const v = sEd.buf.replace(/\n/g, "\u23CE");
+      const c = Math.min(sEd.cursor, v.length);
+      const at = c < v.length ? String.fromCodePoint(v.codePointAt(c)) : " ";
       const q2 = inputStash.length ? dim(` [${inputStash.length} queued]`) : "";
-      err(`\r\x1B[K${dim("  stash \u203A ")}${stashBuf}${q2}`);
+      return `${dim("\u203A ")}${v.slice(0, c)}${inverse(at)}${v.slice(c + at.length)}${q2}`;
+    };
+    spinner.tail = () => sEd.buf ? stashView() : "";
+    const renderStashBuf = () => {
+      if (spinner.active) return;
+      err(`\r\x1B[K${sEd.buf ? "  " + stashView() : ""}`);
     };
     repaintStash = renderStashBuf;
-    process.stdin.on("keypress", (_s, key) => {
-      if (!activeTurn) return;
+    keyInput.on("keypress", (_s, key) => {
+      if (isMenuActive()) return;
+      if (!activeTurn && !dispatchPending) return;
       if (key?.ctrl && key?.name === "o") {
         toggleVerbose();
         return;
       }
       const k = key?.name;
-      const cancel = k === "escape" || key?.ctrl && k === "c";
-      if (cancel) {
-        if (stashBuf) {
-          stashBuf = "";
-          err("\r\x1B[K");
-          return;
-        }
+      if (!sEd.pasting && (k === "escape" || key?.ctrl && k === "c")) {
         if (!aborting) {
           aborting = true;
-          activeTurn.abort();
+          activeTurn?.abort();
           voiceIO?.interrupt();
           err(yellow("\n  \u238B cancelling\u2026") + dim(" (Ctrl-C again to force-quit)\n"));
           setTimeout(() => {
@@ -11179,35 +11728,29 @@ ${extra}` : body);
         }
         return;
       }
-      if (k === "return" || k === "enter") {
-        if (stashBuf.trim()) {
-          inputStash.push(stashBuf.trim());
-          err(`\r\x1B[K${green("  \u2713 stashed")} ${dim(`#${inputStash.length}: ${stashBuf.trim().slice(0, 50)}${stashBuf.trim().length > 50 ? "\u2026" : ""}`)}
+      const action = applyKey(sEd, key ?? {}, _s);
+      if (action === "submit") {
+        const text = sEd.expand().trim();
+        sEd.reset();
+        if (text) {
+          inputStash.push(text);
+          const view = text.replace(/\n+/g, " \u23CE ");
+          err(`\r\x1B[K${green("  \u2713 stashed")} ${dim(`#${inputStash.length}: ${view.slice(0, 50)}${view.length > 50 ? "\u2026" : ""}`)}
 `);
         }
-        stashBuf = "";
-        return;
-      }
-      if (k === "backspace") {
-        if (stashBuf.length) {
-          stashBuf = stashBuf.slice(0, -1);
-          if (stashBuf) renderStashBuf();
-          else err("\r\x1B[K");
-        }
-        return;
-      }
-      if (!key?.ctrl && !key?.meta && isPrintable(_s)) {
-        stashBuf += _s;
-        renderStashBuf();
         return;
       }
+      if (sEd.pasting) return;
+      if (action === "eof" || action === "rewind") return;
+      renderStashBuf();
     });
   }
   const promptStr = bold(cyan("agentx \u203A "));
   const contPrompt = dim("  \u2026 \u203A ");
-  const classifyPaste = pastePathClassifier(cwd);
   const releaseStdin = () => {
+    releaseKeyInput();
     if (process.stdin.isTTY) {
+      err("\x1B[?2004l");
       try {
         process.stdin.setRawMode(false);
       } catch {
@@ -11218,6 +11761,7 @@ ${extra}` : body);
   let prefill;
   let tick = 0;
   const dispatchLine = async (line) => {
+    if (/^[!#/]/.test(line)) dispatchPending = false;
     history.unshift(line.replace(/\n+/g, " \u23CE "));
     remember(line.replace(/\n+/g, " \u23CE "));
     if (line.startsWith("!")) {
@@ -11372,8 +11916,8 @@ ${extra}` : body);
       if (t !== void 0) prefill = t;
     }
     aborting = false;
-    const carry = stashBuf;
-    stashBuf = "";
+    const carry = stashText() ? stashEd.expand() : "";
+    stashEd?.reset();
     err("\n");
     const initial = prefill ?? (carry || void 0);
     prefill = void 0;
@@ -11428,6 +11972,10 @@ ${extra}` : body);
       history,
       classifyPaste,
       onEmptyPaste: grabClipboardAttachment,
+      onSubmit: () => {
+        dispatchPending = true;
+      },
+      // claim keys buffered behind the Enter (turn isn't active yet)
       initial: cont ? void 0 : initial,
       status: computeFooter,
       vimMode: cfg.editorMode === "vim",
@@ -11478,7 +12026,8 @@ ${extra}` : body);
     let quit = await dispatchLine(line) === "quit";
     while (!quit && inputStash.length) {
       const next = inputStash.shift();
-      err(dim(`  \u23CE stashed \u203A ${next.slice(0, 60)}${next.length > 60 ? "\u2026" : ""}
+      const nview = next.replace(/\n+/g, " \u23CE ");
+      err(dim(`  \u23CE stashed \u203A ${nview.slice(0, 60)}${nview.length > 60 ? "\u2026" : ""}
 `));
       quit = await dispatchLine(next) === "quit";
     }
@@ -11488,6 +12037,7 @@ ${extra}` : body);
 `));
       await turn(prompt);
     }
+    dispatchPending = false;
     session.meta.scheduledJobs = scheduler.snapshot();
     try {
       store.save(session);
@@ -11524,11 +12074,11 @@ ${extra}` : body);
 `));
         onCtrlC();
       };
-      process.stdin.on("data", onByte);
+      keyInput.on("data", onByte);
       await Promise.race([dx.idle(), new Promise((res) => {
         onCtrlC = res;
       })]);
-      process.stdin.off("data", onByte);
+      keyInput.off("data", onByte);
       if (forced) {
         voiceIO?.stop();
         releaseStdin();
@@ -11610,7 +12160,7 @@ async function main() {
     }
   });
   if (args.task) {
-    const mounted = await mountMcp(cfg, new McpOAuth({ storePath: join9(cwd, ".agent", "mcp-auth.json") }));
+    const mounted = await mountMcp(cfg, new McpOAuth({ storePath: join11(cwd, ".agent", "mcp-auth.json") }));
     const agent = await makeAgent(args, ai, cfg, mounted.flatMap((m) => m.tools));
     const store = new SessionStore(cwd);
     const session = startSession(args, store, agent, cwd);
@@ -11649,6 +12199,7 @@ export {
   formatTranscriptFull,
   jsonResult,
   mcpMentionResolver,
+  mentionRefs,
   parseArgs,
   pastePathClassifier,
   readImageParts,