mindweave 2.4.8 → 2.4.9

package/README.md

@@ -70,8 +70,9 @@ else is configured inside a session.
 
 Short version, one line each. The depth is in the linked pages.
 
-- **14 providers, 52 models, one key** — DeepSeek, Anthropic, OpenAI, Gemini, xAI,
-  Mistral, Groq, Cerebras, Qwen, Kimi, GLM, Meta, MiniMax, Tencent. Only the driver you
+- **15 providers, 53 models, one key** — DeepSeek, Anthropic, OpenAI, Gemini, xAI,
+  Mistral, Groq, Cerebras, Qwen, Kimi, GLM, Meta, MiniMax, Tencent, plus every
+  tool-capable model on OpenRouter. Only the driver you
   use is loaded. Switch with `/provider` and `/model`; remembered per project.
   [PROVIDERS.md](src/drivers/PROVIDERS.md)
 - **Real tools** — read and edit files, multi-file edits, ripgrep search, a shell with

package/dist/cli/App.js

@@ -46,10 +46,10 @@ import { TrustGate } from "./components/TrustGate.js";
 import { rootBreadth, breadthWarning, trustPersists, isTrusted, rememberTrust } from "./trust.js";
 import { projectDir } from "../memory/store.js";
 import { parseUndoArg, undoNotice } from "../tools/checkpoints.js";
-import { DEFAULT_MODEL_CONFIG, thinkLevels, thinkLabel, modelLabel, modelsOfProvider, providerOf, usableFallback, needsKeySetup, withModel, saveModelConfig, refreshModels } from "../dynamo/model.js";
+import { DEFAULT_MODEL_CONFIG, thinkLevels, thinkLabel, modelLabel, modelsOfProvider, providerOf, usableFallback, needsKeySetup, withModel, saveModelConfig, refreshModels, DISCOVERY_TTL_MS } from "../dynamo/model.js";
 import { allProviders, manifestForModel, modelsOf } from "../drivers/registry.js";
 import { orderProviders, orderModels } from "./pickerOrder.js";
-import { accessRefusal } from "../drivers/providerError.js";
+import { accessRefusal, providerOutage } from "../drivers/providerError.js";
 import { resolveAttachments, stripAttachments } from "./attachments.js";
 import { collapsePastes, wrapPastedText } from "../memory/pastedText.js";
 import { createDropHandles, expandHandles } from "./dropHandles.js";
@@ -89,7 +89,7 @@ import { perf, perfEnabled } from "./perfLog.js";
 import { isGroupMember, groupSettled, planGroupReveal, planStandaloneReveal, resultQueued, STANDALONE_HOLD_MS } from "./groupReveal.js";
 import { drain as drainQueue, popAll as popAllQueued, queueMessage, takeSteerable, visibleQueue } from "./messageQueue.js";
 import { routeCommand, parseCommandLine, unknownCommandMessage } from "./commandRoute.js";
-import { resolveChoice } from "./commandArgs.js";
+import { resolveChoice, splitModelArg } from "./commandArgs.js";
 import { carryAcrossFreshSession } from "./sessionCarry.js";
 import { toolDisplay, isGroupable, KIND_COLOR } from "./toolDisplay.js";
 import { workingVerb } from "./workingVerb.js";
