fix(models): hide openrouter nested provider duplicates

steipete · steipete · commit 739479254661 · 2026-05-10T06:08:39.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,7 @@ Docs: https://docs.openclaw.ai
 - Channels/iMessage: wire `action: "reply"` attachments through `imsg send-rich --file` when the installed imsg build advertises that capability (probed once via `imsg send-rich --help` and cached on the private-API status). Reply now hydrates `media`/`mediaUrl`/`fileUrl`/`mediaUrls[0]`/`filePath`/`path`/base64 `buffer`+`filename` through the shared outbound resolver, stages buffers via the existing `withTempFile` helper, rejects `http(s)://` URL attachments with a targeted error pointing callers at `send`'s full attachment-resolver pipeline, and falls back to the explicit `imsg#114 not landed yet` error on older imsg builds. Depends on the upstream `openclaw/imsg#114` capability landing in an installable release; until then the new path stays gated and users see the same explicit fallback `#79822` introduced. (#79864) Thanks @omarshahine.
 - Telegram: preserve the first-preview debounce while appending true partial-stream deltas, so edited draft previews no longer duplicate earlier text when providers emit incremental output. (#80045) Thanks @TurboTheTurtle.
 - Agents/Anthropic: report 1M session context for Claude Opus/Sonnet 4 models even when local model config still advertises 200k, matching model discovery and preventing premature status/UI overflow. Fixes #66766.
+- Models/OpenRouter: hide missing-auth direct provider rows in `/model status` when they are only duplicated by a nested OpenRouter model id such as `openrouter/google/...`, while preserving explicitly configured direct providers. Fixes #62317.
 - Volcengine/Kimi: strip provider-unsupported tool schema length and item constraint keywords for direct and coding-plan models so hosted Kimi runs do not reject message tools with `minLength`. Fixes #38817.
 - DeepSeek: backfill V4 `reasoning_content` replay fields for unowned OpenAI-compatible proxy providers, preventing follow-up request failures outside the bundled DeepSeek and OpenRouter routes. Fixes #79608.
 
diff --git a/src/auto-reply/reply/directive-handling.model.test.ts b/src/auto-reply/reply/directive-handling.model.test.ts
@@ -517,6 +517,75 @@ describe("/model chat UX", () => {
     expect(reply?.text).not.toContain("missing (missing)");
   });
 
+  it("hides missing-auth direct provider rows covered by OpenRouter nested model ids", async () => {
+    const reply = await resolveModelInfoReply({
+      directives: parseInlineDirectives("/model status"),
+      provider: "openrouter",
+      model: "google/gemini-3-flash-preview",
+      defaultProvider: "openrouter",
+      defaultModel: "google/gemini-3-flash-preview",
+      cfg: {
+        commands: { text: true },
+        models: {
+          providers: {
+            openrouter: {
+              models: [{ id: "google/gemini-3-flash-preview", name: "Gemini via OpenRouter" }],
+            },
+          },
+        },
+      } as OpenClawConfig,
+      allowedModelCatalog: [
+        { provider: "google", id: "gemini-3-flash-preview", name: "Gemini 3 Flash" },
+        {
+          provider: "openrouter",
+          id: "google/gemini-3-flash-preview",
+          name: "Gemini via OpenRouter",
+        },
+      ],
+    });
+
+    expect(reply?.text).toContain("[openrouter]");
+    expect(reply?.text).toContain("openrouter/google/gemini-3-flash-preview");
+    expect(reply?.text).not.toContain("\n[google]");
+    expect(reply?.text).not.toContain("\n  • google/gemini-3-flash-preview");
+  });
+
+  it("keeps explicitly configured direct provider rows next to OpenRouter nested ids", async () => {
+    const reply = await resolveModelInfoReply({
+      directives: parseInlineDirectives("/model status"),
+      provider: "openrouter",
+      model: "google/gemini-3-flash-preview",
+      defaultProvider: "openrouter",
+      defaultModel: "google/gemini-3-flash-preview",
+      cfg: {
+        commands: { text: true },
+        models: {
+          providers: {
+            google: {
+              models: [{ id: "gemini-3-flash-preview", name: "Gemini 3 Flash" }],
+            },
+            openrouter: {
+              models: [{ id: "google/gemini-3-flash-preview", name: "Gemini via OpenRouter" }],
+            },
+          },
+        },
+      } as OpenClawConfig,
+      allowedModelCatalog: [
+        { provider: "google", id: "gemini-3-flash-preview", name: "Gemini 3 Flash" },
+        {
+          provider: "openrouter",
+          id: "google/gemini-3-flash-preview",
+          name: "Gemini via OpenRouter",
+        },
+      ],
+    });
+
+    expect(reply?.text).toContain("[google]");
+    expect(reply?.text).toContain("google/gemini-3-flash-preview");
+    expect(reply?.text).toContain("[openrouter]");
+    expect(reply?.text).toContain("openrouter/google/gemini-3-flash-preview");
+  });
+
   it("reports Codex runtime auth for OpenAI status rows", async () => {
     setAuthProfiles({
       "openai-codex:patrick@example.test": {
diff --git a/src/auto-reply/reply/directive-handling.model.ts b/src/auto-reply/reply/directive-handling.model.ts
@@ -2,6 +2,7 @@ import { resolveAuthStorePathForDisplay } from "../../agents/auth-profiles.js";
 import { resolveAgentHarnessPolicy } from "../../agents/harness/selection.js";
 import {
   type ModelAliasIndex,
+  buildConfiguredModelCatalog,
   modelKey,
   normalizeProviderId,
   resolveConfiguredModelRef,
@@ -263,6 +264,46 @@ function buildModelPickerCatalog(params: {
   return out;
 }
 
+function filterMissingAuthNestedProviderDuplicates(params: {
+  cfg: OpenClawConfig;
+  entries: ModelPickerCatalogEntry[];
+  authByProvider: Map<string, string>;
+}): ModelPickerCatalogEntry[] {
+  const configuredKeys = new Set(
+    buildConfiguredModelCatalog({ cfg: params.cfg }).map((entry) =>
+      modelKey(entry.provider, entry.id),
+    ),
+  );
+  const wrapperKeys = new Set<string>();
+  for (const entry of params.entries) {
+    const id = normalizeOptionalString(entry.id) ?? "";
+    const slash = id.indexOf("/");
+    if (slash <= 0) {
+      continue;
+    }
+    const nestedProvider = normalizeProviderId(id.slice(0, slash));
+    const nestedModel = normalizeOptionalString(id.slice(slash + 1)) ?? "";
+    const wrapperProvider = normalizeProviderId(entry.provider);
+    if (!nestedProvider || !nestedModel || nestedProvider === wrapperProvider) {
+      continue;
+    }
+    wrapperKeys.add(modelKey(nestedProvider, nestedModel));
+  }
+  if (wrapperKeys.size === 0) {
+    return params.entries;
+  }
+
+  return params.entries.filter((entry) => {
+    const provider = normalizeProviderId(entry.provider);
+    const id = normalizeOptionalString(entry.id) ?? "";
+    const key = modelKey(provider, id);
+    if (configuredKeys.has(key)) {
+      return true;
+    }
+    return params.authByProvider.get(provider) !== "missing" || !wrapperKeys.has(key);
+  });
+}
+
 export async function maybeHandleModelDirectiveInfo(params: {
   directives: InlineDirectives;
   cfg: OpenClawConfig;
@@ -409,7 +450,12 @@ export async function maybeHandleModelDirectiveInfo(params: {
   }
 
   const byProvider = new Map<string, ModelPickerCatalogEntry[]>();
-  for (const entry of pickerCatalog) {
+  const statusCatalog = filterMissingAuthNestedProviderDuplicates({
+    cfg: params.cfg,
+    entries: pickerCatalog,
+    authByProvider,
+  });
+  for (const entry of statusCatalog) {
     const provider = normalizeProviderId(entry.provider);
     const models = byProvider.get(provider);
     if (models) {
