mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-07-31 12:22:14 +03:00
9c1db94c74
resolveOmniRoutePluginOptions() auto-prefixes providerId with "opencode-"
(commit 75b52e286) so OpenCode 1.17.8+'s native-adapter gate accepts it as a
registered provider id. That prefixed value was being reused for the
OmniRoute-server-facing identifiers too: mapRawModelToModelV2's id/providerID,
mapComboToModelV2's providerID, and the dynamic provider hook's combo catalog
keys. OmniRoute's server has no "opencode-<x>" provider alias, so every
dispatched model failed credential lookup with "No credentials for
opencode-omniroute" / "No active credentials for provider:
opencode-omniroute".
Add a second, unprefixed omnirouteProviderId field and thread it through the
four dynamic-hook call sites that emit server-facing identifiers, while
leaving the OC-gate-prefixed providerId in place for AuthHook.provider,
provider registration (hook.id), and the static-catalog path (which OC
strips before dispatch, per the existing static-block comments).
100 lines
4.2 KiB
TypeScript
100 lines
4.2 KiB
TypeScript
/**
|
|
* Regression test for #6859.
|
|
*
|
|
* `resolveOmniRoutePluginOptions()` auto-prefixes `providerId` with
|
|
* `"opencode-"` (commit 75b52e286) so OpenCode 1.17.8+'s native-adapter gate
|
|
* accepts it as an OC-registered provider id. That prefixed value must stay
|
|
* OC-internal (AuthHook.provider / provider registration keys) — it must
|
|
* NEVER leak into the identifiers OmniRoute's own server parses to resolve
|
|
* credentials (`mapRawModelToModelV2`'s `id`/`providerID`,
|
|
* `mapComboToModelV2`'s `providerID`, and the dynamic-hook catalog keys).
|
|
*
|
|
* OmniRoute's server-side `parseModel()` (open-sse/services/model.ts) splits
|
|
* a dispatched model string on `/` to recover the provider name and look up
|
|
* credentials. If the plugin embeds the OC-gate-prefixed id in that string,
|
|
* the server looks up credentials for a provider named "opencode-omniroute"
|
|
* (which never exists in `src/shared/constants/providers.ts`) instead of
|
|
* "omniroute" — producing the exact "No credentials for opencode-omniroute" /
|
|
* "No active credentials for provider: opencode-omniroute" errors reported
|
|
* in #6859.
|
|
*/
|
|
|
|
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import {
|
|
createOmniRouteProviderHook,
|
|
mapRawModelToModelV2,
|
|
resolveOmniRoutePluginOptions,
|
|
} from "../src/index.js";
|
|
|
|
/**
|
|
* Minimal stand-in for OmniRoute's own `parseModel()` (open-sse/services/
|
|
* model.ts), which splits a dispatched `<providerID>/<modelID>` string on the
|
|
* FIRST "/" to recover the provider name used for credential lookup. Kept
|
|
* local (rather than cross-importing the real module) so this package's
|
|
* self-contained test suite (`cd @omniroute/opencode-plugin && npm test`)
|
|
* doesn't depend on the root repo's `@/*` path-alias resolution.
|
|
*/
|
|
function splitProviderFromDispatchedModel(modelStr: string): string {
|
|
const idx = modelStr.indexOf("/");
|
|
return idx === -1 ? modelStr : modelStr.slice(0, idx);
|
|
}
|
|
|
|
const apiAuth = (key: string) => ({ type: "api" as const, key });
|
|
|
|
test("#6859: server-facing model id/providerID must resolve to the unprefixed provider name", () => {
|
|
const resolved = resolveOmniRoutePluginOptions();
|
|
|
|
// The OC-gate-compatible id stays prefixed — it is legitimate for
|
|
// AuthHook.provider / provider registration.
|
|
assert.equal(resolved.providerId, "opencode-omniroute");
|
|
|
|
// A second, unprefixed id must be exposed for anything that reaches
|
|
// OmniRoute's own server (model id prefix, ModelV2.providerID, combo keys).
|
|
assert.equal(
|
|
resolved.omnirouteProviderId,
|
|
"omniroute",
|
|
"resolveOmniRoutePluginOptions() must expose an unprefixed omnirouteProviderId"
|
|
);
|
|
|
|
// A bare raw /v1/models entry (no existing "/" in its id — the common
|
|
// case for OmniRoute's catalog) mapped with the server-facing id.
|
|
const model = mapRawModelToModelV2(
|
|
{ id: "claude-opus-4-7" },
|
|
{ providerId: resolved.omnirouteProviderId, baseURL: "http://localhost:20128" }
|
|
);
|
|
|
|
assert.equal(model.providerID, "omniroute");
|
|
assert.equal(model.id, "omniroute/claude-opus-4-7");
|
|
|
|
// OpenCode dispatches back to OmniRoute using `providerID/modelKey`
|
|
// (matches the issue's own repro: `-m opencode-omniroute/oc/big-pickle`).
|
|
const dispatchedModelString = `${model.providerID}/claude-opus-4-7`;
|
|
const parsedProvider = splitProviderFromDispatchedModel(dispatchedModelString);
|
|
|
|
assert.equal(
|
|
parsedProvider,
|
|
"omniroute",
|
|
`server-side provider split resolved '${parsedProvider}', expected 'omniroute' — ` +
|
|
`credentials lookup would fail for an OC-gate-prefixed provider id`
|
|
);
|
|
});
|
|
|
|
test("#6859: createOmniRouteProviderHook end-to-end — catalog keys/providerID never carry the OC-gate prefix", async () => {
|
|
const hook = createOmniRouteProviderHook(
|
|
{ baseURL: "https://or.example.com/v1" },
|
|
{
|
|
fetcher: async () => [{ id: "claude-opus-4-7" }],
|
|
combosFetcher: async () => [],
|
|
}
|
|
);
|
|
const out = await hook.models!({} as never, { auth: apiAuth("sk-test") as never });
|
|
const model = out["omniroute/claude-opus-4-7"];
|
|
assert.ok(model, "catalog keyed under the unprefixed provider name");
|
|
assert.equal(model.providerID, "omniroute");
|
|
assert.ok(
|
|
!model.providerID.startsWith("opencode-"),
|
|
"the OC-gate prefix must never leak into ModelV2.providerID"
|
|
);
|
|
});
|