nexrall-code 0.5.108 → 0.5.110

package/dist/index.js

@@ -3186,6 +3186,8 @@ var require_auth = __commonJS({
     exports2.getToken = getToken;
     exports2.getRefreshToken = getRefreshToken;
     exports2.updateTokens = updateTokens;
+    exports2.getBillingTeamId = getBillingTeamId;
+    exports2.setBillingTeamId = setBillingTeamId;
     var fs9 = __importStar(__require("fs"));
     var path8 = __importStar(__require("path"));
     var os6 = __importStar(__require("os"));
@@ -3263,6 +3265,30 @@ var require_auth = __commonJS({
       };
       fs9.writeFileSync(CONFIG_FILE, JSON.stringify(next, null, 2), { mode: 384 });
     }
+    function getBillingTeamId() {
+      const auth = loadAuth2();
+      const v = auth?.billingTeamId;
+      return typeof v === "number" && Number.isSafeInteger(v) && v > 0 ? v : null;
+    }
+    function setBillingTeamId(teamId) {
+      let existing = {};
+      try {
+        if (fs9.existsSync(CONFIG_FILE)) {
+          const parsed = JSON.parse(fs9.readFileSync(CONFIG_FILE, "utf-8"));
+          if (typeof parsed === "object" && parsed !== null)
+            existing = parsed;
+        }
+      } catch {
+      }
+      ensureConfigDir();
+      const next = { ...existing };
+      if (typeof teamId === "number" && Number.isSafeInteger(teamId) && teamId > 0) {
+        next.billingTeamId = teamId;
+      } else {
+        delete next.billingTeamId;
+      }
+      fs9.writeFileSync(CONFIG_FILE, JSON.stringify(next, null, 2), { mode: 384 });
+    }
   }
 });
 
