@narumitw/pi-btw 0.59.0 → 0.60.0

package/README.md

@@ -59,7 +59,11 @@ Read the [workflow guide](./docs/workflows.md) for context selection, copying, s
 ## ⚙️ Settings
 
 By default, `/btw` uses the current session model.
-To use an independent model for side questions, create:
+Open `/btw` → **Settings** → **Model** to choose an available model or **Same as main thread** to remove the override.
+The searchable picker follows the current Pi model scope and saves immediately without changing the main session model.
+A manually configured available model outside that scope remains active and visible until you explicitly choose another option.
+
+You can also edit the user settings file directly:
 
 ```text
 $PI_CODING_AGENT_DIR/pi-btw.json
@@ -83,6 +87,7 @@ The configured model must exist in Pi's model registry and have usable credentia
 If it is missing or unauthenticated, pi-btw warns and falls back to the current session model.
 If neither model is available, `/btw` reports an error and stops.
 This selection affects only `/btw`; it does not change the main session model.
+Model changes apply when the next new or resumed side thread starts.
 
 Pi calls its reasoning setting the **thinking level**.
 In Settings, choose **Same as main thread** to start each new side thread from the main thread's current thinking level.

package/dist/index.ts

@@ -4,9 +4,9 @@
 // src/btw.ts
 import {
   clampThinkingLevel,
-  getSupportedThinkingLevels
+  getSupportedThinkingLevels as getSupportedThinkingLevels2
 } from "@earendil-works/pi-ai";
-import { BorderedLoader } from "@earendil-works/pi-coding-agent";
+import { BorderedLoader as BorderedLoader2 } from "@earendil-works/pi-coding-agent";
 
 // src/bring-to-main.ts
 import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
@@ -1302,6 +1302,12 @@ import {
 } from "@earendil-works/pi-coding-agent";
 import { Key as Key3, matchesKey as matchesKey3 } from "@earendil-works/pi-tui";
 
+// src/menu.ts
+import { getSupportedThinkingLevels } from "@earendil-works/pi-ai";
+import {
+  BorderedLoader
+} from "@earendil-works/pi-coding-agent";
+
 // src/settings.ts
 import { randomUUID } from "node:crypto";
 import { constants } from "node:fs";
@@ -1628,6 +1634,10 @@ function applyBtwSettingsPatch(current, patch) {
     if (Object.keys(keys).length) updated.keybindings = keys;
     else delete updated.keybindings;
   }
+  if (Object.hasOwn(patch, "model")) {
+    if (patch.model === void 0) delete updated.model;
+    else updated.model = patch.model;
+  }
   if (Object.hasOwn(patch, "thinkingLevel")) {
     if (patch.thinkingLevel === void 0) delete updated.thinkingLevel;
     else updated.thinkingLevel = patch.thinkingLevel;
@@ -1661,12 +1671,30 @@ function formatError2(error) {
 var SAME_AS_MAIN_THREAD = "Same as main thread";
 async function showBtwCommandMenu(ctx, options) {
   if (ctx.mode !== "tui") return "closed";
-  const { defineMenu, runMenu } = await import("@narumitw/pi-tui-kit");
+  const { defineMenu, runMenu, sanitizeTerminalText } = await import("@narumitw/pi-tui-kit");
   if (ctx.signal?.aborted) return "closed";
   const settingsPath = options.settingsPath ?? btwSettingsPath();
   const readSettings = options.readSettings ?? readBtwSettings;
   const updateSettings = options.updateSettings ?? updateBtwSettings;
-  const levels = options.availableThinkingLevels.length > 0 ? [...options.availableThinkingLevels] : ["off"];
+  const getAvailable = ctx.modelRegistry.getAvailable;
+  const allAvailableModels = deduplicateModels(
+    options.availableModels ?? (typeof getAvailable === "function" ? getAvailable.call(ctx.modelRegistry) : ctx.modelRegistry.getAll())
+  );
+  const currentModel = options.currentModel ?? ctx.model;
+  const scopedModels = options.scopedModels ?? ctx.scopedModels ?? [];
+  const selectableModels = availableModelsInScope(allAvailableModels, scopedModels);
+  const modelItemIds = new Map(selectableModels.map((model, index) => [model, `btw-settings-model:${index}`]));
+  const modelsByItemId = new Map(selectableModels.map((model) => [modelItemIds.get(model), model]));
+  const safeModelMetadata = (value, fallback) => {
+    const safe = sanitizeTerminalText(value).trim() || fallback;
+    return [...safe].slice(0, 512).join("");
+  };
+  const displayModelReference = (model) => `${safeModelMetadata(model.id, "unknown model")} [${safeModelMetadata(model.provider, "unknown provider")}]`;
+  const rawModelReference = (model) => {
+    const reference = `${model.provider}/${model.id}`;
+    const parsed = parseBtwModelReference(reference);
+    return parsed?.provider === model.provider && parsed.modelId === model.id ? reference : void 0;
+  };
   const displaySettingsPath = sanitizeSingleLine(settingsPath);
   const resumeThreads = options.resumeThreads ?? [];
   let startSelected = false;
@@ -1725,6 +1753,48 @@ async function showBtwCommandMenu(ctx, options) {
       return { kind: "rejected" };
     }
   };
+  const saveModel = async (model, signal) => {
+    const modelReference = model ? rawModelReference(model) : void 0;
+    if (model && !modelReference) return { kind: "cancelled" };
+    const result2 = await ctx.ui.custom(
+      (tui, theme, _keybindings, done) => {
+        const loader = new BorderedLoader(tui, theme, "Saving Pi BTW model...");
+        const ownerController = new AbortController();
+        const saveSignal = AbortSignal.any([signal, loader.signal, ownerController.signal]);
+        let settled = false;
+        const finish = (value) => {
+          if (settled) return;
+          settled = true;
+          done(value);
+        };
+        const cancel = () => finish({ kind: "cancelled" });
+        loader.onAbort = cancel;
+        saveSignal.addEventListener("abort", cancel, { once: true });
+        queueMicrotask(() => {
+          void (async () => {
+            await Promise.resolve();
+            if (saveSignal.aborted) return;
+            try {
+              await updateSettings({ model: modelReference }, { settingsPath, signal: saveSignal });
+              finish({ kind: "saved" });
+            } catch (error) {
+              finish(saveSignal.aborted ? { kind: "cancelled" } : { kind: "failed", error });
+            }
+          })();
+        });
+        return {
+          render: (width) => loader.render(width),
+          invalidate: () => loader.invalidate(),
+          handleInput: (data) => loader.handleInput(data),
+          dispose() {
+            ownerController.abort(new DOMException("Pi BTW model save disposed", "AbortError"));
+            loader.dispose();
+          }
+        };
+      }
+    );
+    return result2 ?? { kind: "cancelled" };
+  };
   const loadState = async () => {
     const loaded = await readSettings(settingsPath);
     if (loaded.kind === "invalid") {
@@ -1732,13 +1802,79 @@ async function showBtwCommandMenu(ctx, options) {
     }
     return { kind: "valid", settings: loaded.kind === "loaded" ? loaded.settings : {} };
   };
-  const currentMainThinkingLevel = clampToAvailableThinkingLevel(options.currentThinkingLevel, levels);
-  const displayThinkingLevel = (settings) => settings.thinkingLevel === void 0 ? SAME_AS_MAIN_THREAD : clampToAvailableThinkingLevel(settings.thinkingLevel, levels);
-  const displayThinkingSummary = (settings) => settings.thinkingLevel === void 0 ? `${SAME_AS_MAIN_THREAD} (currently ${currentMainThinkingLevel})` : displayThinkingLevel(settings);
+  const configuredModel = (settings) => {
+    if (!settings.model) return void 0;
+    const reference = parseBtwModelReference(settings.model);
+    return reference ? allAvailableModels.find((model) => model.provider === reference.provider && model.id === reference.modelId) : void 0;
+  };
+  const selectableConfiguredModel = (settings) => {
+    const configured = configuredModel(settings);
+    return configured ? selectableModels.find((model) => sameModel(model, configured)) : void 0;
+  };
+  const thinkingLevels = (settings) => {
+    const overridden = options.availableThinkingLevels;
+    const effectiveModel = configuredModel(settings) ?? currentModel;
+    const available = overridden && overridden.length > 0 ? overridden : effectiveModel ? getSupportedThinkingLevels(effectiveModel) : BTW_THINKING_LEVELS;
+    return available.length > 0 ? [...available] : ["off"];
+  };
+  const currentMainThinkingLevel = (settings) => clampToAvailableThinkingLevel(options.currentThinkingLevel, thinkingLevels(settings));
+  const displayThinkingLevel = (settings) => settings.thinkingLevel === void 0 ? SAME_AS_MAIN_THREAD : clampToAvailableThinkingLevel(settings.thinkingLevel, thinkingLevels(settings));
+  const displayThinkingSummary = (settings) => settings.thinkingLevel === void 0 ? `${SAME_AS_MAIN_THREAD} (currently ${currentMainThinkingLevel(settings)})` : displayThinkingLevel(settings);
   const displayRememberSummary = (settings) => {
     const value = effectiveRememberThinkingLevelChanges(settings) ? "On" : "Off";
     return settings.thinkingLevel === void 0 ? `${value} (fixed levels only)` : value;
   };
+  const displayModelValue = (settings) => {
+    if (!settings.model) {
+      return currentModel ? `${SAME_AS_MAIN_THREAD} (${displayModelReference(currentModel)})` : SAME_AS_MAIN_THREAD;
+    }
+    const available = configuredModel(settings);
+    if (!available) return `${SAME_AS_MAIN_THREAD} \xB7 ${safeModelMetadata(settings.model, "unknown model")} unavailable`;
+    const reference = displayModelReference(available);
+    return selectableConfiguredModel(settings) ? reference : `${reference} \xB7 outside current scope`;
+  };
+  const modelItems = (settings) => {
+    const configured = configuredModel(settings);
+    const selectable = selectableConfiguredModel(settings);
+    const retained = settings.model && !selectable;
+    return [
+      {
+        id: "same-as-main",
+        label: SAME_AS_MAIN_THREAD,
+        description: currentModel ? `Currently ${displayModelReference(currentModel)}` : "Use the main thread model when /btw starts."
+      },
+      ...selectableModels.map((model) => {
+        const reference = displayModelReference(model);
+        const name = safeModelMetadata(model.name ?? "", "");
+        const validReference = rawModelReference(model);
+        return {
+          id: modelItemIds.get(model),
+          label: reference,
+          ...name ? { details: [`Model Name: ${name}`] } : {},
+          searchText: [reference, name].filter(Boolean).join(" "),
+          ...!validReference ? {
+            disabled: true,
+            disabledReason: "This model identity cannot be stored in pi-btw.json."
+          } : {}
+        };
+      }),
+      ...retained ? [
+        {
+          id: "configured-model",
+          label: configured ? displayModelReference(configured) : safeModelMetadata(settings.model, "unknown model"),
+          ...configured ? { description: "Configured outside the current model scope; retained until changed." } : {
+            disabled: true,
+            disabledReason: "Configured model is unavailable; /btw falls back to the main model."
+          }
+        }
+      ] : []
+    ];
+  };
+  const selectedModelItemId = (settings) => {
+    const selected = selectableConfiguredModel(settings);
+    return selected ? modelItemIds.get(selected) : settings.model ? "configured-model" : "same-as-main";
+  };
+  const currentModelItemId = (settings) => settings.model && configuredModel(settings) ? selectedModelItemId(settings) : "same-as-main";
   const menu = defineMenu({
     start: "main",
     screens: {
@@ -1746,6 +1882,7 @@ async function showBtwCommandMenu(ctx, options) {
         kind: "actions",
         title: "Pi BTW",
         lines: [
+          `Model: ${displayModelValue(state.settings)}`,
           `Thinking: ${displayThinkingSummary(state.settings)} \xB7 Remember changes: ${displayRememberSummary(state.settings)}`,
           `Copy on select: ${effectiveFullscreenCopyOnSelect(state.settings) ? "On" : "Off"}`
         ],
@@ -1773,7 +1910,7 @@ async function showBtwCommandMenu(ctx, options) {
           {
             id: "settings",
             label: "Settings",
-            description: "Choose thinking, keybindings, and selection copying",
+            description: "Choose model, thinking, keybindings, and selection copying",
             to: state.kind === "invalid" ? "invalid" : "settings"
           }
         ],
@@ -1797,12 +1934,19 @@ async function showBtwCommandMenu(ctx, options) {
         title: "Pi BTW Settings",
         lines: [`User settings \xB7 ${displaySettingsPath}`],
         items: [
+          {
+            id: "model",
+            label: "Model",
+            description: "Choose the model for future pi-btw side threads without changing the main session.",
+            currentValue: displayModelValue(state.settings),
+            action: "open-model"
+          },
           {
             id: "thinkingLevel",
             label: "Thinking level",
-            description: `Set the starting level for future pi-btw side threads. Currently ${currentMainThinkingLevel}.`,
+            description: `Set the starting level for future pi-btw side threads. Currently ${currentMainThinkingLevel(state.settings)}.`,
             currentValue: displayThinkingLevel(state.settings),
-            values: [SAME_AS_MAIN_THREAD, ...levels],
+            values: [SAME_AS_MAIN_THREAD, ...thinkingLevels(state.settings)],
             action: "set-thinking"
           },
           {
@@ -1830,6 +1974,21 @@ async function showBtwCommandMenu(ctx, options) {
           }))
         ]
       }),
+      model: ({ state }) => ({
+        kind: "choice",
+        title: "Pi BTW Model",
+        lines: [
+          "Same as main thread is the default and fallback when a configured model is unavailable.",
+          ...state.settings.model && !selectableConfiguredModel(state.settings) ? [`Configured: ${displayModelValue(state.settings)}`] : []
+        ],
+        items: modelItems(state.settings),
+        action: "set-model",
+        currentItemId: currentModelItemId(state.settings),
+        initialItemId: selectedModelItemId(state.settings),
+        enableSearch: true,
+        viewportSize: 10,
+        hint: "back"
+      }),
       shortcut: ({ state }) => ({
         kind: "actions",
         title: shortcutLabels[shortcut],
@@ -1866,6 +2025,26 @@ async function showBtwCommandMenu(ctx, options) {
       },
       "save-shortcut": ({ state, value, signal }) => saveShortcut(state, value?.trim() ?? "", signal),
       "reset-shortcut": ({ state, signal }) => saveShortcut(state, void 0, signal),
+      "open-model": async () => ({ kind: "to", screen: "model" }),
+      "set-model": async ({ state, itemId, signal }) => {
+        if (itemId === "configured-model" && configuredModel(state.settings)) {
+          return { kind: "back" };
+        }
+        const model = itemId ? modelsByItemId.get(itemId) : void 0;
+        if (itemId !== "same-as-main" && (!model || !rawModelReference(model))) return { kind: "rejected" };
+        const result2 = await saveModel(model, signal);
+        if (result2.kind === "failed") {
+          notifySaveFailure(ctx, result2.error);
+          return { kind: "rejected" };
+        }
+        if (result2.kind === "cancelled" || signal.aborted) return { kind: "close" };
+        notifySafely(
+          ctx,
+          model ? `Pi BTW model: ${displayModelReference(model)}.` : `Pi BTW model: ${SAME_AS_MAIN_THREAD}.`,
+          "info"
+        );
+        return { kind: "back" };
+      },
       start: async () => {
         startSelected = true;
         return { kind: "close" };
@@ -1881,8 +2060,9 @@ async function showBtwCommandMenu(ctx, options) {
         resumedThreadId = itemId;
         return { kind: "close" };
       },
-      "set-thinking": async ({ value, signal }) => {
+      "set-thinking": async ({ state, value, signal }) => {
         if (!value) return { kind: "rejected" };
+        const levels = thinkingLevels(state.settings);
         const patch = value === SAME_AS_MAIN_THREAD ? { thinkingLevel: void 0 } : levels.includes(value) ? { thinkingLevel: value } : void 0;
         if (!patch) return { kind: "rejected" };
         try {
@@ -1985,6 +2165,21 @@ async function runBtwMenuPreservingEditor(ctx, run, onKeybindings) {
   }
   return result;
 }
+function deduplicateModels(models) {
+  return models.filter((model, index) => models.findIndex((candidate) => sameModel(candidate, model)) === index);
+}
+function availableModelsInScope(availableModels, scopedModels) {
+  if (scopedModels.length === 0) return [...availableModels];
+  return deduplicateModels(
+    scopedModels.flatMap((entry) => {
+      const available = availableModels.find((model) => sameModel(model, entry.model));
+      return available ? [available] : [];
+    })
+  );
+}
+function sameModel(left, right) {
+  return left.provider === right.provider && left.id === right.id;
+}
 function clampToAvailableThinkingLevel(requested, available) {
   if (available.includes(requested)) return requested;
   const requestedIndex = BTW_THINKING_LEVELS.indexOf(requested);
@@ -3100,17 +3295,8 @@ function btw(pi, dependencies = {}) {
   });
 }
 async function showCommandMenuForBtw(pi, ctx, resumeThreads) {
-  const currentModel = ctx.model;
-  const availableModels = ctx.modelRegistry.getAll();
-  const currentThinkingLevel = pi.getThinkingLevel();
-  const loaded = await readBtwSettings();
-  const settings = loaded.kind === "loaded" ? loaded.settings : {};
-  const configured = settings.model ? parseBtwModelReference(settings.model) : void 0;
-  const configuredModel = configured ? availableModels.find((model2) => model2.provider === configured.provider && model2.id === configured.modelId) : void 0;
-  const model = configuredModel ?? currentModel;
   return showBtwCommandMenu(ctx, {
-    currentThinkingLevel,
-    availableThinkingLevels: model ? getSupportedThinkingLevels(model) : BTW_THINKING_LEVELS,
+    currentThinkingLevel: pi.getThinkingLevel(),
     resumeThreads
   });
 }
@@ -3124,7 +3310,7 @@ async function loadSettingsForCommand(ctx) {
 }
 async function resolveBtwModelWithLoader(settings, ctx) {
   return ctx.ui.custom((tui, theme, _keybindings, done) => {
-    const loader = new BorderedLoader(tui, theme, "Resolving /btw model credentials...");
+    const loader = new BorderedLoader2(tui, theme, "Resolving /btw model credentials...");
     let settled = false;
     loader.onAbort = () => {
       if (settled) return;
@@ -3167,7 +3353,7 @@ async function runBtwThread({
   const persistThinkingLevel = dependencies.persistThinkingLevel ?? ((level) => updateBtwSettings({ thinkingLevel: level }, { settingsPath }));
   const now = dependencies.now ?? Date.now;
   const thread = state?.thread ?? createSideThread(buildConversationContext(ctx.sessionManager.getBranch()));
-  const thinkingLevels = getSupportedThinkingLevels(selected.model);
+  const thinkingLevels = getSupportedThinkingLevels2(selected.model);
   const pendingWrites = /* @__PURE__ */ new Set();
   const steeringQuestions = [];
   let activeThinkingLevel = clampThinkingLevel(selected.model, state?.thinkingLevel ?? thinkingLevel);