From a238e428fe922eb2fcb1b2857b00a934513b7b42 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sun, 6 Sep 2026 12:53:03 +0000 Subject: [PATCH] fix: load registerApiProvider dynamically for OMP OMP rewrites @earendil-works/pi-ai/compat to a bundle without registerApiProvider, which broke static import at install/load. Probe the export at runtime; stock pi still registers qoder-api for global streamSimple, while OMP relies on registerProvider(streamSimple). --- README.md | 1 + package-lock.json | 4 ++-- package.json | 2 +- src/__tests__/providers.test.ts | 42 +++++++++++++++++++++++++++++++-- src/index.ts | 24 ++++++++++--------- 5 files changed, 57 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5ca3784..a881365 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ A [pi](https://shittycodingagent.ai/) extension that connects pi to Qoder. ```bash pi install npm:pi-provider-qoder +# or: omp install npm:pi-provider-qoder ``` ```bash diff --git a/package-lock.json b/package-lock.json index 8664c9c..64437bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pi-provider-qoder", - "version": "0.4.3", + "version": "0.4.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pi-provider-qoder", - "version": "0.4.3", + "version": "0.4.4", "license": "MIT", "devDependencies": { "@biomejs/biome": "2.5.12", diff --git a/package.json b/package.json index 6570c0e..73c19bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pi-provider-qoder", - "version": "0.4.3", + "version": "0.4.4", "description": "Pi extension for Qoder AI — with OAuth authentication, COSY signatures and WAF bypass", "type": "module", "license": "MIT", diff --git a/src/__tests__/providers.test.ts b/src/__tests__/providers.test.ts index d86879f..480cfc8 100644 --- a/src/__tests__/providers.test.ts +++ b/src/__tests__/providers.test.ts @@ -18,6 +18,7 @@ afterEach(() => { else process.env[name] = value; } vi.unstubAllGlobals(); + vi.doUnmock("@earendil-works/pi-ai/compat"); vi.resetModules(); }); @@ -88,8 +89,15 @@ 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 actual = await vi.importActual("@earendil-works/pi-ai/compat"); + const registerSpy = vi.fn((...args: Parameters) => { + return actual.registerApiProvider(...args); + }); + vi.doMock("@earendil-works/pi-ai/compat", () => ({ + ...actual, + registerApiProvider: registerSpy, + })); + 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 @@ -113,6 +121,7 @@ describe("qoder-api registry", () => { await registerProviders(pi as never); + expect(registerSpy).toHaveBeenCalledTimes(1); expect(registerProvider).toHaveBeenCalledTimes(2); expect(providers.has("qoder")).toBe(true); expect(providers.has("qoder-cn")).toBe(true); @@ -129,4 +138,33 @@ describe("qoder-api registry", () => { /No API provider registered for api: qoder-api/, ); }); + + it("still registers providers when registerApiProvider is absent (OMP-style)", async () => { + for (const name of patEnvNames) delete process.env[name]; + + vi.doMock("@earendil-works/pi-ai/compat", () => ({ + // OMP bundled pi-ai/compat does not export registerApiProvider. + })); + + const { default: registerProviders } = await import("../index.js"); + + const providers = new Map>(); + const registerProvider = vi.fn((providerID: string, config: Record) => { + providers.set(providerID, config); + }); + const pi = { + registerProvider, + on: vi.fn(), + }; + + await expect(registerProviders(pi as never)).resolves.toBeUndefined(); + + 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"); + }); }); diff --git a/src/index.ts b/src/index.ts index 68d805b..f65fc12 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,4 @@ 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, @@ -20,15 +19,18 @@ type OAuthConfigWithUsage = NonNullable & { const QODER_API = "qoder-api" as Api; -function registerQoderApi(): void { - registerApiProvider( - { - api: QODER_API, - stream: streamQoder, - streamSimple: streamQoder, - }, - "provider:qoder", - ); +async function registerQoderApi(): Promise { + try { + const compat = await import("@earendil-works/pi-ai/compat"); + const register = (compat as Record).registerApiProvider; + if (typeof register !== "function") return; // OMP / hosts without the export + (register as (config: unknown, source: string) => void)( + { api: QODER_API, stream: streamQoder, streamSimple: streamQoder }, + "provider:qoder", + ); + } catch { + // Host has no compat registry; registerProvider(streamSimple) is enough. + } } function modelsForProvider(mode: QoderMode, providerID: string): Model[] { @@ -90,7 +92,7 @@ async function refreshModelsAtStartup(mode: QoderMode): Promise { } export default async function (pi: ExtensionAPI) { - registerQoderApi(); + await registerQoderApi(); for (const mode of QODER_MODES) { const providerID = getQoderRegionConfig(mode).providerID;