diff --git a/README.md b/README.md index 9e149e0..6c3b306 100644 --- a/README.md +++ b/README.md @@ -96,20 +96,25 @@ China: ### Global `qoder` -Exposes the backing model keys returned by Qoder, including: +Exposes friendly IDs derived from the catalog `display_name` (whitespace is +removed), including: -- **Tier Models**: `auto`, `ultimate`, `performance`, `efficient`, `lite` +- **Tier Models**: `Auto`, `Ultimate`, `Performance`, `Efficient`, `Lite` - **Frontier Models**: - - `qmodel` (Qwen3.7 Plus) - - `cmodel` (Cantus) - - `qmodel_preview` (Qwen3.8 Max Preview) - - `qmodel_latest` (Qwen3.7 Max) - - `dmodel` (DeepSeek V4 Pro) - - `dfmodel` (DeepSeek V4 Flash) - - `gm51model` (GLM 5.2) - - `kmodel` (Kimi K2.7 Code) - - `kmodel_latest` (Kimi K3) - - `mmodel` (MiniMax M3) + - `Qwen3.7Plus` + - `Cantus` + - `Qwen3.8-Max` + - `Qwen3.7-Max` + - `DeepSeek-V4-Pro` + - `DeepSeek-V4-Flash` + - `GLM-5.2` + - `Kimi-K2.7-Code` + - `Kimi-K3` + - `MiniMax-M3` + +The original service keys remain compatibility aliases, so existing commands +such as `--model lite` and references such as `qoder/lite` still send the +upstream `lite` key. Global models default to a 1M context window, matching the Qoder API (verified against `lite` with prompts up to 1,000K tokens). `kmodel` stays at the 256K its @@ -153,7 +158,7 @@ pi --provider qoder-cn --model qwen3.7-plus Global example: ```bash -pi --provider qoder --model auto +pi --provider qoder --model Lite ``` ## Architecture @@ -161,7 +166,7 @@ pi --provider qoder --model auto ```text src/ ├── index.ts # Extension registration -├── cosy.ts # COSY signature, machine ID, region/endpoints, CN model aliases +├── cosy.ts # COSY signature, machine ID, region/endpoints, friendly model IDs ├── login.ts # OAuth device flow + PAT login sequence ├── pat.ts # PAT → job-token exchange + identity resolution ├── models.ts # Model definitions and dynamic config cache diff --git a/src/__tests__/cosy.test.ts b/src/__tests__/cosy.test.ts index ddeaa7c..9ed3765 100644 --- a/src/__tests__/cosy.test.ts +++ b/src/__tests__/cosy.test.ts @@ -14,7 +14,7 @@ import { getQoderUserEmailFallback, getQoderUserInfoURL, isQoderCNMode, - toQoderCNModelId, + toQoderModelId, } from "../cosy.js"; // ── getQoderMode ────────────────────────────────────────────────────────── @@ -159,24 +159,24 @@ describe("getQoderUserEmailFallback", () => { }); }); -// ── toQoderCNModelId ────────────────────────────────────────────────────── +// ── toQoderModelId ──────────────────────────────────────────────────────── -describe("toQoderCNModelId", () => { +describe("toQoderModelId", () => { it("strips whitespace from the upstream display_name", () => { // The display name is used directly as the pi-visible model id, with // whitespace removed so it stays a clean token for persistence keys and // search. "Qwen3.8-Flash" has no spaces already. - expect(toQoderCNModelId("Qwen3.8-Flash")).toBe("Qwen3.8-Flash"); + expect(toQoderModelId("Qwen3.8-Flash")).toBe("Qwen3.8-Flash"); }); it("collapses internal spaces", () => { - expect(toQoderCNModelId("Qwen 3.8 Max")).toBe("Qwen3.8Max"); - expect(toQoderCNModelId("DeepSeek V4 Pro")).toBe("DeepSeekV4Pro"); + expect(toQoderModelId("Qwen 3.8 Max")).toBe("Qwen3.8Max"); + expect(toQoderModelId("DeepSeek V4 Pro")).toBe("DeepSeekV4Pro"); }); it("falls back to a default when no display name is given", () => { - expect(toQoderCNModelId()).toBe("QoderCNModel"); - expect(toQoderCNModelId("")).toBe("QoderCNModel"); + expect(toQoderModelId()).toBe("QoderModel"); + expect(toQoderModelId("")).toBe("QoderModel"); }); }); diff --git a/src/__tests__/models.test.ts b/src/__tests__/models.test.ts index 4caa98c..112932b 100644 --- a/src/__tests__/models.test.ts +++ b/src/__tests__/models.test.ts @@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest"; import { contextWindowFromCatalog, DEFAULT_CONTEXT_WINDOW, + getCachedModelConfig, staticCnModels, staticModels, ZERO_COST, @@ -16,7 +17,7 @@ describe("staticModels", () => { }); it("has auto as first entry", () => { - expect(staticModels[0].id).toBe("auto"); + expect(staticModels[0].id).toBe("Auto"); }); it("every model has required fields", () => { @@ -43,16 +44,22 @@ describe("staticModels", () => { it("uses a 1M context window for models confirmed to support it", () => { // Global lite was live-tested through 1,000K tokens (issue #13). auto, // efficient, and gm51model share the same Qoder 1M catalog family. - for (const id of ["auto", "efficient", "lite", "gm51model"]) { - const model = staticModels.find((m) => m.id === id); - expect(model, id).toBeDefined(); + for (const key of ["auto", "efficient", "lite", "gm51model"]) { + const model = staticModels.find((m) => m.upstreamKey === key); + expect(model, key).toBeDefined(); expect(model?.contextWindow).toBe(DEFAULT_CONTEXT_WINDOW); expect(model?.contextWindow).toBe(1_000_000); } }); it("keeps kmodel at the catalog-advertised 256K window", () => { - expect(staticModels.find((m) => m.id === "kmodel")?.contextWindow).toBe(256000); + expect(staticModels.find((m) => m.upstreamKey === "kmodel")?.contextWindow).toBe(256000); + }); + + it("maps friendly ids and legacy keys to the same static upstream key", () => { + expect(getCachedModelConfig("Lite", "global")?.key).toBe("lite"); + expect(getCachedModelConfig("lite", "global")?.key).toBe("lite"); + expect(getCachedModelConfig("Qwen3.8-Max", "global")?.key).toBe("qmodel_preview"); }); }); diff --git a/src/cosy.ts b/src/cosy.ts index 7f436ff..1bb6bfe 100644 --- a/src/cosy.ts +++ b/src/cosy.ts @@ -125,8 +125,8 @@ export function getQoderRefreshURL(mode?: string): string { * tracks whatever upstream returns, so a renamed/upgraded model is shown * correctly without a code change. */ -export function toQoderCNModelId(displayName?: string): string { - return (displayName || "QoderCNModel").replace(/\s+/g, ""); +export function toQoderModelId(displayName?: string): string { + return (displayName || "QoderModel").replace(/\s+/g, ""); } export function getQoderManageUrl(mode?: string): string { diff --git a/src/models.ts b/src/models.ts index 339641f..2273b9e 100644 --- a/src/models.ts +++ b/src/models.ts @@ -8,7 +8,7 @@ import { getQoderMode, getQoderModelListURL, isQoderCNMode, - toQoderCNModelId, + toQoderModelId, } from "./cosy.js"; export const ZERO_COST = Object.freeze({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }); @@ -55,6 +55,7 @@ export interface QoderModelEntry { export interface QoderModelDef { id: string; + upstreamKey?: string; name: string; api: "qoder-api"; provider: "qoder" | "qoder-cn"; @@ -80,8 +81,10 @@ function getQoderCachePath(mode?: string): string { export const staticModels: QoderModelDef[] = [ { - id: "auto", - name: "Qoder Auto", + id: "Auto", + upstreamKey: "auto", + upstreamKey: "auto", + name: "Auto", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -93,8 +96,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "ultimate", - name: "Qoder Ultimate", + id: "Ultimate", + upstreamKey: "ultimate", + name: "Ultimate", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -106,8 +110,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "performance", - name: "Qoder Performance", + id: "Performance", + upstreamKey: "performance", + name: "Performance", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -119,8 +124,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "efficient", - name: "Qoder Efficient", + id: "Efficient", + upstreamKey: "efficient", + name: "Efficient", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -132,8 +138,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "lite", - name: "Qoder Lite", + id: "Lite", + upstreamKey: "lite", + name: "Lite", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -145,8 +152,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "qmodel", - name: "Qwen3.7 Plus (Qoder)", + id: "Qwen3.7Plus", + upstreamKey: "qmodel", + name: "Qwen3.7 Plus", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -158,8 +166,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "cmodel", - name: "Cantus (Qoder)", + id: "Cantus", + upstreamKey: "cmodel", + name: "Cantus", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -171,8 +180,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "qmodel_preview", - name: "Qwen3.8 Max Preview (Qoder)", + id: "Qwen3.8-Max", + upstreamKey: "qmodel_preview", + name: "Qwen3.8-Max", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -184,8 +194,10 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "qmodel_latest", - name: "Qwen3.7 Max (Qoder)", + id: "Qwen3.7-Max", + upstreamKey: "qmodel_latest", + upstreamKey: "qmodel_latest", + name: "Qwen3.7-Max", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -197,8 +209,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "dmodel", - name: "DeepSeek V4 Pro (Qoder)", + id: "DeepSeek-V4-Pro", + upstreamKey: "dmodel", + name: "DeepSeek-V4-Pro", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -210,8 +223,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "dfmodel", - name: "DeepSeek V4 Flash (Qoder)", + id: "DeepSeek-V4-Flash", + upstreamKey: "dfmodel", + name: "DeepSeek-V4-Flash", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -223,8 +237,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "gm51model", - name: "GLM 5.2 (Qoder)", + id: "GLM-5.2", + upstreamKey: "gm51model", + name: "GLM-5.2", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -236,8 +251,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "kmodel", - name: "Kimi K2.7 Code (Qoder)", + id: "Kimi-K2.7-Code", + upstreamKey: "kmodel", + name: "Kimi-K2.7-Code", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -250,8 +266,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "kmodel_latest", - name: "Kimi K3 (Qoder)", + id: "Kimi-K3", + upstreamKey: "kmodel_latest", + name: "Kimi-K3", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -263,8 +280,9 @@ export const staticModels: QoderModelDef[] = [ maxTokens: MAX_OUTPUT_TOKENS, }, { - id: "mmodel", - name: "MiniMax M3 (Qoder)", + id: "MiniMax-M3", + upstreamKey: "mmodel", + name: "MiniMax-M3", api: "qoder-api", provider: "qoder", baseUrl: "https://api3.qoder.sh/", @@ -310,6 +328,7 @@ export const staticCnModels: QoderModelDef[] = [ }, { id: "Qwen3.7-Plus", + upstreamKey: "qmodel", name: "Qwen3.7-Plus", api: "qoder-api", provider: "qoder-cn", @@ -324,6 +343,7 @@ export const staticCnModels: QoderModelDef[] = [ }, { id: "Qwen3.6-Flash", + upstreamKey: "q36fmodel", name: "Qwen3.6-Flash", api: "qoder-api", provider: "qoder-cn", @@ -338,6 +358,7 @@ export const staticCnModels: QoderModelDef[] = [ }, { id: "DeepSeek-V4-Pro", + upstreamKey: "dmodel", name: "DeepSeek-V4-Pro", api: "qoder-api", provider: "qoder-cn", @@ -352,6 +373,7 @@ export const staticCnModels: QoderModelDef[] = [ }, { id: "DeepSeek-V4-Flash", + upstreamKey: "dfmodel", name: "DeepSeek-V4-Flash", api: "qoder-api", provider: "qoder-cn", @@ -366,6 +388,7 @@ export const staticCnModels: QoderModelDef[] = [ }, { id: "GLM-5.2", + upstreamKey: "gm51model", name: "GLM-5.2", api: "qoder-api", provider: "qoder-cn", @@ -381,6 +404,7 @@ export const staticCnModels: QoderModelDef[] = [ }, { id: "Kimi-K2.7-Code", + upstreamKey: "kmodel", name: "Kimi-K2.7-Code", api: "qoder-api", provider: "qoder-cn", @@ -396,6 +420,7 @@ export const staticCnModels: QoderModelDef[] = [ }, { id: "MiniMax-M2.7", + upstreamKey: "mmodel", name: "MiniMax-M2.7", api: "qoder-api", provider: "qoder-cn", @@ -463,12 +488,17 @@ export function getCachedModels(mode?: string): QoderModelDef[] { try { const data = JSON.parse(readFileSync(cachePath, "utf8")); if (data && Array.isArray(data.models)) { + const models = data.models.map((model: QoderModelDef) => { + const config = data.configs?.[model.id] as QoderModelEntry | undefined; + const display = config?.display_name; + return display ? { ...model, id: toQoderModelId(display), name: display } : model; + }); // Older releases injected `auto` without a corresponding service config. // Keep an explicitly enabled service model, but drop the legacy fallback. if (data.configs && typeof data.configs === "object" && !data.configs.auto) { - return data.models.filter((model: QoderModelDef) => model.id !== "auto"); + return models.filter((model: QoderModelDef) => model.id.toLowerCase() !== "auto"); } - return data.models; + return models; } } catch {} } @@ -486,19 +516,24 @@ export function getCachedModelConfig(modelKey: string, mode?: string): QoderMode } catch {} } - // No cached config. This only happens before the first successful catalog - // fetch (e.g. not yet logged in), in which case the request cannot succeed - // anyway. Return a minimal entry carrying the id as the key so callers have - // something to read; reasoning is unknown so default to false. - if (isQoderCNMode(mode)) { + // Static catalogs expose friendly ids too. Preserve raw keys as request-time + // aliases so older commands and persisted selections continue to work. + const staticModel = (isQoderCNMode(mode) ? staticCnModels : staticModels).find( + (model) => model.id.toLowerCase() === modelKey.toLowerCase() || model.upstreamKey === modelKey, + ); + if (staticModel) { return { - key: modelKey, - is_reasoning: false, + key: staticModel.upstreamKey || modelKey, + is_reasoning: staticModel.reasoning, source: "system", }; } - return null; + return { + key: modelKey, + is_reasoning: false, + source: "system", + }; } /** Resolve contextWindow from a catalog entry. Exported for tests. */ @@ -600,12 +635,10 @@ export async function updateQoderModelsCache( const isReasoning = !!entry.is_reasoning || !!entry.thinking_config; const supportsEffort = !!entry.thinking_config?.enabled?.efforts; const thinkingLevelMap = buildThinkingLevelMap(entry); - // CN models expose the upstream display_name (whitespace-stripped) as the - // pi-visible id; the original `key` is stored in `configs` and read back at - // request time, so no key<->friendlyId mapping table is needed. - const modelInfo = isQoderCNMode(mode) - ? { id: toQoderCNModelId(display), name: display } - : { id: key, name: display }; + // Both regions expose display_name (whitespace-stripped) as the pi-visible + // id. The original key remains indexed in configs for request-time lookup + // and compatibility with old CLI/persisted model references. + const modelInfo = { id: toQoderModelId(display), name: display }; configs[key] = entry; if (modelInfo.id !== key) configs[modelInfo.id] = entry; diff --git a/src/stream.ts b/src/stream.ts index 634ffa8..225ffaf 100644 --- a/src/stream.ts +++ b/src/stream.ts @@ -137,18 +137,15 @@ export function streamQoder( const email = ident.email || getQoderUserEmailFallback(providerMode); const machineID = ident.machineID || getMachineId(); - // The model `id` pi exposes is the upstream display_name (whitespace - // stripped) for CN, or the raw key for the international site. The - // request-time upstream `key` is read back from the cached model config - // (which stores the original entry keyed by both `key` and `id`), so no - // key<->friendlyId mapping table is needed here. + // Both providers expose the upstream display_name (whitespace stripped) + // as the pi id. Read the original key from cached/static config so the + // gateway still receives identifiers such as `lite` or `qmodel`. const modelConfig = getCachedModelConfig(model.id, providerMode) || { key: model.id, is_reasoning: false, source: "system", }; - // Use the cached entry's original upstream key when available; fall back to - // the pi id (international site already uses the key as id). + // Raw legacy keys are also indexed as aliases by the model config cache. const qoderModel = modelConfig.key || model.id; const isReasoning = !!modelConfig.is_reasoning;