nexrall-code 0.5.187 → 0.5.188

package/dist/index.js

@@ -10094,7 +10094,7 @@ var require_client = __commonJS({
     }
     var MAX_TOTAL_ATTEMPTS = (MAX_RETRIES + 1) * (MAX_RETRIES + 1);
     async function streamChat(messages, options, onEvent) {
-      const { model, env: env3, editorContext, nexrallMd, mode, effort, clientType, abortSignal, extraTools, agents, skills, allowRestartAfterRender, canWriteSharedMemory, hasOwnAgentStore, canSpawnSubAgents, canBrowseWeb, toolAllowlist } = options;
+      const { model, env: env3, editorContext, nexrallMd, mode, effort, clientType, abortSignal, extraTools, agents, skills, allowRestartAfterRender, canWriteSharedMemory, hasOwnAgentStore, canSpawnSubAgents, canBrowseWeb, toolAllowlist, alwaysLoadServers } = options;
       let turnId = (0, crypto_1.randomUUID)();
       const controller = new AbortController();
       if (abortSignal?.aborted)
@@ -10141,6 +10141,7 @@ var require_client = __commonJS({
           canSpawnSubAgents,
           canBrowseWeb,
           toolAllowlist,
+          alwaysLoadServers,
           ...billingOverrideFields3()
         });
         chatBody = gzipRequestsEnabled() && json.length >= GZIP_MIN_BYTES ? { data: (0, zlib_1.gzipSync)(json, { level: 5 }), gzip: true, turnId } : { data: json, gzip: false, turnId };
@@ -25392,6 +25393,11 @@ ${ctx}
         options.nexrallMd ?? null
       ].filter((s2) => s2 !== null).join("\n\n---\n\n") || void 0;
       const mcpInstructionsBlock = () => (0, instructions_1.formatMcpInstructions)((options.mcpManager?.serverInstructions() ?? []).filter((e2) => !options._mcpServerAllowlist || options._mcpServerAllowlist.has(e2.server)));
+      const alwaysLoadServerNames = (() => {
+        const named = options.mcpManager?.alwaysLoadServers() ?? [];
+        const scoped = named.filter((n) => !options._mcpServerAllowlist || options._mcpServerAllowlist.has(n));
+        return scoped.length ? scoped : void 0;
+      })();
       const chatRequestOptions = () => ({
         model,
         mode: options.mode,
@@ -25438,6 +25444,10 @@ ${ctx}
         // (and gets refused on) write, office and image tools. Sorted so the tools cache
         // prefix is identical for every run of the same agent type.
         toolAllowlist: options._allowedTools ? [...options._allowedTools].sort() : void 0,
+        // Servers the user pinned with `alwaysLoad: true` (computed above). The backend
+        // keeps their `<server>__*` tools out of the tool cap and both deferral paths;
+        // undefined (not []) when nothing is pinned so older backends see the same body.
+        alwaysLoadServers: alwaysLoadServerNames,
         // Withholds the `task` schema and its instructions when this run cannot
         // delegate — see canSpawnSubAgents.
         canSpawnSubAgents: maySpawn,
@@ -27705,6 +27715,21 @@ var require_manager = __commonJS({
       get toolCount() {
         return this._toolMap.size;
       }
+      /**
+       * Names of configured servers whose entry sets `alwaysLoad: true` (CC parity).
+       * The agent loop sends this per request; the backend keeps those servers' tools
+       * out of BOTH deferral paths (tool-search `defer_loading` and the cap selector's
+       * droppable set). Config-level — a server that failed to connect still contributes
+       * an inert name, since it sends no tools to protect. Sorted because the list rides
+       * in the request body, which is part of the tools-cache key.
+       */
+      alwaysLoadServers() {
+        const names = [];
+        for (const [name, cfg] of this._configs)
+          if (cfg.alwaysLoad === true)
+            names.push(name);
+        return names.sort();
+      }
       static transportOf(cfg) {
         if (cfg?.type)
           return cfg.type;
@@ -27724,7 +27749,8 @@ var require_manager = __commonJS({
             // insufficient_scope challenge — the row says so, the detail says which scope.
             needsAuth: this._needsAuth.has(name),
             missingScope: this.missingScope(name) || void 0,
-            protocolVersion: client.protocolVersion
+            protocolVersion: client.protocolVersion,
+            alwaysLoad: this._configs.get(name)?.alwaysLoad === true
           });
         }
         for (const name of this._configs.keys()) {
@@ -27738,7 +27764,8 @@ var require_manager = __commonJS({
               transport: _McpManager.transportOf(this._configs.get(name)),
               tools: [],
               connected: false,
-              disabled: true
+              disabled: true,
+              alwaysLoad: this._configs.get(name)?.alwaysLoad === true
             });
             continue;
           }
@@ -27750,7 +27777,8 @@ var require_manager = __commonJS({
             disabled,
             error,
             needsAuth: this._needsAuth.has(name),
-            missingScope: this.missingScope(name) || void 0
+            missingScope: this.missingScope(name) || void 0,
+            alwaysLoad: this._configs.get(name)?.alwaysLoad === true
           });
         }
         return out.sort((a, b) => a.name.localeCompare(b.name));
@@ -67748,6 +67776,8 @@ function buildServer(input) {
       cfg2.clientId = input.clientId.trim();
     if (input.clientSecret)
       cfg2.clientSecret = input.clientSecret;
+    if (input.alwaysLoad)
+      cfg2.alwaysLoad = true;
     return { ok: true, value: cfg2 };
   }
   if (input.clientId || input.clientSecret)
@@ -67759,6 +67789,8 @@ function buildServer(input) {
     cfg.args = rest.slice(1);
   if (Object.keys(env3.value).length)
     cfg.env = env3.value;
+  if (input.alwaysLoad)
+    cfg.alwaysLoad = true;
   return { ok: true, value: cfg };
 }
 function parseServerJson(text) {
@@ -67777,6 +67809,8 @@ function parseServerJson(text) {
     return { ok: false, error: 'A server is either stdio ("command") or http/sse ("url"), not both.' };
   if (s2.args !== void 0 && (!Array.isArray(s2.args) || s2.args.some((a) => typeof a !== "string")))
     return { ok: false, error: '"args" must be an array of strings.' };
+  if (s2.alwaysLoad !== void 0 && typeof s2.alwaysLoad !== "boolean")
+    return { ok: false, error: '"alwaysLoad" must be true or false.' };
   return { ok: true, value: s2 };
 }
 function describeServer(name, s2) {
@@ -67785,7 +67819,8 @@ function describeServer(name, s2) {
   const env3 = s2.env && Object.keys(s2.env).length ? `  env: ${Object.keys(s2.env).join(", ")}` : "";
   const hdr = s2.headers && Object.keys(s2.headers).length ? `  headers: ${Object.keys(s2.headers).join(", ")}` : "";
   const client = s2.clientId ? `  client-id: ${s2.clientId}` : "";
-  return `${name}  [${kind}]  ${target}${env3}${hdr}${client}`;
+  const pinned = s2.alwaysLoad ? "  always-load" : "";
+  return `${name}  [${kind}]  ${target}${env3}${hdr}${client}${pinned}`;
 }
 function redactUrl(u) {
   try {
@@ -67820,7 +67855,8 @@ function mcpAddCommand(name, rest, opts, workDir = process.cwd()) {
     env: opts.env,
     header: opts.header,
     clientId: opts.clientId,
-    clientSecret: opts.clientSecret
+    clientSecret: opts.clientSecret,
+    alwaysLoad: opts.alwaysLoad
   });
   if (!b.ok) {
     console.error(b.error);
@@ -67885,7 +67921,8 @@ function mcpListCommand(workDir = process.cwd(), json = false) {
             url: s2.url ? redactUrl(s2.url) : void 0,
             env_keys: Object.keys(s2.env ?? {}),
             header_keys: Object.keys(s2.headers ?? {}),
-            disabled: disabled.has(n)
+            disabled: disabled.has(n),
+            alwaysLoad: s2.alwaysLoad === true
           };
         }),
         null,
@@ -95181,14 +95218,15 @@ function statusDot(row2) {
   return row2.connected ? "\u25CF" : "\u25CB";
 }
 function describeRow(row2) {
+  const pin = row2.alwaysLoad ? " \xB7 always-load" : "";
   if (row2.disabled)
     return "switched off \u2014 /mcp enable " + row2.name;
   if (row2.connected && row2.needsAuth) {
     const why = row2.missingScope ? "needs more permissions" : "needs re-auth";
-    return `${row2.toolCount} tool${row2.toolCount === 1 ? "" : "s"} \xB7 ${why} \u2014 /mcp auth ${row2.name}`;
+    return `${row2.toolCount} tool${row2.toolCount === 1 ? "" : "s"}${pin} \xB7 ${why} \u2014 /mcp auth ${row2.name}`;
   }
   if (row2.connected)
-    return `${row2.toolCount} tool${row2.toolCount === 1 ? "" : "s"}`;
+    return `${row2.toolCount} tool${row2.toolCount === 1 ? "" : "s"}${pin}`;
   if (row2.needsAuth)
     return "needs authentication \u2014 /mcp auth " + row2.name + " (signs in)";
   return row2.error && row2.error !== "disconnected" ? row2.error : "disconnected";
@@ -95218,6 +95256,8 @@ function formatMcpDetail(input) {
   out.push(`    state: ${state}`);
   if (row2.connected && row2.protocolVersion)
     out.push(`    protocol: ${row2.protocolVersion}`);
+  if (row2.alwaysLoad)
+    out.push("    always-load: on \u2014 tools are never deferred or dropped by the tool cap");
   if (scope && scope !== "none") {
     const where = scope === "project" ? ".nexrall/mcp.json" : scope === "user" ? "~/.nexrall/mcp.json" : "a plugin (its definition cannot be edited here)";
     out.push(`    defined in: ${where}`);
@@ -99834,7 +99874,8 @@ ${text}` : "");
     missingScope: st.missingScope,
     error: st.error,
     toolCount: st.tools.length,
-    protocolVersion: st.protocolVersion
+    protocolVersion: st.protocolVersion,
+    alwaysLoad: st.alwaysLoad
   }));
   const matchMcpRows = (rows, name) => {
     const exact = rows.filter((r2) => r2.name === name);
@@ -104312,7 +104353,7 @@ program2.command("update").description("Update nex to the latest version").optio
 var mcp = program2.command("mcp").description("Manage MCP servers (add, list, get, remove) \u2014 same files as /mcp");
 mcp.command("add <name> [target...]").description(
   "Add a server. stdio: nex mcp add fs -- npx -y @modelcontextprotocol/server-filesystem .   http/sse: nex mcp add --transport http docs https://example.com/mcp"
-).option("-t, --transport <type>", "stdio (default) | http | sse").option("-e, --env <KEY=value...>", "Environment variable for a stdio server (repeatable)").option("-H, --header <header...>", 'Header for an http/sse server, "Name: value" (repeatable)').option("--client-id <id>", "OAuth client id for an http/sse server without dynamic registration").option("--client-secret <secret>", "OAuth client secret (sent client_secret_post; stored in mcp.json)").option("-s, --scope <scope>", "project (default, ./.nexrall/mcp.json) | user (~/.nexrall/mcp.json)").action((name, target, opts) => {
+).option("-t, --transport <type>", "stdio (default) | http | sse").option("-e, --env <KEY=value...>", "Environment variable for a stdio server (repeatable)").option("-H, --header <header...>", 'Header for an http/sse server, "Name: value" (repeatable)').option("--client-id <id>", "OAuth client id for an http/sse server without dynamic registration").option("--client-secret <secret>", "OAuth client secret (sent client_secret_post; stored in mcp.json)").option("--always-load", "Keep this server's tools out of the backend tool cap (never deferred or dropped)").option("-s, --scope <scope>", "project (default, ./.nexrall/mcp.json) | user (~/.nexrall/mcp.json)").action((name, target, opts) => {
   process.exit(mcpAddCommand(name, target, opts));
 });
 mcp.command("add-json <name> <json>").description(`Add a server from a JSON definition, e.g. '{"command":"npx","args":["-y","pkg"]}'`).option("-s, --scope <scope>", "project (default) | user").action((name, json, opts) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.187",
-  "description": "Nexrall Code \u2014 AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
+  "version": "0.5.188",
+  "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",
     "cli",