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).
This commit is contained in:
@@ -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
|
||||
|
||||
Generated
+2
-2
@@ -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",
|
||||
|
||||
+1
-1
@@ -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",
|
||||
|
||||
@@ -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<typeof import("@earendil-works/pi-ai/compat")>("@earendil-works/pi-ai/compat");
|
||||
const registerSpy = vi.fn((...args: Parameters<typeof actual.registerApiProvider>) => {
|
||||
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<string, Record<string, unknown>>();
|
||||
const registerProvider = vi.fn((providerID: string, config: Record<string, unknown>) => {
|
||||
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");
|
||||
});
|
||||
});
|
||||
|
||||
+13
-11
@@ -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<ProviderConfig["oauth"]> & {
|
||||
|
||||
const QODER_API = "qoder-api" as Api;
|
||||
|
||||
function registerQoderApi(): void {
|
||||
registerApiProvider(
|
||||
{
|
||||
api: QODER_API,
|
||||
stream: streamQoder,
|
||||
streamSimple: streamQoder,
|
||||
},
|
||||
"provider:qoder",
|
||||
);
|
||||
async function registerQoderApi(): Promise<void> {
|
||||
try {
|
||||
const compat = await import("@earendil-works/pi-ai/compat");
|
||||
const register = (compat as Record<string, unknown>).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<Api>[] {
|
||||
@@ -90,7 +92,7 @@ async function refreshModelsAtStartup(mode: QoderMode): Promise<void> {
|
||||
}
|
||||
|
||||
export default async function (pi: ExtensionAPI) {
|
||||
registerQoderApi();
|
||||
await registerQoderApi();
|
||||
|
||||
for (const mode of QODER_MODES) {
|
||||
const providerID = getQoderRegionConfig(mode).providerID;
|
||||
|
||||
Reference in New Issue
Block a user