@@ -9903,6 +9929,7 @@ var require_client = __commonJS({
     exports2.revokeRefreshToken = revokeRefreshToken2;
     exports2.describeAttachment = describeAttachment2;
     exports2.getBalance = getBalance3;
+    exports2.getOrgs = getOrgs;
     exports2.getCodeModels = getCodeModels;
     exports2.getUsageDaily = getUsageDaily;
     exports2.exchangeVscodeCode = exchangeVscodeCode;
@@ -10091,7 +10118,7 @@ var require_client = __commonJS({
           {
             method: "POST",
             headers: authHeaders(),
-            body: JSON.stringify({ messages, model, env: env4, editorContext, nexrallMd, mode, effort, clientType, extraTools, agents, skills, turnId, canWriteSharedMemory, hasOwnAgentStore, canSpawnSubAgents, canBrowseWeb }),
+            body: JSON.stringify({ messages, model, env: env4, editorContext, nexrallMd, mode, effort, clientType, extraTools, agents, skills, turnId, canWriteSharedMemory, hasOwnAgentStore, canSpawnSubAgents, canBrowseWeb, teamId: (0, index_1.getBillingTeamId)() }),
             signal
           }
         ];
@@ -10271,18 +10298,31 @@ var require_client = __commonJS({
           const errText = errorBodyOverride ?? await response.text();
           let errMsg = `API error ${response.status}`;
           let balance;
+          let code;
+          let remaining;
+          let teamId;
           try {
             const parsed = JSON.parse(errText);
             if (parsed.error)
               errMsg = parsed.error;
             if (typeof parsed.balance === "number")
               balance = parsed.balance;
+            if (typeof parsed.code === "string")
+              code = parsed.code;
+            if (typeof parsed.remaining === "number")
+              remaining = parsed.remaining;
+            if (typeof parsed.teamId === "number")
+              teamId = parsed.teamId;
           } catch {
             errMsg = errText || errMsg;
           }
           throw Object.assign(new Error(errMsg), {
             status: response.status,
             balance,
+            // Team-billing context (migration 139) — see the parse above.
+            ...code ? { code } : {},
+            ...remaining !== void 0 ? { remaining } : {},
+            ...teamId !== void 0 ? { teamId } : {},
             ...forbiddenExhausted ? { retryable: true } : {},
             ...sessionExpired ? { authExpired: true } : {}
           });
@@ -10650,7 +10690,7 @@ var require_client = __commonJS({
       const fetchOnce = () => (0, node_fetch_1.default)(`${exports2.API_BASE}/api/code/assets/describe`, {
         method: "POST",
         headers: { ...authHeaders(), "Content-Type": "application/json" },
-        body: JSON.stringify({ kind, data, media_type: mediaType, name })
+        body: JSON.stringify({ kind, data, media_type: mediaType, name, teamId: (0, index_1.getBillingTeamId)() })
       });
       let response = await fetchOnce();
       if (response.status === 401 || response.status === 403) {
@@ -10695,6 +10735,26 @@ var require_client = __commonJS({
       const data = await response.json();
       return typeof data.balance === "number" ? data.balance : 0;
     }
+    async function getOrgs() {
+      const fetchOnce = () => (0, node_fetch_1.default)(`${exports2.API_BASE}/api/code/orgs`, { method: "GET", headers: authHeaders() });
+      let response = await fetchOnce();
+      if (response.status === 401 || response.status === 403) {
+        const body = await response.text().catch(() => "");
+        if (isExpiredTokenResponse(response.status, body) && await refreshAccessToken()) {
+          response = await fetchOnce();
+        } else {
+          throw new Error(`API error ${response.status}: ${body}`);
+        }
+      }
+      if (!response.ok) {
+        throw new Error(`API error ${response.status}`);
+      }
+      const json = await response.json();
+      return {
+        personal: { balance: typeof json.personal?.balance === "number" ? json.personal.balance : 0 },
+        teams: Array.isArray(json.teams) ? json.teams : []
+      };
+    }
     async function getCodeModels() {
       const fetchOnce = () => (0, node_fetch_1.default)(`${exports2.API_BASE}/api/code/models`, { method: "GET", headers: authHeaders() });
       let response = await fetchOnce();
@@ -12210,8 +12270,8 @@ var require_agentTypes = __commonJS({
     ]);
     exports2.VALID_MODELS = [
       "claude-sonnet-5",
-      "claude-opus-5",
-      "claude-fable-5",
+      "claude-opus-5-5",
+      "claude-fable-5-1",
       "gpt-5.4",
       "gpt-5.4-mini",
       "gpt-4.1",
@@ -102947,7 +103007,7 @@ ${lines.join("\n")}`;
       let cost;
       let balance;
       try {
-        const r2 = await _httpsPost(`${client_1.API_BASE}/api/code/assets/generate`, JSON.stringify({ prompt: prompt2, aspect_ratio: aspectRatio }), { "Content-Type": "application/json", Authorization: `Bearer ${token}` }, 17e4, abortSignal);
+        const r2 = await _httpsPost(`${client_1.API_BASE}/api/code/assets/generate`, JSON.stringify({ prompt: prompt2, aspect_ratio: aspectRatio, teamId: (0, auth_1.getBillingTeamId)() }), { "Content-Type": "application/json", Authorization: `Bearer ${token}` }, 17e4, abortSignal);
         let json = {};
         try {
           json = JSON.parse(r2.body);
@@ -103052,7 +103112,7 @@ ${lines.join("\n")}` };
       if (!token)
         return { error: "Not authenticated. Run `nexrall-code login` first." };
       try {
-        const r2 = await _httpsPost(`${client_1.API_BASE}/api/code/tools/web_search`, JSON.stringify({ query }), { "Content-Type": "application/json", Authorization: `Bearer ${token}` }, 3e4, abortSignal);
+        const r2 = await _httpsPost(`${client_1.API_BASE}/api/code/tools/web_search`, JSON.stringify({ query, teamId: (0, auth_1.getBillingTeamId)() }), { "Content-Type": "application/json", Authorization: `Bearer ${token}` }, 3e4, abortSignal);
         let json = {};
         try {
           json = JSON.parse(r2.body);
@@ -104831,6 +104891,7 @@ var require_loop = __commonJS({
     exports2.trimToResumableBoundary = trimToResumableBoundary;
     var types_1 = require_types();
     var client_1 = require_client();
+    var index_1 = require_auth();
     var executor_1 = require_executor();
     var agentTypes_1 = require_agentTypes();
     var skills_1 = require_skills();
@@ -104843,7 +104904,7 @@ var require_loop = __commonJS({
     var worktreeEnforcement_1 = require_worktreeEnforcement();
     var agentRegistry_1 = require_agentRegistry();
     var sandbox_1 = require_sandbox();
-    var index_1 = require_plugins();
+    var index_2 = require_plugins();
     var testIntegrity_1 = require_testIntegrity();
     var flaky_1 = require_flaky();
     var claimEvidence_1 = require_claimEvidence();
@@ -104863,7 +104924,7 @@ var require_loop = __commonJS({
           fromSettings = JSON.parse(fs9.readFileSync(p, "utf-8")).hooks ?? {};
       } catch {
       }
-      const fromPlugins = (0, index_1.pluginHooks)(workDir);
+      const fromPlugins = (0, index_2.pluginHooks)(workDir);
       const merged = { ...fromSettings };
       for (const phase of Object.keys(fromPlugins)) {
         const extra = fromPlugins[phase];
@@ -105015,6 +105076,14 @@ var require_loop = __commonJS({
         case "no-balance":
           return `
 \u{1F4B3} Stopped: your balance is empty, so the request was rejected before it started. Top up and send "continue" \u2014 no tokens were used for this turn.
+`;
+        case "no-team-budget":
+          return `
+\u{1F4B3} Stopped: the team budget you are billing to is empty, so the request was rejected before it started. Ask your team admin to add funds \u2014 or switch "Bill to" back to Personal \u2014 and send "continue". No tokens were used for this turn.
+`;
+        case "team-unavailable":
+          return `
+\u26A0\uFE0F Stopped: that team is no longer available for billing (you may have been removed, or the team was suspended). "Bill to" has been reset to your Personal account, so sending "continue" will run on your own wallet.
 `;
         case "stalled":
           return `
@@ -105037,6 +105106,13 @@ ${ctx.repeatError}
 `;
       }
     }
+    var TEAM_SCOPE_ERROR_CODES = /* @__PURE__ */ new Set([
+      "team_unavailable",
+      "team_not_found",
+      "not_a_member",
+      "member_suspended",
+      "team_suspended"
+    ]);
     function resolveMaxIterations(optionValue, settingsRaw) {
       const fromEnv = Number(process.env.NEXRALL_MAX_ITERATIONS);
       const fromSettings = Number(settingsRaw.maxIterations);
@@ -105699,8 +105775,8 @@ ${partial}` : "",
       fast: 2e5,
       // Anthropic, by real model id.
       "claude-sonnet-5": 1e6,
-      "claude-opus-5": 1e6,
-      "claude-fable-5": 1e6,
+      "claude-opus-5-5": 1e6,
+      "claude-fable-5-1": 1e6,
       "claude-haiku-4-5-20251001": 2e5,
       // OpenAI, by real model id (measured).
       "gpt-5.4": 922e3,
@@ -106356,12 +106432,25 @@ Continue the work from here.` }] });
               break;
             }
             const status = err.status;
+            const code = err.code;
+            if (status === 402 && code === "team_budget_exhausted") {
+              const remaining = err.remaining ?? 0;
+              const teamId = err.teamId;
+              options.onTeamBudgetStatus?.({ teamId, remaining });
+              stopReason = options.onTeamBudgetStatus ? "reported-elsewhere" : "no-team-budget";
+              break;
+            }
             if (status === 402) {
               const balance = err.balance ?? 0;
               options.onBalanceStatus?.(balance, true);
               stopReason = options.onBalanceStatus ? "reported-elsewhere" : "no-balance";
               break;
             }
+            if (status === 403 && typeof code === "string" && TEAM_SCOPE_ERROR_CODES.has(code)) {
+              (0, index_1.setBillingTeamId)(null);
+              stopReason = "team-unavailable";
+              break;
+            }
             runSimpleHooks(hooks.OnError, options.workDir);
             throw new types_1.AgentTurnError(`Stream failed: ${err.message}`, trimToResumableBoundary(messages), completedRounds, err);
           }
@@ -154737,8 +154826,8 @@ var CLI_VERSION = (() => {
 })();
 var MODEL_LABELS = {
   "claude-sonnet-5": "Claude Sonnet 5",
-  "claude-opus-5": "Claude Opus 5",
-  "claude-fable-5": "Claude Fable 5",
+  "claude-opus-5-5": "Claude Opus 5.5",
+  "claude-fable-5-1": "Claude Fable 5.1",
   "claude-haiku-4-5-20251001": "Claude Haiku 4.5",
   "gpt-5.6-sol": "GPT-5.6 Sol",
   "gpt-5.6-terra": "GPT-5.6 Terra",
@@ -154753,15 +154842,15 @@ var MODEL_LABELS = {
 var LEGACY_MODEL_ALIASES = {
   turbo: "claude-sonnet-5",
   auto: "claude-sonnet-5",
-  pro: "claude-opus-5",
-  power: "claude-opus-5",
-  ultra: "claude-fable-5",
+  pro: "claude-opus-5-5",
+  power: "claude-opus-5-5",
+  ultra: "claude-fable-5-1",
   fast: "claude-haiku-4-5-20251001"
 };
 var SELECTABLE_MODELS = [
   "claude-sonnet-5",
-  "claude-opus-5",
-  "claude-fable-5",
+  "claude-opus-5-5",
+  "claude-fable-5-1",
   "gpt-5.6-sol",
   "gpt-5.6-terra",
   "gpt-5.6-luna",
@@ -154769,13 +154858,19 @@ var SELECTABLE_MODELS = [
   "gpt-5.4-mini",
   "gpt-4.1",
   "deepseek-flash",
-  "qwen3.7-max",
+  // qwen3.7-max deliberately NOT offered as of 2026-09-27 — it is
+  // `selectable: false` in the backend's services/codeModels.js (every
+  // request 400s with Alibaba's `Arrearage` error), so liveSelectableModelIds()
+  // never returns it. Dropped from this static fallback too so an offline /
+  // older-backend session offers the same list instead of a row that cannot
+  // run. MODEL_LABELS keeps its entry so a session already saved on it still
+  // shows a real name rather than the raw id. Re-add both together.
   "glm-5.3"
 ];
 var MODEL_COST_MULTIPLIER = {
   "claude-sonnet-5": 1.5,
-  "claude-opus-5": 3,
-  "claude-fable-5": 5,
+  "claude-opus-5-5": 3,
+  "claude-fable-5-1": 5,
   // GPT-5.6 family (2026-07 launch, Terra/Luna repriced 2026-07-30) — same
   // relative-to-gpt-4.1/qwen3.7-max (=1x) signal as every other row here,
   // off backend migration 132's per-1M-token seed prices (Sol $5/$30, Terra
@@ -154822,7 +154917,7 @@ function selectableModelIds() {
 function normaliseModelId(model) {
   const raw = (model ?? "").trim();
   if (!raw)
-    return "claude-sonnet-5";
+    return "deepseek-flash";
   return LEGACY_MODEL_ALIASES[raw.toLowerCase()] ?? raw;
 }
 var MODEL_EFFORT_STYLE = {
@@ -155487,7 +155582,7 @@ function printHelp() {
     ["/worktree [list]", "Show this session's worktree isolation status, or list every worktree (start one with `nex --worktree [name]`)"],
     ["/peers [send <name> <msg>|broadcast <msg>]", "List other discoverable Nexrall Code sessions, message one directly, or broadcast to all"],
     ["/help", "Show this help"],
-    ["/model [name]", "Switch model (e.g. claude-opus-5, gpt-5.4)"],
+    ["/model [name]", "Switch model (e.g. claude-opus-5-5, gpt-5.4)"],
     ["/mode [ask|edit|plan|auto]", "Set agent mode"],
     ["/effort [level]", "Set thinking effort level (options depend on the current model \u2014 run /effort with no argument to see them)"],
     ["/yolo", "Auto-approve all permissions"],
@@ -157077,12 +157172,12 @@ program2.command("sessions").description("List or delete saved chat sessions").o
   console.log(source_default.dim("  nex sessions --delete <id>  to remove one"));
   console.log();
 });
-program2.option("-p, --pro", "Use Claude Opus 5 (most capable)").option("-t, --turbo", "Use Claude Sonnet 5 (fast, default)").option("-u, --ultra", "Use Claude Fable 5 (most powerful)").option("-y, --yolo", "Auto-approve all tool calls (no permission prompts)").option("-d, --dir <path>", "Set working directory (default: current directory)").option("-m, --model <name>", "Explicit model, e.g. claude-opus-5 | gpt-5.4 | gpt-4.1").option("-r, --resume [id]", "Resume last session, or a specific session id").option("-w, --worktree [name]", "Isolate this session in its own worktree \u2014 a separate directory (and, in a git repo, its own branch) so it can never overwrite files another session (or you) are touching in the main checkout. Omit a name for an auto-generated one; pass an existing name to resume that same worktree.").option("-e, --effort <level>", "Thinking effort \u2014 real levels depend on the model (e.g. DeepSeek: low|high|max, Qwen: low|high); run `nex --model <id>` then `/effort` with no argument to see a model's scale").option("--no-banner", "Skip the ASCII banner (useful in scripts/pipes)").option("--output-format <fmt>", "One-shot output format: text | json | stream-json (implies auto-approve)").option("--audit [path]", "Log every tool call (and refusal) to a JSONL trail (default: .nexrall/audit/<session>.jsonl)").argument("[prompt...]", "One-shot prompt \u2014 if omitted, starts interactive mode").action(async (promptParts, options) => {
+program2.option("-p, --pro", "Use Claude Opus 5 (most capable)").option("-t, --turbo", "Use Claude Sonnet 5 (fast, default)").option("-u, --ultra", "Use Claude Fable 5 (most powerful)").option("-y, --yolo", "Auto-approve all tool calls (no permission prompts)").option("-d, --dir <path>", "Set working directory (default: current directory)").option("-m, --model <name>", "Explicit model, e.g. claude-opus-5-5 | gpt-5.4 | gpt-4.1").option("-r, --resume [id]", "Resume last session, or a specific session id").option("-w, --worktree [name]", "Isolate this session in its own worktree \u2014 a separate directory (and, in a git repo, its own branch) so it can never overwrite files another session (or you) are touching in the main checkout. Omit a name for an auto-generated one; pass an existing name to resume that same worktree.").option("-e, --effort <level>", "Thinking effort \u2014 real levels depend on the model (e.g. DeepSeek: low|high|max, Qwen: low|high); run `nex --model <id>` then `/effort` with no argument to see a model's scale").option("--no-banner", "Skip the ASCII banner (useful in scripts/pipes)").option("--output-format <fmt>", "One-shot output format: text | json | stream-json (implies auto-approve)").option("--audit [path]", "Log every tool call (and refusal) to a JSONL trail (default: .nexrall/audit/<session>.jsonl)").argument("[prompt...]", "One-shot prompt \u2014 if omitted, starts interactive mode").action(async (promptParts, options) => {
   if (!(0, import_code_core7.isAuthenticated)()) {
     console.error("Not logged in. Run: nex auth");
     process.exit(1);
   }
-  const model = options.model ? options.model : options.ultra ? "claude-fable-5" : options.pro ? "claude-opus-5" : options.turbo ? "claude-sonnet-5" : "claude-sonnet-5";
+  const model = options.model ? options.model : options.ultra ? "claude-fable-5-1" : options.pro ? "claude-opus-5-5" : options.turbo ? "claude-sonnet-5" : "deepseek-flash";
   const workDir = options.dir ? path7.resolve(options.dir) : process.cwd();
   if (options.yolo)
     setAutoApprove("all");

package/package.json

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