@@ -141,6 +141,11 @@ function orderedProviderList() {
 function orderedModelList(model) {
     return orderModels(modelsOfProvider(model));
 }
+/** The same order, for a provider named by id rather than by one of its models. */
+function orderedModelsOf(providerId) {
+    const provider = allProviders().find((p) => p.id === providerId);
+    return provider ? orderModels(modelsOf(provider)) : [];
+}
 // After you pick a session in /continue, the three ways to resume it.
 const RESUME_MODES = [
     { label: "Compact & continue", description: "summarize the old chat first so it won't eat your context, then pick up where you left off" },
@@ -2013,7 +2018,10 @@ export function App({ resumeSessionId, initialScreen }) {
             // the provider's own sentence quoted inside it. Anything else — a malformed
             // request, a bug of ours — stays loud, which is the point of classifying
             // narrowly. See drivers/providerError.ts.
-            const refusal = accessRefusal(error, providerOf(s.modelConfig.model).label, otherProviderHasKey(s.modelConfig.model));
+            // A provider falling over after the retries ran out gets the same calm treatment:
+            // it is not our crash, and the useful news is "wait, or switch model".
+            const refusal = accessRefusal(error, providerOf(s.modelConfig.model).label, otherProviderHasKey(s.modelConfig.model)) ??
+                providerOutage(error, providerOf(s.modelConfig.model).label, modelLabel(s.modelConfig.model));
             if (refusal)
                 enqueueReveal({ type: "notice", title: refusal.title, body: refusal.body });
             else
@@ -2148,15 +2156,28 @@ export function App({ resumeSessionId, initialScreen }) {
     }
     // Apply a /model pick: switch model (clamping reasoning to a valid level), persist
     // the choice for this project, and confirm.
-    async function applyModel(index) {
+    async function applyModel(index, providerId) {
         const s = session.current;
-        // Index into the SAME list the picker rendered — the current provider's models in
-        // display order, not every model everywhere. Indexing a differently-ordered list
-        // here would silently select a different model than the one on screen, and would
-        // type-check perfectly.
-        const choice = s ? orderedModelList(s.modelConfig.model)[index] : undefined;
+        // Index into the SAME list the picker rendered — that provider's models in display
+        // order, not every model everywhere. Indexing a differently-ordered list here would
+        // silently select a different model than the one on screen, and would type-check
+        // perfectly.
+        const list = !s ? [] : providerId ? orderedModelsOf(providerId) : orderedModelList(s.modelConfig.model);
+        const choice = list[index];
         if (!s || !choice)
             return;
+        // A model on another provider is a provider switch, and gets the same key check.
+        const target = manifestForModel(choice.id);
+        if (target.id !== providerOf(s.modelConfig.model).id) {
+            if (missingKeyFor(choice.id)) {
+                pendingSwitch.current = { model: choice.id, apiKeyEnv: target.apiKeyEnv, label: target.label };
+                note(`${target.label} has no key yet — add one and the switch will finish.`);
+                setKeysOpen(true);
+                return;
+            }
+            await switchTo(choice.id, target.label);
+            return;
+        }
         s.modelConfig = withModel(s.modelConfig, choice.id);
         await saveModelConfig(s.cwd, s.modelConfig);
         note(`model → ${modelLabel(s.modelConfig.model)} · ${thinkLabel(s.modelConfig)}`);
@@ -2202,6 +2223,10 @@ export function App({ resumeSessionId, initialScreen }) {
         s.modelConfig = withModel(s.modelConfig, model);
         await saveModelConfig(s.cwd, s.modelConfig);
         note(`provider → ${providerLabel} · model → ${modelLabel(s.modelConfig.model)} · ${thinkLabel(s.modelConfig)}`);
+        // Where prompts go is worth a sentence at the moment someone moves their work there.
+        const notice = manifestForModel(model).notice;
+        if (notice)
+            note(notice);
     }
     // Apply a /think pick for the current model: set thinking + effort, persist, confirm.
     async function applyThink(index) {
@@ -2256,7 +2281,7 @@ export function App({ resumeSessionId, initialScreen }) {
         else if (o.kind === "provider")
             void applyProvider(index);
         else if (o.kind === "model")
-            void applyModel(index);
+            void applyModel(index, o.providerId);
         else if (o.kind === "think")
             void applyThink(index);
         else if (o.kind === "screen") {
@@ -2620,12 +2645,12 @@ export function App({ resumeSessionId, initialScreen }) {
             setOverlay({ kind: "sessions", items: sessions });
             return;
         }
-        // Both pickers refresh discovered providers first, so a model pulled since the
-        // session started appears without a restart. Awaited rather than fired off: the
+        // Both pickers refresh discovered providers whose list has gone stale, so a newly
+        // served model appears without a restart. Awaited rather than fired off: the
         // picker renders from the list, and opening on a stale one that then changes
         // under the cursor is the exact "two-stage reveal" the UI work removed.
         if (name === "/provider") {
-            await refreshModels();
+            await refreshModels({ maxAgeMs: DISCOVERY_TTL_MS });
             setOverlay({ kind: "provider" });
             return;
         }
@@ -2641,12 +2666,21 @@ export function App({ resumeSessionId, initialScreen }) {
         // getting the picker anyway — which is what happened before, because the argument
         // was dropped without a word — reads as the app not having heard you.
         if (name === "/model") {
-            await refreshModels();
+            await refreshModels({ maxAgeMs: DISCOVERY_TTL_MS });
             if (arg) {
-                const picked = resolveChoice(arg, orderedModelList(s.modelConfig.model), "model");
+                const current = providerOf(s.modelConfig.model).id;
+                const here = resolveChoice(arg, orderedModelList(s.modelConfig.model), "model");
+                const { providerId, words } = splitModelArg(arg, allProviders(), current, here.kind !== "error");
+                // `/model openrouter` alone: that provider's picker.
+                if (!words)
+                    return setOverlay({ kind: "model", providerId });
+                const picked = providerId === current ? here : resolveChoice(words, orderedModelsOf(providerId), "model");
                 if (picked.kind === "error")
                     return say(picked.message);
-                await applyModel(picked.index);
+                // Several fit: show exactly those, in the picker, rather than a list to retype from.
+                if (picked.kind === "several")
+                    return setOverlay({ kind: "model", providerId, filter: words });
+                await applyModel(picked.index, providerId);
                 return;
             }
             setOverlay({ kind: "model" });
@@ -2675,7 +2709,7 @@ export function App({ resumeSessionId, initialScreen }) {
         if (name === "/think") {
             if (arg) {
                 const picked = resolveChoice(arg, thinkLevels(s.modelConfig.model), "reasoning level");
-                if (picked.kind === "error")
+                if (picked.kind !== "match")
                     return say(picked.message);
                 await applyThink(picked.index);
                 return;
@@ -3102,9 +3136,10 @@ export function App({ resumeSessionId, initialScreen }) {
         }
         if (overlay.kind === "model") {
             const id = cur?.modelConfig.model ?? DEFAULT_MODEL_CONFIG.model;
-            // Only the current provider's models, in display order (default first, rest A→Z).
-            // Switching provider is /provider's job.
-            const models = orderedModelList(id);
+            // One provider's models, in display order (default first, rest A→Z): the one in use,
+            // unless `/model <provider> …` named another.
+            const models = overlay.providerId ? orderedModelsOf(overlay.providerId) : orderedModelList(id);
+            const pickerProvider = overlay.providerId ? allProviders().find((p) => p.id === overlay.providerId)?.label ?? "" : providerOf(id).label;
             // The two facts that decide the choice and are nowhere else on the screen: how much
             // it can hold, and whether it can see an image you attach. They lead the description
             // because the row truncates from the RIGHT — put behind the prose they would be the
@@ -3118,7 +3153,7 @@ export function App({ resumeSessionId, initialScreen }) {
                     description: m.description ? `${facts} · ${m.description}` : facts,
                 };
             });
-            return (_jsx(Picker, { title: `Choose a ${providerOf(id).label} model`, items: items, width: width, maxRows: maxRows, initialIndex: Math.max(0, models.findIndex((m) => m.id === id)), onSelect: onOverlaySelect, onCancel: onOverlayCancel }));
+            return (_jsx(Picker, { title: `Choose a ${pickerProvider} model`, items: items, width: width, maxRows: maxRows, initialIndex: Math.max(0, models.findIndex((m) => m.id === id)), initialFilter: overlay.filter, onSelect: onOverlaySelect, onCancel: onOverlayCancel }));
         }
         if (overlay.kind === "think") {
             const model = cur?.modelConfig.model ?? DEFAULT_MODEL_CONFIG.model;