nexrall-code 0.5.55 → 0.5.56

package/dist/index.js

@@ -15902,7 +15902,11 @@ var require_loop = __commonJS({
     exports.executeAgentMemoryWrite = executeAgentMemoryWrite;
     exports.stopReasonNotice = stopReasonNotice;
     exports.resolveMaxIterations = resolveMaxIterations;
+    exports.bashNeedsRepoLock = bashNeedsRepoLock;
+    exports.lockPathsFor = lockPathsFor;
+    exports.resolveMaxConcurrentSubtasks = resolveMaxConcurrentSubtasks;
     exports.createLimiter = createLimiter;
+    exports._resetSubTaskLimiter = _resetSubTaskLimiter;
     exports.resolveSubtaskTimeoutMs = resolveSubtaskTimeoutMs;
     exports.extractSubTaskText = extractSubTaskText;
     exports.capSubTaskText = capSubTaskText;
@@ -16144,10 +16148,89 @@ ${ctx.repeatError}
           _fileLocks.delete(absPath);
       }
     }
-    var MAX_CONCURRENT_SUBTASKS = (() => {
-      const raw = Number(process.env.NEXRALL_MAX_CONCURRENT_SUBTASKS);
-      return Number.isFinite(raw) && raw > 0 ? Math.floor(raw) : 4;
-    })();
+    async function withFileLocks(absPaths, fn) {
+      const unique = [...new Set(absPaths.filter(Boolean))].sort();
+      if (unique.length === 0)
+        return fn();
+      const [first, ...rest] = unique;
+      return withFileLock(first, () => rest.length ? withFileLocks(rest, fn) : fn());
+    }
+    var WRITE_TOOLS = /* @__PURE__ */ new Set([
+      "write_file",
+      "edit_file",
+      "multi_edit",
+      "delete_file",
+      "move_file",
+      "copy_file",
+      "notebook_edit"
+    ]);
+    var REPO_STATE_LOCK = "\0repo-state";
+    var MUTATING_BASH_VERBS = /* @__PURE__ */ new Set([
+      "git",
+      "npm",
+      "pnpm",
+      "yarn",
+      "bun",
+      "cargo",
+      "go",
+      "pip",
+      "pip3",
+      "poetry",
+      "uv",
+      "bundle",
+      "composer",
+      "gradle",
+      "mvn",
+      "make",
+      "terraform",
+      "helm",
+      "docker",
+      "vsce",
+      "tsc",
+      "pytest",
+      "dotnet",
+      "swift",
+      "gem"
+    ]);
+    function bashNeedsRepoLock(command) {
+      if (!command)
+        return false;
+      const segments = command.split(/\|\||&&|[;|&\n()]|\$\(/);
+      for (const seg of segments) {
+        for (const tokenRaw of seg.trim().split(/\s+/)) {
+          const token = tokenRaw.replace(/^["']|["']$/g, "");
+          if (!token)
+            continue;
+          if (/^[A-Za-z_][A-Za-z0-9_]*=/.test(token))
+            continue;
+          if (token === "sudo" || token === "time" || token === "nice" || token === "env")
+            continue;
+          const verb = token.split("/").pop() ?? token;
+          if (MUTATING_BASH_VERBS.has(verb))
+            return true;
+          break;
+        }
+      }
+      return false;
+    }
+    function lockPathsFor(name, input, workDir) {
+      if (!WRITE_TOOLS.has(name))
+        return [];
+      const raw = [input.path, input.source, input.destination, input.dest].filter((p) => typeof p === "string" && p.length > 0);
+      const abs = raw.map((p) => workDir ? path6.resolve(workDir, p) : p);
+      return abs.length ? abs : [name];
+    }
+    var DEFAULT_MAX_CONCURRENT_SUBTASKS = 4;
+    function resolveMaxConcurrentSubtasks(settingsRaw = {}) {
+      const clamp = (n) => Math.min(Math.floor(n), 16);
+      const fromEnv = Number(process.env.NEXRALL_MAX_CONCURRENT_SUBTASKS);
+      if (Number.isFinite(fromEnv) && fromEnv > 0)
+        return clamp(fromEnv);
+      const fromSettings = Number(settingsRaw.maxConcurrentSubtasks);
+      if (Number.isFinite(fromSettings) && fromSettings > 0)
+        return clamp(fromSettings);
+      return DEFAULT_MAX_CONCURRENT_SUBTASKS;
+    }
     function createLimiter(max) {
       let active = 0;
       const queue = [];
@@ -16166,7 +16249,20 @@ ${ctx.repeatError}
         }
       };
     }
-    var _subTaskLimit = createLimiter(MAX_CONCURRENT_SUBTASKS);
+    var _subTaskLimitInstance = null;
+    var _subTaskLimitMax = 0;
+    var _inFlightSubTasks = 0;
+    function subTaskLimiter(workDir) {
+      if (!_subTaskLimitInstance) {
+        _subTaskLimitMax = resolveMaxConcurrentSubtasks(workDir ? (0, rules_1.loadSettings)(workDir).raw : {});
+        _subTaskLimitInstance = createLimiter(_subTaskLimitMax);
+      }
+      return { run: _subTaskLimitInstance, max: _subTaskLimitMax };
+    }
+    function _resetSubTaskLimiter() {
+      _subTaskLimitInstance = null;
+      _subTaskLimitMax = 0;
+    }
     function humanDescription(name, input) {
       switch (name) {
         case "read_file":
@@ -17255,7 +17351,20 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
             if (!permitted) {
               result = { error: deniedReason ?? "Permission denied by user" };
             } else if (name === "task") {
-              result = depth === 0 ? await _subTaskLimit(() => runSubTask(input, options, agentTypes)) : await runSubTask(input, options, agentTypes);
+              if (depth === 0) {
+                const { run: limitRun, max: limitMax } = subTaskLimiter(options.workDir);
+                if (_inFlightSubTasks >= limitMax) {
+                  (options.onNotice ?? options.onText)(`\u23F3 Queued: ${limitMax} sub-agents are already running, so this one starts when a slot frees up (raise "maxConcurrentSubtasks" in .nexrall/settings.json to widen it).`);
+                }
+                _inFlightSubTasks++;
+                try {
+                  result = await limitRun(() => runSubTask(input, options, agentTypes));
+                } finally {
+                  _inFlightSubTasks--;
+                }
+              } else {
+                result = await runSubTask(input, options, agentTypes);
+              }
             } else {
               const pre = runToolHooks(hooks.PreToolUse, "PreToolUse", name, input, options.workDir);
               if (pre.block) {
@@ -17275,15 +17384,10 @@ ${options.nexrallMd}` : "") : options.nexrallMd;
                     result = { output: mcpOutput ?? "" };
                   } else {
                     options.checkpointManager?.recordBeforeMutation(name, input);
-                    const WRITE_TOOLS = /* @__PURE__ */ new Set(["write_file", "edit_file", "multi_edit", "delete_file", "move_file", "copy_file", "notebook_edit"]);
                     const onStream = options.onToolStreamChunk ? (chunk) => options.onToolStreamChunk(name, chunk) : void 0;
-                    if (WRITE_TOOLS.has(name)) {
-                      const targetPath = typeof input.path === "string" ? input.path : typeof input.source === "string" ? input.source : "";
-                      const absTarget = targetPath && options.workDir ? path6.resolve(options.workDir, targetPath) : targetPath;
-                      result = await withFileLock(absTarget || name, () => (0, executor_1.executeTool)(name, input, options.abortSignal, sandboxCfg, options.workDir, agentScope, onStream));
-                    } else {
-                      result = await (0, executor_1.executeTool)(name, input, options.abortSignal, sandboxCfg, options.workDir, agentScope, onStream);
-                    }
+                    const run = () => (0, executor_1.executeTool)(name, input, options.abortSignal, sandboxCfg, options.workDir, agentScope, onStream);
+                    const locks = name === "bash" ? bashNeedsRepoLock(String(input.command ?? "")) ? [REPO_STATE_LOCK] : [] : lockPathsFor(name, input, options.workDir);
+                    result = locks.length ? await withFileLocks(locks, run) : await run();
                   }
                 } catch (err) {
                   result = { error: `Tool execution failed: ${err.message}` };
@@ -54708,22 +54812,30 @@ var _replInterface = null;
 function setReadlineInterface(rl) {
   _replInterface = rl;
 }
+var _promptChain = Promise.resolve();
+function serialisePrompt(fn) {
+  const next = _promptChain.then(fn, fn);
+  _promptChain = next.catch(() => void 0);
+  return next;
+}
 function askUser(question) {
-  if (_replInterface) {
-    const rl = _replInterface;
+  return serialisePrompt(() => {
+    if (_replInterface) {
+      const rl = _replInterface;
+      return new Promise((resolve3) => {
+        rl.question(question, (answer) => resolve3(answer.trim()));
+      });
+    }
     return new Promise((resolve3) => {
-      rl.question(question, (answer) => resolve3(answer.trim()));
-    });
-  }
-  return new Promise((resolve3) => {
-    const rl = readline2.createInterface({
-      input: process.stdin,
-      output: process.stderr,
-      terminal: true
-    });
-    rl.question(question, (answer) => {
-      rl.close();
-      resolve3(answer.trim());
+      const rl = readline2.createInterface({
+        input: process.stdin,
+        output: process.stderr,
+        terminal: true
+      });
+      rl.question(question, (answer) => {
+        rl.close();
+        resolve3(answer.trim());
+      });
     });
   });
 }
@@ -64349,7 +64461,7 @@ var InkReadlineAdapter = class extends EventEmitter3 {
 };
 
 // src/commands/chat.ts
-var CLI_VERSION = "0.5.55";
+var CLI_VERSION = "0.5.56";
 var MODEL_LABELS = {
   turbo: "Nexrall Turbo",
   pro: "Nexrall Pro",
@@ -66016,7 +66128,7 @@ function pluginSourceRemoveCommand(name, opts) {
 
 // src/index.ts
 var program2 = new Command();
-program2.name("nex").description("Nexrall Code \u2014 AI coding assistant (powered by Nexrall)").version("0.5.55").enablePositionalOptions();
+program2.name("nex").description("Nexrall Code \u2014 AI coding assistant (powered by Nexrall)").version("0.5.56").enablePositionalOptions();
 program2.command("auth").description("Login to your Nexrall account").action(authCommand);
 program2.command("logout").description("Log out of your Nexrall account").action(logoutCommand);
 program2.command("update").description("Update nex to the latest version").option("-c, --check", "Check for updates without installing").option("-y, --yes", "Skip confirmation prompt").action(async (opts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.55",
+  "version": "0.5.56",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",
@@ -41,7 +41,7 @@
     "react": "^19.2.8",
     "readline": "^1.3.0",
     "string-width": "^7.2.0",
-    "@nexrall/code-core": "1.4.30"
+    "@nexrall/code-core": "1.4.31"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.600.0",