nexrall-code 0.5.115 → 0.5.116

package/dist/index.js

@@ -9921,6 +9921,8 @@ var require_client = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.API_BASE = void 0;
     exports2.chooseFinalContent = chooseFinalContent;
+    exports2.earlyToolResolveEnabled = earlyToolResolveEnabled;
+    exports2.gzipRequestsEnabled = gzipRequestsEnabled;
     exports2.streamChat = streamChat;
     exports2.cancelTurn = cancelTurn;
     exports2.revokeRefreshToken = revokeRefreshToken2;
@@ -9937,6 +9939,7 @@ var require_client = __commonJS({
     var eventsource_parser_1 = require_dist();
     var node_fetch_1 = __importDefault((init_src(), __toCommonJS(src_exports)));
     var crypto_1 = __require("crypto");
+    var zlib_1 = __require("zlib");
     var index_1 = require_auth();
     var DEFAULT_API_BASE = "https://api.nexrall.com";
     function resolveApiBase() {
@@ -10027,6 +10030,13 @@ var require_client = __commonJS({
     var MAX_RETRIES = 5;
     var RETRY_BASE_MS = 1e3;
     var RETRY_MAX_MS = 3e4;
+    function earlyToolResolveEnabled() {
+      return process.env.NEXRALL_EARLY_TOOL_RESOLVE !== "0";
+    }
+    var GZIP_MIN_BYTES = 32 * 1024;
+    function gzipRequestsEnabled() {
+      return process.env.NEXRALL_GZIP_REQUESTS !== "0";
+    }
     var HOUSEKEEPING_FRAMES = /* @__PURE__ */ new Set([
       "resumable",
       "runtime_context",
@@ -10101,6 +10111,14 @@ var require_client = __commonJS({
       let carryToolUse = [];
       let emittedAnythingAcrossAttempts = false;
       let emittedCharsAcrossAttempts = 0;
+      let chatBody = null;
+      const getChatBody = () => {
+        if (chatBody && chatBody.turnId === turnId)
+          return chatBody;
+        const json = JSON.stringify({ messages, model, env: env4, editorContext, nexrallMd, mode, effort, clientType, extraTools, agents, skills, turnId, canWriteSharedMemory, hasOwnAgentStore, canSpawnSubAgents, canBrowseWeb, toolAllowlist, ...billingOverrideFields2() });
+        chatBody = gzipRequestsEnabled() && json.length >= GZIP_MIN_BYTES ? { data: (0, zlib_1.gzipSync)(json, { level: 5 }), gzip: true, turnId } : { data: json, gzip: false, turnId };
+        return chatBody;
+      };
       const buildFetchArgs = () => {
         const signal = controller.signal;
         if (resuming) {
@@ -10115,12 +10133,15 @@ var require_client = __commonJS({
         }
         return [
           `${exports2.API_BASE}/api/code/chat`,
-          {
-            method: "POST",
-            headers: authHeaders(),
-            body: JSON.stringify({ messages, model, env: env4, editorContext, nexrallMd, mode, effort, clientType, extraTools, agents, skills, turnId, canWriteSharedMemory, hasOwnAgentStore, canSpawnSubAgents, canBrowseWeb, toolAllowlist, ...billingOverrideFields2() }),
-            signal
-          }
+          (() => {
+            const body = getChatBody();
+            return {
+              method: "POST",
+              headers: body.gzip ? { ...authHeaders(), "Content-Encoding": "gzip" } : authHeaders(),
+              body: body.data,
+              signal
+            };
+          })()
         ];
       };
       const isRetryableStreamMsg = (m2) => {
@@ -10494,6 +10515,16 @@ var require_client = __commonJS({
                           cache_read_input_tokens: typeof evt.cache_read_input_tokens === "number" ? evt.cache_read_input_tokens : void 0
                         }
                       });
+                      if (evt.partial !== true && completedMessage?.stopReason === "tool_use" && earlyToolResolveEnabled()) {
+                        clearInterval(heartbeatWatchdog);
+                        const drainGuard = setTimeout(() => {
+                          stream.destroy?.();
+                        }, HEARTBEAT_TIMEOUT_MS);
+                        drainGuard.unref?.();
+                        stream.once("end", () => clearTimeout(drainGuard));
+                        stream.once("close", () => clearTimeout(drainGuard));
+                        resolve4();
+                      }
                     }
                     break;
                   }
@@ -10808,7 +10839,7 @@ var require_client = __commonJS({
       const data = await response.json();
       return {
         models: Array.isArray(data.models) ? data.models : [],
-        defaultModel: typeof data.defaultModel === "string" ? data.defaultModel : "claude-sonnet-5"
+        defaultModel: typeof data.defaultModel === "string" ? data.defaultModel : "deepseek-flash"
       };
     }
     async function getUsageDaily(days = 30) {
@@ -12130,7 +12161,7 @@ var require_agentTypes = __commonJS({
       // edit Z directly" does better work, and withholding it meant every sub-agent
       // rediscovered project conventions from scratch. Writing is a different thing
       // entirely — memory is durable, cross-session, SHARED state, while sub-agents run
-      // up to 4-wide in parallel with their reasoning hidden from the user. A wrong fact
+      // up to 10-wide (configurable) in parallel with their reasoning hidden from the user. A wrong fact
       // written there is invisible and permanent, and it competes for a capped, shared
       // budget that gets periodically condensed.
       //
@@ -13978,41 +14009,100 @@ var require_tsLangService = __commonJS({
       return null;
     }
     var _services = /* @__PURE__ */ new Map();
-    function getService(workDir) {
-      const cached = _services.get(workDir);
-      if (cached)
-        return cached;
+    function findGoverningConfig(ts, workDir, filePath) {
+      try {
+        if (filePath) {
+          const near = ts.findConfigFile(path8.dirname(filePath), ts.sys.fileExists, "tsconfig.json");
+          if (near)
+            return near;
+        }
+        return ts.findConfigFile(workDir, ts.sys.fileExists, "tsconfig.json") || void 0;
+      } catch {
+        return void 0;
+      }
+    }
+    var MAX_ROOT_FILES = 2e4;
+    var ROOT_RESCAN_MS = Number(process.env.NEXRALL_TS_ROOT_RESCAN_MS ?? 2e3);
+    function getService(workDir, filePath) {
       const ts = loadTs(workDir);
       if (!ts)
         return null;
+      const cfgPath = findGoverningConfig(ts, workDir, filePath);
+      const key = cfgPath ?? workDir;
+      const cached = _services.get(key);
+      if (cached)
+        return cached;
       const versions = /* @__PURE__ */ new Map();
       const snapshots = /* @__PURE__ */ new Map();
+      const mtimes = /* @__PURE__ */ new Map();
+      const mtimeOf = (fileName) => {
+        try {
+          return fs9.statSync(fileName).mtimeMs;
+        } catch {
+          return -1;
+        }
+      };
       const readSource = (fileName) => {
         const cachedSrc = snapshots.get(fileName);
-        if (cachedSrc !== void 0)
+        const m2 = mtimeOf(fileName);
+        if (cachedSrc !== void 0 && mtimes.get(fileName) === m2)
           return cachedSrc;
         try {
           const src = fs9.readFileSync(fileName, "utf-8");
           snapshots.set(fileName, src);
+          mtimes.set(fileName, m2);
           return src;
         } catch {
-          return void 0;
+          return cachedSrc;
         }
       };
       let options = { allowJs: true, checkJs: false, target: 99, module: 99 };
-      try {
-        const cfgPath = ts.findConfigFile(workDir, ts.sys.fileExists, "tsconfig.json");
-        if (cfgPath) {
-          const parsed = ts.readConfigFile(cfgPath, ts.sys.readFile);
-          const conf = ts.parseJsonConfigFileContent(parsed.config ?? {}, ts.sys, path8.dirname(cfgPath));
-          if (conf.options)
+      let rootFiles = /* @__PURE__ */ new Set();
+      const addConfig = (cfg, depth) => {
+        try {
+          const parsed = ts.readConfigFile(cfg, ts.sys.readFile);
+          const conf = ts.parseJsonConfigFileContent(parsed.config ?? {}, ts.sys, path8.dirname(cfg));
+          if (depth === 0 && conf.options)
             options = { ...conf.options, allowJs: true };
+          for (const f3 of conf.fileNames ?? []) {
+            if (rootFiles.size >= MAX_ROOT_FILES)
+              break;
+            rootFiles.add(path8.resolve(f3));
+          }
+          if (depth === 0 && rootFiles.size === 0) {
+            for (const ref of conf.projectReferences ?? []) {
+              const refCfg = ts.resolveProjectReferencePath ? ts.resolveProjectReferencePath(ref) : ref.path;
+              if (refCfg && ts.sys.fileExists(refCfg))
+                addConfig(refCfg, depth + 1);
+            }
+          }
+        } catch {
         }
-      } catch {
-      }
+      };
+      if (cfgPath)
+        addConfig(cfgPath, 0);
+      let rootsScannedAt = Date.now();
+      const refreshRoots = () => {
+        if (!cfgPath || Date.now() - rootsScannedAt < ROOT_RESCAN_MS)
+          return;
+        rootsScannedAt = Date.now();
+        const prev = rootFiles;
+        rootFiles = /* @__PURE__ */ new Set();
+        addConfig(cfgPath, 0);
+        if (rootFiles.size === 0)
+          rootFiles = prev;
+      };
       const host = {
-        getScriptFileNames: () => Array.from(versions.keys()),
-        getScriptVersion: (f3) => String(versions.get(f3) ?? 0),
+        getScriptFileNames: () => {
+          refreshRoots();
+          if (versions.size === 0)
+            return Array.from(rootFiles);
+          const all = new Set(rootFiles);
+          for (const f3 of versions.keys())
+            all.add(f3);
+          return Array.from(all);
+        },
+        getScriptVersion: (f3) => `${versions.get(f3) ?? 0}:${mtimeOf(f3)}`,
         getScriptSnapshot: (f3) => {
           const src = readSource(f3);
           return src === void 0 ? void 0 : ts.ScriptSnapshot.fromString(src);
@@ -14028,7 +14118,7 @@ var require_tsLangService = __commonJS({
       };
       const service = ts.createLanguageService(host, ts.createDocumentRegistry());
       const svc = { ts, service, root: workDir, versions, snapshots };
-      _services.set(workDir, svc);
+      _services.set(key, svc);
       return svc;
     }
     function ensureFile(svc, absPath) {
@@ -14069,7 +14159,7 @@ var require_tsLangService = __commonJS({
       return r2.startsWith("..") ? abs : r2;
     }
     function tsGoToDefinition(deps) {
-      const svc = getService(deps.workDir);
+      const svc = getService(deps.workDir, deps.filePath);
       if (!svc)
         return null;
       if (!ensureFile(svc, deps.filePath))
@@ -14093,7 +14183,7 @@ var require_tsLangService = __commonJS({
 ${out.join("\n")}` };
     }
     function tsFindReferences(deps) {
-      const svc = getService(deps.workDir);
+      const svc = getService(deps.workDir, deps.filePath);
       if (!svc)
         return null;
       if (!ensureFile(svc, deps.filePath))
@@ -14121,7 +14211,7 @@ ${out.join("\n")}` };
 ${lines.join("\n")}` };
     }
     function tsGetHover(deps) {
-      const svc = getService(deps.workDir);
+      const svc = getService(deps.workDir, deps.filePath);
       if (!svc)
         return null;
       if (!ensureFile(svc, deps.filePath))
@@ -101394,6 +101484,8 @@ var require_executor = __commonJS({
       };
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.capExternalOutput = capExternalOutput;
+    exports2.runCapture = runCapture;
     exports2.globToRegex = globToRegex;
     exports2.executeTool = executeTool;
     var fs9 = __importStar(__require("fs"));
@@ -101688,7 +101780,7 @@ Resolve the conflict (remove <<<<<<< / ======= / >>>>>>> markers and keep the in
         if (isNew) {
           return { output: `Created ${resolved} (${lines} lines, ${bytes} bytes)${sec}`, linesAdded: lines, linesRemoved: 0 };
         }
-        const xfile = crossFileBreakageWarning(resolved, normalizeLF(priorContent), normalizeLF(content), workDir ?? process.cwd());
+        const xfile = await crossFileBreakageWarning(resolved, normalizeLF(priorContent), normalizeLF(content), workDir ?? process.cwd());
         let tiMarker = "";
         const ti = (0, testIntegrity_1.analyzeTestEdit)(resolved, normalizeLF(priorContent), normalizeLF(content));
         if (ti.suspicious)
@@ -102216,17 +102308,104 @@ ${body}` : void 0 }));
         child.on("close", () => clearInterval(pollAbort));
       });
     }
+    function capExternalOutput(output, label, maxChars = MAX_OUTPUT_CHARS) {
+      if (output.length <= maxChars)
+        return output;
+      let spillNote = "";
+      try {
+        fs9.mkdirSync(SPILL_DIR, { recursive: true });
+        const safe = label.replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 60);
+        const spillPath = path8.join(SPILL_DIR, `${safe}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.log`);
+        fs9.writeFileSync(spillPath, (0, safeSlice_1.sliceSafeEnd)(output, MAX_SPILL_BYTES));
+        spillNote = ` Full output (${output.length} chars) saved to ${spillPath} \u2014 use read_file with offset/limit to inspect any section.`;
+      } catch {
+      }
+      const headLen = Math.floor(maxChars * 0.7);
+      const tailLen = maxChars - headLen;
+      const omitted = output.length - headLen - tailLen;
+      return `${(0, safeSlice_1.sliceSafeEnd)(output, headLen)}
+
+[\u2026 ${omitted} chars omitted.${spillNote}]
+
+${(0, safeSlice_1.sliceSafeStart)(output, output.length - tailLen)}`;
+    }
+    function runCapture(cmd, args, opts) {
+      return new Promise((resolve4) => {
+        let stdout = "";
+        let stderr = "";
+        let bytes = 0;
+        let error;
+        let settled = false;
+        let child;
+        try {
+          child = (0, child_process_1.spawn)(cmd, args, { cwd: opts.cwd, stdio: ["ignore", "pipe", "pipe"] });
+        } catch (e2) {
+          resolve4({ stdout: "", stderr: "", status: null, signal: null, error: e2 });
+          return;
+        }
+        const finish = (status, signal) => {
+          if (settled)
+            return;
+          settled = true;
+          clearTimeout(timer);
+          resolve4({ stdout, stderr, status, signal, ...error ? { error } : {} });
+        };
+        const kill = (code) => {
+          if (!error)
+            error = Object.assign(new Error(`${cmd} ${code}`), { code });
+          try {
+            child.kill("SIGTERM");
+          } catch {
+          }
+        };
+        const timer = setTimeout(() => kill("ETIMEDOUT"), opts.timeout);
+        child.stdout.setEncoding("utf-8");
+        child.stderr.setEncoding("utf-8");
+        child.stdout.on("data", (chunk) => {
+          if (error)
+            return;
+          bytes += Buffer.byteLength(chunk);
+          if (bytes > opts.maxBuffer) {
+            stdout += chunk.slice(0, Math.max(0, chunk.length - (bytes - opts.maxBuffer)));
+            kill("ENOBUFS");
+            return;
+          }
+          stdout += chunk;
+        });
+        child.stderr.on("data", (chunk) => {
+          if (stderr.length < 64 * 1024)
+            stderr += chunk;
+        });
+        child.on("error", (e2) => {
+          if (!error)
+            error = e2;
+          finish(null, null);
+        });
+        child.on("close", (code, signal) => finish(code, signal));
+      });
+    }
     var _rgChecked = false;
     var _rgAvailable = false;
+    var _rgBin = "rg";
     function ripgrepAvailable() {
       if (!_rgChecked) {
-        const probe = (0, child_process_1.spawnSync)("rg", ["--version"], { encoding: "utf-8", timeout: 3e3 });
-        _rgAvailable = probe.status === 0;
         _rgChecked = true;
+        const candidates = [process.env.NEXRALL_RG_PATH, "rg"].filter((c) => !!c);
+        for (const bin of candidates) {
+          const probe = (0, child_process_1.spawnSync)(bin, ["--version"], { encoding: "utf-8", timeout: 3e3 });
+          if (probe.status === 0) {
+            _rgBin = bin;
+            _rgAvailable = true;
+            break;
+          }
+        }
       }
       return _rgAvailable;
     }
-    function crossFileBreakageWarning(editedAbsPath, oldContent, newContent, workDir) {
+    function rgBin() {
+      return _rgBin;
+    }
+    async function crossFileBreakageWarning(editedAbsPath, oldContent, newContent, workDir) {
       if (process.env.NEXRALL_CROSSFILE_CHECK === "0")
         return "";
       let removed;
@@ -102246,8 +102425,8 @@ ${body}` : void 0 }));
       })();
       const hits = [];
       const MAX_SYMBOLS = 8;
-      for (const sym of removed.slice(0, MAX_SYMBOLS)) {
-        const refs = scanReferences(sym.name, workDir, editedReal);
+      const scanned = await Promise.all(removed.slice(0, MAX_SYMBOLS).map(async (sym) => ({ sym, refs: await scanReferences(sym.name, workDir, editedReal) })));
+      for (const { sym, refs } of scanned) {
         if (refs.length) {
           const shown = refs.slice(0, 3).map((r2) => `      ${r2}`).join("\n");
           const more = refs.length > 3 ? `
@@ -102264,44 +102443,26 @@ ${shown}${more}`);
 ` + hits.join("\n") + `
 Update these call-sites (or restore the symbol), then run a build/typecheck to confirm nothing is broken.`;
     }
-    function scanReferences(name, workDir, excludeRealPath) {
+    async function scanReferences(name, workDir, excludeRealPath) {
       const pattern = `\\b${name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`;
       const files = /* @__PURE__ */ new Set();
       try {
-        if (ripgrepAvailable()) {
-          const r2 = (0, child_process_1.spawnSync)("rg", ["-l", "--no-messages", "-e", pattern, "."], {
-            cwd: workDir,
-            encoding: "utf-8",
-            timeout: 8e3,
-            maxBuffer: 8 * 1024 * 1024
-          });
-          if (r2.stdout)
-            for (const line of r2.stdout.split("\n")) {
-              if (line.trim())
-                files.add(line.trim());
-            }
-        } else {
-          const r2 = (0, child_process_1.spawnSync)("grep", [
-            "-rlI",
-            "--exclude-dir=node_modules",
-            "--exclude-dir=.git",
-            "--exclude-dir=dist",
-            "--exclude-dir=.next",
-            "-E",
-            pattern,
-            "."
-          ], {
-            cwd: workDir,
-            encoding: "utf-8",
-            timeout: 8e3,
-            maxBuffer: 8 * 1024 * 1024
-          });
-          if (r2.stdout)
-            for (const line of r2.stdout.split("\n")) {
-              if (line.trim())
-                files.add(line.trim());
-            }
-        }
+        const opts = { cwd: workDir, timeout: 8e3, maxBuffer: 8 * 1024 * 1024 };
+        const r2 = ripgrepAvailable() ? await runCapture(rgBin(), ["-l", "--no-messages", "-e", pattern, "."], opts) : await runCapture("grep", [
+          "-rlI",
+          "--exclude-dir=node_modules",
+          "--exclude-dir=.git",
+          "--exclude-dir=dist",
+          "--exclude-dir=.next",
+          "-E",
+          pattern,
+          "."
+        ], opts);
+        if (r2.stdout)
+          for (const line of r2.stdout.split("\n")) {
+            if (line.trim())
+              files.add(line.trim());
+          }
       } catch {
         return [];
       }
@@ -102334,7 +102495,8 @@ Update these call-sites (or restore the symbol), then run a build/typecheck to c
         if (searchType === "filename") {
           const matches = [];
           const patternLower = pattern.toLowerCase();
-          walkDir(resolved, (filePath) => {
+          const listing = await listFiles(resolved);
+          listing.files.forEach((filePath) => {
             const name = path8.basename(filePath);
             const nameLower = name.toLowerCase();
             const rel = path8.relative(resolved, filePath).replace(/\\/g, "/");
@@ -102352,6 +102514,9 @@ Update these call-sites (or restore the symbol), then run a build/typecheck to c
           }).join("\n");
           if (out.length > MAX_OUTPUT_CHARS)
             out = (0, safeSlice_1.sliceSafeEnd)(out, MAX_OUTPUT_CHARS) + "\n[Truncated]";
+          if (listing.truncated)
+            out += `
+[Scan stopped after ${WALK_MAX_FILES.toLocaleString("en-US")} files \u2014 narrow the path for complete results.]`;
           return { output: out };
         } else {
           const SEARCH_MAX_BUFFER = 64 * 1024 * 1024;
@@ -102359,7 +102524,7 @@ Update these call-sites (or restore the symbol), then run a build/typecheck to c
           const relTarget = path8.relative(base, resolved);
           const inside = !relTarget.startsWith("..") && !path8.isAbsolute(relTarget);
           const target = inside ? relTarget || "." : resolved;
-          const spawnOpts = { encoding: "utf-8", timeout: DEFAULT_TIMEOUT_MS, maxBuffer: SEARCH_MAX_BUFFER, cwd: base };
+          const spawnOpts = { timeout: DEFAULT_TIMEOUT_MS, maxBuffer: SEARCH_MAX_BUFFER, cwd: base };
           let result;
           if (ripgrepAvailable()) {
             const args = filesOnly ? ["--files-with-matches", "--color=never", "--hidden", "--glob", "!.git"] : [
@@ -102381,7 +102546,7 @@ Update these call-sites (or restore the symbol), then run a build/typecheck to c
             if (include)
               args.push("--glob", include);
             args.push("-m", "200", "--regexp", pattern, target);
-            result = (0, child_process_1.spawnSync)("rg", args, spawnOpts);
+            result = await runCapture(rgBin(), args, spawnOpts);
           } else {
             const args = [filesOnly ? "-rlE" : "-rnE", "--binary-files=without-match", "--color=never"];
             if (ignoreCase)
@@ -102391,13 +102556,13 @@ Update these call-sites (or restore the symbol), then run a build/typecheck to c
             if (include)
               args.push(`--include=${include}`);
             args.push("--exclude-dir=.git", "--exclude-dir=node_modules", "--exclude-dir=dist", "--exclude-dir=.next", "--exclude-dir=__pycache__", "--exclude-dir=.turbo", "--exclude-dir=coverage", "--exclude-dir=.cache", "--exclude-dir=.venv", "--exclude-dir=venv", "-m", "200", pattern, target);
-            result = (0, child_process_1.spawnSync)("grep", args, spawnOpts);
+            result = await runCapture("grep", args, spawnOpts);
           }
           let output = (result.stdout ?? "").replace(/^\.\//gm, "");
           const stderr = result.stderr ?? "";
           const spawnErr = result.error;
           if (spawnErr) {
-            if (spawnErr.code === "ETIMEDOUT" || result.signal === "SIGTERM") {
+            if (spawnErr.code === "ETIMEDOUT" || result.signal === "SIGTERM" && spawnErr.code !== "ENOBUFS") {
               const partial = output ? `
 
 Partial results before timeout:
@@ -102413,7 +102578,7 @@ ${globalCapMatches(output)}` : "";
           if (result.status === 1 && !output)
             return { output: "No matches found." };
           if (result.status !== 0 && result.status !== 1) {
-            const hint = /parenthes|bracket|brace|Unmatched|repetition-operator|invalid regex/i.test(stderr) ? ' \u2014 the pattern has invalid/unbalanced regex syntax. If you meant to match literal parentheses/brackets, escape them (e.g. "\\(", "\\)"), or simplify the pattern.' : "";
+            const hint = /parenthes|bracket|brace|Unmatched|unclosed|repetition-operator|invalid regex/i.test(stderr) ? ' \u2014 the pattern has invalid/unbalanced regex syntax. If you meant to match literal parentheses/brackets, escape them (e.g. "\\(", "\\)"), or simplify the pattern.' : "";
             return { error: (stderr || "search failed").trim() + hint };
           }
           if (filesOnly) {
@@ -102495,11 +102660,36 @@ ${globalCapMatches(output)}` : "";
       ".idea",
       ".DS_Store"
     ]);
+    var WALK_MAX_FILES = 5e4;
+    async function listFiles(root) {
+      if (ripgrepAvailable()) {
+        const args = ["--files", "--hidden", "--follow", "--no-messages", "--color=never"];
+        for (const d of WALK_SKIP_DIRS)
+          args.push("--glob", `!**/${d}/**`);
+        args.push(".");
+        const r2 = await runCapture(rgBin(), args, { cwd: root, timeout: DEFAULT_TIMEOUT_MS, maxBuffer: 64 * 1024 * 1024 });
+        if (!r2.error && (r2.status === 0 || r2.status === 1 || r2.status === 2 && r2.stdout)) {
+          const files2 = r2.stdout.split("\n").filter(Boolean).map((f3) => path8.join(root, f3.replace(/^\.\//, "")));
+          return { files: files2, truncated: false };
+        }
+      }
+      const files = [];
+      let truncated = false;
+      walkDir(root, (f3) => {
+        if (files.length >= WALK_MAX_FILES) {
+          truncated = true;
+          return false;
+        }
+        files.push(f3);
+        return true;
+      });
+      return { files, truncated };
+    }
     function walkDir(dirPath, callback, _visited = /* @__PURE__ */ new Set()) {
       try {
         const real = fs9.realpathSync(dirPath);
         if (_visited.has(real))
-          return;
+          return true;
         _visited.add(real);
         const entries = fs9.readdirSync(dirPath, { withFileTypes: true });
         for (const entry of entries) {
@@ -102514,13 +102704,15 @@ ${globalCapMatches(output)}` : "";
           if (isDir) {
             if (WALK_SKIP_DIRS.has(entry.name))
               continue;
-            walkDir(fullPath, callback, _visited);
-          } else {
-            callback(fullPath);
+            if (walkDir(fullPath, callback, _visited) === false)
+              return false;
+          } else if (callback(fullPath) === false) {
+            return false;
           }
         }
       } catch {
       }
+      return true;
     }
     async function createDirectory(input, workDir) {
       const dirPath = typeof input.path === "string" ? input.path : "";
@@ -102678,7 +102870,7 @@ ${globalCapMatches(output)}` : "";
         const diff3 = buildDiff(filePath, oldNorm, newNorm, origNorm);
         const linesBefore = origNorm.split("\n").length;
         const linesAfter = updated.split("\n").length;
-        const xfile = crossFileBreakageWarning(resolved, origNorm, normalizeLF(updated), workDir ?? process.cwd());
+        const xfile = await crossFileBreakageWarning(resolved, origNorm, normalizeLF(updated), workDir ?? process.cwd());
         const sec = (0, securityLint_1.securityNoteText)((0, securityLint_1.checkSecurity)(newNorm));
         return {
           output: `Edited ${resolved} (${linesBefore} \u2192 ${linesAfter} lines)
@@ -103054,7 +103246,7 @@ ${body}${truncNote}
         }
         const finalContent = wasCRLF ? content.replace(/\n/g, "\r\n") : content;
         atomicWritePreservingMode(resolved, finalContent, pre.mode);
-        const xfile = crossFileBreakageWarning(resolved, originalNorm, content, workDir ?? process.cwd());
+        const xfile = await crossFileBreakageWarning(resolved, originalNorm, content, workDir ?? process.cwd());
         const sec = (0, securityLint_1.securityNoteText)((0, securityLint_1.checkSecurity)(insertedText.join("\n")));
         return {
           output: `Applied ${edits.length} edit(s) to ${resolved}:
@@ -103078,14 +103270,17 @@ ${d}`).join("\n") + xfile + sec,
         const matches = [];
         const regex2 = globToRegex(pattern);
         const useBasename = !pattern.includes("/") && !pattern.includes("**");
-        walkDir(resolved, (filePath) => {
+        const listing = await listFiles(resolved);
+        for (const filePath of listing.files) {
           const rel = path8.relative(resolved, filePath).replace(/\\/g, "/");
           if (regex2.test(rel) || useBasename && regex2.test(path8.basename(filePath))) {
             matches.push(filePath);
           }
-        });
+        }
+        const scanNote = listing.truncated ? `
+[Scan stopped after ${WALK_MAX_FILES.toLocaleString("en-US")} files \u2014 narrow the path for complete results.]` : "";
         if (!matches.length)
-          return { output: `No files matched pattern: ${pattern}` };
+          return { output: `No files matched pattern: ${pattern}${scanNote}` };
         const mtime = (f3) => {
           try {
             return fs9.statSync(f3).mtimeMs;
@@ -103098,7 +103293,7 @@ ${d}`).join("\n") + xfile + sec,
         const more = sorted.length > shown.length ? `
 [${sorted.length - shown.length} more not shown \u2014 narrow the pattern or path]` : "";
         return { output: `${matches.length} file(s) matched "${pattern}" under ${resolved}:
-${shown.join("\n")}${more}` };
+${shown.join("\n")}${more}${scanNote}` };
       } catch (err) {
         return { error: err.message };
       }
@@ -106220,6 +106415,7 @@ var require_loop = __commonJS({
     exports2.contextWindowFor = contextWindowFor2;
     exports2.compactionLimits = compactionLimits;
     exports2.compactionThresholds = compactionThresholds2;
+    exports2.pruneReclaimFloor = pruneReclaimFloor;
     exports2.estimateBodyBytes = estimateBodyBytes2;
     exports2.allowsTestOnlyWrite = allowsTestOnlyWrite;
     exports2.findSafeCutIndex = findSafeCutIndex;
@@ -106579,9 +106775,10 @@ ${ctx.repeatError}
       const abs = raw.map((p) => workDir ? path8.resolve(workDir, p) : p);
       return abs.length ? abs : [name];
     }
-    var DEFAULT_MAX_CONCURRENT_SUBTASKS = 4;
+    var DEFAULT_MAX_CONCURRENT_SUBTASKS = 10;
+    var HARD_MAX_CONCURRENT_SUBTASKS = 32;
     function resolveMaxConcurrentSubtasks(settingsRaw = {}) {
-      const clamp = (n) => Math.max(1, Math.min(Math.floor(n), 16));
+      const clamp = (n) => Math.max(1, Math.min(Math.floor(n), HARD_MAX_CONCURRENT_SUBTASKS));
       const fromEnv = Number(process.env.NEXRALL_MAX_CONCURRENT_SUBTASKS);
       if (Number.isFinite(fromEnv) && fromEnv > 0)
         return clamp(fromEnv);
@@ -107058,12 +107255,12 @@ ${sk.body.trim()}` : `# Preloaded skill: ${n}
         }).join("\n\n");
       }
       const subNexrallMd = [
+        inheritedMd,
         SUBAGENT_PREAMBLE,
         agent ? `# Sub-agent role: ${agent.name}
 ${agent.prompt}` : "",
         preloadedSkills,
-        agentMemoryNotes,
-        inheritedMd
+        agentMemoryNotes
       ].filter(Boolean).join("\n\n---\n\n");
       const testFilesOnly = !!agent?.testFilesOnly || !!options._testFilesOnly;
       const allowed = intersectAllowlists(agent?.tools ? new Set(agent.tools) : null, options._allowedTools);
@@ -107498,6 +107695,12 @@ ${partial}` : "",
       return { prune: prune / contextWindow, compact: compact / contextWindow };
     }
     var PRUNE_MIN_RECLAIM_BYTES = 96 * 1024;
+    var PRUNE_MIN_RECLAIM_BYTES_COLD = 16 * 1024;
+    var CACHE_COLD_AFTER_MS = 5 * 6e4;
+    var _lastApiCallEndedAt = /* @__PURE__ */ new Map();
+    function pruneReclaimFloor(lastCallEndedAt, now = Date.now()) {
+      return lastCallEndedAt !== void 0 && now - lastCallEndedAt >= CACHE_COLD_AFTER_MS ? PRUNE_MIN_RECLAIM_BYTES_COLD : PRUNE_MIN_RECLAIM_BYTES;
+    }
     var COMPACT_KEEP_MIN = 6;
     var COMPACT_MIN_RECLAIM_BYTES = 32 * 1024;
     var COMPACT_MAX_FAILURES = 3;
@@ -108110,7 +108313,8 @@ Continue the work from here.` }] });
           const tokenPressure = lastPromptTokens > compactLimits.compact;
           let bytePressure = bodyBytes > MAX_BODY_BYTES;
           if (autoCompact && !compacting && (prunePressure || bytePressure) && messages.length > PRUNE_KEEP_RECENT + 2) {
-            const reclaimed = pruneOldToolResults(messages, PRUNE_MIN_RECLAIM_BYTES);
+            const floor = depth === 0 ? pruneReclaimFloor(_lastApiCallEndedAt.get(options.sessionId || PROCESS_BUDGET_KEY)) : PRUNE_MIN_RECLAIM_BYTES;
+            const reclaimed = pruneOldToolResults(messages, floor);
             if (reclaimed > 0) {
               bodyBytes = estimateBodyBytes2(messages);
               bytePressure = bodyBytes > MAX_BODY_BYTES;
@@ -108225,6 +108429,8 @@ Continue the work from here.` }] });
               allowRestartAfterRender: !!options.onStreamRestart
             }, onEvent);
             options.onApiCallDuration?.(Date.now() - _apiCallStartedAt);
+            if (depth === 0)
+              _lastApiCallEndedAt.set(options.sessionId || PROCESS_BUDGET_KEY, Date.now());
             if (pendingRuntimeContext)
               persistRuntimeContext(messages, sentUserIdx, pendingRuntimeContext);
           } catch (err) {
@@ -108462,7 +108668,7 @@ Continue the work from here.` }] });
                     result = external;
                   } else if (options.mcpManager?.isMcpTool(name)) {
                     const mcpOutput = await stopAwaiting(options.mcpManager.callTool(name, input, options.abortSignal), options.abortSignal);
-                    result = mcpOutput === STOP_TIMEOUT_RESULT ? STOP_TIMEOUT_RESULT : { output: mcpOutput ?? "" };
+                    result = mcpOutput === STOP_TIMEOUT_RESULT ? STOP_TIMEOUT_RESULT : { output: (0, executor_1.capExternalOutput)(mcpOutput ?? "", `mcp-${name}`) };
                   } else {
                     options.checkpointManager?.recordBeforeMutation(name, input);
                     const onStream = options.onToolStreamChunk ? (chunk) => options.onToolStreamChunk(name, chunk, void 0, toolMeta) : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.115",
+  "version": "0.5.116",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",