laohuang 0.8.2 → 0.8.3

package/README.md

@@ -29,8 +29,15 @@ Google Vertex, OAuth-only providers, and OpenAI Codex. Use `/providers` to see
 available, configured, and verified status independently.
 
 `/login <provider>` stores API-key credentials, `/logout <provider>` removes
-them, `/model <provider> <model>` switches the session, and `/apikey` remains a
-compatibility alias. `verified` means an explicitly authorized live native
+them, and `/model` opens a searchable list of all available models from
+configured providers, including credentials supplied through environment variables.
+Search by provider ID, model ID, or model name; scroll to browse the full list.
+If no models are available, the CLI points to `/login`.
+`/model <provider>` narrows the list, `/model <provider> <model>` switches
+directly, and `/apikey` remains a compatibility alias. Switching models affects
+only the current session, not the default profile.
+
+`verified` means an explicitly authorized live native
 tool-call/tool-result E2E was recorded; no providers are checked in as verified
 by default.
 

package/dist/bin.js

@@ -10022,7 +10022,7 @@ function renderMarkdownStyledLines(text, width) {
   const layoutWidth = Math.max(12, width);
   const lines2 = [];
   let previous = null;
-  for (const block of renderBlocks(clean, layoutWidth)) {
+  for (const block of renderBlocks(clean, layoutWidth, Math.max(1, width))) {
     const leadingBlank = previous === null ? block.kind === "list" || block.kind === "table" || block.kind === "quote" : previous !== "hr";
     if (leadingBlank) {
       lines2.push(line());
@@ -10046,7 +10046,7 @@ function styleKey(style) {
     style.background ?? ""
   ].join("|");
 }
-function renderBlocks(text, layoutWidth) {
+function renderBlocks(text, layoutWidth, tableWidth) {
   const lines2 = text.replace(/\r\n/g, "\n").split("\n");
   const blocks = [];
   let paragraph = [];
@@ -10094,6 +10094,7 @@ function renderBlocks(text, layoutWidth) {
       const delimiter = splitTableRow(lines2[index + 1].trim());
       if (header !== null && delimiter !== null && delimiter.length === header.length && delimiter.every((cell) => /^:?-+:?$/.test(cell))) {
         flushParagraph();
+        const tableStart = index;
         index += 2;
         const rows = [];
         while (index < lines2.length) {
@@ -10110,7 +10111,7 @@ function renderBlocks(text, layoutWidth) {
         }
         blocks.push({
           kind: "table",
-          lines: renderTable(header, rows, layoutWidth)
+          lines: renderTable(header, rows, tableWidth, lines2.slice(tableStart, index))
         });
         continue;
       }
@@ -10249,7 +10250,7 @@ function segmentsWidth(segments) {
   }
   return width;
 }
-function renderTable(header, rows, layoutWidth) {
+function renderTable(header, rows, layoutWidth, rawLines) {
   const columnCount = header.length;
   const borderStyle = {
     foreground: "border_muted"
@@ -10261,12 +10262,26 @@ function renderTable(header, rows, layoutWidth) {
   const normalize = (cells) => Array.from({ length: columnCount }, (_, i) => cells[i] ?? "");
   const headerCells = normalize(header).map((cell) => parseInline(cell, headerStyle));
   const bodyCells = rows.map((row) => normalize(row).map((cell) => parseInline(cell, {})));
+  const minWidths = Array(columnCount).fill(1);
+  for (const row of [headerCells, ...bodyCells]) {
+    for (let i = 0; i < columnCount; i += 1) {
+      for (const segment of row[i]) {
+        for (const cluster of graphemeClusters(segment.text)) {
+          minWidths[i] = Math.max(minWidths[i], clusterWidth(cluster));
+        }
+      }
+    }
+  }
+  const spacingWidth = 2 * columnCount;
+  if (minWidths.reduce((total, width) => total + width, spacingWidth) > layoutWidth) {
+    return rawLines.flatMap((text) => wrapSegments([{ text, style: {} }], layoutWidth));
+  }
   const widths = Array.from({ length: columnCount }, (_, i) => Math.max(1, segmentsWidth(headerCells[i]), ...bodyCells.map((row) => segmentsWidth(row[i]))));
   const totalWidth = () => widths.reduce((total, w) => total + w, 0) + 2 * (columnCount - 1) + 2;
-  while (totalWidth() > layoutWidth && Math.max(...widths) > 1) {
-    let widest = 0;
-    for (let i = 1; i < widths.length; i += 1) {
-      if (widths[i] > widths[widest]) {
+  while (totalWidth() > layoutWidth) {
+    let widest = -1;
+    for (let i = 0; i < widths.length; i += 1) {
+      if (widths[i] > minWidths[i] && (widest === -1 || widths[i] > widths[widest])) {
         widest = i;
       }
     }
@@ -10296,7 +10311,7 @@ function renderTableRows(cells, widths, borderStyle, padStyle) {
       if (i > 0) {
         line2.push({ style: borderStyle, text: " " });
       }
-      const cellLine = wrappedCells[i][row];
+      const cellLine = wrappedCells[i][row] ?? [];
       line2.push(...cellLine);
       const pad = widths[i] - segmentsWidth(cellLine);
       if (pad > 0) {
@@ -14737,7 +14752,7 @@ var SessionCommands = class {
     this.registry = new CommandRegistry([
       {
         name: "/model",
-        description: "\u9009\u62E9\u5F53\u524D\u4F9B\u5E94\u5546\u7684\u6A21\u578B\u6216\u5207\u6362\u4F9B\u5E94\u5546",
+        description: "\u641C\u7D22\u5E76\u9009\u62E9\u5DF2\u914D\u7F6E\u4F9B\u5E94\u5546\u7684\u6A21\u578B",
         usage: "/model [provider|model] [model]",
         handler: (args) => this.handleModel(args),
         allowedStates: IDLE_ONLY,
@@ -15124,16 +15139,10 @@ ${sessionDisplayDescription(session, {
     }
     let provider;
     let modelName;
-    if (args.length === 0) {
-      const selectedProvider = await this.selectModelProvider();
-      if (selectedProvider === null) {
-        return true;
-      }
-      provider = selectedProvider;
-    } else if (args.length === 2) {
+    if (args.length === 2) {
       provider = args[0];
       modelName = args[1];
-    } else {
+    } else if (args.length === 1) {
       const argument = args[0];
       if (this.#catalog.getProvider(argument) !== void 0) {
         provider = argument;
@@ -15144,9 +15153,24 @@ ${sessionDisplayDescription(session, {
     }
     if (modelName === void 0) {
       try {
-        const models = await this.#selector.listModels(provider, "");
+        let models;
+        if (provider === void 0) {
+          const available = await this.#selector.listConfiguredModels();
+          models = available.models;
+          for (const failure of available.errors) {
+            this.notice(
+              `Could not list models for ${failure.provider}: ${errorMessage10(failure.error)}`,
+              "warning"
+            );
+          }
+        } else {
+          models = await this.#selector.listModels(provider, "");
+        }
         if (models.length === 0) {
-          this.notice(`No models available for provider: ${provider}`, "error");
+          this.notice(
+            provider === void 0 ? "No models available from configured providers. Use /login to configure a provider." : `No models available for provider: ${provider}. Use /login ${provider} to configure credentials.`,
+            "warning"
+          );
           return true;
         }
         if (this.#presenter === null) {
@@ -15155,26 +15179,34 @@ ${sessionDisplayDescription(session, {
         }
         const selected = await this.#presenter.select({
           id: "model-name",
-          title: `Select model for ${provider}`,
-          items: models.map((model) => ({
-            value: `${provider}/${model.id}`,
-            label: model.name,
-            description: provider
+          title: provider === void 0 ? "Select model from configured providers" : `Select model for ${provider}`,
+          items: models.map((model2) => ({
+            value: `${model2.provider}/${model2.id}`,
+            label: model2.name,
+            description: model2.provider
           })),
-          currentValue: this.#currentConfig.provider === provider ? `${provider}/${this.#currentConfig.model}` : void 0,
+          currentValue: `${this.#currentConfig.provider}/${this.#currentConfig.model}`,
           searchable: true,
-          maxVisible: 20
+          maxVisible: 10
         });
         if (selected === null) {
           return true;
         }
-        const prefix = `${provider}/`;
-        modelName = selected.startsWith(prefix) ? selected.slice(prefix.length) : selected;
+        const model = models.find((candidate) => `${candidate.provider}/${candidate.id}` === selected);
+        if (model === void 0) {
+          this.notice("Selected model is no longer available. Run /model to refresh the list.", "error");
+          return true;
+        }
+        provider = model.provider;
+        modelName = model.id;
       } catch (error) {
         this.notice(`Could not list models: ${errorMessage10(error)}`, "error");
         return true;
       }
     }
+    if (provider === void 0) {
+      return true;
+    }
     let selection;
     try {
       selection = await this.#selector.selectExact({
@@ -15187,6 +15219,7 @@ ${sessionDisplayDescription(session, {
       return true;
     }
     if (selection === null) {
+      this.notice(`Use /login ${provider} to configure credentials before switching models.`, "warning");
       return true;
     }
     const previousProvider = this.#currentConfig.provider;
@@ -15445,23 +15478,6 @@ ${sessionDisplayDescription(session, {
       )
     };
   }
-  async selectModelProvider() {
-    if (this.#presenter === null) {
-      this.notice("Model provider selection is unavailable.", "error");
-      return null;
-    }
-    const selected = await this.#presenter.select({
-      id: "model-provider",
-      title: "Select model provider",
-      items: this.#selector.listProviders().map((provider) => ({
-        value: provider.id,
-        label: provider.name,
-        description: provider.id
-      })),
-      currentValue: this.#currentConfig.provider
-    });
-    return selected;
-  }
   *modelCompletions(args) {
     if (args.length === 0) {
       yield ["current", "\u663E\u793A\u5F53\u524D\u6A21\u578B"];
@@ -15578,12 +15594,30 @@ var ModelSelector = class {
     return this.#catalog.listProviders();
   }
   async listModels(provider, query) {
+    if (!await this.#providerAuth.ensureConfigured(provider, { promptIfMissing: false })) {
+      return [];
+    }
     await this.#catalog.refresh(provider);
     return filterModels(
       await this.#catalog.listAvailableModels(provider),
-      query,
-      20
+      query
+    );
+  }
+  async listConfiguredModels() {
+    const providers = this.#catalog.listProviders();
+    const results = await Promise.allSettled(
+      providers.map((provider) => this.listModels(provider.id, ""))
     );
+    const models = [];
+    const errors = [];
+    for (const [index, result] of results.entries()) {
+      if (result.status === "fulfilled") {
+        models.push(...result.value);
+      } else {
+        errors.push({ provider: providers[index].id, error: result.reason });
+      }
+    }
+    return { models: filterModels(models, ""), errors };
   }
   async selectExact(options) {
     const provider = this.#catalog.getProvider(options.providerName);
@@ -15615,7 +15649,7 @@ var ModelSelector = class {
     };
   }
 };
-function filterModels(models, query, limit = 20) {
+function filterModels(models, query) {
   const normalized = query.toLowerCase().trim();
   const terms = normalized.split(/\s+/).filter((term) => term.length > 0);
   const matched = models.filter((model) => {
@@ -15639,9 +15673,9 @@ function filterModels(models, query, limit = 20) {
     if (leftPrefix !== rightPrefix) {
       return leftPrefix ? -1 : 1;
     }
-    return left.id.localeCompare(right.id);
+    return left.provider.localeCompare(right.provider) || left.id.localeCompare(right.id);
   });
-  return matched.slice(0, limit);
+  return matched;
 }
 
 // src/plain-command-presenter.ts
@@ -17323,6 +17357,10 @@ async function main(argv, options = {}) {
     await sessionRecorder.close();
     await sessionController.close();
   }
+  const renderError = terminalUi?.renderError ?? null;
+  if (renderError !== null) {
+    throw new Error(`Terminal rendering failed: ${errorMessage11(renderError)}`, { cause: renderError });
+  }
   return cleanShutdown ? 0 : 1;
 }
 function defaultSessionsRoot(environ) {