agent.libx.js 0.93.28 → 0.93.30

package/dist/cli.js

@@ -26,7 +26,10 @@ var init_redact = __esm({
 });
 
 // src/tools.structured.ts
-async function walkFiles(fs, dir, out = []) {
+function ckAbort(signal) {
+  if (signal?.aborted) throw new Error("aborted");
+}
+async function walkFiles(fs, dir, signal, out = []) {
   let entries;
   try {
     entries = await fs.readDir(dir);
@@ -34,8 +37,9 @@ async function walkFiles(fs, dir, out = []) {
     return out;
   }
   for (const name of entries.sort()) {
+    ckAbort(signal);
     const p = dir === "/" ? `/${name}` : `${dir}/${name}`;
-    if (await fs.isDirectory(p)) await walkFiles(fs, p, out);
+    if (await fs.isDirectory(p)) await walkFiles(fs, p, signal, out);
     else out.push(p);
   }
   return out;
@@ -92,13 +96,14 @@ function signaturesOf(content, cap = 40) {
   }
   return out;
 }
-async function repoIndex(fs, glob, mode = "code") {
+async function repoIndex(fs, glob, mode = "code", signal) {
   const scope = glob ? anchoredGlob(fs, String(glob)) : null;
   const filter = mode === "code" ? isCode : mode === "docs" ? isDoc : (p) => isCode(p) || isDoc(p);
-  const files = (await walkFiles(fs, fsCwd(fs))).filter((p) => scope ? scope.test(p) : filter(p));
+  const files = (await walkFiles(fs, fsCwd(fs), signal)).filter((p) => scope ? scope.test(p) : filter(p));
   const blocks = [];
   let shown = 0;
   for (const path of files) {
+    ckAbort(signal);
     let content;
     try {
       content = await fs.readFile(path);
@@ -218,7 +223,7 @@ var init_tools_structured = __esm({
         const include = pats.filter((p) => !p.startsWith("!")).map((p) => anchoredGlob(ctx.fs, p));
         const exclude = pats.filter((p) => p.startsWith("!")).map((p) => anchoredGlob(ctx.fs, p.slice(1)));
         const includes = include.length ? include : [anchoredGlob(ctx.fs, "**")];
-        const hits = (await walkFiles(ctx.fs, fsCwd(ctx.fs))).filter(
+        const hits = (await walkFiles(ctx.fs, fsCwd(ctx.fs), ctx.signal)).filter(
           (p) => includes.some((re) => re.test(p)) && !exclude.some((re) => re.test(p))
         );
         return hits.length ? hits.join("\n") : "(no matches)";
@@ -245,11 +250,12 @@ var init_tools_structured = __esm({
           throw new Error(`invalid regex: ${String(e)}`);
         }
         const scope = glob ? anchoredGlob(ctx.fs, String(glob)) : null;
-        const files = (await walkFiles(ctx.fs, fsCwd(ctx.fs))).filter((p) => !scope || scope.test(p));
+        const files = (await walkFiles(ctx.fs, fsCwd(ctx.fs), ctx.signal)).filter((p) => !scope || scope.test(p));
         const ctxN = Math.max(0, Number(context ?? 0));
         const out = [];
         const matched = [];
         for (const path of files) {
+          ckAbort(ctx.signal);
           let content;
           try {
             content = await ctx.fs.readFile(path);
@@ -285,7 +291,7 @@ var init_tools_structured = __esm({
           scope: { type: "string", enum: ["code", "docs", "all"], description: 'what to map: "code" (default), "docs", or "all"' }
         }
       },
-      run: ({ glob, scope }, ctx) => repoIndex(ctx.fs, glob, scope || "code")
+      run: ({ glob, scope }, ctx) => repoIndex(ctx.fs, glob, scope || "code", ctx.signal)
     };
     writeTool = {
       name: "Write",
@@ -1671,7 +1677,7 @@ close access f`;
 
 // cli/cli.ts
 import { join as join9, resolve as resolve3, basename as basename2, extname, dirname as dirname4 } from "path";
-import { AIClient, listModels, listProviders, getProviderFromModel, getModelInfo, resolveModel, isModelSupported } from "ai.libx.js";
+import { AIClient, listModels, listProviders, getProviderFromModel, getModelInfo, resolveModel, isModelSupported, disposeCursorSessions } from "ai.libx.js";
 
 // src/llm.ts
 function contentText(content) {
@@ -2002,9 +2008,9 @@ async function loadCommands(fs, dir, opts = {}) {
       properties: { name: { type: "string" }, args: { type: "string", description: "arguments to fill the template" } }
     },
     async run({ name, args }, ctx) {
-      const slug = String(name ?? "").replace(/^\//, "");
-      const c = commands.find((x) => x.name === slug);
-      if (!c) return `Error: no command named '${slug}'. Available: ${commands.map((x) => x.name).join(", ")}`;
+      const slug2 = String(name ?? "").replace(/^\//, "");
+      const c = commands.find((x) => x.name === slug2);
+      if (!c) return `Error: no command named '${slug2}'. Available: ${commands.map((x) => x.name).join(", ")}`;
       return expandCommand(ctx.fs, c, String(args ?? ""));
     }
   };
@@ -2039,9 +2045,9 @@ async function loadMemory(fs, dir, opts = {}) {
     const lines = md.split("\n");
     if (!header) header = lines.filter((l) => !/^\s*-\s*\[.+\]\(.+\.md\)/.test(l)).join("\n").trim();
     for (const l of lines.filter((l2) => /^\s*-\s*\[.+\]\(.+\.md\)/.test(l2))) {
-      const slug = l.match(/\]\(([^)]+)\.md\)/)?.[1];
-      if (slug && !seenSlugs.has(slug)) {
-        seenSlugs.add(slug);
+      const slug2 = l.match(/\]\(([^)]+)\.md\)/)?.[1];
+      if (slug2 && !seenSlugs.has(slug2)) {
+        seenSlugs.add(slug2);
         allPointers.push(l);
       }
     }
@@ -2057,20 +2063,20 @@ function slugify(s, fallback = "note") {
   const base = String(s ?? "").trim().toLowerCase().replace(/\.md$/i, "").replace(/[^\w\s-]/g, "").replace(/[\s_]+/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "").slice(0, 48);
   return base || fallback;
 }
-async function writeFact(fs, dir, slug, body, opts) {
+async function writeFact(fs, dir, slug2, body, opts) {
   await mkdirp(fs, dir);
   const content = opts?.type ? `---
 type: ${opts.type}
 ---
 
 ${body}` : body;
-  await fs.writeFile(`${dir}/${slug}.md`, content.endsWith("\n") ? content : content + "\n");
+  await fs.writeFile(`${dir}/${slug2}.md`, content.endsWith("\n") ? content : content + "\n");
   const indexPath = `${dir}/MEMORY.md`;
   const idx = await fs.exists(indexPath) ? await fs.readFile(indexPath) : "# Memory Index\n";
   const summary = opts?.description || body.split("\n")[0].slice(0, 80);
-  const line = `- [${slug}](${slug}.md) \u2014 ${summary}`;
+  const line = `- [${slug2}](${slug2}.md) \u2014 ${summary}`;
   const lines = idx.split("\n");
-  const at = lines.findIndex((l) => l.includes(`(${slug}.md)`));
+  const at = lines.findIndex((l) => l.includes(`(${slug2}.md)`));
   if (at >= 0) {
     if (lines[at] !== line) {
       lines[at] = line;
@@ -2121,8 +2127,8 @@ async function listSlugs(fs, dir, prefix = "") {
   }
   return out;
 }
-async function loadFact(fs, dir, slug) {
-  const path = `${dir}/${slug}.md`;
+async function loadFact(fs, dir, slug2) {
+  const path = `${dir}/${slug2}.md`;
   try {
     const raw = await fs.readFile(path);
     const { body } = splitFrontmatter(raw);
@@ -2131,9 +2137,9 @@ async function loadFact(fs, dir, slug) {
     return null;
   }
 }
-async function loadFactMulti(fs, dirs, slug) {
+async function loadFactMulti(fs, dirs, slug2) {
   for (const d of dirs) {
-    const r = await loadFact(fs, d, slug);
+    const r = await loadFact(fs, d, slug2);
     if (r != null) return r;
   }
   return null;
@@ -2159,9 +2165,9 @@ function recallTool(fs, dirs) {
         pattern: { type: "string", description: 'glob pattern to match against slugs (e.g. "auth*", "*database*")' }
       }
     },
-    async run({ slug, slugs, pattern }, ctx) {
+    async run({ slug: slug2, slugs, pattern }, ctx) {
       let targets = [];
-      if (slug) targets = [cleanSlug(slug)];
+      if (slug2) targets = [cleanSlug(slug2)];
       else if (Array.isArray(slugs)) targets = slugs.map(cleanSlug).filter(Boolean);
       else if (pattern) {
         const escaped = String(pattern).replace(/[.+^${}()|[\]\\]/g, "\\$&");
@@ -2212,19 +2218,19 @@ function memorySearchTool(fs, dirs) {
         matcher = (l) => l.toLowerCase().includes(lower);
       }
       const loaded = [];
-      for (const slug of slugs) {
-        const body = await loadFactMulti(fs, dirs, slug);
-        if (body) loaded.push({ slug, body });
+      for (const slug2 of slugs) {
+        const body = await loadFactMulti(fs, dirs, slug2);
+        if (body) loaded.push({ slug: slug2, body });
       }
       const idf = idfWeights(loaded.map((l) => l.body));
       const qTokens = tokenize(q2);
       const hits = [];
-      for (const { slug, body } of loaded) {
+      for (const { slug: slug2, body } of loaded) {
         const lines = body.split("\n");
         const matchLine = lines.find(matcher);
         if (!matchLine && !relevanceScore(body, qTokens, idf)) continue;
         const snippet = matchLine?.trim().slice(0, 120) || lines.find((l) => l.trim())?.trim().slice(0, 120) || "";
-        hits.push({ slug, snippet, score: relevanceScore(body, qTokens, idf) });
+        hits.push({ slug: slug2, snippet, score: relevanceScore(body, qTokens, idf) });
       }
       if (!hits.length) return "(no matches)";
       hits.sort((a, b) => b.score - a.score);
@@ -2248,11 +2254,11 @@ function rememberTool(fs, dir, memOpts = {}) {
         description: { type: "string", description: "one-line summary for the memory index (\u226480 chars)" }
       }
     },
-    async run({ fact, slug, type, description }, ctx) {
+    async run({ fact, slug: slug2, type, description }, ctx) {
       const body = String(fact ?? "").trim();
       if (!body) return `Error: nothing to remember (empty fact).`;
       if (++writes > maxWrites) return `Rate limit: too many memories this session (${maxWrites}). Only persist genuinely durable facts.`;
-      const name = slugify(slug || body.split("\n")[0]);
+      const name = slugify(slug2 || body.split("\n")[0]);
       const isGlobal = (type === "user" || type === "feedback") && memOpts.userDir;
       const targetDir = isGlobal ? memOpts.userDir : dir;
       await writeFact(fs, targetDir, name, body, { type, description });
@@ -3008,6 +3014,7 @@ var Agent = class _Agent {
       toolCallsTotal += toolCalls.length;
       if (o.maxToolCalls && toolCallsTotal > o.maxToolCalls) return kill("max_tool_calls");
       for (const tc of toolCalls) {
+        if (o.signal?.aborted) return kill("aborted");
         const raw = await this.dispatch(tc);
         let content;
         if (typeof raw === "string") {
@@ -3473,6 +3480,99 @@ init_tools();
 init_tools_structured();
 init_logging();
 var log4 = forComponent("scratch");
+var SCRATCH_DIR = "/scratch";
+function shortArgs(args) {
+  try {
+    const s = JSON.stringify(args ?? {});
+    return s.length > 50 ? s.slice(0, 47) + "\u2026" : s;
+  } catch {
+    return "";
+  }
+}
+var slug = (s) => s.replace(/[^a-z0-9]+/gi, "-").replace(/^-+|-+$/g, "").toLowerCase().slice(0, 32) || "out";
+var Scratch = class {
+  constructor(fs, options = {}) {
+    this.fs = fs;
+    this.options = { threshold: 1500, dir: SCRATCH_DIR, previewChars: 320, ...options };
+  }
+  fs;
+  options;
+  seq = 0;
+  dirReady;
+  /** Number of captures so far. */
+  get count() {
+    return this.seq;
+  }
+  /** Wrap a tool: oversized STRING results spill to a scratch file; everything else passes through. */
+  capture(tool) {
+    const { threshold, dir, previewChars } = this.options;
+    return {
+      ...tool,
+      run: async (args, ctx) => {
+        const raw = await tool.run(args, ctx);
+        if (typeof raw !== "string" || raw.length <= threshold) return raw;
+        const id = "a" + ++this.seq;
+        const path = `${dir}/${id}-${slug(tool.name)}.txt`;
+        const header = `# ${tool.name}(${shortArgs(args)}) \u2014 ${raw.length} bytes
+`;
+        try {
+          await (this.dirReady ??= mkdirp(this.fs, dir));
+          await this.fs.writeFile(path, header + raw);
+        } catch (e) {
+          log4.debug("scratch write failed; returning raw", e);
+          return raw;
+        }
+        const preview = raw.slice(0, previewChars).replace(/\s+/g, " ").trim();
+        return `[scratch ${path} \xB7 ${tool.name} \xB7 ${raw.length} bytes \u2014 full output saved out of context to keep it clean]
+preview: ${preview}\u2026
+To pull a specific detail, Grep/Read ${path}, or call Ask({ question: "\u2026", over: "${path}" }). Do NOT guess at what the preview cuts off.`;
+      }
+    };
+  }
+  /** Wrap many tools at once. */
+  captureAll(tools) {
+    return tools.map((t) => this.capture(t));
+  }
+};
+var ASK_PROMPT = "You are a retrieval-extraction step with Read, Grep and Glob over a scratch filesystem holding raw outputs from earlier tools. Find the information that answers the question and return it concisely, quoting values/facts verbatim. Do NOT add analysis or anything not grounded in the files. If the answer is not present, say so plainly.";
+function makeAskTool(o) {
+  const dir = o.dir ?? SCRATCH_DIR;
+  return {
+    name: "Ask",
+    description: "Answer a question by peeking into the scratch files \u2014 large earlier outputs (web search, big reads, subagent reports) kept out of your context. Pass `over` with a scratch path for a targeted lookup, or omit it to search the scratch dir. Returns only the extracted answer; the full data never enters your context.",
+    parameters: {
+      type: "object",
+      required: ["question"],
+      properties: {
+        question: { type: "string", description: "what you need from the scratch files" },
+        over: { type: "string", description: 'scratch path to read, e.g. "/scratch/a3-websearch.txt"; omit to search' }
+      }
+    },
+    async run({ question, over }) {
+      const q2 = String(question ?? "").trim();
+      if (!q2) return "Error: empty question";
+      const child = new Agent({
+        ai: o.ai,
+        model: o.model,
+        fs: o.fs,
+        tools: toolsByName(["Read", "Grep", "Glob"]),
+        maxSteps: o.maxSteps ?? 6,
+        systemPrompt: ASK_PROMPT
+      });
+      const hint = over ? `Start by reading: ${over}.` : `Grep/Glob ${dir} to find the relevant file(s) first.`;
+      try {
+        const res = await child.run(`${hint}
+
+Question: ${q2}`);
+        const answer = (res.text ?? "").trim();
+        return answer || "(no answer found in scratch)";
+      } catch (e) {
+        log4.debug("Ask peek failed", e);
+        return `Error querying scratch: ${e?.message ?? e}`;
+      }
+    }
+  };
+}
 
 // src/lessons.ts
 init_logging();
@@ -3531,15 +3631,15 @@ If the run was fine or the issue was purely task-specific (not generalizable), r
   const m = text.match(/LESSON:\s*(.+)/i);
   const lesson = m?.[1]?.trim().slice(0, 200) ?? "";
   if (!lesson || /^none\b/i.test(lesson)) return null;
-  const slug = ("lesson-" + slugify(lesson)).slice(0, 56);
+  const slug2 = ("lesson-" + slugify(lesson)).slice(0, 56);
   try {
-    await writeFact(o.fs, o.dir, slug, lesson);
+    await writeFact(o.fs, o.dir, slug2, lesson);
   } catch (e) {
     log6.warn(`could not persist lesson: ${e?.message ?? e}`);
     return null;
   }
-  log6.debug(`reflection persisted ${slug}`);
-  return slug;
+  log6.debug(`reflection persisted ${slug2}`);
+  return slug2;
 }
 function digestRun(messages, maxChars) {
   const lines = [];
@@ -3570,6 +3670,11 @@ var DuplexAgentOptions = class {
   actModel = "anthropic/claude-sonnet-4-6";
   /** Premium reasoning model. Set to `false` to disable the Think tier entirely. */
   thinkModel = "anthropic/claude-opus-4-8";
+  /** Per-worker providerOptions, derived from the worker's actual model at spawn time (IoC — keeps duplex
+   *  provider-agnostic). Workers override the reflex/main model, so provider-specific options (e.g. cursor's
+   *  cwd/cursorSession) must be recomputed for the worker's model, never inherited from the main template —
+   *  leaking cursor options to an anthropic worker is a hard 400. Returns undefined → no providerOptions. */
+  providerOptionsFor;
   /** Escape hatches merged over the derived per-agent options. */
   reflexOptions;
   actOptions;
@@ -3832,6 +3937,9 @@ ${recent}` : brief) + verify;
       model: tierModel,
       ...tier === "think" ? { reasoning: tierOpts?.reasoning ?? "high" } : {},
       ...tierOpts,
+      // Recompute providerOptions for THIS worker's model (after tierOpts so it wins over any inherited
+      // main-template value) — prevents cursor-only cwd/cursorSession leaking onto an anthropic worker.
+      providerOptions: o.providerOptionsFor?.(tierModel),
       ...workerHost ? { host: workerHost } : {},
       ...hooks ? { hooks } : {},
       signal: controller.signal
@@ -5475,6 +5583,10 @@ function toCursorMcp(servers) {
   }
   return Object.keys(out).length ? { mcpServers: out } : void 0;
 }
+function cursorProviderOptions(model, cwd, mcpServers) {
+  if (!(model ?? "").startsWith("cursor/")) return void 0;
+  return { cwd, ...toCursorMcp(mcpServers) ?? {}, ...process.env.CURSOR_WARM === "0" ? {} : { cursorSession: randomUUID() } };
+}
 async function buildAgent(o) {
   if (typeof o.sandbox !== "boolean")
     throw new Error(
@@ -5566,6 +5678,8 @@ Reference files in them by their mount path (the left side).`;
     const jobs = new ShellJobRegistry({ cwd, killOnExit: true });
     realShell = [makeRealShellTool({ cwd, registry: jobs }), ...makeShellJobTools(jobs)];
   }
+  const scratchDir = o.scratch ? o.scratchDir ?? `${cwd}/.agent/scratch` : void 0;
+  const scratch = scratchDir ? new Scratch(fs, { dir: scratchDir }) : void 0;
   return new Agent({
     ai: o.ai,
     fs,
@@ -5576,7 +5690,10 @@ Reference files in them by their mount path (the left side).`;
     // would corrupt those calls.
     // Warm cursor session (default on; CURSOR_WARM=0 to disable): one long-lived agent reused across
     // turns, amortising the ~2s Agent.create + h2 handshake. Keyed per agentx launch.
-    ...isCursor ? { providerOptions: { cwd, ...toCursorMcp(o.mcpServers) ?? {}, ...process.env.CURSOR_WARM === "0" ? {} : { cursorSession: randomUUID() } } } : {},
+    ...(() => {
+      const po = cursorProviderOptions(o.model, cwd, o.mcpServers);
+      return po ? { providerOptions: po } : {};
+    })(),
     ...(() => {
       const now5 = /* @__PURE__ */ new Date();
       const platformNames = { darwin: "macOS", linux: "Linux", win32: "Windows" };
@@ -5590,7 +5707,13 @@ SANDBOX: you operate on an in-memory COPY of this directory \u2014 the real disk
 The filesystem root '/' is the real machine root \u2014 you have full filesystem access, like a normal shell. Use paths relative to the working directory, or absolute paths. Secret files (.env, .ssh, keys, .git) are hidden for safety.`;
       const shellNote = useRealShell && !virtual ? "The `Shell` tool runs /bin/sh \u2014 you can run any installed binary (git, bun, node, curl, etc). Use `Shell` for all shell commands." : void 0;
       const toneNote = "Be concise. Do not use emojis unless the user asks. Do not explain what you are about to do \u2014 just do it.";
-      const extra = [o.appendSystemPrompt, envNote, cwdNote, shellNote, toneNote, mountNote].filter(Boolean).join("\n\n");
+      const mcpNote = (() => {
+        const names = new Set(Object.keys(o.mcpServers ?? {}));
+        for (const t of o.extraTools ?? []) if (t.name.startsWith("mcp__")) names.add(t.name.slice(5).split("__")[0]);
+        const list = [...names];
+        return `You are agentx (the agent.libx.js runtime) \u2014 NOT Claude Code or Claude Desktop, which are separate agents with their own config. Your MCP servers are configured in .agent/settings.json or .agent/config.* (this project's .agent/ or ~/.agent/), and their tools are already in your tool list as \`mcp__<server>__<tool>\`.${list.length ? ` Configured MCP servers: ${list.join(", ")}.` : " No MCP servers are currently configured."} When asked which MCPs/tools you have, answer from your own tool list \u2014 never read Claude Code/Desktop config (e.g. ~/.claude.json, claude_desktop_config.json) to answer; those belong to a different agent.`;
+      })();
+      const extra = [o.appendSystemPrompt, envNote, cwdNote, shellNote, toneNote, mountNote, mcpNote].filter(Boolean).join("\n\n");
       const basePrompt = (() => {
         let p = new AgentOptions().systemPrompt;
         if (!virtual) p = p.replace("operating on a virtual filesystem", "operating on the host filesystem");
@@ -5600,10 +5723,16 @@ The filesystem root '/' is the real machine root \u2014 you have full filesystem
       return { systemPrompt: basePrompt + "\n\n" + extra };
     })(),
     tools: (() => {
-      const base = toolsByName([...o.tools ?? DEFAULT_TOOLS, ...autoWebTools()]);
-      if (!realShell.length) return [...base, ...o.extraTools ?? []];
+      let base = toolsByName([...o.tools ?? DEFAULT_TOOLS, ...autoWebTools()]);
+      const tail = [...o.extraTools ?? []];
+      if (scratch) {
+        const CAPTURE2 = /* @__PURE__ */ new Set(["WebSearch", "WebFetch"]);
+        base = base.map((t) => CAPTURE2.has(t.name) ? scratch.capture(t) : t);
+        tail.push(makeAskTool({ fs, ai: o.ai, model: o.scratchAskModel ?? o.model ?? "anthropic/claude-sonnet-4-6", dir: scratchDir }));
+      }
+      if (!realShell.length) return [...base, ...tail];
       const filtered = base.filter((t) => t.name !== "bash");
-      return [...filtered, ...realShell, ...o.extraTools ?? []];
+      return [...filtered, ...realShell, ...tail];
     })(),
     maxSteps: o.maxSteps ?? 30,
     ...o.reasoning != null ? { reasoning: o.reasoning } : {},
@@ -7837,6 +7966,7 @@ function parseArgs(argv) {
     else if (x === "--ask") a.ask = true;
     else if (x === "--yes" || x === "-y") a.yes = true;
     else if (x === "--vfs" || x === "--sandbox") a.vfs = true;
+    else if (x === "--scratch") a.scratch = true;
     else if (x === "--boddb") a.boddb = val(++i, x);
     else if (x === "--seed") a.seed = true;
     else if (x === "--shell") a.shell = true;
@@ -7890,6 +8020,7 @@ Flags:
   --no-stream          disable token streaming
                        (default: disk mode \u2014 full real filesystem access, like Claude Code)
   --vfs, --sandbox     sandbox mode: work over an in-memory copy of cwd \u2014 real disk is NEVER modified
+  --scratch            spill big web outputs to scratch files (kept out of context; peek via Grep/Ask)
   --boddb <dir>        database-backed workspace: files live in a persistent bod-db store at <dir>,
                        surviving across runs \u2014 real disk is NEVER modified (DB-native; add --seed below)
   --seed               with --boddb: hydrate the store from cwd on the first run (empty DB) only
@@ -7993,14 +8124,26 @@ function makeHost(format = "text", opts) {
   const flushText = () => {
     if (md && md.pending()) process.stdout.write(md.flush());
   };
+  let openReasonLine = false;
+  const closeReasonLine = () => {
+    if (openReasonLine) {
+      process.stderr.write("\n");
+      openReasonLine = false;
+    }
+  };
   return {
     flushText,
     notify(e) {
       spinner.stop();
       if (e.kind === "text_delta") {
         if (streamJson) process.stdout.write(JSON.stringify({ type: "text", text: e.message }) + "\n");
-        else if (md) process.stdout.write(md.feed(e.message));
-        else (cleanStdout ? process.stderr : process.stdout).write(e.message);
+        else if (md) {
+          closeReasonLine();
+          process.stdout.write(md.feed(e.message));
+        } else {
+          if (!cleanStdout) closeReasonLine();
+          (cleanStdout ? process.stderr : process.stdout).write(e.message);
+        }
         return;
       }
       if (e.kind === "thinking_delta") {
@@ -8008,12 +8151,14 @@ function makeHost(format = "text", opts) {
         else if (!cleanStdout) {
           if (md && md.pending()) process.stdout.write(md.flush() + "\n");
           process.stderr.write(dim(e.message));
+          openReasonLine = true;
         }
         return;
       }
+      if (!("message" in e)) return;
+      closeReasonLine();
       if (md && md.pending()) process.stdout.write(md.flush() + "\n");
-      const notice = "message" in e ? e.message : e.kind;
-      err(dim(`  \xB7 ${notice}
+      err(dim(`  \xB7 ${e.message}
 `));
     },
     async confirm(prompt) {
@@ -8342,6 +8487,7 @@ function optsFor(args, ai, cfg = {}, extraTools = []) {
     seed: args.seed,
     realShell: args.shell,
     // undefined → core.ts defaults (on for disk, off for sandbox/boddb)
+    scratch: args.scratch,
     appendSystemPrompt: args.appendSystemPrompt,
     addDirs: args.addDirs,
     stream: args.stream,
@@ -8705,7 +8851,7 @@ async function repl(args, ai, cfg, cwd) {
     return { decision: "deny" };
   };
   if (duplex) {
-    const { host: _host, stream: _stream, signal: _signal, ...wo } = agent.options;
+    const { host: _host, stream: _stream, signal: _signal, providerOptions: _po, ...wo } = agent.options;
     workerOptions = wo;
     if (workerOptions.permissions)
       workerOptions.permissions = new PermissionPolicy({ ...workerOptions.permissions.options, host: void 0, ask: duplexAsk });
@@ -8785,6 +8931,7 @@ async function repl(args, ai, cfg, cwd) {
       ...args.voiceModel ?? cfg.reflexModel ? { reflexModel: resolveModelOrNewest(args.voiceModel ?? cfg.reflexModel) } : {},
       actModel: agent.options.model,
       actOptions: workerOptions,
+      providerOptionsFor: (m) => cursorProviderOptions(m, cwd, cfg.mcpServers),
       ...(args.thinkModel ?? cfg.thinkModel) !== void 0 ? { thinkModel: (args.thinkModel ?? cfg.thinkModel) === false ? false : resolveModelOrNewest(String(args.thinkModel ?? cfg.thinkModel)) } : {},
       host,
       ...args.voice ? { voiceStyle: "conversational", progressUpdates: true, askRelay: true } : {},
@@ -8887,15 +9034,30 @@ async function repl(args, ai, cfg, cwd) {
     const img = grabClipboardImage(dir, String(Date.now()));
     return img ? { display: "Image", ref: "@" + img.path, path: img.path } : null;
   };
+  const forceQuit = (code = 130) => {
+    try {
+      voiceIO?.stop();
+    } catch {
+    }
+    try {
+      disposeCursorSessions();
+    } catch {
+    }
+    void closeMcp(mounted);
+    process.exit(code);
+  };
   process.on("SIGINT", () => {
     if (activeTurn) {
+      if (aborting) {
+        err(red("\n  \u23FB force-quit\n"));
+        forceQuit();
+        return;
+      }
       activeTurn.abort();
       voiceIO?.interrupt();
       return;
     }
-    voiceIO?.stop();
-    void closeMcp(mounted);
-    process.exit(130);
+    forceQuit();
   });
   installCancelGuards(mounted);
   const store = new SessionStore(cwd);
@@ -9478,7 +9640,7 @@ ${extra}` : body);
     commands: { desc: "pick a custom slash command to run (./.agent/commands)", run: () => pickAndRun("command") },
     skills: { desc: "pick a skill to run (./.agent/skills)", run: () => pickAndRun("skill") },
     mcp: {
-      desc: "manage MCP servers \u2014 /mcp [add <name> <cmd|url>] [login <name>] [remove <name>] [resources [name]]",
+      desc: "manage MCP servers \u2014 /mcp [add <name> <cmd|url>] [login <name>] [remove <name>] [tools [name]] [resources [name]]",
       run: async (a) => {
         const sub = a[0]?.toLowerCase();
         if (sub === "login") {
@@ -9554,6 +9716,22 @@ ${extra}` : body);
 `));
           return;
         }
+        if (sub === "tools") {
+          const filter = a[1];
+          const targets = filter ? mounted.filter((m) => m.name === filter) : mounted;
+          if (!targets.length) {
+            err(dim(`  (no ${filter ? `MCP server "${filter}"` : "MCP servers"} found)
+`));
+            return;
+          }
+          for (const m of targets) {
+            err(`  ${cyan(m.name)} ${dim(`(${m.tools.length} tools)`)}
+`);
+            for (const t of m.tools) err(dim(`     - ${t.name.replace(`mcp__${m.name}__`, "")}${t.description ? " \u2014 " + t.description.split("\n")[0] : ""}
+`));
+          }
+          return;
+        }
         if (sub === "resources") {
           const filter = a[1];
           const targets = filter ? mounted.filter((m) => m.name === filter) : mounted;
@@ -9588,16 +9766,16 @@ ${extra}` : body);
           }
           for (const m of mounted) {
             const ver = m.serverInfo?.name ? dim(` \xB7 ${m.serverInfo.name}${m.serverInfo.version ? " v" + m.serverInfo.version : ""}`) : "";
-            err(`  ${cyan(m.name)}${ver} ${dim(`(${m.tools.length} tools)`)}
+            err(`  ${green("\u2713")} ${cyan(m.name)}${ver} ${dim(`(${m.tools.length} tools)`)}
 `);
-            for (const t of m.tools) err(dim(`     - ${t.name.replace(`mcp__${m.name}__`, "")}${t.description ? " \u2014 " + t.description.split("\n")[0] : ""}
-`));
           }
+          err(dim("  /mcp tools [name] to list tools \xB7 /mcp resources [name] for resources\n"));
         };
         const items = [
           { label: "list", value: "list", desc: `show mounted servers (${mounted.length})` },
           { label: "add", value: "add", desc: "mount a new MCP server" },
           ...mounted.length ? [
+            { label: "tools", value: "tools", desc: "list a server's tools" },
             { label: "remove", value: "remove", desc: "unmount an MCP server" },
             { label: "resources", value: "resources", desc: "list server resources" }
           ] : []
@@ -9626,13 +9804,13 @@ ${extra}` : body);
           const rv = await selectMenu(process.stderr, { title: "remove server", items: mounted.map((m) => ({ label: m.name, value: m.name })) });
           if (!rv) return;
           a = ["remove", rv];
-        } else if (picked === "resources") {
+        } else if (picked === "tools" || picked === "resources") {
           if (mounted.length === 1) {
-            a = ["resources", mounted[0].name];
+            a = [picked, mounted[0].name];
           } else {
-            const rv = await selectMenu(process.stderr, { title: "server resources", items: [{ label: "(all)", value: "" }, ...mounted.map((m) => ({ label: m.name, value: m.name }))] });
+            const rv = await selectMenu(process.stderr, { title: `server ${picked}`, items: [{ label: "(all)", value: "" }, ...mounted.map((m) => ({ label: m.name, value: m.name }))] });
             if (rv === null) return;
-            a = rv ? ["resources", rv] : ["resources"];
+            a = rv ? [picked, rv] : [picked];
           }
         }
         return builtins.mcp.run(a);
@@ -9772,7 +9950,13 @@ ${extra}` : body);
           aborting = true;
           activeTurn.abort();
           voiceIO?.interrupt();
-          err(yellow("\n  \u238B cancelling\u2026\n"));
+          err(yellow("\n  \u238B cancelling\u2026") + dim(" (Ctrl-C again to force-quit)\n"));
+          setTimeout(() => {
+            if (activeTurn) err(red("  \u26A0 still cancelling \u2014 press Ctrl-C to force-quit\n"));
+          }, 4e3).unref?.();
+        } else if (key?.ctrl && k === "c") {
+          err(red("\n  \u23FB force-quit\n"));
+          forceQuit();
         } else if (k === "escape" && !pendingRewind) {
           pendingRewind = true;
           err(dim("  \u238B\u238B jumping back to edit\u2026\n"));
@@ -10070,6 +10254,7 @@ ${extra}` : body);
       if (forced) {
         voiceIO?.stop();
         releaseStdin();
+        disposeCursorSessions();
         await closeMcp(mounted);
         process.exit(130);
       }
@@ -10078,6 +10263,7 @@ ${extra}` : body);
     }
   }
   releaseStdin();
+  disposeCursorSessions();
   await closeMcp(mounted);
 }
 function readAllStdin() {
@@ -10154,8 +10340,8 @@ async function main() {
     const { ok, res } = await runTurn(agent, store, session, args.task, void 0, cwd);
     if (cfg.reflectOnFailure && !ok && res && agent.options.memoryDir) {
       const _fsBase = agent.options.fs.getCwd() === "/" ? "" : agent.options.fs.getCwd();
-      const slug = await reflectOnRun({ ai, model: agent.options.model, fs: agent.options.fs, dir: primaryMemDir(agent.options.memoryDir, `${_fsBase}/.agent/memory`), result: res });
-      if (slug) err(dim(`  \u270E learned a lesson \u2192 ${slug}
+      const slug2 = await reflectOnRun({ ai, model: agent.options.model, fs: agent.options.fs, dir: primaryMemDir(agent.options.memoryDir, `${_fsBase}/.agent/memory`), result: res });
+      if (slug2) err(dim(`  \u270E learned a lesson \u2192 ${slug2}
 `));
     }
     await closeMcp(mounted);