diff --git a/package-lock.json b/package-lock.json index 17de0fd..3680ac6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pi-provider-qoder", - "version": "0.4.0", + "version": "0.4.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pi-provider-qoder", - "version": "0.4.0", + "version": "0.4.1", "license": "MIT", "devDependencies": { "@biomejs/biome": "2.4.2", diff --git a/package.json b/package.json index 352eb3d..d59514b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pi-provider-qoder", - "version": "0.4.0", + "version": "0.4.1", "description": "Pi extension for Qoder AI \u2014 with OAuth authentication, COSY signatures and WAF bypass", "type": "module", "license": "MIT", @@ -19,7 +19,7 @@ "README.md" ], "scripts": { - "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent", + "build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent --external:@earendil-works/pi-ai/compat", "check": "node node_modules/typescript/bin/tsc --noEmit", "lint": "node node_modules/@biomejs/biome/bin/biome check .", "lint:fix": "node node_modules/@biomejs/biome/bin/biome check --write .", diff --git a/src/__tests__/catalog.test.ts b/src/__tests__/catalog.test.ts index 4236f1a..c8c2a90 100644 --- a/src/__tests__/catalog.test.ts +++ b/src/__tests__/catalog.test.ts @@ -82,6 +82,7 @@ describe("staticCnModels", () => { expect(m.id).toBeTruthy(); expect(m.name).toBeTruthy(); expect(m.api).toBe("qoder-api"); + expect(m.api).not.toBe("qoder-cn-api"); expect(m.provider).toBe("qoder-cn"); expect(m.baseUrl).toContain("qoder.com.cn"); expect(typeof m.reasoning).toBe("boolean"); diff --git a/src/__tests__/providers.test.ts b/src/__tests__/providers.test.ts index e75bff6..d86879f 100644 --- a/src/__tests__/providers.test.ts +++ b/src/__tests__/providers.test.ts @@ -21,6 +21,21 @@ afterEach(() => { vi.resetModules(); }); +function liteModel(provider: "qoder" | "qoder-cn") { + return { + id: "Lite", + name: "Lite", + api: "qoder-api", + provider, + baseUrl: provider === "qoder-cn" ? "https://gateway.qoder.com.cn/" : "https://api3.qoder.sh/", + reasoning: false, + input: ["text"] as const, + cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, + contextWindow: 1000000, + maxTokens: 131072, + }; +} + describe("provider region binding", () => { it("binds qoder to global and qoder-cn to CN", async () => { for (const name of patEnvNames) delete process.env[name]; @@ -68,3 +83,50 @@ describe("provider region binding", () => { expect(fetchMock).toHaveBeenLastCalledWith("https://openapi.qoder.com.cn/api/v2/quota/usage", expect.any(Object)); }); }); + +describe("qoder-api registry", () => { + it("registers qoder-api so global streamSimple works for both regions", async () => { + for (const name of patEnvNames) delete process.env[name]; + + // Import compat and the extension in the same test. afterEach resetModules + // would otherwise give them separate copies of the API registry Map. + const { getApiProvider, streamSimple, unregisterApiProviders } = await import("@earendil-works/pi-ai/compat"); + const { default: registerProviders } = await import("../index.js"); + // Node caches node_modules ESM, so a prior test in this file may already + // have registered qoder-api. Drop that entry before asserting the empty state. + unregisterApiProviders("provider:qoder"); + const emptyContext = { systemPrompt: "", messages: [] }; + + expect(getApiProvider("qoder-api")).toBeUndefined(); + expect(() => streamSimple(liteModel("qoder") as never, emptyContext)).toThrow( + /No API provider registered for api: qoder-api/, + ); + + const providers = new Map>(); + const registerProvider = vi.fn((providerID: string, config: Record) => { + providers.set(providerID, config); + }); + const pi = { + registerProvider, + on: vi.fn(), + }; + + await registerProviders(pi as never); + + expect(registerProvider).toHaveBeenCalledTimes(2); + expect(providers.has("qoder")).toBe(true); + expect(providers.has("qoder-cn")).toBe(true); + expect(providers.get("qoder")?.api).toBe("qoder-api"); + expect(providers.get("qoder-cn")?.api).toBe("qoder-api"); + expect(typeof providers.get("qoder")?.streamSimple).toBe("function"); + expect(typeof providers.get("qoder-cn")?.streamSimple).toBe("function"); + + expect(getApiProvider("qoder-api")).toBeDefined(); + expect(() => streamSimple(liteModel("qoder") as never, emptyContext)).not.toThrow( + /No API provider registered for api: qoder-api/, + ); + expect(() => streamSimple(liteModel("qoder-cn") as never, emptyContext)).not.toThrow( + /No API provider registered for api: qoder-api/, + ); + }); +}); diff --git a/src/index.ts b/src/index.ts index 1dbe4a1..68d805b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,5 @@ import type { Api, Model, OAuthCredentials } from "@earendil-works/pi-ai"; +import { registerApiProvider } from "@earendil-works/pi-ai/compat"; import type { ExtensionAPI, ProviderConfig } from "@earendil-works/pi-coding-agent"; import { autoLoginQoderFromEnvironment, @@ -17,6 +18,19 @@ type OAuthConfigWithUsage = NonNullable & { fetchUsage: (credentials: OAuthCredentials) => Promise; }; +const QODER_API = "qoder-api" as Api; + +function registerQoderApi(): void { + registerApiProvider( + { + api: QODER_API, + stream: streamQoder, + streamSimple: streamQoder, + }, + "provider:qoder", + ); +} + function modelsForProvider(mode: QoderMode, providerID: string): Model[] { const cached = getCachedModels(mode); const modelsToUse = cached.length > 0 ? cached : mode === "cn" ? staticCnModels : staticModels; @@ -49,7 +63,7 @@ function registerQoderProvider(pi: ExtensionAPI, mode: QoderMode): void { const oauth = createQoderOAuth(mode); pi.registerProvider(providerID, { baseUrl: getQoderBaseUrl(mode), - api: "qoder-api" as Api, + api: QODER_API, models: modelsForProvider(mode, providerID) as unknown as ProviderConfig["models"], oauth: oauth as ProviderConfig["oauth"], // pi-coding-agent resolves its own nested @earendil-works/pi-ai copy, so the @@ -76,6 +90,8 @@ async function refreshModelsAtStartup(mode: QoderMode): Promise { } export default async function (pi: ExtensionAPI) { + registerQoderApi(); + for (const mode of QODER_MODES) { const providerID = getQoderRegionConfig(mode).providerID; try {