Skip to content
Python

OpenRouter account as its own Subscriptions provider

Rohit C Prasad0126a966af4e
diff --git a/README.md b/README.md
index 01723fb3..8ce19139 100644
--- a/README.md
+++ b/README.md
@@ -22,14 +22,13 @@ It runs on your machine and doesn't lock you into any model: bring your own API
Open the app, add a model key (or point it at Ollama), and ask for something real.
-For OpenRouter, open **Settings → Models → OpenRouter** (also available during
-setup). Enter an API key and click **Test**, or choose **Sign in with OpenRouter**
-below the key field. Browser sign-in uses your OpenRouter credits and stores the
-issued key locally. For a remote backend, choose **Use a manual code** and paste
-the code shown by OpenRouter. Signing in selects account credentials; testing and
-saving an API key explicitly switches back. Disconnecting an active account does
-not silently fall back to a saved or environment key. To revoke the issued key
-remotely, use the **Manage or revoke keys on OpenRouter** link.
+OpenRouter comes two ways under **Settings → Models & Keys**: **OpenRouter** (API
+keys) takes a key you paste; **OpenRouter account** (Subscriptions) signs you in
+through the browser and uses your OpenRouter credits — the key OpenRouter issues
+stays on this computer. On a remote backend choose **Use a manual code** and paste
+the code OpenRouter shows. Each card is its own provider with its own models, so
+disconnecting the account never falls back to a pasted key. To revoke the issued
+key on OpenRouter's side, use the **Manage or revoke keys on OpenRouter** link.
## Use cases
diff --git a/coworker/providers/matrix.py b/coworker/providers/matrix.py
index ec2917ea..6dcee64b 100644
--- a/coworker/providers/matrix.py
+++ b/coworker/providers/matrix.py
@@ -342,6 +342,16 @@ MATRIX: dict[str, ModelEntry] = {
}
+# The signed-in OpenRouter provider serves the same catalog as the key-based one.
+MATRIX.update(
+ {
+ "openrouter-account:" + mid.split(":", 1)[1]: entry
+ for mid, entry in list(MATRIX.items())
+ if mid.startswith("openrouter:")
+ }
+)
+
+
def entry_for(model: str) -> ModelEntry | None:
return MATRIX.get(model)
diff --git a/coworker/providers/openrouter_auth.py b/coworker/providers/openrouter_auth.py
index c1c52a8a..638d7d2b 100644
--- a/coworker/providers/openrouter_auth.py
+++ b/coworker/providers/openrouter_auth.py
@@ -1,4 +1,5 @@
-"""OpenRouter PKCE login. Account keys stay server-side; no refresh token is issued."""
+"""OpenRouter PKCE login for the `openrouter-account` provider. The key OpenRouter issues
+lives in that provider's own profile; no refresh token is involved."""
from __future__ import annotations
@@ -53,11 +54,8 @@ class OpenRouterAuth:
self.exchanging = False
def status(self) -> dict[str, Any]:
- profile = self.secrets.get("provider:openrouter") or {}
return {
"connected": bool((self.secrets.get(PROFILE) or {}).get("api_key")),
- "active": profile.get("auth_method") == "account"
- and bool(profile.get("account_connected")),
"authorizing": self.attempt_id is not None,
"attempt_id": self.attempt_id,
"authorize_url": self.authorize_url,
@@ -175,9 +173,6 @@ class OpenRouterAuth:
if attempt_id != self.attempt_id:
return self.status()
self.secrets.put(PROFILE, {"api_key": key})
- profile = dict(self.secrets.get("provider:openrouter") or {})
- profile.update(auth_method="account", account_connected=True)
- self.secrets.put("provider:openrouter", profile)
self.cancel()
self.on_changed()
except Exception:
@@ -190,8 +185,5 @@ class OpenRouterAuth:
self.cancel()
self.error = None
self.secrets.delete(PROFILE)
- profile = dict(self.secrets.get("provider:openrouter") or {})
- profile["account_connected"] = False
- self.secrets.put("provider:openrouter", profile)
self.on_changed()
return self.status()
diff --git a/coworker/providers/registry.py b/coworker/providers/registry.py
index 02a1e4c8..411fe522 100644
--- a/coworker/providers/registry.py
+++ b/coworker/providers/registry.py
@@ -223,6 +223,19 @@ def _local_server(name: str):
return build
+OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1"
+
+
+def _build_openrouter_account(profile: dict[str, Any], secrets: Any) -> ProviderClient:
+ """The `openrouter-account` provider: the key OpenRouter issued at sign-in
+ (providers/openrouter_auth.py), always against OpenRouter's own endpoint — a
+ browser credential is never sent to a custom gateway."""
+ api_key = ((profile or {}).get("api_key") or "").strip()
+ if not api_key:
+ raise RuntimeError("OpenRouter account not signed in — sign in under Models & Keys.")
+ return OpenAIProvider(api_key=api_key, base_url=OPENROUTER_BASE_URL)
+
+
def _openai_compat(vendor: str, default_base_url: str, env_key: Optional[str] = None):
"""Builder factory for vendors reached through their OpenAI-compatible API (Z AI, DeepSeek,
Kimi, MiniMax, Qwen, xAI, Mistral). The key is resolved from the vendor's OWN profile (or its
@@ -232,16 +245,6 @@ def _openai_compat(vendor: str, default_base_url: str, env_key: Optional[str] =
"""
def build(profile: dict[str, Any], secrets: Any) -> ProviderClient:
- if vendor == "OpenRouter" and profile.get("auth_method") == "account":
- account = (secrets.get("provider:openrouter-account") or {}) if secrets else {}
- if not profile.get("account_connected") or not account.get("api_key"):
- raise RuntimeError(
- "OpenRouter account disconnected — sign in or explicitly save an API key."
- )
- # Browser credentials must never be sent to a custom gateway.
- return OpenAIProvider(
- api_key=account["api_key"], base_url="https://openrouter.ai/api/v1"
- )
base_url = ((profile or {}).get("base_url") or "").strip() or default_base_url
api_key = ((profile or {}).get("api_key") or "").strip() or (
os.environ.get(env_key, "").strip() if env_key else ""
@@ -701,6 +704,18 @@ DESCRIPTORS: list[ProviderDescriptor] = [
recommended_model="z-ai/glm-5.2",
env_key="OPENROUTER_API_KEY",
),
+ ProviderDescriptor(
+ name="openrouter-account",
+ kind="subscription",
+ title="OpenRouter account",
+ needs_key=False,
+ fields=[],
+ build=_build_openrouter_account,
+ recommended_model="z-ai/glm-5.2",
+ blurb="Sign in with your OpenRouter account and use its credits — nothing to "
+ "paste. The key OpenRouter issues stays on this machine.",
+ auth="oauth",
+ ),
ProviderDescriptor(
name="ollama",
title="Ollama",
@@ -799,11 +814,10 @@ def descriptor_configured(d: ProviderDescriptor, profile: dict[str, Any]) -> boo
a stored or env key. Multi-field cloud providers (no `api_key` field, e.g. Bedrock):
every required field present — their actual credentials may be ambient (~/.aws, ADC).
"""
- if d.name == "openrouter" and profile.get("auth_method") == "account":
- return bool(profile.get("account_connected"))
if d.auth == "oauth":
- # A stored token set = signed in (the tokens live in the same profile).
- return bool((profile or {}).get("tokens"))
+ # Signed in = a stored token set, or the key a sign-in issued (OpenRouter).
+ profile = profile or {}
+ return bool(profile.get("tokens") or profile.get("api_key"))
if not d.needs_key:
return True # keyless (Ollama) — usable out of the box
profile = profile or {}
diff --git a/coworker/server/app.py b/coworker/server/app.py
index d66085d2..86aa10b8 100644
--- a/coworker/server/app.py
+++ b/coworker/server/app.py
@@ -188,13 +188,13 @@ def create_app(manager: SessionManager) -> FastAPI:
from ..providers.openrouter_auth import OpenRouterAuth
def openrouter_changed() -> None:
- manager._refresh_provider("openrouter")
- if manager._provider_configured("openrouter"):
+ manager._refresh_provider("openrouter-account")
+ if manager._provider_configured("openrouter-account"):
from ..providers.registry import get_descriptor
- model = get_descriptor("openrouter").recommended_model
+ model = get_descriptor("openrouter-account").recommended_model
if model:
- qualified = f"openrouter:{model}"
+ qualified = f"openrouter-account:{model}"
manager.add_model(qualified)
if not manager._provider_configured(manager._model_provider(manager.model)):
manager.set_default_model(qualified)
@@ -250,7 +250,7 @@ def create_app(manager: SessionManager) -> FastAPI:
@app.middleware("http")
async def require_sidecar_token(request: Request, call_next):
- if request.url.path.startswith("/v1/providers/openrouter/") and not _origin_allowed(
+ if request.url.path.startswith("/v1/providers/openrouter-account/") and not _origin_allowed(
request.headers.get("origin")
):
return JSONResponse({"error": "origin not allowed"}, status_code=403)
@@ -2341,14 +2341,14 @@ def create_app(manager: SessionManager) -> FastAPI:
name = (body or {}).get("name", "")
if not name:
return {"ok": False, "error": "name required"}
- if name == "openrouter":
+ if name == "openrouter-account":
openrouter_auth.cancel()
return manager.set_provider(name, (body or {}).get("fields"))
return await asyncio.to_thread(manager.set_provider, name, (body or {}).get("fields"))
@app.delete("/v1/providers/{name}")
async def providers_remove(name: str) -> dict[str, Any]:
- if name == "openrouter":
+ if name == "openrouter-account":
openrouter_auth.cancel()
return manager.remove_provider(name)
return await asyncio.to_thread(manager.remove_provider, name)
@@ -2379,23 +2379,23 @@ def create_app(manager: SessionManager) -> FastAPI:
asyncio.create_task(manager.codex_signin())
return {"ok": True, "started": True}
- @app.get("/v1/providers/openrouter/status")
+ @app.get("/v1/providers/openrouter-account/status")
async def openrouter_status():
return openrouter_auth.status()
- @app.post("/v1/providers/openrouter/signin")
+ @app.post("/v1/providers/openrouter-account/signin")
async def openrouter_signin(body: dict):
return await openrouter_auth.start(manual=body.get("manual") is True)
- @app.post("/v1/providers/openrouter/complete")
+ @app.post("/v1/providers/openrouter-account/complete")
async def openrouter_complete(body: dict):
return await openrouter_auth.complete(body.get("code"), body.get("attempt_id"))
- @app.post("/v1/providers/openrouter/cancel")
+ @app.post("/v1/providers/openrouter-account/cancel")
async def openrouter_cancel():
return openrouter_auth.cancel()
- @app.post("/v1/providers/openrouter/disconnect")
+ @app.post("/v1/providers/openrouter-account/disconnect")
async def openrouter_disconnect():
return openrouter_auth.disconnect()
diff --git a/coworker/server/manager.py b/coworker/server/manager.py
index b2a9e69f..89ec1e56 100644
--- a/coworker/server/manager.py
+++ b/coworker/server/manager.py
@@ -4065,10 +4065,6 @@ class SessionManager:
d.name
),
}
- if d.name == "openrouter":
- row["api_key_configured"] = bool(
- profile.get("api_key") or os.environ.get("OPENROUTER_API_KEY")
- )
if d.kind == "local":
# A keyless server is "connected" when it answers (cached probes), not
# when a form was saved; the page groups connected providers first.
@@ -4189,10 +4185,7 @@ class SessionManager:
profile[f.key] = val
elif not f.required:
profile.pop(f.key, None)
- missing = [
- f.label for f in d.fields if f.required and not profile.get(f.key)
- and not (name == "openrouter" and f.key == "api_key" and os.environ.get("OPENROUTER_API_KEY"))
- ]
+ missing = [f.label for f in d.fields if f.required and not profile.get(f.key)]
if missing:
return {"ok": False, "error": "missing: " + ", ".join(missing)}
# A (re)pasted key stamps its save date — Settings shows "key added <date>" so stale
@@ -4201,8 +4194,6 @@ class SessionManager:
from datetime import date
profile["key_set_at"] = date.today().isoformat()
- if name == "openrouter" and "api_key" in fields:
- profile["auth_method"] = "api_key"
self.secrets.put(f"provider:{name}", profile)
self.adopt_provider_default(name)
return {"ok": True, "provider": name, "recommended_model": d.recommended_model}
@@ -4245,14 +4236,7 @@ class SessionManager:
d = get_descriptor(name)
if d is None:
return {"ok": False, "error": f"unknown provider: {name}"}
- if name == "openrouter":
- profile = self.secrets.get("provider:openrouter") or {}
- self.secrets.put("provider:openrouter", {
- key: value for key, value in profile.items()
- if key in {"auth_method", "account_connected"}
- })
- else:
- self.secrets.delete(f"provider:{name}")
+ self.secrets.delete(f"provider:{name}")
self._refresh_provider(name)
return {"ok": True, "provider": name}
diff --git a/surfaces/gui/e2e/openrouter-signin.spec.ts b/surfaces/gui/e2e/openrouter-signin.spec.ts
index f988f908..ee95e3b6 100644
--- a/surfaces/gui/e2e/openrouter-signin.spec.ts
+++ b/surfaces/gui/e2e/openrouter-signin.spec.ts
@@ -13,26 +13,33 @@ async function mockOpenRouter(page: Page) {
{
name: "openrouter",
title: "OpenRouter",
+ kind: "api_key",
needs_key: true,
- configured: connected,
+ configured: false,
values: {},
suggested_models: [],
recommended_model: null,
fields: [
- {
- key: "api_key",
- label: "API key",
- secret: true,
- required: true,
- help: "",
- placeholder: "sk-or-…",
- },
+ { key: "api_key", label: "API key", secret: true, required: true, help: "", placeholder: "sk-or-…" },
],
},
+ {
+ name: "openrouter-account",
+ title: "OpenRouter account",
+ kind: "subscription",
+ auth: "oauth",
+ needs_key: false,
+ configured: connected,
+ signed_in: connected,
+ values: {},
+ suggested_models: [],
+ recommended_model: null,
+ fields: [],
+ },
],
}),
);
- await page.route("**/v1/providers/openrouter/**", async (route) => {
+ await page.route("**/v1/providers/openrouter-account/**", async (route) => {
const action = new URL(route.request().url()).pathname.split("/").pop();
if (action === "signin") {
expect(route.request().postDataJSON()).toEqual({ manual: true });
@@ -51,7 +58,6 @@ async function mockOpenRouter(page: Page) {
await route.fulfill({
json: {
connected,
- active: connected,
authorizing,
error: null,
attempt_id: authorizing ? "attempt-1" : null,
@@ -64,7 +70,7 @@ async function mockOpenRouter(page: Page) {
}
for (const surface of ["settings", "onboarding"] as const) {
- test(`${surface}: OpenRouter API key precedes account login, manual login and disconnect work`, async ({
+ test(`${surface}: OpenRouter account is its own card; manual login and disconnect work`, async ({
page,
}) => {
await mockOpenRouter(page);
@@ -77,14 +83,11 @@ for (const surface of ["settings", "onboarding"] as const) {
await page.getByRole("button", { name: "Run setup again" }).click();
}
const prefix = surface === "settings" ? "set" : "ob";
- await page.getByTestId(`${prefix}-provider-openrouter`).click();
- const key = page.getByTestId(`${prefix}-field-api_key`);
+ await page.getByTestId(`${prefix}-provider-openrouter-account`).click();
const signIn = page.getByTestId(`${prefix}-openrouter-signin`);
- await expect(key).toBeVisible();
await expect(signIn).toBeVisible();
- const keyBox = await key.boundingBox();
- const signInBox = await signIn.boundingBox();
- expect(keyBox!.y + keyBox!.height).toBeLessThan(signInBox!.y);
+ // The account card has no key field; the key lives on the API-key card.
+ await expect(page.getByTestId(`${prefix}-field-api_key`)).toHaveCount(0);
await page
.getByRole("button", { name: "Use a manual code", exact: true })
.click();
@@ -94,8 +97,7 @@ for (const surface of ["settings", "onboarding"] as const) {
await page.getByRole("button", { name: "Connect", exact: true }).click();
await expect(
page.getByTestId(`${prefix}-openrouter-connected`),
- ).toContainText("account credentials active");
- await expect(key).toHaveValue("");
+ ).toContainText("Connected to your OpenRouter account");
await page
.getByRole("button", { name: "Disconnect account", exact: true })
.click();
diff --git a/surfaces/gui/src/api.ts b/surfaces/gui/src/api.ts
index 79cdecbf..fbb3fb9d 100644
--- a/surfaces/gui/src/api.ts
+++ b/surfaces/gui/src/api.ts
@@ -2408,7 +2408,6 @@ export interface ProviderField {
}
export interface ProviderInfo {
- api_key_configured?: boolean;
name: string;
title: string;
needs_key: boolean;
@@ -2436,7 +2435,6 @@ export interface ProviderInfo {
// -- ChatGPT-subscription provider sign-in (OAuth; tokens never reach the GUI) ------
export interface OpenRouterAuthStatus {
connected: boolean;
- active: boolean;
authorizing: boolean;
attempt_id: string | null;
authorize_url: string | null;
@@ -2447,7 +2445,7 @@ export async function openRouterAuth(
action: "status" | "signin" | "complete" | "cancel" | "disconnect",
body: Record<string, unknown> = {},
): Promise<OpenRouterAuthStatus> {
- const response = await fetch(`${httpBase()}/v1/providers/openrouter/${action}`, action === "status" ? undefined : {
+ const response = await fetch(`${httpBase()}/v1/providers/openrouter-account/${action}`, action === "status" ? undefined : {
method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body),
});
if (!response.ok) throw new Error("OpenRouter authentication request failed");
diff --git a/surfaces/gui/src/components/ManageTabs.tsx b/surfaces/gui/src/components/ManageTabs.tsx
index 1d19ab9d..de87d6ba 100644
--- a/surfaces/gui/src/components/ManageTabs.tsx
+++ b/surfaces/gui/src/components/ManageTabs.tsx
@@ -175,7 +175,7 @@ export function ModelsTab() {
<div className="mt-6" data-testid="model-preview">
<div className={SEC_H + " mb-1.5"}>{t("manage.included_models")}</div>
<p className="text-meta text-muted mb-2.5 leading-relaxed">
- {t("manage.included_models_help")}
+ {t(info?.auth === "oauth" ? "manage.included_models_help_signin" : "manage.included_models_help")}
</p>
<div className="space-y-1">
{(info?.suggested_models || []).map((m) => {
diff --git a/surfaces/gui/src/locales/en.json b/surfaces/gui/src/locales/en.json
index 15400b85..1da16d1e 100644
--- a/surfaces/gui/src/locales/en.json
+++ b/surfaces/gui/src/locales/en.json
@@ -1,7 +1,6 @@
{
"openrouter": {
- "title": "Or connect your OpenRouter account",
- "note": "Uses your OpenRouter credits. Signing in selects account billing; testing and saving an API key selects that key instead.",
+ "title": "OpenRouter account",
"signin": "Sign in with OpenRouter",
"manual": "Use a manual code",
"waiting": "Complete sign-in in your browser.",
@@ -9,8 +8,7 @@
"cancel": "Cancel",
"code": "Authorization code",
"connect": "Connect",
- "active": "Connected · account credentials active",
- "saved": "Account saved · API key active",
+ "connected": "Connected to your OpenRouter account",
"disconnect": "Disconnect account",
"manage": "Manage or revoke keys on OpenRouter",
"unreachable": "Could not complete the request. Check the connection and try again."
@@ -1283,6 +1281,7 @@
"could_not_start_managed": "could not start the connect",
"id_title": "ID: {{id}}",
"included_models": "Included models",
+ "included_models_help_signin": "Curated, agent-capable models this provider serves — sign in above to enable them.",
"included_models_help": "Curated, agent-capable models this provider serves — add your key above to enable them.",
"listening_empty": "None yet — open a session's Sources ▸ Channels to subscribe it to a channel.",
"listening_title": "Sessions listening to {{title}} channels · {{n}}",
diff --git a/surfaces/gui/src/locales/zh.json b/surfaces/gui/src/locales/zh.json
index 909fc665..5f43ac74 100644
--- a/surfaces/gui/src/locales/zh.json
+++ b/surfaces/gui/src/locales/zh.json
@@ -1,7 +1,6 @@
{
"openrouter": {
- "title": "或连接您的 OpenRouter 账户",
- "note": "使用您的 OpenRouter 额度。登录后使用账户凭据;测试并保存 API 密钥后改用该密钥。",
+ "title": "OpenRouter 账户",
"signin": "使用 OpenRouter 登录",
"manual": "手动输入授权码",
"waiting": "请在浏览器中完成登录。",
@@ -9,8 +8,7 @@
"cancel": "取消",
"code": "授权码",
"connect": "连接",
- "active": "已连接 · 正在使用账户凭据",
- "saved": "账户已保存 · 正在使用 API 密钥",
+ "connected": "已连接到你的 OpenRouter 账户",
"disconnect": "断开账户连接",
"manage": "在 OpenRouter 管理或撤销密钥",
"unreachable": "无法完成请求。请检查连接后重试。"
@@ -1266,6 +1264,7 @@
"could_not_start_managed": "无法启动连接",
"id_title": "ID:{{id}}",
"included_models": "内置模型",
+ "included_models_help_signin": "此提供方精选的 agent 模型 —— 在上方登录即可启用。",
"included_models_help": "此提供方精选的 agent 模型 —— 在上方添加密钥即可启用。",
"listening_empty": "暂无 —— 打开会话的「来源 ▸ 频道」即可订阅频道。",
"listening_title": "正在监听 {{title}} 频道的会话 · {{n}}",
diff --git a/surfaces/gui/src/providers/OpenRouterSignIn.test.tsx b/surfaces/gui/src/providers/OpenRouterSignIn.test.tsx
index 34a1b2fa..2b0806d1 100644
--- a/surfaces/gui/src/providers/OpenRouterSignIn.test.tsx
+++ b/surfaces/gui/src/providers/OpenRouterSignIn.test.tsx
@@ -19,7 +19,6 @@ const translate = (key: string) => key;
const idle: OpenRouterAuthStatus = {
connected: false,
- active: false,
authorizing: false,
attempt_id: null,
authorize_url: null,
@@ -34,7 +33,6 @@ const pending: OpenRouterAuthStatus = {
const connected: OpenRouterAuthStatus = {
...idle,
connected: true,
- active: true,
};
beforeEach(() => {
@@ -43,31 +41,24 @@ beforeEach(() => {
});
afterEach(cleanup);
-it("places account sign-in below the API key in the shared provider form", async () => {
+it("is the account card's whole form: sign-in, no key field", async () => {
const info = {
- name: "openrouter",
- title: "OpenRouter",
- needs_key: true,
+ name: "openrouter-account",
+ title: "OpenRouter account",
+ kind: "subscription" as const,
+ auth: "oauth" as const,
+ needs_key: false,
configured: false,
values: {},
suggested_models: [],
recommended_model: null,
- fields: [
- {
- key: "api_key",
- label: "API key",
- secret: true,
- required: true,
- help: "",
- placeholder: "sk-or-…",
- },
- ],
+ fields: [],
};
const ps: ProviderSetupState = {
providers: [info],
ordered: [info],
info,
- sel: "openrouter",
+ sel: "openrouter-account",
fields: {},
refreshProviders: async () => {},
setFieldValue: vi.fn(),
@@ -89,11 +80,8 @@ it("places account sign-in below the API key in the shared provider form", async
fieldSaved: null,
};
render(<ProviderForm ps={ps} tp="shared" />);
- const key = screen.getByTestId("shared-field-api_key");
- const signIn = screen.getByTestId("shared-openrouter-signin");
- expect(
- key.compareDocumentPosition(signIn) & Node.DOCUMENT_POSITION_FOLLOWING,
- ).toBeTruthy();
+ expect(screen.getByTestId("shared-openrouter-signin")).toBeTruthy();
+ expect(screen.queryByTestId("shared-field-api_key")).toBeNull();
await waitFor(() => expect(openRouterAuth).toHaveBeenCalledWith("status"));
});
@@ -206,7 +194,7 @@ it("submits a manual code bound to its attempt and shows connected state", async
code: "returned-code",
attempt_id: "attempt-1",
});
- expect(screen.getByText("openrouter.active")).toBeTruthy();
+ expect(screen.getByText(/openrouter\.connected/)).toBeTruthy();
expect(changed).toHaveBeenCalled();
});
diff --git a/surfaces/gui/src/providers/OpenRouterSignIn.tsx b/surfaces/gui/src/providers/OpenRouterSignIn.tsx
index cbb4f66e..000d6314 100644
--- a/surfaces/gui/src/providers/OpenRouterSignIn.tsx
+++ b/surfaces/gui/src/providers/OpenRouterSignIn.tsx
@@ -50,7 +50,7 @@ export function OpenRouterSignIn({
useEffect(() => {
if (status && !status.authorizing) void onChanged();
- }, [status?.connected, status?.active, status?.authorizing]);
+ }, [status?.connected, status?.authorizing]);
const action = async (
name: "signin" | "complete" | "cancel" | "disconnect",
@@ -92,20 +92,13 @@ export function OpenRouterSignIn({
const button =
"rounded-lg border border-line px-3 py-2 text-[13px] text-ink hover:border-lineStrong disabled:opacity-40";
return (
- <section
- className="mt-4 border-t border-line pt-4"
- aria-label={t("openrouter.title")}
- >
- <p className="text-[13px] font-medium text-ink">
- {t("openrouter.title")}
- </p>
- <p className="text-[12px] text-faint mt-1 mb-3">{t("openrouter.note")}</p>
+ <section className="mt-4" aria-label={t("openrouter.title")}>
{status?.connected && (
<p
className="text-[12px] text-ok mb-2"
data-testid={`${tp}-openrouter-connected`}
>
- {t(status.active ? "openrouter.active" : "openrouter.saved")}
+ ✓ {t("openrouter.connected")}
</p>
)}
{status?.authorizing ? (
diff --git a/surfaces/gui/src/providers/ProviderSetup.tsx b/surfaces/gui/src/providers/ProviderSetup.tsx
index 51836d1d..c191b1c1 100644
--- a/surfaces/gui/src/providers/ProviderSetup.tsx
+++ b/surfaces/gui/src/providers/ProviderSetup.tsx
@@ -134,7 +134,7 @@ export function useProviderSetup(opts?: { onSaved?: () => void }): ProviderSetup
}, []);
const info = providers.find((p) => p.name === sel);
- const credentialed = (info?.api_key_configured ?? !!info?.configured) && !!info?.needs_key;
+ const credentialed = !!info?.configured && !!info?.needs_key;
const openProvider = (name: string) => {
const p = providers.find((x) => x.name === name);
@@ -169,13 +169,7 @@ export function useProviderSetup(opts?: { onSaved?: () => void }): ProviderSetup
setVerify({ state: "error", msg: res.error || t("provider.err_couldnt_verify") });
return false;
}
- if (dirty || !info?.configured || sel === "openrouter") {
- const saved = await setProvider(sel, fields).catch(() => ({ ok: false }));
- if (!saved.ok) {
- setVerify({ state: "error", msg: t("provider.err_unreachable") });
- return false;
- }
- }
+ if (dirty || !info?.configured) await setProvider(sel, fields).catch(() => {});
if (!info?.needs_key) setKeylessOk((s) => new Set(s).add(sel));
setVerify({ state: "ok" });
setDirty(false);
@@ -530,7 +524,12 @@ export function ProviderForm({
</div>
{info?.blurb && <p className="text-meta text-faint mt-1">{info.blurb}</p>}
- {info?.auth === "oauth" && <OAuthSignIn info={info} tp={tp} onChanged={ps.refreshProviders} />}
+ {info?.auth === "oauth" &&
+ (info.name === "openrouter-account" ? (
+ <OpenRouterSignIn tp={tp} onChanged={ps.refreshProviders} />
+ ) : (
+ <OAuthSignIn info={info} tp={tp} onChanged={ps.refreshProviders} />
+ ))}
{fieldsAll
.filter(
@@ -541,8 +540,6 @@ export function ProviderForm({
)
.map((f) => fieldRow(f, !choice && f.key === testKey))}
- {sel === "openrouter" && <OpenRouterSignIn tp={tp} onChanged={ps.refreshProviders} />}
-
{/* Auth-method segmented control + the selected method's panel (owner call
2026-07-26): one joined track, then a soft inset card holding only that
method's description, fields, and its own Test & save footer. */}
diff --git a/surfaces/gui/src/providers/logos.ts b/surfaces/gui/src/providers/logos.ts
index 7289b0f8..f8dcbfef 100644
--- a/surfaces/gui/src/providers/logos.ts
+++ b/surfaces/gui/src/providers/logos.ts
@@ -44,6 +44,8 @@ export const PROVIDER_LOGOS: Record<string, string> = {
bedrock,
vertex,
openrouter,
+ // Same mark for the signed-in OpenRouter provider: same models, billed to the account.
+ "openrouter-account": openrouter,
fireworks,
together,
zai,
@@ -68,6 +70,7 @@ export const PROVIDER_ORDER = [
"bedrock",
"vertex",
"openrouter",
+ "openrouter-account",
"fireworks",
"together",
"zai",
diff --git a/tests/test_openrouter_auth.py b/tests/test_openrouter_auth.py
index 58255c1e..b081ec88 100644
--- a/tests/test_openrouter_auth.py
+++ b/tests/test_openrouter_auth.py
@@ -111,29 +111,26 @@ def test_cancel_during_listener_creation_closes_stale_listener(tmp_path, monkeyp
asyncio.run(run())
-def test_account_uses_official_endpoint_and_ignores_other_keys(tmp_path, monkeypatch):
+def test_account_provider_uses_official_endpoint_and_its_own_key(tmp_path, monkeypatch):
from coworker.providers import registry
- store = SecretStore(tmp_path / "secrets.json")
- store.put("provider:openrouter-account", {"api_key": "account-key"})
monkeypatch.setenv("OPENROUTER_API_KEY", "environment-key")
monkeypatch.setattr(registry, "OpenAIProvider", lambda **kwargs: kwargs)
- builder = registry._openai_compat(
- "OpenRouter", "https://openrouter.ai/api/v1", "OPENROUTER_API_KEY"
- )
- profile = {
- "auth_method": "account",
- "account_connected": True,
- "api_key": "manual-key",
- "base_url": "https://untrusted.example",
- }
- assert builder(profile, store) == {
+ d = registry.get_descriptor("openrouter-account")
+ assert d.kind == "subscription" and d.auth == "oauth"
+ # The signed-in key, always against OpenRouter's own endpoint.
+ assert d.build({"api_key": "account-key", "base_url": "https://untrusted.example"}, None) == {
"api_key": "account-key",
"base_url": "https://openrouter.ai/api/v1",
}
- profile["account_connected"] = False
- with pytest.raises(RuntimeError, match="disconnected"):
- builder(profile, store)
+ assert registry.descriptor_configured(d, {"api_key": "account-key"})
+ assert not registry.descriptor_configured(d, {})
+ with pytest.raises(RuntimeError, match="not signed in"):
+ d.build({}, None)
+ # The key-based card still resolves its own key and ignores the account's.
+ key_card = registry.get_descriptor("openrouter")
+ assert key_card.build({"api_key": "manual-key"}, None)["api_key"] == "manual-key"
+ assert key_card.build({}, None)["api_key"] == "environment-key"
def test_cancel_during_exchange_cannot_restore_account(tmp_path, monkeypatch):
diff --git a/tests/test_openrouter_routes.py b/tests/test_openrouter_routes.py
index 059872d9..f1955217 100644
--- a/tests/test_openrouter_routes.py
+++ b/tests/test_openrouter_routes.py
@@ -6,7 +6,7 @@ from coworker.providers import openrouter_auth
from coworker.server import SessionManager, create_app
-def test_account_login_switching_and_disconnect(tmp_path, monkeypatch):
+def test_account_login_is_its_own_provider_and_disconnects(tmp_path, monkeypatch):
async def exchange(code, verifier):
assert code == "valid-code"
return "sk-or-account-secret"
@@ -17,64 +17,49 @@ def test_account_login_switching_and_disconnect(tmp_path, monkeypatch):
client = TestClient(create_app(manager))
with client:
start = client.post(
- "/v1/providers/openrouter/signin", json={"manual": True}
+ "/v1/providers/openrouter-account/signin", json={"manual": True}
).json()
done = client.post(
- "/v1/providers/openrouter/complete",
- json={
- "code": "valid-code",
- "attempt_id": start["attempt_id"],
- },
+ "/v1/providers/openrouter-account/complete",
+ json={"code": "valid-code", "attempt_id": start["attempt_id"]},
).json()
- assert done["active"] and done["connected"]
+ assert done["connected"] and not done["authorizing"]
rows = client.get("/v1/providers").json()
- row = next(row for row in rows if row["name"] == "openrouter")
- assert row["configured"] and row["api_key_configured"]
+ by_name = {row["name"]: row for row in rows}
+ # Two cards: the key under API keys, the account under Subscriptions.
+ assert by_name["openrouter"]["configured"] and by_name["openrouter"]["kind"] == "api_key"
+ account = by_name["openrouter-account"]
+ assert account["configured"] and account["signed_in"] and account["kind"] == "subscription"
assert "sk-or-" not in str(rows)
- assert manager._provider_configured("openrouter")
+ assert manager._provider_configured("openrouter-account")
+ assert manager.secrets.get("provider:openrouter") == {"api_key": "sk-or-manual"}
- # Explicitly saving the existing manual key switches billing methods.
- saved = client.post(
- "/v1/providers", json={"name": "openrouter", "fields": {"api_key": ""}}
- ).json()
- assert saved["ok"]
- status = client.get("/v1/providers/openrouter/status").json()
- assert status["connected"] and not status["active"]
-
- start = client.post(
- "/v1/providers/openrouter/signin", json={"manual": True}
- ).json()
- client.post(
- "/v1/providers/openrouter/complete",
- json={"code": "valid-code", "attempt_id": start["attempt_id"]},
- )
- client.delete("/v1/providers/openrouter")
- assert client.get("/v1/providers/openrouter/status").json()["active"]
- assert not (manager.secrets.get("provider:openrouter") or {}).get("api_key")
- disconnected = client.post("/v1/providers/openrouter/disconnect").json()
+ # Signing out leaves the key-based provider alone.
+ disconnected = client.post("/v1/providers/openrouter-account/disconnect").json()
assert not disconnected["connected"]
- assert not manager._provider_configured("openrouter")
+ assert not manager._provider_configured("openrouter-account")
+ assert manager._provider_configured("openrouter")
def test_routes_reject_invalid_input_and_cancel_pending_login(tmp_path):
manager = SessionManager(workspace=tmp_path)
with TestClient(create_app(manager)) as client:
assert (
- client.post("/v1/providers/openrouter/signin", json=[]).status_code == 422
+ client.post("/v1/providers/openrouter-account/signin", json=[]).status_code == 422
)
started = client.post(
- "/v1/providers/openrouter/signin", json={"manual": True}
+ "/v1/providers/openrouter-account/signin", json={"manual": True}
).json()
assert started["authorizing"]
- assert not client.post("/v1/providers/openrouter/cancel").json()["authorizing"]
+ assert not client.post("/v1/providers/openrouter-account/cancel").json()["authorizing"]
result = client.post(
- "/v1/providers/openrouter/complete",
+ "/v1/providers/openrouter-account/complete",
json={"code": "old", "attempt_id": started["attempt_id"]},
).json()
assert result["error"] and not result["connected"]
assert (
client.post(
- "/v1/providers/openrouter/signin",
+ "/v1/providers/openrouter-account/signin",
json={},
headers={"Origin": "https://evil.example"},
).status_code
diff --git a/tests/test_providers.py b/tests/test_providers.py
index cd0daad7..0461724b 100644
--- a/tests/test_providers.py
+++ b/tests/test_providers.py
@@ -520,7 +520,9 @@ def test_matrix_labels_and_custom_model_fallback():
# 70→75 (2026-10-01, OPE-215): three OpenRouter rows (Nemotron 3 Ultra, Nemotron 3.5
# Lightning, GLM 5.3). The pruning owed above is still not done; it remains the owner's
# call and should come before this is raised again.
- assert len(MATRIX) < 75
+ # The `openrouter-account:` rows are aliases of the `openrouter:` rows (one source), so
+ # they are excluded from the count rather than counted against it.
+ assert len([m for m in MATRIX if not m.startswith("openrouter-account:")]) < 75
assert all(e.caps.tools for e in MATRIX.values())
# A custom (unlisted) reseller model falls back to the conservative default — usable,
# but at the user's own risk (no parallel tool calls assumed).