reasonix 0.27.0 → 0.27.2

package/dist/cli/index.js

@@ -5282,6 +5282,7 @@ function escapeAttr(s) {
 // src/tools/filesystem.ts
 import { promises as fs } from "fs";
 import * as pathMod from "path";
+import picomatch2 from "picomatch";
 var DEFAULT_MAX_READ_BYTES = 2 * 1024 * 1024;
 var DEFAULT_MAX_LIST_BYTES = 256 * 1024;
 var DEFAULT_AUTO_PREVIEW_LINES = 200;
@@ -5289,6 +5290,20 @@ var AUTO_PREVIEW_HEAD_LINES = 80;
 var AUTO_PREVIEW_TAIL_LINES = 40;
 var SKIP_DIR_NAMES = new Set(DEFAULT_INDEX_EXCLUDES.dirs);
 var BINARY_EXTENSIONS = new Set(DEFAULT_INDEX_EXCLUDES.exts);
+function displayRel(rootDir, full) {
+  return pathMod.relative(rootDir, full).replaceAll("\\", "/");
+}
+var GLOB_METACHARS = /[*?{[]/;
+function compileNameFilter(filter) {
+  if (!filter) return null;
+  if (!GLOB_METACHARS.test(filter)) {
+    const needle = filter.toLowerCase();
+    return (name) => name.toLowerCase().includes(needle);
+  }
+  const matchPath = filter.includes("/");
+  const isMatch = picomatch2(filter, { dot: true, nocase: true });
+  return matchPath ? (_n, rel) => isMatch(rel) : (name) => isMatch(name);
+}
 function isLikelyBinaryByName(name) {
   const dot2 = name.lastIndexOf(".");
   if (dot2 < 0) return false;
@@ -5493,7 +5508,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
   });
   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.",
+    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. Skips dependency / VCS / build directories (node_modules, .git, dist, build, .next, target, .venv) by default.",
     readOnly: true,
     parameters: {
       type: "object",
@@ -5502,6 +5517,10 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
         pattern: {
           type: "string",
           description: "Substring (or regex) to match against filenames."
+        },
+        include_deps: {
+          type: "boolean",
+          description: "When true, also walk node_modules / .git / dist / build / etc. Off by default \u2014 most filename searches are about the user's own code."
         }
       },
       required: ["pattern"]
@@ -5509,6 +5528,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
     fn: async (args) => {
       const startAbs = safePath(args.path ?? ".");
       const needle = args.pattern.toLowerCase();
+      const includeDeps = args.include_deps === true;
       let re = null;
       try {
         re = new RegExp(args.pattern, "i");
@@ -5529,7 +5549,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
           const lower = e.name.toLowerCase();
           const hit = re ? re.test(e.name) : lower.includes(needle);
           if (hit) {
-            const rel = pathMod.relative(rootDir, full);
+            const rel = displayRel(rootDir, full);
             if (totalBytes + rel.length + 1 > maxListBytes) {
               matches.push("[\u2026 search truncated \u2014 refine pattern \u2026]");
               return;
@@ -5537,7 +5557,10 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
             matches.push(rel);
             totalBytes += rel.length + 1;
           }
-          if (e.isDirectory()) await walk4(full);
+          if (e.isDirectory()) {
+            if (!includeDeps && SKIP_DIR_NAMES.has(e.name)) continue;
+            await walk4(full);
+          }
         }
       };
       await walk4(startAbs);
@@ -5561,7 +5584,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
         },
         glob: {
           type: "string",
-          description: "Optional file-name suffix or substring filter. Examples: '.ts' (only TypeScript), 'test' (any file with 'test' in the name). Reduces noise when you know the file shape."
+          description: "Optional filename filter. Real glob when the value contains `*`, `?`, `{`, or `[` \u2014 e.g. '*.ts', '**/*.tsx', 'src/**/*.{ts,tsx}'. Plain substring otherwise \u2014 e.g. '.ts' (suffix), 'test' (anywhere in the name). Patterns containing `/` match against the path relative to the search root; otherwise just the basename."
         },
         case_sensitive: {
           type: "boolean",
@@ -5578,7 +5601,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
       const startAbs = safePath(args.path ?? ".");
       const caseSensitive = args.case_sensitive === true;
       const includeDeps = args.include_deps === true;
-      const nameFilter = typeof args.glob === "string" ? args.glob.toLowerCase() : null;
+      const nameMatch = compileNameFilter(typeof args.glob === "string" ? args.glob : null);
       let re = null;
       try {
         re = new RegExp(args.pattern, caseSensitive ? "" : "i");
@@ -5606,9 +5629,9 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
             continue;
           }
           if (!e.isFile()) continue;
-          if (nameFilter && !e.name.toLowerCase().includes(nameFilter)) continue;
-          if (isLikelyBinaryByName(e.name)) continue;
           const full = pathMod.join(dir, e.name);
+          if (nameMatch && !nameMatch(e.name, displayRel(rootDir, full))) continue;
+          if (isLikelyBinaryByName(e.name)) continue;
           let stat2;
           try {
             stat2 = await fs.stat(full);
@@ -5625,7 +5648,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
           const firstNul = raw.indexOf(0);
           if (firstNul !== -1 && firstNul < 8 * 1024) continue;
           const text = raw.toString("utf8");
-          const rel = pathMod.relative(rootDir, full);
+          const rel = displayRel(rootDir, full);
           const lines = text.split(/\r?\n/);
           for (let li = 0; li < lines.length; li++) {
             const line = lines[li];
@@ -5690,7 +5713,7 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
       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)}`;
+      return `wrote ${args.content.length} chars to ${displayRel(rootDir, abs)}`;
     }
   });
   registry.register({
@@ -5716,17 +5739,17 @@ Prefer \`list_directory\` for a single-level view, \`search_files\` to find spec
       const adaptedReplace = args.replace.replace(/\r?\n/g, le);
       const firstIdx = before.indexOf(adaptedSearch);
       if (firstIdx < 0) {
-        throw new Error(`edit_file: search text not found in ${pathMod.relative(rootDir, abs)}`);
+        throw new Error(`edit_file: search text not found in ${displayRel(rootDir, abs)}`);
       }
       const nextIdx = before.indexOf(adaptedSearch, 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`
+          `edit_file: search text appears multiple times in ${displayRel(rootDir, abs)} \u2014 include more context to disambiguate`
         );
       }
       const after = before.slice(0, firstIdx) + adaptedReplace + before.slice(firstIdx + adaptedSearch.length);
       await fs.writeFile(abs, after, "utf8");
-      const rel = pathMod.relative(rootDir, abs);
+      const rel = displayRel(rootDir, abs);
       const header2 = `edited ${rel} (${adaptedSearch.length}\u2192${adaptedReplace.length} chars)`;
       const startLine = before.slice(0, firstIdx).split(/\r?\n/).length;
       const diff = renderEditDiff(adaptedSearch, adaptedReplace, startLine);
@@ -5745,7 +5768,7 @@ ${diff}`;
     fn: async (args) => {
       const abs = safePath(args.path);
       await fs.mkdir(abs, { recursive: true });
-      return `created ${pathMod.relative(rootDir, abs)}/`;
+      return `created ${displayRel(rootDir, abs)}/`;
     }
   });
   registry.register({
@@ -5764,7 +5787,7 @@ ${diff}`;
       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 `moved ${displayRel(rootDir, src)} \u2192 ${displayRel(rootDir, dst)}`;
     }
   });
   return registry;
