reasonix 0.4.6 → 0.4.9

package/dist/cli/index.js

@@ -96,8 +96,8 @@ function computeWait(attempt, initial, cap, retryAfter) {
 }
 function sleep(ms, signal) {
   if (ms <= 0) return Promise.resolve();
-  return new Promise((resolve4, reject) => {
-    const timer = setTimeout(resolve4, ms);
+  return new Promise((resolve5, reject) => {
+    const timer = setTimeout(resolve5, ms);
     if (signal) {
       const onAbort = () => {
         clearTimeout(timer);
@@ -563,7 +563,7 @@ var ToolRegistry = class {
       }
     }));
   }
-  async dispatch(name, argumentsRaw) {
+  async dispatch(name, argumentsRaw, opts = {}) {
     const tool = this._tools.get(name);
     if (!tool) {
       return JSON.stringify({ error: `unknown tool: ${name}` });
@@ -580,7 +580,7 @@ var ToolRegistry = class {
       args = nestArguments(args);
     }
     try {
-      const result = await tool.fn(args);
+      const result = await tool.fn(args, { signal: opts.signal });
       return typeof result === "string" ? result : JSON.stringify(result);
     } catch (err) {
       return JSON.stringify({
@@ -614,8 +614,20 @@ async function bridgeMcpTools(client, opts = {}) {
       name: registeredName,
       description: mcpTool.description ?? "",
       parameters: mcpTool.inputSchema,
-      fn: async (args) => {
-        const toolResult = await client.callTool(mcpTool.name, args);
+      fn: async (args, ctx) => {
+        const toolResult = await client.callTool(mcpTool.name, args, {
+          // Forward server-side progress frames to the bridge caller,
+          // tagged with the registered name so multi-server UIs can
+          // disambiguate. No-op when `onProgress` isn't configured —
+          // the client then also omits the _meta.progressToken and
+          // the server won't emit progress.
+          onProgress: opts.onProgress ? (info) => opts.onProgress({ toolName: registeredName, ...info }) : void 0,
+          // Thread the tool-dispatch AbortSignal all the way down to
+          // the MCP request so Esc truly cancels in flight — the
+          // client will emit notifications/cancelled AND reject the
+          // pending promise immediately, no "wait for subprocess".
+          signal: ctx?.signal
+        });
         return flattenMcpResult(toolResult, { maxChars: maxResultChars });
       }
     });
@@ -1204,11 +1216,13 @@ var CacheFirstLoop = class {
   _turn = 0;
   _streamPreference;
   /**
-   * Set by {@link abort} to short-circuit the tool-call loop after the
-   * current iteration. Reset at the start of each `step()` so an Esc
-   * during one turn doesn't poison the next.
+   * AbortController per active turn. Threaded through the DeepSeek
+   * HTTP calls AND every tool dispatch so Esc actually cancels the
+   * in-flight network/subprocess work — not "we'll get to it after
+   * the current call finishes." Re-created at the start of each
+   * `step()` (the prior turn's signal has already fired).
    */
-  _aborted = false;
+  _turnAbort = new AbortController();
   constructor(opts) {
     this.client = opts.client;
     this.prefix = opts.prefix;
@@ -1321,14 +1335,15 @@ var CacheFirstLoop = class {
     return msgs;
   }
   /**
-   * Signal the currently-running {@link step} that the user wants to
-   * stop exploring. Takes effect at the next iteration boundary — if a
-   * tool call is mid-flight it will be allowed to finish, then the
-   * loop diverts to the forced-summary path so the user gets an
-   * answer instead of a cliff. Called by the TUI on Esc.
+   * Signal the currently-running {@link step} to stop **now**. Cancels
+   * the in-flight network request (DeepSeek HTTP/SSE) AND any tool call
+   * currently dispatching (MCP `notifications/cancelled` + promise
+   * reject). The loop itself also sees `signal.aborted` at each
+   * iteration boundary and exits quickly instead of looping again.
+   * Called by the TUI on Esc.
    */
   abort() {
-    this._aborted = true;
+    this._turnAbort.abort();
   }
   /**
    * Drop everything in the log after (and including) the most recent
@@ -1366,13 +1381,14 @@ var CacheFirstLoop = class {
   async *step(userInput) {
     this._turn++;
     this.scratch.reset();
-    this._aborted = false;
+    this._turnAbort = new AbortController();
+    const signal = this._turnAbort.signal;
     let pendingUser = userInput;
     const toolSpecs = this.prefix.tools();
     const warnAt = Math.max(1, Math.floor(this.maxToolIters * 0.7));
     let warnedForIterBudget = false;
     for (let iter = 0; iter < this.maxToolIters; iter++) {
-      if (this._aborted) {
+      if (signal.aborted) {
         yield {
           turn: this._turn,
           role: "warning",
@@ -1435,7 +1451,8 @@ var CacheFirstLoop = class {
             {
               model: this.model,
               messages,
-              tools: toolSpecs.length ? toolSpecs : void 0
+              tools: toolSpecs.length ? toolSpecs : void 0,
+              signal
             },
             {
               ...this.branchOptions,
@@ -1444,8 +1461,8 @@ var CacheFirstLoop = class {
             }
           );
           for (let k = 0; k < budget; k++) {
-            const sample = queue.shift() ?? await new Promise((resolve4) => {
-              waiter = resolve4;
+            const sample = queue.shift() ?? await new Promise((resolve5) => {
+              waiter = resolve5;
             });
             yield {
               turn: this._turn,
@@ -1485,7 +1502,8 @@ var CacheFirstLoop = class {
           for await (const chunk of this.client.stream({
             model: this.model,
             messages,
-            tools: toolSpecs.length ? toolSpecs : void 0
+            tools: toolSpecs.length ? toolSpecs : void 0,
+            signal
           })) {
             if (chunk.contentDelta) {
               assistantContent += chunk.contentDelta;
@@ -1524,7 +1542,8 @@ var CacheFirstLoop = class {
           const resp = await this.client.chat({
             model: this.model,
             messages,
-            tools: toolSpecs.length ? toolSpecs : void 0
+            tools: toolSpecs.length ? toolSpecs : void 0,
+            signal
           });
           assistantContent = resp.content;
           reasoningContent = resp.reasoningContent ?? "";
@@ -1588,7 +1607,7 @@ var CacheFirstLoop = class {
           toolName: name,
           toolArgs: args
         };
-        const result = await this.tools.dispatch(name, args);
+        const result = await this.tools.dispatch(name, args, { signal });
         this.appendAndPersist({
           role: "tool",
           tool_call_id: call.id ?? "",
@@ -1615,8 +1634,9 @@ var CacheFirstLoop = class {
       });
       const resp = await this.client.chat({
         model: this.model,
-        messages
+        messages,
         // no tools → model is forced to answer in text
+        signal: this._turnAbort.signal
       });
       const rawContent = resp.content?.trim() ?? "";
       const cleaned = stripHallucinatedToolMarkup(rawContent);
@@ -1712,13 +1732,298 @@ function formatLoopError(err) {
   return msg;
 }
 
+// src/tools/filesystem.ts
+import { promises as fs } from "fs";
+import * as pathMod from "path";
+var DEFAULT_MAX_READ_BYTES = 2 * 1024 * 1024;
+var DEFAULT_MAX_LIST_BYTES = 256 * 1024;
+function registerFilesystemTools(registry, opts) {
+  const rootDir = pathMod.resolve(opts.rootDir);
+  const allowWriting = opts.allowWriting !== false;
+  const maxReadBytes = opts.maxReadBytes ?? DEFAULT_MAX_READ_BYTES;
+  const maxListBytes = opts.maxListBytes ?? DEFAULT_MAX_LIST_BYTES;
+  const safePath = (raw) => {
+    if (typeof raw !== "string" || raw.length === 0) {
+      throw new Error("path must be a non-empty string");
+    }
+    const resolved = pathMod.resolve(rootDir, raw);
+    const normRoot = pathMod.resolve(rootDir);
+    const rel = pathMod.relative(normRoot, resolved);
+    if (rel.startsWith("..") || pathMod.isAbsolute(rel)) {
+      throw new Error(`path escapes sandbox root (${normRoot}): ${raw}`);
+    }
+    return resolved;
+  };
+  registry.register({
+    name: "read_file",
+    description: "Read a file under the sandbox root. Returns the full contents (truncated with a notice if larger than the per-call cap). Paths may be relative to the root or absolute-under-root.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string", description: "Path to read (relative to rootDir or absolute)." },
+        head: { type: "integer", description: "If set, return only the first N lines." },
+        tail: { type: "integer", description: "If set, return only the last N lines." }
+      },
+      required: ["path"]
+    },
+    fn: async (args) => {
+      const abs = safePath(args.path);
+      const stat = await fs.stat(abs);
+      if (stat.isDirectory()) {
+        throw new Error(`not a file: ${args.path} (it's a directory)`);
+      }
+      const raw = await fs.readFile(abs);
+      if (raw.length > maxReadBytes) {
+        const head = raw.slice(0, maxReadBytes).toString("utf8");
+        return `${head}
+
+[\u2026truncated ${raw.length - maxReadBytes} bytes \u2014 file is ${raw.length} B, cap ${maxReadBytes} B. Retry with head/tail for targeted view.]`;
+      }
+      const text = raw.toString("utf8");
+      if (typeof args.head === "number" && args.head > 0) {
+        return text.split(/\r?\n/).slice(0, args.head).join("\n");
+      }
+      if (typeof args.tail === "number" && args.tail > 0) {
+        let lines = text.split(/\r?\n/);
+        if (lines.length > 0 && lines[lines.length - 1] === "") lines = lines.slice(0, -1);
+        return lines.slice(Math.max(0, lines.length - args.tail)).join("\n");
+      }
+      return text;
+    }
+  });
+  registry.register({
+    name: "list_directory",
+    description: "List entries in a directory under the sandbox root. Returns one line per entry, marking directories with a trailing slash. Not recursive \u2014 use directory_tree for that.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string", description: "Directory to list (default: root)." }
+      }
+    },
+    fn: async (args) => {
+      const abs = safePath(args.path ?? ".");
+      const entries = await fs.readdir(abs, { withFileTypes: true });
+      const lines = [];
+      for (const e of entries.sort((a, b) => a.name.localeCompare(b.name))) {
+        lines.push(e.isDirectory() ? `${e.name}/` : e.name);
+      }
+      return lines.join("\n") || "(empty directory)";
+    }
+  });
+  registry.register({
+    name: "directory_tree",
+    description: "Recursively list entries in a directory. Shows indented tree structure with directories marked '/'. Caps output so a huge tree doesn't drown the context.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string", description: "Root of the tree (default: sandbox root)." },
+        maxDepth: { type: "integer", description: "Max recursion depth (default 4)." }
+      }
+    },
+    fn: async (args) => {
+      const startAbs = safePath(args.path ?? ".");
+      const maxDepth = typeof args.maxDepth === "number" ? args.maxDepth : 4;
+      const lines = [];
+      let totalBytes = 0;
+      let truncated = false;
+      const walk2 = async (dir, depth) => {
+        if (truncated) return;
+        if (depth > maxDepth) return;
+        let entries;
+        try {
+          entries = await fs.readdir(dir, { withFileTypes: true });
+        } catch {
+          return;
+        }
+        entries.sort((a, b) => a.name.localeCompare(b.name));
+        for (const e of entries) {
+          if (truncated) return;
+          const indent = "  ".repeat(depth);
+          const line = e.isDirectory() ? `${indent}${e.name}/` : `${indent}${e.name}`;
+          totalBytes += line.length + 1;
+          if (totalBytes > maxListBytes) {
+            lines.push(`  [\u2026 tree truncated at ${maxListBytes} bytes \u2026]`);
+            truncated = true;
+            return;
+          }
+          lines.push(line);
+          if (e.isDirectory()) {
+            await walk2(pathMod.join(dir, e.name), depth + 1);
+          }
+        }
+      };
+      await walk2(startAbs, 0);
+      return lines.join("\n") || "(empty tree)";
+    }
+  });
+  registry.register({
+    name: "search_files",
+    description: "Find files whose NAME matches a substring or regex. Case-insensitive. Walks the directory recursively under the sandbox root. Returns one path per line.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string", description: "Directory to start the search at (default: root)." },
+        pattern: {
+          type: "string",
+          description: "Substring (or regex) to match against filenames."
+        }
+      },
+      required: ["pattern"]
+    },
+    fn: async (args) => {
+      const startAbs = safePath(args.path ?? ".");
+      const needle = args.pattern.toLowerCase();
+      let re = null;
+      try {
+        re = new RegExp(args.pattern, "i");
+      } catch {
+        re = null;
+      }
+      const matches = [];
+      let totalBytes = 0;
+      const walk2 = async (dir) => {
+        let entries;
+        try {
+          entries = await fs.readdir(dir, { withFileTypes: true });
+        } catch {
+          return;
+        }
+        for (const e of entries) {
+          const full = pathMod.join(dir, e.name);
+          const lower = e.name.toLowerCase();
+          const hit = re ? re.test(e.name) : lower.includes(needle);
+          if (hit) {
+            const rel = pathMod.relative(rootDir, full);
+            if (totalBytes + rel.length + 1 > maxListBytes) {
+              matches.push("[\u2026 search truncated \u2014 refine pattern \u2026]");
+              return;
+            }
+            matches.push(rel);
+            totalBytes += rel.length + 1;
+          }
+          if (e.isDirectory()) await walk2(full);
+        }
+      };
+      await walk2(startAbs);
+      return matches.length === 0 ? "(no matches)" : matches.join("\n");
+    }
+  });
+  registry.register({
+    name: "get_file_info",
+    description: "Stat a path under the sandbox root. Returns type (file|directory|symlink), size in bytes, mtime in ISO-8601.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string" }
+      },
+      required: ["path"]
+    },
+    fn: async (args) => {
+      const abs = safePath(args.path);
+      const st = await fs.lstat(abs);
+      const type = st.isDirectory() ? "directory" : st.isSymbolicLink() ? "symlink" : "file";
+      return JSON.stringify({
+        type,
+        size: st.size,
+        mtime: st.mtime.toISOString()
+      });
+    }
+  });
+  if (!allowWriting) return registry;
+  registry.register({
+    name: "write_file",
+    description: "Create or overwrite a file under the sandbox root with the given content. Parent directories are created as needed.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string" },
+        content: { type: "string" }
+      },
+      required: ["path", "content"]
+    },
+    fn: async (args) => {
+      const abs = safePath(args.path);
+      await fs.mkdir(pathMod.dirname(abs), { recursive: true });
+      await fs.writeFile(abs, args.content, "utf8");
+      return `wrote ${args.content.length} chars to ${pathMod.relative(rootDir, abs)}`;
+    }
+  });
+  registry.register({
+    name: "edit_file",
+    description: "Apply a SEARCH/REPLACE edit to an existing file. `search` must match exactly (whitespace sensitive) \u2014 no regex. The match must be unique in the file; otherwise the edit is refused to avoid surprise rewrites. This flat-string shape replaces the `{oldText, newText}[]` JSON array form that previously triggered R1 DSML hallucinations.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string" },
+        search: { type: "string", description: "Exact text to find (must be unique)." },
+        replace: { type: "string", description: "Text to substitute in place of `search`." }
+      },
+      required: ["path", "search", "replace"]
+    },
+    fn: async (args) => {
+      const abs = safePath(args.path);
+      const before = await fs.readFile(abs, "utf8");
+      if (args.search.length === 0) {
+        throw new Error("edit_file: search cannot be empty");
+      }
+      const firstIdx = before.indexOf(args.search);
+      if (firstIdx < 0) {
+        throw new Error(`edit_file: search text not found in ${pathMod.relative(rootDir, abs)}`);
+      }
+      const nextIdx = before.indexOf(args.search, firstIdx + 1);
+      if (nextIdx >= 0) {
+        throw new Error(
+          `edit_file: search text appears multiple times in ${pathMod.relative(rootDir, abs)} \u2014 include more context to disambiguate`
+        );
+      }
+      const after = before.slice(0, firstIdx) + args.replace + before.slice(firstIdx + args.search.length);
+      await fs.writeFile(abs, after, "utf8");
+      return `edited ${pathMod.relative(rootDir, abs)} (${args.search.length}\u2192${args.replace.length} chars)`;
+    }
+  });
+  registry.register({
+    name: "create_directory",
+    description: "Create a directory (and any missing parents) under the sandbox root.",
+    parameters: {
+      type: "object",
+      properties: { path: { type: "string" } },
+      required: ["path"]
+    },
+    fn: async (args) => {
+      const abs = safePath(args.path);
+      await fs.mkdir(abs, { recursive: true });
+      return `created ${pathMod.relative(rootDir, abs)}/`;
+    }
+  });
+  registry.register({
+    name: "move_file",
+    description: "Rename/move a file or directory under the sandbox root.",
+    parameters: {
+      type: "object",
+      properties: {
+        source: { type: "string" },
+        destination: { type: "string" }
+      },
+      required: ["source", "destination"]
+    },
+    fn: async (args) => {
+      const src = safePath(args.source);
+      const dst = safePath(args.destination);
+      await fs.mkdir(pathMod.dirname(dst), { recursive: true });
+      await fs.rename(src, dst);
+      return `moved ${pathMod.relative(rootDir, src)} \u2192 ${pathMod.relative(rootDir, dst)}`;
+    }
+  });
+  return registry;
+}
+
 // src/env.ts
 import { readFileSync as readFileSync3 } from "fs";
-import { resolve } from "path";
+import { resolve as resolve2 } from "path";
 function loadDotenv(path = ".env") {
   let raw;
   try {
-    raw = readFileSync3(resolve(process.cwd(), path), "utf8");
+    raw = readFileSync3(resolve2(process.cwd(), path), "utf8");
   } catch {
     return;
   }
@@ -2279,6 +2584,13 @@ var McpClient = class {
   _serverInfo = { name: "", version: "" };
   _protocolVersion = "";
   _instructions;
+  // Progress-token → handler for notifications/progress routing. Tokens
+  // are minted per call when the caller supplies an onProgress
+  // callback; cleared when the final response lands (or the pending
+  // request rejects). No leaks — the `try/finally` in callTool
+  // guarantees cleanup even on timeout.
+  progressHandlers = /* @__PURE__ */ new Map();
+  nextProgressToken = 1;
   constructor(opts) {
     this.transport = opts.transport;
     this.clientInfo = opts.clientInfo ?? { name: "reasonix", version: "0.3.0-dev" };
@@ -2333,13 +2645,36 @@ var McpClient = class {
     this.assertInitialized();
     return this.request("tools/list", {});
   }
-  /** Invoke a tool by name. Returns the raw MCP result (caller unwraps content). */
-  async callTool(name, args) {
+  /**
+   * Invoke a tool by name. When `onProgress` is supplied, attaches a
+   * fresh progress token so the server can send incremental updates
+   * via `notifications/progress`; they're routed to the callback until
+   * the final response arrives (or the request times out, in which
+   * case the handler is simply dropped — no extra notification).
+   *
+   * When `signal` is supplied, aborting it:
+   *   1) fires `notifications/cancelled` to the server (MCP 2024-11-05
+   *      way of saying "forget this request, I no longer care"), and
+   *   2) rejects the pending promise immediately with an AbortError,
+   *      so the caller doesn't have to wait for the subprocess to
+   *      finish its in-flight file write or network request.
+   * The server MAY still emit a late response; we drop it in dispatch
+   * since the request id is gone from `pending`.
+   */
+  async callTool(name, args, opts = {}) {
     this.assertInitialized();
-    return this.request("tools/call", {
-      name,
-      arguments: args ?? {}
-    });
+    const params = { name, arguments: args ?? {} };
+    let token;
+    if (opts.onProgress) {
+      token = this.nextProgressToken++;
+      this.progressHandlers.set(token, opts.onProgress);
+      params._meta = { progressToken: token };
+    }
+    try {
+      return await this.request("tools/call", params, opts.signal);
+    } finally {
+      if (token !== void 0) this.progressHandlers.delete(token);
+    }
   }
   /**
    * List resources the server exposes. Supports a pagination cursor;
@@ -2393,24 +2728,56 @@ var McpClient = class {
   assertInitialized() {
     if (!this.initialized) throw new Error("MCP client not initialized \u2014 call initialize() first");
   }
-  async request(method, params) {
+  async request(method, params, signal) {
     const id = this.nextId++;
     const frame = { jsonrpc: "2.0", id, method, params };
-    const promise = new Promise((resolve4, reject) => {
+    let abortHandler = null;
+    const promise = new Promise((resolve5, reject) => {
       const timeout = setTimeout(() => {
         this.pending.delete(id);
+        if (abortHandler && signal) signal.removeEventListener("abort", abortHandler);
         reject(
           new Error(`MCP request ${method} (id=${id}) timed out after ${this.requestTimeoutMs}ms`)
         );
       }, this.requestTimeoutMs);
       this.pending.set(id, {
-        resolve: resolve4,
+        resolve: resolve5,
         reject,
         timeout
       });
+      if (signal) {
+        if (signal.aborted) {
+          this.pending.delete(id);
+          clearTimeout(timeout);
+          reject(new Error(`MCP request ${method} (id=${id}) aborted before send`));
+          return;
+        }
+        abortHandler = () => {
+          this.pending.delete(id);
+          clearTimeout(timeout);
+          void this.transport.send({
+            jsonrpc: "2.0",
+            method: "notifications/cancelled",
+            params: { requestId: id, reason: "aborted by user" }
+          }).catch(() => {
+          });
+          reject(new Error(`MCP request ${method} (id=${id}) aborted by user`));
+        };
+        signal.addEventListener("abort", abortHandler, { once: true });
+      }
     });
-    await this.transport.send(frame);
-    return promise;
+    try {
+      await this.transport.send(frame);
+    } catch (err) {
+      this.pending.delete(id);
+      if (abortHandler && signal) signal.removeEventListener("abort", abortHandler);
+      throw err;
+    }
+    try {
+      return await promise;
+    } finally {
+      if (abortHandler && signal) signal.removeEventListener("abort", abortHandler);
+    }
   }
   startReaderIfNeeded() {
     if (this.readerStarted) return;
@@ -2431,7 +2798,16 @@ var McpClient = class {
     }
   }
   dispatch(msg) {
-    if (!("id" in msg) || msg.id === null || msg.id === void 0) return;
+    if (!("id" in msg) || msg.id === null || msg.id === void 0) {
+      if ("method" in msg && msg.method === "notifications/progress") {
+        const p = msg.params;
+        if (!p || p.progressToken === void 0) return;
+        const handler = this.progressHandlers.get(p.progressToken);
+        if (!handler) return;
+        handler({ progress: p.progress, total: p.total, message: p.message });
+      }
+      return;
+    }
     if (!("result" in msg) && !("error" in msg)) return;
     const pending = this.pending.get(msg.id);
     if (!pending) return;
@@ -2488,12 +2864,12 @@ var StdioTransport = class {
   }
   async send(message) {
     if (this.closed) throw new Error("MCP transport is closed");
-    return new Promise((resolve4, reject) => {
+    return new Promise((resolve5, reject) => {
       const line = `${JSON.stringify(message)}
 `;
       this.child.stdin.write(line, "utf8", (err) => {
         if (err) reject(err);
-        else resolve4();
+        else resolve5();
       });
     });
   }
@@ -2504,8 +2880,8 @@ var StdioTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve4) => {
-        this.waiters.push(resolve4);
+      const next = await new Promise((resolve5) => {
+        this.waiters.push(resolve5);
       });
       if (next === null) return;
       yield next;
@@ -2571,8 +2947,8 @@ var SseTransport = class {
   constructor(opts) {
     this.url = opts.url;
     this.headers = opts.headers ?? {};
-    this.endpointReady = new Promise((resolve4, reject) => {
-      this.resolveEndpoint = resolve4;
+    this.endpointReady = new Promise((resolve5, reject) => {
+      this.resolveEndpoint = resolve5;
       this.rejectEndpoint = reject;
     });
     this.endpointReady.catch(() => void 0);
@@ -2599,8 +2975,8 @@ var SseTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve4) => {
-        this.waiters.push(resolve4);
+      const next = await new Promise((resolve5) => {
+        this.waiters.push(resolve5);
       });
       if (next === null) return;
       yield next;
@@ -2800,7 +3176,7 @@ async function trySection(load) {
 
 // src/code/edit-blocks.ts
 import { existsSync as existsSync2, mkdirSync as mkdirSync3, readFileSync as readFileSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname3, resolve as resolve2 } from "path";
+import { dirname as dirname4, resolve as resolve3 } from "path";
 var BLOCK_RE = /^(\S[^\n]*)\n<{7} SEARCH\n([\s\S]*?)\n?={7}\n([\s\S]*?)\n?>{7} REPLACE/gm;
 function parseEditBlocks(text) {
   const out = [];
@@ -2818,8 +3194,8 @@ function parseEditBlocks(text) {
   return out;
 }
 function applyEditBlock(block, rootDir) {
-  const absRoot = resolve2(rootDir);
-  const absTarget = resolve2(absRoot, block.path);
+  const absRoot = resolve3(rootDir);
+  const absTarget = resolve3(absRoot, block.path);
   if (absTarget !== absRoot && !absTarget.startsWith(`${absRoot}${sep()}`)) {
     return {
       path: block.path,
@@ -2838,7 +3214,7 @@ function applyEditBlock(block, rootDir) {
           message: "file does not exist; to create it, use an empty SEARCH block"
         };
       }
-      mkdirSync3(dirname3(absTarget), { recursive: true });
+      mkdirSync3(dirname4(absTarget), { recursive: true });
       writeFileSync3(absTarget, block.replace, "utf8");
       return { path: block.path, status: "created" };
     }
@@ -2869,13 +3245,13 @@ function applyEditBlocks(blocks, rootDir) {
   return blocks.map((b) => applyEditBlock(b, rootDir));
 }
 function snapshotBeforeEdits(blocks, rootDir) {
-  const absRoot = resolve2(rootDir);
+  const absRoot = resolve3(rootDir);
   const seen = /* @__PURE__ */ new Set();
   const snapshots = [];
   for (const b of blocks) {
     if (seen.has(b.path)) continue;
     seen.add(b.path);
-    const abs = resolve2(absRoot, b.path);
+    const abs = resolve3(absRoot, b.path);
     if (!existsSync2(abs)) {
       snapshots.push({ path: b.path, prevContent: null });
       continue;
@@ -2889,9 +3265,9 @@ function snapshotBeforeEdits(blocks, rootDir) {
   return snapshots;
 }
 function restoreSnapshots(snapshots, rootDir) {
-  const absRoot = resolve2(rootDir);
+  const absRoot = resolve3(rootDir);
   return snapshots.map((snap) => {
-    const abs = resolve2(absRoot, snap.path);
+    const abs = resolve3(absRoot, snap.path);
     if (abs !== absRoot && !abs.startsWith(`${absRoot}${sep()}`)) {
       return {
         path: snap.path,
@@ -2928,11 +3304,11 @@ var VERSION = "0.4.3";
 
 // src/cli/commands/chat.tsx
 import { render } from "ink";
-import React9, { useState as useState4 } from "react";
+import React9, { useState as useState5 } from "react";
 
 // src/cli/ui/App.tsx
-import { Box as Box7, Static, Text as Text7, useApp, useInput } from "ink";
-import React7, { useCallback, useEffect as useEffect2, useMemo, useRef, useState as useState2 } from "react";
+import { Box as Box7, Static, Text as Text7, useApp, useInput as useInput2 } from "ink";
+import React7, { useCallback, useEffect as useEffect3, useMemo, useRef, useState as useState3 } from "react";
 
 // src/cli/ui/EventLog.tsx
 import { Box as Box3, Text as Text3 } from "ink";
@@ -3271,9 +3647,44 @@ function truncate2(s, max) {
 }
 
 // src/cli/ui/PromptInput.tsx
-import { Box as Box4, Text as Text4 } from "ink";
-import TextInput from "ink-text-input";
-import React4 from "react";
+import { Box as Box4, Text as Text4, useInput } from "ink";
+import React4, { useEffect as useEffect2, useState as useState2 } from "react";
+
+// src/cli/ui/multiline-keys.ts
+var BACKSLASH_SUFFIX = /\\$/;
+function processMultilineKey(value, key) {
+  if (key.tab || key.upArrow || key.downArrow || key.leftArrow || key.rightArrow || key.escape || key.pageUp || key.pageDown) {
+    return { next: null, submit: false };
+  }
+  if (key.input === "\n" || key.ctrl && key.input === "j") {
+    return { next: `${value}
+`, submit: false };
+  }
+  if (key.return) {
+    if (key.shift) {
+      return { next: `${value}
+`, submit: false };
+    }
+    if (BACKSLASH_SUFFIX.test(value)) {
+      return { next: `${value.slice(0, -1)}
+`, submit: false };
+    }
+    return { next: null, submit: true, submitValue: value };
+  }
+  if (key.backspace || key.delete) {
+    if (value.length === 0) return { next: null, submit: false };
+    return { next: value.slice(0, -1), submit: false };
+  }
+  if ((key.ctrl || key.meta) && key.input.length === 0) {
+    return { next: null, submit: false };
+  }
+  if (key.input.length > 0 && !key.ctrl && !key.meta) {
+    return { next: value + key.input, submit: false };
+  }
+  return { next: null, submit: false };
+}
+
+// src/cli/ui/PromptInput.tsx
 function PromptInput({
   value,
   onChange,
@@ -3281,17 +3692,53 @@ function PromptInput({
   disabled,
   placeholder
 }) {
-  const effectivePlaceholder = disabled ? placeholder ?? "\u2026waiting for response\u2026" : placeholder ?? "type a message, or /command";
-  return /* @__PURE__ */ React4.createElement(Box4, { borderStyle: "round", borderColor: disabled ? "gray" : "cyan", paddingX: 1 }, /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: disabled ? "gray" : "cyan" }, "you \u203A", " "), /* @__PURE__ */ React4.createElement(
-    TextInput,
-    {
-      value,
-      onChange,
-      onSubmit,
-      focus: !disabled,
-      placeholder: effectivePlaceholder
+  const [showCursor, setShowCursor] = useState2(true);
+  useEffect2(() => {
+    if (disabled) {
+      setShowCursor(false);
+      return;
     }
-  ));
+    setShowCursor(true);
+    const id = setInterval(() => setShowCursor((s) => !s), 500);
+    return () => clearInterval(id);
+  }, [disabled]);
+  useInput(
+    (input, key) => {
+      const keyEvent = {
+        input,
+        return: key.return,
+        shift: key.shift,
+        ctrl: key.ctrl,
+        meta: key.meta,
+        backspace: key.backspace,
+        delete: key.delete,
+        tab: key.tab,
+        upArrow: key.upArrow,
+        downArrow: key.downArrow,
+        leftArrow: key.leftArrow,
+        rightArrow: key.rightArrow,
+        escape: key.escape,
+        pageUp: key.pageUp,
+        pageDown: key.pageDown
+      };
+      const action = processMultilineKey(value, keyEvent);
+      if (action.next !== null) onChange(action.next);
+      if (action.submit) onSubmit(action.submitValue ?? value);
+    },
+    { isActive: !disabled }
+  );
+  const effectivePlaceholder = disabled ? placeholder ?? "\u2026waiting for response\u2026" : placeholder ?? "type a message, or /command \xB7 Ctrl+J for newline";
+  const lines = value.length > 0 ? value.split("\n") : [""];
+  const borderColor = disabled ? "gray" : "cyan";
+  return /* @__PURE__ */ React4.createElement(Box4, { borderStyle: "round", borderColor, paddingX: 1, flexDirection: "column" }, lines.map((line, i) => {
+    const isLast = i === lines.length - 1;
+    const isFirst = i === 0;
+    const showPlaceholder = isFirst && value.length === 0;
+    return (
+      // biome-ignore lint/suspicious/noArrayIndexKey: stable by construction — lines are derived from `value.split("\n")` and never reordered
+      /* @__PURE__ */ React4.createElement(Box4, { key: i }, isFirst ? /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: borderColor }, "you \u203A", " ") : /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, "     "), showPlaceholder && isLast && !disabled ? /* @__PURE__ */ React4.createElement(Text4, { color: borderColor }, showCursor ? "\u258C" : " ") : null, showPlaceholder ? /* @__PURE__ */ React4.createElement(Text4, { dimColor: true }, effectivePlaceholder) : /* @__PURE__ */ React4.createElement(Text4, null, line), !showPlaceholder && isLast && !disabled ? /* @__PURE__ */ React4.createElement(Text4, { color: borderColor }, showCursor ? "\u258C" : " ") : null)
+    );
+  }));
 }
 
 // src/cli/ui/SlashSuggestions.tsx
@@ -3785,22 +4232,24 @@ function App({
   tools,
   mcpSpecs,
   mcpServers,
+  progressSink,
   codeMode
 }) {
   const { exit } = useApp();
-  const [historical, setHistorical] = useState2([]);
-  const [streaming, setStreaming] = useState2(null);
-  const [input, setInput] = useState2("");
-  const [busy, setBusy] = useState2(false);
+  const [historical, setHistorical] = useState3([]);
+  const [streaming, setStreaming] = useState3(null);
+  const [input, setInput] = useState3("");
+  const [busy, setBusy] = useState3(false);
   const abortedThisTurn = useRef(false);
-  const [ongoingTool, setOngoingTool] = useState2(null);
+  const [ongoingTool, setOngoingTool] = useState3(null);
+  const [toolProgress, setToolProgress] = useState3(null);
   const lastEditSnapshots = useRef(null);
   const pendingEdits = useRef([]);
   const promptHistory = useRef([]);
   const historyCursor = useRef(-1);
   const toolHistoryRef = useRef([]);
-  const [slashSelected, setSlashSelected] = useState2(0);
-  const [summary, setSummary] = useState2({
+  const [slashSelected, setSlashSelected] = useState3(0);
+  const [summary, setSummary] = useState3({
     turns: 0,
     totalCostUsd: 0,
     claudeEquivalentUsd: 0,
@@ -3817,7 +4266,7 @@ function App({
       startedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
   }
-  useEffect2(() => {
+  useEffect3(() => {
     return () => {
       transcriptRef.current?.end();
     };
@@ -3826,7 +4275,7 @@ function App({
     if (!input.startsWith("/") || input.includes(" ")) return null;
     return suggestSlashCommands(input.slice(1), !!codeMode);
   }, [input, codeMode]);
-  useEffect2(() => {
+  useEffect3(() => {
     setSlashSelected((prev) => {
       if (!slashMatches || slashMatches.length === 0) return 0;
       if (prev >= slashMatches.length) return slashMatches.length - 1;
@@ -3845,8 +4294,21 @@ function App({
     loopRef.current = l;
     return l;
   }, [model, system, harvest2, branch, session, tools]);
+  useEffect3(() => {
+    if (!progressSink) return;
+    progressSink.current = (info) => {
+      setToolProgress({
+        progress: info.progress,
+        total: info.total,
+        message: info.message
+      });
+    };
+    return () => {
+      if (progressSink.current) progressSink.current = null;
+    };
+  }, [progressSink]);
   const sessionBannerShown = useRef(false);
-  useEffect2(() => {
+  useEffect3(() => {
     if (sessionBannerShown.current) return;
     sessionBannerShown.current = true;
     if (!session) {
@@ -3878,7 +4340,7 @@ function App({
       ]);
     }
   }, [session, loop]);
-  useInput((_input, key) => {
+  useInput2((_input, key) => {
     if (key.escape && busy) {
       if (abortedThisTurn.current) return;
       abortedThisTurn.current = true;
@@ -4096,9 +4558,11 @@ function App({
             }
           } else if (ev.role === "tool_start") {
             setOngoingTool({ name: ev.toolName ?? "?", args: ev.toolArgs });
+            setToolProgress(null);
           } else if (ev.role === "tool") {
             flush();
             setOngoingTool(null);
+            setToolProgress(null);
             toolHistoryRef.current.push({
               toolName: ev.toolName ?? "?",
               text: ev.content
@@ -4129,6 +4593,7 @@ function App({
         clearInterval(timer);
         setStreaming(null);
         setOngoingTool(null);
+        setToolProgress(null);
         setSummary(loop.stats.summary());
         setBusy(false);
       }
@@ -4156,12 +4621,15 @@ function App({
       harvestOn: loop.harvestEnabled,
       branchBudget: loop.branchOptions.budget
     }
-  ), /* @__PURE__ */ React7.createElement(Static, { items: historical }, (item) => /* @__PURE__ */ React7.createElement(EventRow, { key: item.id, event: item })), streaming ? /* @__PURE__ */ React7.createElement(Box7, { marginY: 1 }, /* @__PURE__ */ React7.createElement(EventRow, { event: streaming })) : null, ongoingTool ? /* @__PURE__ */ React7.createElement(OngoingToolRow, { tool: ongoingTool }) : null, /* @__PURE__ */ React7.createElement(PromptInput, { value: input, onChange: setInput, onSubmit: handleSubmit, disabled: busy }), /* @__PURE__ */ React7.createElement(SlashSuggestions, { matches: slashMatches, selectedIndex: slashSelected }));
+  ), /* @__PURE__ */ React7.createElement(Static, { items: historical }, (item) => /* @__PURE__ */ React7.createElement(EventRow, { key: item.id, event: item })), streaming ? /* @__PURE__ */ React7.createElement(Box7, { marginY: 1 }, /* @__PURE__ */ React7.createElement(EventRow, { event: streaming })) : null, ongoingTool ? /* @__PURE__ */ React7.createElement(OngoingToolRow, { tool: ongoingTool, progress: toolProgress }) : null, /* @__PURE__ */ React7.createElement(PromptInput, { value: input, onChange: setInput, onSubmit: handleSubmit, disabled: busy }), /* @__PURE__ */ React7.createElement(SlashSuggestions, { matches: slashMatches, selectedIndex: slashSelected }));
 }
-function OngoingToolRow({ tool }) {
-  const [tick, setTick] = useState2(0);
-  const [elapsed, setElapsed] = useState2(0);
-  useEffect2(() => {
+function OngoingToolRow({
+  tool,
+  progress
+}) {
+  const [tick, setTick] = useState3(0);
+  const [elapsed, setElapsed] = useState3(0);
+  useEffect3(() => {
     const start = Date.now();
     const frameId = setInterval(() => setTick((t) => t + 1), 120);
     const secId = setInterval(() => setElapsed(Math.floor((Date.now() - start) / 1e3)), 1e3);
@@ -4172,7 +4640,19 @@ function OngoingToolRow({ tool }) {
   }, []);
   const frames = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
   const summary = summarizeToolArgs(tool.name, tool.args);
-  return /* @__PURE__ */ React7.createElement(Box7, { marginY: 1, flexDirection: "column" }, /* @__PURE__ */ React7.createElement(Box7, null, /* @__PURE__ */ React7.createElement(Text7, { color: "cyan" }, frames[tick % frames.length]), /* @__PURE__ */ React7.createElement(Text7, { color: "yellow" }, ` tool<${tool.name}> running\u2026`), /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, ` ${elapsed}s`)), summary ? /* @__PURE__ */ React7.createElement(Box7, { paddingLeft: 2 }, /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, summary)) : null);
+  return /* @__PURE__ */ React7.createElement(Box7, { marginY: 1, flexDirection: "column" }, /* @__PURE__ */ React7.createElement(Box7, null, /* @__PURE__ */ React7.createElement(Text7, { color: "cyan" }, frames[tick % frames.length]), /* @__PURE__ */ React7.createElement(Text7, { color: "yellow" }, ` tool<${tool.name}> running\u2026`), /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, ` ${elapsed}s`)), progress ? /* @__PURE__ */ React7.createElement(Box7, { paddingLeft: 2 }, /* @__PURE__ */ React7.createElement(Text7, { color: "cyan" }, renderProgressLine(progress))) : null, summary ? /* @__PURE__ */ React7.createElement(Box7, { paddingLeft: 2 }, /* @__PURE__ */ React7.createElement(Text7, { dimColor: true }, summary)) : null);
+}
+function renderProgressLine(p) {
+  const msg = p.message ? `  ${p.message}` : "";
+  if (p.total && p.total > 0) {
+    const ratio = Math.max(0, Math.min(1, p.progress / p.total));
+    const width = 20;
+    const filled = Math.round(ratio * width);
+    const bar = "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
+    const pct2 = (ratio * 100).toFixed(0);
+    return `[${bar}] ${p.progress}/${p.total} ${pct2}%${msg}`;
+  }
+  return `progress: ${p.progress}${msg}`;
 }
 function summarizeToolArgs(name, args) {
   if (!args || args === "{}") return "";
@@ -4257,11 +4737,11 @@ function describeRepair(repair) {
 
 // src/cli/ui/Setup.tsx
 import { Box as Box8, Text as Text8, useApp as useApp2 } from "ink";
-import TextInput2 from "ink-text-input";
-import React8, { useState as useState3 } from "react";
+import TextInput from "ink-text-input";
+import React8, { useState as useState4 } from "react";
 function Setup({ onReady }) {
-  const [value, setValue] = useState3("");
-  const [error, setError] = useState3(null);
+  const [value, setValue] = useState4("");
+  const [error, setError] = useState4(null);
   const { exit } = useApp2();
   const handleSubmit = (raw) => {
     const trimmed = raw.trim();
@@ -4283,7 +4763,7 @@ function Setup({ onReady }) {
     onReady(trimmed);
   };
   return /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React8.createElement(Text8, { bold: true, color: "cyan" }, "Welcome to Reasonix."), /* @__PURE__ */ React8.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React8.createElement(Text8, null, "Paste your DeepSeek API key to get started.")), /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, "Get one (free credit on signup): https://platform.deepseek.com/api_keys"), /* @__PURE__ */ React8.createElement(Text8, { dimColor: true }, "Saved locally to ", defaultConfigPath()), /* @__PURE__ */ React8.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React8.createElement(Text8, { bold: true, color: "cyan" }, "key \u203A "), /* @__PURE__ */ React8.createElement(
-    TextInput2,
+    TextInput,
     {
       value,
       onChange: setValue,
@@ -4295,8 +4775,8 @@ function Setup({ onReady }) {
 }
 
 // src/cli/commands/chat.tsx
-function Root({ initialKey, tools, mcpSpecs, mcpServers, ...appProps }) {
-  const [key, setKey] = useState4(initialKey);
+function Root({ initialKey, tools, mcpSpecs, mcpServers, progressSink, ...appProps }) {
+  const [key, setKey] = useState5(initialKey);
   if (!key) {
     return /* @__PURE__ */ React9.createElement(
       Setup,
@@ -4321,6 +4801,7 @@ function Root({ initialKey, tools, mcpSpecs, mcpServers, ...appProps }) {
       tools,
       mcpSpecs,
       mcpServers,
+      progressSink,
       codeMode: appProps.codeMode
     }
   );
@@ -4333,9 +4814,10 @@ async function chatCommand(opts) {
   const successfulSpecs = [];
   const failedSpecs = [];
   const mcpServers = [];
-  let tools;
+  const progressSink = { current: null };
+  let tools = opts.seedTools;
   if (requestedSpecs.length > 0) {
-    tools = new ToolRegistry();
+    if (!tools) tools = new ToolRegistry();
     for (const raw of requestedSpecs) {
       try {
         const spec = parseMcpSpec(raw);
@@ -4343,7 +4825,11 @@ async function chatCommand(opts) {
         const transport = spec.transport === "sse" ? new SseTransport({ url: spec.url }) : new StdioTransport({ command: spec.command, args: spec.args });
         const mcp2 = new McpClient({ transport });
         await mcp2.initialize();
-        const bridge = await bridgeMcpTools(mcp2, { registry: tools, namePrefix: prefix });
+        const bridge = await bridgeMcpTools(mcp2, {
+          registry: tools,
+          namePrefix: prefix,
+          onProgress: (info) => progressSink.current?.(info)
+        });
         let report;
         try {
           report = await inspectMcpServer(mcp2);
@@ -4381,7 +4867,7 @@ async function chatCommand(opts) {
         );
       }
     }
-    if (successfulSpecs.length === 0) {
+    if (successfulSpecs.length === 0 && !opts.seedTools) {
       tools = void 0;
     }
   }
@@ -4394,6 +4880,7 @@ async function chatCommand(opts) {
         tools,
         mcpSpecs,
         mcpServers,
+        progressSink,
         ...opts
       }
     ),
@@ -4407,14 +4894,15 @@ async function chatCommand(opts) {
 }
 
 // src/cli/commands/code.tsx
-import { basename, resolve as resolve3 } from "path";
+import { basename, resolve as resolve4 } from "path";
 async function codeCommand(opts = {}) {
   const { codeSystemPrompt: codeSystemPrompt2 } = await import("./prompt-MMANQ36Z.js");
-  const rootDir = resolve3(opts.dir ?? process.cwd());
+  const rootDir = resolve4(opts.dir ?? process.cwd());
   const session = opts.noSession ? void 0 : `code-${sanitizeName(basename(rootDir))}`;
-  const fsSpec = `filesystem=npx -y @modelcontextprotocol/server-filesystem ${quoteIfNeeded(rootDir)}`;
+  const tools = new ToolRegistry();
+  registerFilesystemTools(tools, { rootDir });
   process.stderr.write(
-    `\u25B8 reasonix code: rooted at ${rootDir}, session "${session ?? "(ephemeral)"}"
+    `\u25B8 reasonix code: rooted at ${rootDir}, session "${session ?? "(ephemeral)"}" \xB7 ${tools.size} native fs tool(s)
 `
   );
   await chatCommand({
@@ -4424,13 +4912,10 @@ async function codeCommand(opts = {}) {
     system: codeSystemPrompt2(rootDir),
     transcript: opts.transcript,
     session,
-    mcp: [fsSpec],
+    seedTools: tools,
     codeMode: { rootDir }
   });
 }
-function quoteIfNeeded(s) {
-  return /\s|"/.test(s) ? `"${s.replace(/"/g, '\\"')}"` : s;
-}
 
 // src/cli/commands/diff.ts
 import { writeFileSync as writeFileSync4 } from "fs";
@@ -4439,8 +4924,8 @@ import { render as render2 } from "ink";
 import React12 from "react";
 
 // src/cli/ui/DiffApp.tsx
-import { Box as Box10, Static as Static2, Text as Text10, useApp as useApp3, useInput as useInput2 } from "ink";
-import React11, { useState as useState5 } from "react";
+import { Box as Box10, Static as Static2, Text as Text10, useApp as useApp3, useInput as useInput3 } from "ink";
+import React11, { useState as useState6 } from "react";
 
 // src/cli/ui/RecordView.tsx
 import { Box as Box9, Text as Text9 } from "ink";
@@ -4483,8 +4968,8 @@ function DiffApp({ report }) {
   const { exit } = useApp3();
   const maxIdx = Math.max(0, report.pairs.length - 1);
   const initialIdx = report.firstDivergenceTurn ? report.pairs.findIndex((p) => p.turn === report.firstDivergenceTurn) : 0;
-  const [idx, setIdx] = useState5(Math.max(0, initialIdx));
-  useInput2((input, key) => {
+  const [idx, setIdx] = useState6(Math.max(0, initialIdx));
+  useInput3((input, key) => {
     if (input === "q" || key.ctrl && input === "c") {
       exit();
       return;
@@ -4728,13 +5213,13 @@ import { render as render3 } from "ink";
 import React14 from "react";
 
 // src/cli/ui/ReplayApp.tsx
-import { Box as Box11, Static as Static3, Text as Text11, useApp as useApp4, useInput as useInput3 } from "ink";
-import React13, { useMemo as useMemo2, useState as useState6 } from "react";
+import { Box as Box11, Static as Static3, Text as Text11, useApp as useApp4, useInput as useInput4 } from "ink";
+import React13, { useMemo as useMemo2, useState as useState7 } from "react";
 function ReplayApp({ meta, pages }) {
   const { exit } = useApp4();
   const maxIdx = Math.max(0, pages.length - 1);
-  const [idx, setIdx] = useState6(maxIdx);
-  useInput3((input, key) => {
+  const [idx, setIdx] = useState7(maxIdx);
+  useInput4((input, key) => {
     if (input === "q" || key.ctrl && input === "c") {
       exit();
       return;
@@ -5089,13 +5574,13 @@ import { render as render4 } from "ink";
 import React17 from "react";
 
 // src/cli/ui/Wizard.tsx
-import { Box as Box13, Text as Text13, useApp as useApp5, useInput as useInput5 } from "ink";
-import TextInput3 from "ink-text-input";
-import React16, { useState as useState8 } from "react";
+import { Box as Box13, Text as Text13, useApp as useApp5, useInput as useInput6 } from "ink";
+import TextInput2 from "ink-text-input";
+import React16, { useState as useState9 } from "react";
 
 // src/cli/ui/Select.tsx
-import { Box as Box12, Text as Text12, useInput as useInput4 } from "ink";
-import React15, { useState as useState7 } from "react";
+import { Box as Box12, Text as Text12, useInput as useInput5 } from "ink";
+import React15, { useState as useState8 } from "react";
 function SingleSelect({
   items,
   initialValue,
@@ -5106,8 +5591,8 @@ function SingleSelect({
     0,
     items.findIndex((i) => i.value === initialValue && !i.disabled)
   );
-  const [index, setIndex] = useState7(initialIndex === -1 ? 0 : initialIndex);
-  useInput4((_input, key) => {
+  const [index, setIndex] = useState8(initialIndex === -1 ? 0 : initialIndex);
+  useInput5((_input, key) => {
     if (key.upArrow) {
       setIndex((i) => findNextEnabled(items, i, -1));
     } else if (key.downArrow) {
@@ -5136,12 +5621,12 @@ function MultiSelect({
   onCancel,
   footer
 }) {
-  const [index, setIndex] = useState7(() => {
+  const [index, setIndex] = useState8(() => {
     const first = items.findIndex((i) => !i.disabled);
     return first === -1 ? 0 : first;
   });
-  const [selected, setSelected] = useState7(new Set(initialSelected));
-  useInput4((input, key) => {
+  const [selected, setSelected] = useState8(new Set(initialSelected));
+  useInput5((input, key) => {
     if (key.upArrow) {
       setIndex((i) => findNextEnabled(items, i, -1));
     } else if (key.downArrow) {
@@ -5219,15 +5704,15 @@ var PRESET_DESCRIPTIONS = {
 var CATALOG_BY_NAME = new Map(MCP_CATALOG.map((e) => [e.name, e]));
 function Wizard({ onComplete, onCancel, existingApiKey, initial }) {
   const { exit } = useApp5();
-  const [step, setStep] = useState8(existingApiKey ? "preset" : "apiKey");
-  const [data, setData] = useState8({
+  const [step, setStep] = useState9(existingApiKey ? "preset" : "apiKey");
+  const [data, setData] = useState9({
     apiKey: existingApiKey ?? "",
     preset: initial?.preset ?? "fast",
     selectedCatalog: deriveInitialCatalog(initial?.mcp ?? []),
     catalogArgs: {}
   });
-  const [error, setError] = useState8(null);
-  useInput5((_input, key) => {
+  const [error, setError] = useState9(null);
+  useInput6((_input, key) => {
     if (key.escape && step !== "saved" && onCancel) onCancel();
   });
   if (step === "apiKey") {
@@ -5343,9 +5828,9 @@ function ApiKeyStep({
   error,
   onError
 }) {
-  const [value, setValue] = useState8("");
+  const [value, setValue] = useState9("");
   return /* @__PURE__ */ React16.createElement(Box13, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React16.createElement(Text13, { bold: true, color: "cyan" }, "Welcome to Reasonix."), /* @__PURE__ */ React16.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text13, null, "Paste your DeepSeek API key to get started.")), /* @__PURE__ */ React16.createElement(Text13, { dimColor: true }, "Get one (free credit on signup): https://platform.deepseek.com/api_keys"), /* @__PURE__ */ React16.createElement(Text13, { dimColor: true }, "Saved locally to ", defaultConfigPath()), /* @__PURE__ */ React16.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text13, { bold: true, color: "cyan" }, "key \u203A "), /* @__PURE__ */ React16.createElement(
-    TextInput3,
+    TextInput2,
     {
       value,
       onChange: setValue,
@@ -5369,9 +5854,9 @@ function McpArgsStep({
   onSubmit,
   onError
 }) {
-  const [value, setValue] = useState8("");
+  const [value, setValue] = useState9("");
   return /* @__PURE__ */ React16.createElement(StepFrame, { title: `Configure ${entry.name}`, step: 2, total: 3 }, /* @__PURE__ */ React16.createElement(Box13, { flexDirection: "column" }, /* @__PURE__ */ React16.createElement(Text13, null, entry.summary), entry.note ? /* @__PURE__ */ React16.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text13, { dimColor: true }, entry.note)) : null, /* @__PURE__ */ React16.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text13, null, "Required parameter: "), /* @__PURE__ */ React16.createElement(Text13, { bold: true }, entry.userArgs)), /* @__PURE__ */ React16.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text13, { bold: true, color: "cyan" }, entry.userArgs, " \u203A "), /* @__PURE__ */ React16.createElement(
-    TextInput3,
+    TextInput2,
     {
       value,
       onChange: setValue,
@@ -5389,13 +5874,13 @@ function McpArgsStep({
   )), error ? /* @__PURE__ */ React16.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text13, { color: "red" }, error)) : null));
 }
 function ReviewConfirm({ onConfirm }) {
-  useInput5((_i, key) => {
+  useInput6((_i, key) => {
     if (key.return) onConfirm();
   });
   return null;
 }
 function ExitOnEnter({ onExit }) {
-  useInput5((_i, key) => {
+  useInput6((_i, key) => {
     if (key.return) onExit();
   });
   return null;
@@ -5452,10 +5937,10 @@ function buildSpec(name, argsByName) {
   const entry = CATALOG_BY_NAME.get(name);
   if (!entry) return name;
   const userArg = entry.userArgs ? argsByName[name] : void 0;
-  const tail = userArg ? ` ${quoteIfNeeded2(userArg)}` : "";
+  const tail = userArg ? ` ${quoteIfNeeded(userArg)}` : "";
   return `${entry.name}=npx -y ${entry.package}${tail}`;
 }
-function quoteIfNeeded2(s) {
+function quoteIfNeeded(s) {
   return /\s|"/.test(s) ? `"${s.replace(/"/g, '\\"')}"` : s;
 }