@tritard/waterbrother 0.16.7 → 0.16.9

package/README.md

@@ -29,6 +29,7 @@ It is Vercel-ready via `vercel.json` (clean URLs, no build step required).
 - First-run onboarding wizard in terminal
   - asks for provider first
   - asks for API key when the selected provider requires one
+  - tries a live provider model list after credentials, shows when that live list is in use, then falls back to the built-in catalog
   - prompts for default model and agent profile
 - Multi-provider chat integration through provider adapters and model registry
 - Vision command for local images: `waterbrother vision <image-path> <prompt>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.16.7",
+  "version": "0.16.9",
   "description": "Waterbrother: bring-your-own-model coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -2830,34 +2830,103 @@ async function chooseProviderInteractive(defaultProvider = 'xai') {
   return selected?.value || defaultProvider;
 }
 
-async function chooseModelInteractive(defaultModel, provider = '') {
-  const catalog = MODEL_CATALOG.filter((model) => !provider || model.provider === provider);
-  const defaultIndex = Math.max(0, catalog.findIndex((model) => model.id === defaultModel));
-  const options = catalog.map((model, index) => ({
-    value: model.id,
-    label: `${model.id}${index === defaultIndex ? ' (default)' : ''}`
+async function buildModelPickerOptions(defaultModel, provider = '', { apiKey = '', baseUrl = '', allowRemote = true } = {}) {
+  const normalizedProvider = normalizeProvider(provider);
+  let remoteModels = [];
+  if (allowRemote && normalizedProvider) {
+    try {
+      remoteModels = await listModels({
+        provider: normalizedProvider,
+        apiKey,
+        baseUrl
+      });
+    } catch {
+      remoteModels = [];
+    }
+  }
+
+  const seen = new Set();
+  const options = [];
+
+  for (const model of remoteModels) {
+    const value = String(model?.id || "").trim();
+    if (!value || seen.has(value)) continue;
+    seen.add(value);
+    options.push({
+      value,
+      label: model?.notes ? `${value} - ${model.notes}` : value
+    });
+  }
+
+  for (const model of MODEL_CATALOG) {
+    if (normalizedProvider && model.provider !== normalizedProvider) continue;
+    const value = String(model?.id || "").trim();
+    if (!value || seen.has(value)) continue;
+    seen.add(value);
+    options.push({
+      value,
+      label: model?.notes ? `${value} - ${model.notes}` : value
+    });
+  }
+
+  if (!options.length) {
+    options.push({
+      value: defaultModel,
+      label: `${defaultModel} (default)`
+    });
+  }
+
+  const defaultIndex = Math.max(0, options.findIndex((model) => model.value === defaultModel));
+  const titledOptions = options.map((model, index) => ({
+    value: model.value,
+    label: `${model.label}${index === defaultIndex ? " (default)" : ""}`
   }));
+
+  return {
+    normalizedProvider,
+    options: titledOptions,
+    defaultIndex,
+    usedRemote: remoteModels.length > 0
+  };
+}
+
+async function chooseModelInteractive(defaultModel, provider = '', { apiKey = '', baseUrl = '', allowRemote = true } = {}) {
+  const picker = await buildModelPickerOptions(defaultModel, provider, { apiKey, baseUrl, allowRemote });
+  if (picker.usedRemote) {
+    console.log(dim(`Using live ${picker.normalizedProvider} model list.`));
+  } else if (picker.normalizedProvider) {
+    console.log(dim(`Live ${picker.normalizedProvider} model list unavailable. Falling back to the built-in catalog.`));
+  }
+
   const selected = await chooseFromInteractiveMenu({
-    title: 'Select default model:',
-    options,
-    defaultIndex
+    title: picker.usedRemote
+      ? `Select default model for ${picker.normalizedProvider} (live list):`
+      : picker.normalizedProvider
+        ? `Select default model for ${picker.normalizedProvider}:`
+        : "Select default model:",
+    options: picker.options,
+    defaultIndex: picker.defaultIndex
   });
   return selected?.value || defaultModel;
 }
 
-async function chooseRuntimeModelInteractive(currentModel, provider = '') {
-  const normalizedProvider = normalizeProvider(provider);
-  const catalog = MODEL_CATALOG.filter((model) => !normalizedProvider || model.provider === normalizedProvider);
-  if (catalog.length === 0) return currentModel;
-  const defaultIndex = Math.max(0, catalog.findIndex((model) => model.id === currentModel));
-  const options = catalog.map((model, index) => ({
-    value: model.id,
-    label: `${model.id}${index === defaultIndex ? ' (current)' : ''}`
+async function chooseRuntimeModelInteractive(currentModel, provider = '', { apiKey = '', baseUrl = '', allowRemote = true } = {}) {
+  const picker = await buildModelPickerOptions(currentModel, provider, { apiKey, baseUrl, allowRemote });
+  if (!picker.options.length) return currentModel;
+  const options = picker.options.map((model, index) => ({
+    value: model.value,
+    label: model.value === currentModel || index === picker.defaultIndex
+      ? model.label.replace(/ \(default\)$/, "") + " (current)"
+      : model.label.replace(/ \(default\)$/, "")
   }));
   const selected = await chooseFromInteractiveMenu({
-    title: normalizedProvider ? `Select ${normalizedProvider} model:` : 'Select model:',
+    title: picker.usedRemote
+      ? `Select ${picker.normalizedProvider} model (live list):`
+      : picker.normalizedProvider
+        ? `Select ${picker.normalizedProvider} model:`
+        : 'Select model:',
     options,
-    defaultIndex
+    defaultIndex: picker.defaultIndex
   });
   return selected?.value || currentModel;
 }
@@ -2927,7 +2996,11 @@ async function runOnboardingWizard(config, { cwd }) {
   }
 
   next.baseUrl = providerSpec?.defaultBaseUrl || next.baseUrl || '';
-  next.model = await chooseModelInteractive(next.model || getDefaultModelForProvider(next.provider), next.provider);
+  next.model = await chooseModelInteractive(next.model || getDefaultModelForProvider(next.provider), next.provider, {
+    apiKey: next.apiKey,
+    baseUrl: next.baseUrl,
+    allowRemote: providerSpec?.supportsRemoteModelList !== false
+  });
   next.agentProfile = await chooseAgentProfileInteractive(next.agentProfile || 'coder');
   if (!next.approvalMode) next.approvalMode = 'on-request';
   if (!next.designModel) next.designModel = getDefaultDesignModelForProvider(next.provider);
@@ -8243,7 +8316,12 @@ Be concrete about surfaces — name actual pages/flows. Choose the best stack fo
 
     if (line === "/models") {
       try {
-        const selectedModel = await chooseRuntimeModelInteractive(agent.getModel(), context.runtime.provider);
+        const providerSpec = getProviderSpec(context.runtime.provider);
+        const selectedModel = await chooseRuntimeModelInteractive(agent.getModel(), context.runtime.provider, {
+          apiKey: context.runtime.apiKey,
+          baseUrl: context.runtime.baseUrl,
+          allowRemote: providerSpec?.supportsRemoteModelList !== false
+        });
         const { config } = await loadConfigLayers(context.cwd);
         const nextRuntime = await applyRuntimeSelection({
           config,