@@ -6720,7 +6743,7 @@ function splitOnChainOps(cmd) {
     const ch = cmd[i];
     if (quote2) {
       if (ch === quote2) quote2 = null;
-      else if (ch === "\\" && quote2 === '"' && i + 1 < cmd.length) i++;
+      else if (quote2 === '"' && isDqEscape(ch, cmd[i + 1])) i++;
       i++;
       atTokenStart = false;
       continue;
@@ -6792,7 +6815,7 @@ function parseSegment(segStr) {
     if (quote2) {
       if (ch === quote2) {
         quote2 = null;
-      } else if (ch === "\\" && quote2 === '"' && i + 1 < segStr.length) {
+      } else if (quote2 === '"' && isDqEscape(ch, segStr[i + 1])) {
         cur += segStr[++i] ?? "";
         curHasContent = true;
       } else {
@@ -6898,6 +6921,14 @@ function parseCommandChain(cmd) {
     }
     segments.push(parseSegment(trimmed));
   }
+  for (const seg of segments) {
+    const cmdName = seg.argv[0] ?? "";
+    if (cmdName.toLowerCase() === "cd") {
+      throw new UnsupportedSyntaxError(
+        "cd in parsed command chains does not change cwd for later segments. Use a command-native cwd flag instead, such as `npm --prefix <dir> run <script>`, `git -C <dir> ...`, or `cargo -C <dir> ...`."
+      );
+    }
+  }
   if (ops.length === 0 && segments[0].redirects.length === 0) return null;
   return { segments, ops };
 }
@@ -7195,6 +7226,9 @@ var BUILTIN_ALLOWLIST = [
   "ruff",
   "mypy"
 ];
+function isDqEscape(prev, next) {
+  return prev === "\\" && (next === '"' || next === "\\");
+}
 function tokenizeCommand(cmd) {
   const out = [];
   let cur = "";
@@ -7204,7 +7238,7 @@ function tokenizeCommand(cmd) {
     if (quote2) {
       if (ch === quote2) {
         quote2 = null;
-      } else if (ch === "\\" && quote2 === '"' && i + 1 < cmd.length) {
+      } else if (quote2 === '"' && isDqEscape(ch, cmd[i + 1])) {
         cur += cmd[++i];
       } else {
         cur += ch;
@@ -7246,7 +7280,7 @@ function detectShellOperator(cmd) {
     if (quote2) {
       if (ch === quote2) {
         quote2 = null;
-      } else if (ch === "\\" && quote2 === '"' && i + 1 < cmd.length) {
+      } else if (quote2 === '"' && isDqEscape(ch, cmd[i + 1])) {
         cur += cmd[++i];
         curQuoted = true;
       } else {
@@ -7552,7 +7586,7 @@ function registerShellTools(registry, opts) {
   const isAllowAll = typeof opts.allowAll === "function" ? opts.allowAll : () => opts.allowAll === true;
   registry.register({
     name: "run_command",
-    description: "Run a shell command in the project root and return its combined stdout+stderr.\n\nConstraints (read these before the first call):\n\u2022 Chain operators `|`, `||`, `&&`, `;` ARE supported \u2014 parsed natively, no shell invoked, so semantics are identical on Windows / macOS / Linux. Each chain segment is allowlist-checked individually: `git status | grep main` runs if both halves are allowed.\n\u2022 File redirects ARE supported: `>` truncate, `>>` append, `<` stdin from file, `2>` / `2>>` stderr to file, `2>&1` merge stderr\u2192stdout, `&>` both to file. Targets resolve relative to the project root. At most one redirect per fd per segment.\n\u2022 Background `&`, heredoc `<<`, command substitution `$(\u2026)`, subshells `(\u2026)`, and process substitution `<(\u2026)` are NOT supported. Wrap a literal `&` arg in quotes; for input use a `<` file or the binary's own --input flag.\n\u2022 Env-var expansion `$VAR` is NOT performed \u2014 `$VAR` is passed as a literal string. Use the binary's own --env flag or substitute the value yourself.\n\u2022 `cd` DOES NOT PERSIST between calls \u2014 each call spawns a fresh process rooted at the project. If a tool needs a subdirectory, pass it via the tool's own flag (`npm --prefix`, `cargo -C`, `git -C`, `pytest tests/\u2026`), NOT via a preceding `cd`.\n\u2022 Glob patterns (`*.ts`) are passed through as literal arguments \u2014 no shell expansion. Use `grep -r`, `rg`, `find -name`, etc.\n\u2022 Avoid commands with unbounded output (`netstat -ano`, `find /`, etc.) \u2014 they waste tokens. Filter at source: `netstat -ano -p TCP`, `find src -name '*.ts'`, `grep -c`, `wc -l`.\n\nCommon read-only inspection and test/lint/typecheck commands run immediately; anything that could mutate state, install dependencies, or touch the network is refused until the user confirms it in the TUI. Prefer this over asking the user to run a command manually \u2014 after edits, run the project's tests to verify.",
+    description: "Run a shell command in the project root and return its combined stdout+stderr.\n\nConstraints (read these before the first call):\n\u2022 Chain operators `|`, `||`, `&&`, `;` ARE supported \u2014 parsed natively, no shell invoked, so semantics are identical on Windows / macOS / Linux. Each chain segment is allowlist-checked individually: `git status | grep main` runs if both halves are allowed.\n\u2022 File redirects ARE supported: `>` truncate, `>>` append, `<` stdin from file, `2>` / `2>>` stderr to file, `2>&1` merge stderr\u2192stdout, `&>` both to file. Targets resolve relative to the project root. At most one redirect per fd per segment.\n\u2022 Background `&`, heredoc `<<`, command substitution `$(\u2026)`, subshells `(\u2026)`, and process substitution `<(\u2026)` are NOT supported. Wrap a literal `&` arg in quotes; for input use a `<` file or the binary's own --input flag.\n\u2022 Env-var expansion `$VAR` is NOT performed \u2014 `$VAR` is passed as a literal string. Use the binary's own --env flag or substitute the value yourself.\n\u2022 `cd` DOES NOT PERSIST between calls \u2014 each call spawns a fresh process rooted at the project. `cd` also does not persist within parsed chains like `cd dir && command`. Use a command-native cwd flag instead: `npm --prefix <dir> run <script>`, `npm --prefix <dir> exec -- <bin>`, `git -C <dir> ...`, `cargo -C <dir> ...`, `pytest <dir>/tests`.\n\u2022 Glob patterns (`*.ts`) are passed through as literal arguments \u2014 no shell expansion. Use `grep -r`, `rg`, `find -name`, etc.\n\u2022 Avoid commands with unbounded output (`netstat -ano`, `find /`, etc.) \u2014 they waste tokens. Filter at source: `netstat -ano -p TCP`, `find src -name '*.ts'`, `grep -c`, `wc -l`.\n\nCommon read-only inspection and test/lint/typecheck commands run immediately; anything that could mutate state, install dependencies, or touch the network is refused until the user confirms it in the TUI. Prefer this over asking the user to run a command manually \u2014 after edits, run the project's tests to verify.",
     // Plan-mode gate: allow allowlisted commands through (git status,
     // cargo check, ls, grep …) so the model can actually investigate
     // during planning. Anything that would otherwise trigger a
@@ -15560,6 +15594,9 @@ async function handleSettings(method, _rest, body, ctx) {
     const fields = parseBody8(body);
     const cfg = readConfig(ctx.configPath);
     const changed = [];
+    let langPending = null;
+    let presetPendingLive = null;
+    let effortPendingLive = null;
     if (fields.lang !== void 0) {
       const raw = String(fields.lang);
       const supported = getSupportedLanguages();
@@ -15567,14 +15604,15 @@ async function handleSettings(method, _rest, body, ctx) {
       if (!langCode) {
         return { status: 400, body: { error: `lang must be one of: ${supported.join(", ")}` } };
       }
-      setLanguage(langCode);
+      cfg.lang = langCode;
+      langPending = langCode;
       changed.push("lang");
     }
     if (fields.apiKey !== void 0) {
       if (typeof fields.apiKey !== "string" || !isPlausibleKey(fields.apiKey)) {
         return { status: 400, body: { error: "apiKey must be a plausible sk- token" } };
       }
-      saveApiKey(fields.apiKey, ctx.configPath);
+      cfg.apiKey = fields.apiKey.trim();
       changed.push("apiKey");
     }
     if (fields.baseUrl !== void 0) {
@@ -15582,7 +15620,6 @@ async function handleSettings(method, _rest, body, ctx) {
         return { status: 400, body: { error: "baseUrl must be a non-empty string" } };
       }
       cfg.baseUrl = fields.baseUrl.trim();
-      writeConfig(cfg, ctx.configPath);
       changed.push("baseUrl");
     }
     if (fields.preset !== void 0) {
@@ -15590,16 +15627,15 @@ async function handleSettings(method, _rest, body, ctx) {
         return { status: 400, body: { error: "preset must be auto | flash | pro" } };
       }
       cfg.preset = fields.preset;
-      writeConfig(cfg, ctx.configPath);
-      ctx.applyPresetLive?.(fields.preset);
+      presetPendingLive = fields.preset;
       changed.push("preset");
     }
     if (fields.reasoningEffort !== void 0) {
       if (typeof fields.reasoningEffort !== "string" || !VALID_EFFORTS.has(fields.reasoningEffort)) {
         return { status: 400, body: { error: "reasoningEffort must be high | max" } };
       }
-      saveReasoningEffort(fields.reasoningEffort, ctx.configPath);
-      ctx.applyEffortLive?.(fields.reasoningEffort);
+      cfg.reasoningEffort = fields.reasoningEffort;
+      effortPendingLive = fields.reasoningEffort;
       changed.push("reasoningEffort");
     }
     if (fields.search !== void 0) {
@@ -15607,10 +15643,13 @@ async function handleSettings(method, _rest, body, ctx) {
         return { status: 400, body: { error: "search must be a boolean" } };
       }
       cfg.search = fields.search;
-      writeConfig(cfg, ctx.configPath);
       changed.push("search");
     }
     if (changed.length > 0) {
+      writeConfig(cfg, ctx.configPath);
+      if (langPending) setLanguage(langPending);
+      if (presetPendingLive) ctx.applyPresetLive?.(presetPendingLive);
+      if (effortPendingLive) ctx.applyEffortLive?.(effortPendingLive);
       ctx.audit?.({ ts: Date.now(), action: "set-settings", payload: { fields: changed } });
     }
     return { status: 200, body: { changed } };