nexrall-code 0.5.135 → 0.5.136

package/dist/index.js

@@ -159144,19 +159144,26 @@ function decideChoiceKey(spec, sel, char, key, now, openedAt) {
   const idx = spec.options.findIndex((o) => o.key.toLowerCase() === char.toLowerCase());
   return idx >= 0 ? { kind: "pick", idx } : { kind: "none" };
 }
-function choiceView(spec, sel) {
+function choiceView(spec, sel, maxRows) {
   const n = spec.options.length;
+  const size = maxRows && maxRows > 0 ? Math.min(maxRows, n) : n;
+  const start = windowStart(Math.min(Math.max(sel, 0), Math.max(n - 1, 0)), n, size);
+  const rows = spec.options.slice(start, start + size).map((o, k) => {
+    const i2 = start + k;
+    return { selected: i2 === sel, text: `${i2 === sel ? "\u203A" : " "} ${i2 + 1}. ${o.label}` };
+  });
+  const range = size < n ? `rows ${start + 1}-${start + size} of ${n} \xB7 ` : "";
   return {
     title: spec.title,
     detail: spec.detail,
     risk: spec.risk,
-    rows: spec.options.map((o, i2) => ({
-      selected: i2 === sel,
-      text: `${i2 === sel ? "\u203A" : " "} ${i2 + 1}. ${o.label}`
-    })),
-    hint: `  \u2191\u2193 select \xB7 1-${Math.min(n, 9)} pick \xB7 Enter confirm \xB7 Esc = no`
+    rows,
+    hint: `  \u2191\u2193 select \xB7 ${range}1-${Math.min(n, 9)} pick \xB7 Enter confirm \xB7 Esc = no`
   };
 }
+function choiceRowBudget(terminalRows, max = 12) {
+  return Math.max(3, Math.min(max, terminalRows - 12));
+}
 function denyIndex(spec) {
   return spec.options.findIndex((o) => o.key.toLowerCase() === "n");
 }
@@ -159359,6 +159366,14 @@ var App2 = ({ onReady }) => {
   const onRewind = (0, import_react35.useCallback)((cb) => {
     onRewindRef.current = cb;
   }, []);
+  const onModelRef = (0, import_react35.useRef)(null);
+  const onModel = (0, import_react35.useCallback)((cb) => {
+    onModelRef.current = cb;
+  }, []);
+  const onEffortRef = (0, import_react35.useRef)(null);
+  const onEffort = (0, import_react35.useCallback)((cb) => {
+    onEffortRef.current = cb;
+  }, []);
   const onHelpRef = (0, import_react35.useRef)(null);
   const onHelp = (0, import_react35.useCallback)((cb) => {
     onHelpRef.current = cb;
@@ -159759,6 +159774,17 @@ var App2 = ({ onReady }) => {
       });
       return;
     }
+    if (key.meta && (char === "m" || char === "M" || char === "t" || char === "T")) {
+      if (askResolverRef.current)
+        return;
+      const which = char.toLowerCase() === "m" ? "model" : "effort";
+      if (busyRef.current) {
+        setHintText(`The ${which} can be changed when this turn finishes`);
+        return;
+      }
+      (which === "model" ? onModelRef.current : onEffortRef.current)?.();
+      return;
+    }
     if (key.ctrl && char === "l") {
       forceFullRedrawRef?.();
       return;
@@ -159974,7 +160000,9 @@ var App2 = ({ onReady }) => {
       onExpand,
       onBackground,
       onJump,
-      onEscape
+      onEscape,
+      onModel,
+      onEffort
     });
   }, []);
   const slices = renderInputSlices(line, cursorPos);
@@ -160042,7 +160070,7 @@ var App2 = ({ onReady }) => {
     menuReserveRef.current,
     slashMenu ? slashMenu.rows.length + 1 : mentionMenu ? mentionMenu.rows.length + 1 : 0
   );
-  const choiceVm = choiceRef.current ? choiceView(choiceRef.current.spec, choiceRef.current.sel) : null;
+  const choiceVm = choiceRef.current ? choiceView(choiceRef.current.spec, choiceRef.current.sel, choiceRowBudget(process.stdout.rows ?? 24)) : null;
   const riskColor = choiceVm?.risk === "high" ? "red" : choiceVm?.risk === "medium" ? "yellow" : "green";
   return /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Static, { items, key: staticKey }, (item) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: item.id }, item.content)), live ? /* @__PURE__ */ import_react35.default.createElement(Text, null, live) : null, choiceVm ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Text, { bold: true, wrap: "truncate-end" }, choiceVm.title), choiceVm.detail ? /* @__PURE__ */ import_react35.default.createElement(Text, { wrap: "truncate-end", color: choiceVm.risk ? riskColor : void 0, dimColor: !choiceVm.risk }, choiceVm.risk ? `${choiceVm.risk.toUpperCase()} RISK \xB7 ` : "", choiceVm.detail) : null, choiceVm.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.text, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, choiceVm.hint)) : null, searchVm ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, /* @__PURE__ */ import_react35.default.createElement(Text, { color: searchVm.failed ? "red" : "cyan", wrap: "truncate-end" }, "  " + searchVm.label), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, SEARCH_HINT)) : null, menuReserveRef.current > 0 ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column", justifyContent: "flex-end", minHeight: menuReserveRef.current }, mentionMenu ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, mentionMenu.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.key, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, mentionMenu.hint)) : null, slashMenu ? /* @__PURE__ */ import_react35.default.createElement(Box_default, { flexDirection: "column" }, slashMenu.rows.map((r2) => /* @__PURE__ */ import_react35.default.createElement(Text, { key: r2.key, wrap: "truncate-end", inverse: r2.selected }, r2.text)), /* @__PURE__ */ import_react35.default.createElement(Text, { dimColor: true, wrap: "truncate-end" }, slashMenu.hint)) : null) : null, /* @__PURE__ */ import_react35.default.createElement(
     Box_default,
