fix(moonshot): accept moonshotai/<model> as direct-API alias

jeffrey701 · jeffrey701 · commit e9d91de3fbce · 2026-04-30T03:38:37.000-04:00
Users copying a Kimi model id from OpenRouter (which lists models as moonshotai/kimi-k2.6) and dropping the openrouter/ prefix to hit the direct API saw 'Unknown model: moonshotai/kimi-k2.6'. The direct provider was registered only as moonshot, so only moonshot/kimi-k2.6 resolved. The OpenRouter org slug, Moonshot AI's own branding, and the existing moonshot manifest's modelPricing.providers.moonshot.openRouter entry all use the moonshotai form — only the direct-API name disagreed. The OpenAI plugin already shipped the manifest pattern for this exact shape (azure-openai-responses → openai), and there's a planner test that pins it down. Reuse the same modelCatalog.aliases mechanism in the moonshot manifest: "modelCatalog": { "aliases": { "moonshotai": { "provider": "moonshot" } }, ... } This keeps moonshot as the canonical id (no rename, no breaking change for operators whose configs already say moonshot/...). The catalog planner now resolves moonshotai/<model> through moonshot's existing models list, baseUrl, api class, discovery, pricing, and auth choices unchanged. providers, providerEndpoints, providerRequest, providerAuthEnvVars, and providerAuthChoices stay keyed on moonshot — no duplication, no provider-id divergence. Test: new planner case in src/model-catalog/manifest-planner.test.ts mirrors the existing azure-openai-responses test — asserts that with providerFilter: 'moonshotai' the planner returns rows with ref 'moonshotai/<model>' and the moonshot catalog's api/baseUrl/discovery values. The existing moonshot plugin-registration contract test continues to pass against the modified manifest (canonical providerIds: ['moonshot'] unchanged). Closes #73876
diff --git a/extensions/moonshot/openclaw.plugin.json b/extensions/moonshot/openclaw.plugin.json
@@ -33,6 +33,11 @@
     }
   },
   "modelCatalog": {
+    "aliases": {
+      "moonshotai": {
+        "provider": "moonshot"
+      }
+    },
     "providers": {
       "moonshot": {
         "baseUrl": "https://api.moonshot.ai/v1",
diff --git a/src/model-catalog/manifest-planner.test.ts b/src/model-catalog/manifest-planner.test.ts
@@ -143,6 +143,63 @@ describe("manifest model catalog planner", () => {
     ]);
   });
 
+  // Regression for https://github.com/openclaw/openclaw/issues/73876.
+  // The user-facing complaint is that copying a model id from OpenRouter
+  // (which uses "moonshotai/kimi-k2.6" as the org slug) and dropping the
+  // "openrouter/" prefix to hit the direct API failed with "Unknown
+  // model: moonshotai/kimi-k2.6". The OpenAI plugin already shipped the
+  // alias pattern (azure-openai-responses → openai); applying it to the
+  // moonshot manifest lets the org-slug name resolve to moonshot's
+  // existing catalog without renaming the canonical provider id (which
+  // would break operators whose configs already say "moonshot/...").
+  it("plans moonshotai alias rows from the moonshot provider catalog", () => {
+    const plan = planManifestModelCatalogRows({
+      providerFilter: "moonshotai",
+      registry: {
+        plugins: [
+          {
+            id: "moonshot",
+            providers: ["moonshot"],
+            modelCatalog: {
+              aliases: {
+                moonshotai: {
+                  provider: "moonshot",
+                },
+              },
+              discovery: {
+                moonshot: "static",
+              },
+              providers: {
+                moonshot: {
+                  api: "openai-completions",
+                  baseUrl: "https://api.moonshot.ai/v1",
+                  models: [{ id: "kimi-k2.6", name: "Kimi K2.6" }],
+                },
+              },
+            },
+          },
+        ],
+      },
+    });
+
+    expect(plan.entries).toEqual([
+      expect.objectContaining({
+        pluginId: "moonshot",
+        provider: "moonshotai",
+        discovery: "static",
+      }),
+    ]);
+    expect(plan.rows).toEqual([
+      expect.objectContaining({
+        provider: "moonshotai",
+        id: "kimi-k2.6",
+        ref: "moonshotai/kimi-k2.6",
+        api: "openai-completions",
+        baseUrl: "https://api.moonshot.ai/v1",
+      }),
+    ]);
+  });
+
   it("keeps alias provider rows out of unfiltered broad planning", () => {
     const plan = planManifestModelCatalogRows({
       registry: {