@@ -160262,6 +160290,52 @@ function rewindChoices(cps) {
   return { options, ids: newest.map((c) => c.id) };
 }
 
+// src/ui/pickList.ts
+var PICK_LABEL_MAX = 34;
+var PICK_NOTE_MAX = 30;
+var CURRENT_MARK = "current";
+function buildPickList(o) {
+  if (!o.items.length)
+    return null;
+  const labelMax = o.labelMax ?? PICK_LABEL_MAX;
+  const values = [];
+  const options = o.items.map((it, i2) => {
+    values.push(it.value);
+    const parts = [clip4(it.label, labelMax)];
+    if (it.note)
+      parts.push(clip4(it.note, PICK_NOTE_MAX));
+    if (o.current !== void 0 && it.value === o.current)
+      parts.push(CURRENT_MARK);
+    return { key: String(i2 + 1), label: parts.join("  ") };
+  });
+  options.push({ key: "n", label: o.cancelLabel ?? "Cancel" });
+  const currentIndex = o.current ? values.indexOf(o.current) : -1;
+  return {
+    spec: {
+      title: o.title,
+      detail: o.detail,
+      risk: o.risk ?? "low",
+      options,
+      defaultIndex: currentIndex >= 0 ? currentIndex : 0
+    },
+    values,
+    currentIndex
+  };
+}
+function pickOutcome(list, index) {
+  const value = list.values[index];
+  return value === void 0 ? { kind: "cancel" } : { kind: "pick", value };
+}
+function currentNotOfferedLine(label) {
+  return `Current: ${label} \u2014 not in the list below, so no row is marked.`;
+}
+
+// src/modelSwitch.ts
+function planModelSwitch(next, effort, clamp) {
+  const clamped = clamp(effort, next);
+  return { model: next, effort: clamped, effortChanged: clamped !== effort };
+}
+
 // src/ui/backgroundShells.ts
 var MAX_KEPT = 64e3;
 var BackgroundShells = class {
@@ -160491,10 +160565,6 @@ var MODEL_COST_MULTIPLIER = {
   // 130_glm_5_3_pricing.sql's own caveat if Z.ai ships a GLM-5.3-specific rate.
   "glm-5.3": 0.6
 };
-function modelWithCostHint(id) {
-  const mult = (0, import_code_core9.liveCostMultiplierFor)(id, MODEL_COST_MULTIPLIER[id]);
-  return mult === void 0 ? id : `${id} (${mult}x)`;
-}
 var NO_VISION_MODELS = /* @__PURE__ */ new Set(["qwen3.7-max", "glm-5.3"]);
 var NO_PDF_MODELS = /* @__PURE__ */ new Set([
   "gpt-5.6-sol",
@@ -161539,9 +161609,9 @@ 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-5, gpt-5.4)"],
+    ["/model [name]", "Pick a model from a list (or name one: /model claude-opus-5-5)"],
     ["/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)"],
+    ["/effort [level]", "Pick a thinking effort level (the scale is the current model's own \u2014 /effort opens a list)"],
     ["/yolo", "Auto-approve all permissions"],
     ["/balance", "Show what is paying (personal wallet or team) and what is left"],
     ["/team [use <id|personal>]", "List your teams, or switch what usage is billed to"],
@@ -161590,6 +161660,7 @@ function printHelp() {
     ["Ctrl+W / Alt+\u232B", "Delete the previous word"],
     ["Ctrl+U / Ctrl+K", "Delete to the start / end of the line (Ctrl+Y pastes it back)"],
     ["Shift+Tab", "Cycle the mode: ask \u2192 edit \u2192 auto \u2192 plan (when no turn is running)"],
+    ["Alt+M / Alt+T", "Pick the model / the thinking effort without typing a command"],
     ["Ctrl+R", "Search your prompt history: type to filter, Ctrl+R older, Enter use it, Esc cancel"],
     ["Ctrl+G", "Edit the draft in $VISUAL / $EDITOR"],
     ["Esc Esc", "At an empty prompt: pick a checkpoint to rewind to (same as /rewind)"],
@@ -162037,10 +162108,81 @@ ${text}` : "");
       }
     }
   };
+  const applyModel = (id) => {
+    const plan = planModelSwitch(id, effortLevel, clampEffortForModel);
+    modelAlias = plan.model;
+    effortLevel = plan.effort;
+    updateFooter();
+    console.log(source_default.green(`  Model \u2192 ${source_default.bold(resolveModelLabel(modelAlias))}`));
+    if (plan.effortChanged)
+      console.log(source_default.dim(`  Effort reset \u2192 ${effortLevel} (previous level not available on this model)`));
+  };
+  const applyEffort = (level) => {
+    effortLevel = level;
+    console.log(source_default.green(`  Effort \u2192 ${source_default.bold(level)}`));
+  };
+  const modelPickerNote = (id) => {
+    const parts = [];
+    const mult = (0, import_code_core9.liveCostMultiplierFor)(id, MODEL_COST_MULTIPLIER[id]);
+    if (mult !== void 0 && mult !== 1)
+      parts.push(`${mult}x`);
+    if (needsVisionSidecar(id))
+      parts.push("images via Sonnet");
+    if (needsPdfSidecar(id))
+      parts.push("no PDFs");
+    return parts.length ? parts.join(" \xB7 ") : void 0;
+  };
+  const openModelPicker = async () => {
+    if (!(rl instanceof InkReadlineAdapter))
+      return;
+    const list = buildPickList({
+      title: "Switch model",
+      detail: "Takes effect on the next turn \u2014 the conversation and your files are untouched",
+      items: selectableModelIds().map((id) => ({ value: id, label: resolveModelLabel(id), note: modelPickerNote(id) })),
+      current: modelAlias
+    });
+    if (!list) {
+      console.log(source_default.red("  No model list available (offline and no cached catalogue)."));
+      return;
+    }
+    if (list.currentIndex < 0)
+      console.log(source_default.dim("  " + currentNotOfferedLine(resolveModelLabel(modelAlias))));
+    const out = pickOutcome(list, await rl.askChoice(list.spec));
+    if (out.kind === "cancel")
+      return;
+    applyModel(out.value);
+  };
+  const openEffortPicker = async () => {
+    if (!(rl instanceof InkReadlineAdapter))
+      return;
+    const config = effortConfigFor(modelAlias);
+    if (config.levels.length < 2) {
+      console.log(source_default.dim(`  ${resolveModelLabel(modelAlias)} has one thinking setting (${config.levels[0] ?? "\u2014"} \xB7 ${config.names[0] ?? "not configurable"}); there is nothing to pick.`));
+      return;
+    }
+    const list = buildPickList({
+      title: `Thinking effort \u2014 ${resolveModelLabel(modelAlias)}`,
+      detail: "Higher levels think longer before answering; the scale belongs to this model",
+      items: config.levels.map((v, i2) => ({ value: v, label: v, note: config.names[i2] })),
+      current: effortLevel
+    });
+    if (!list)
+      return;
+    const out = pickOutcome(list, await rl.askChoice(list.spec));
+    if (out.kind === "cancel")
+      return;
+    applyEffort(out.value);
+  };
   if (interactive) {
     getInkTerminal().onHelp(() => {
       printHelp();
     });
+    getInkTerminal().onModel(() => {
+      void openModelPicker();
+    });
+    getInkTerminal().onEffort(() => {
+      void openEffortPicker();
+    });
     getInkTerminal().onJump((delta) => {
       jumpTranscript(messages, delta);
       updateFooter();
@@ -162477,17 +162619,9 @@ ${dirList}`;
           const requested = arg.trim();
           const models = selectableModelIds();
           if (!requested) {
-            console.log(source_default.dim(`  Current: ${source_default.cyan(resolveModelLabel(modelAlias))}`));
-            console.log(source_default.dim(`  Options: ${models.map(modelWithCostHint).join(" \xB7 ")}`));
+            await openModelPicker();
           } else if (models.includes(normaliseModelId(requested))) {
-            modelAlias = normaliseModelId(requested);
-            const clamped = clampEffortForModel(effortLevel, modelAlias);
-            const effortChanged = clamped !== effortLevel;
-            effortLevel = clamped;
-            console.log(source_default.green(`  Model \u2192 ${source_default.bold(resolveModelLabel(modelAlias))}`));
-            if (effortChanged) {
-              console.log(source_default.dim(`  Effort reset \u2192 ${effortLevel} (previous level not available on this model)`));
-            }
+            applyModel(normaliseModelId(requested));
           } else {
             console.log(source_default.red(`  Unknown: ${requested}. Options: ${models.join(", ")}`));
           }
@@ -162521,10 +162655,9 @@ ${dirList}`;
           const config = effortConfigFor(modelAlias);
           const optionsLine = config.levels.map((v, i2) => `${v} (${config.names[i2]})`).join(" \xB7 ");
           if (!effortArg) {
-            console.log(source_default.dim(`  Current: ${source_default.cyan(effortLevel)}  Options: ${optionsLine}`));
+            await openEffortPicker();
           } else if (config.levels.includes(effortArg)) {
-            effortLevel = effortArg;
-            console.log(source_default.green(`  Effort \u2192 ${source_default.bold(effortArg)}`));
+            applyEffort(effortArg);
           } else {
             console.log(source_default.red(`  Unknown: ${effortArg}. Options: ${optionsLine}`));
           }

package/package.json

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