From b4f504094ec67d2ad250954e245079a292b55f30 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Mon, 31 Aug 2026 16:31:54 +0000 Subject: [PATCH] refactor: centralize regional provider configuration Co-authored-by: Simon Shi --- src/cosy.ts | 74 ++++++++++++++++++++++++++++++++++++++++++--------- src/index.ts | 15 ++++++----- src/login.ts | 10 ++++--- src/models.ts | 40 +++++++++++++--------------- src/oauth.ts | 16 ++++++----- src/pat.ts | 18 +++++++------ src/stream.ts | 7 ++--- src/usage.ts | 7 ++--- 8 files changed, 122 insertions(+), 65 deletions(-) diff --git a/src/cosy.ts b/src/cosy.ts index 1bb6bfe..5ea5cc4 100644 --- a/src/cosy.ts +++ b/src/cosy.ts @@ -12,8 +12,9 @@ XcW+ML9FoCI6AOvOzwIDAQAB // Keep the COSY client identity aligned with the current Qoder CLI catalog // protocol. Older values cause the model endpoint to return a reduced list. -const QoderIDEVersion = "1.1.38"; -const QoderClientType = "5"; +export const QODER_GATEWAY_COSY_VERSION = "1.1.38"; +export const QODER_OPENAPI_COSY_VERSION = "1.0.1"; +export const QODER_CLIENT_TYPE = "5"; const QoderDataPolicy = "disagree"; const QoderLoginVersion = "v2"; const QoderMachineOS = @@ -30,6 +31,55 @@ const QoderModeEnv = process.env.QODER_REGION || process.env.QODER_BACKEND || pr export type QoderMode = "global" | "cn"; +export interface QoderRegionConfig { + mode: QoderMode; + providerID: "qoder" | "qoder-cn"; + baseUrl: string; + openApiUrl: string; + centerUrl: string; + manageUrl: string; + modelCacheFile: string; + patEnvNames: readonly string[]; + loginName: string; + userNameFallback: string; + userEmailFallback: string; + usageTitle: string; + supportsBrowserLogin: boolean; +} + +const QODER_REGIONS: Record = { + global: { + mode: "global", + providerID: "qoder", + baseUrl: "https://api3.qoder.sh/", + openApiUrl: "https://openapi.qoder.sh", + centerUrl: "https://center.qoder.sh", + manageUrl: "https://qoder.com", + modelCacheFile: "qoder-models-cache.json", + patEnvNames: ["QODER_API_KEY", "QODER_PERSONAL_ACCESS_TOKEN", "QODER_PAT"], + loginName: "Qoder (Browser OAuth / PAT)", + userNameFallback: "Qoder User", + userEmailFallback: "user@qoder.com", + usageTitle: "Qoder AI Plan", + supportsBrowserLogin: true, + }, + cn: { + mode: "cn", + providerID: "qoder-cn", + baseUrl: "https://gateway.qoder.com.cn/", + openApiUrl: "https://openapi.qoder.com.cn", + centerUrl: "https://gateway.qoder.com.cn", + manageUrl: "https://qoder.com.cn", + modelCacheFile: "qoder-cn-models-cache.json", + patEnvNames: ["QODERCN_API_KEY", "QODERCN_PERSONAL_ACCESS_TOKEN", "QODERCN_PAT"], + loginName: "Qoder CN (PAT)", + userNameFallback: "Qoder CN User", + userEmailFallback: "user@qoder.com.cn", + usageTitle: "Qoder CN Plan", + supportsBrowserLogin: false, + }, +}; + interface UserInfo { uid: string; security_oauth_token: string; @@ -71,20 +121,20 @@ export function isQoderCNMode(modeOverride?: string): boolean { return getQoderMode(modeOverride) === "cn"; } -export function getQoderCNPat(): string { - return process.env.QODERCN_PERSONAL_ACCESS_TOKEN || process.env.QODERCN_PAT || ""; +export function getQoderRegionConfig(mode?: string): QoderRegionConfig { + return QODER_REGIONS[getQoderMode(mode)]; } export function getQoderBaseUrl(mode?: string): string { - return isQoderCNMode(mode) ? "https://gateway.qoder.com.cn/" : "https://api3.qoder.sh/"; + return getQoderRegionConfig(mode).baseUrl; } export function getQoderOpenApiUrl(mode?: string): string { - return isQoderCNMode(mode) ? "https://openapi.qoder.com.cn" : "https://openapi.qoder.sh"; + return getQoderRegionConfig(mode).openApiUrl; } export function getQoderCenterUrl(mode?: string): string { - return isQoderCNMode(mode) ? "https://gateway.qoder.com.cn" : "https://center.qoder.sh"; + return getQoderRegionConfig(mode).centerUrl; } export function getQoderModelListURL(mode?: string): string { @@ -130,11 +180,11 @@ export function toQoderModelId(displayName?: string): string { } export function getQoderManageUrl(mode?: string): string { - return isQoderCNMode(mode) ? "https://qoder.com.cn" : "https://qoder.com"; + return getQoderRegionConfig(mode).manageUrl; } export function getQoderUserEmailFallback(mode?: string): string { - return isQoderCNMode(mode) ? "user@qoder.com.cn" : "user@qoder.com"; + return getQoderRegionConfig(mode).userEmailFallback; } function rsaEncryptBase64(data: Buffer | string): string { @@ -212,7 +262,7 @@ export function buildAuthHeaders( version: "v1", requestId, info: infoB64, - cosyVersion: QoderIDEVersion, + cosyVersion: QODER_GATEWAY_COSY_VERSION, ideVersion: "", }; @@ -236,12 +286,12 @@ export function buildAuthHeaders( "Cosy-Key": cosyKey, "Cosy-User": creds.userID, "Cosy-Date": timestamp, - "Cosy-Version": QoderIDEVersion, + "Cosy-Version": QODER_GATEWAY_COSY_VERSION, "Cosy-Machineid": machineID, "Cosy-Machinetoken": machineID, "Cosy-Machinetype": QoderMachineTypeMagic, "Cosy-Machineos": QoderMachineOS, - "Cosy-Clienttype": QoderClientType, + "Cosy-Clienttype": QODER_CLIENT_TYPE, "Cosy-Clientip": "127.0.0.1", "Cosy-Bodyhash": bodyHash, "Cosy-Bodylength": bodyLen, diff --git a/src/index.ts b/src/index.ts index 4185ca0..32faaa8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,6 +1,6 @@ import type { Api, Model, OAuthCredentials } from "@earendil-works/pi-ai"; import type { ExtensionAPI, ProviderConfig } from "@earendil-works/pi-coding-agent"; -import { getQoderBaseUrl, getQoderMode, getQoderUserEmailFallback, isQoderCNMode } from "./cosy.js"; +import { getQoderBaseUrl, getQoderMode, getQoderRegionConfig, isQoderCNMode } from "./cosy.js"; import { getCachedModels, isCacheStale, staticCnModels, staticModels, updateQoderModelsCache } from "./models.js"; import { autoLoginQoderFromEnvironment, @@ -31,8 +31,9 @@ function modelsForProvider(mode: string, providerID: string): Model[] { } function createQoderOAuth(_providerID: string, mode: string): OAuthConfigWithUsage { + const region = getQoderRegionConfig(mode); return { - name: isQoderCNMode(mode) ? "Qoder CN (PAT)" : "Qoder (Browser OAuth / PAT)", + name: region.loginName, login: isQoderCNMode(mode) ? loginQoderCN : loginQoder, refreshToken: isQoderCNMode(mode) ? refreshQoderTokenCN : refreshQoderToken, getApiKey: (cred: OAuthCredentials) => cred.access, @@ -64,11 +65,12 @@ async function refreshModelsAtStartup(providerID: string, mode: string): Promise const credentials = getCachedCredentials("", providerID); if (!credentials?.access) return; + const region = getQoderRegionConfig(mode); await updateQoderModelsCache( credentials.access, credentials.userID || "qoder-user", - credentials.name || (isQoderCNMode(mode) ? "Qoder CN User" : "Qoder User"), - credentials.email || getQoderUserEmailFallback(mode), + credentials.name || region.userNameFallback, + credentials.email || region.userEmailFallback, mode, ); } @@ -97,12 +99,13 @@ export default async function (pi: ExtensionAPI) { ["qoder-cn", "cn"], ] as const) { try { + const region = getQoderRegionConfig(mode); const accessToken = await ctx.modelRegistry.getApiKeyForProvider(providerID); if (!accessToken || !isCacheStale(mode)) continue; const creds = getCachedCredentials(accessToken, providerID); const userID = creds?.userID || "qoder-user"; - const name = creds?.name || (isQoderCNMode(mode) ? "Qoder CN User" : "Qoder User"); - const email = creds?.email || getQoderUserEmailFallback(mode); + const name = creds?.name || region.userNameFallback; + const email = creds?.email || region.userEmailFallback; await updateQoderModelsCache(accessToken, userID, name, email, mode); } catch { // Best-effort: fall back to the existing cache / static models. diff --git a/src/login.ts b/src/login.ts index 06ad92a..afa47a4 100644 --- a/src/login.ts +++ b/src/login.ts @@ -1,6 +1,6 @@ import crypto from "node:crypto"; import type { OAuthCredentials, OAuthLoginCallbacks } from "@earendil-works/pi-ai"; -import { getMachineId, getQoderMode, isQoderCNMode } from "./cosy.js"; +import { getMachineId, getQoderMode, getQoderRegionConfig } from "./cosy.js"; import { credentialsFromPat } from "./pat.js"; type PromptFn = (p: { message: string; placeholder?: string; allowEmpty?: boolean }) => Promise; @@ -40,13 +40,14 @@ export async function interactiveLogin( callbacks: OAuthLoginCallbacks, mode: string = getQoderMode(), ): Promise { + const region = getQoderRegionConfig(mode); // pi drives this via its built-in LoginDialog, which wires onPrompt/onAuth/ // onProgress to a focused input. We must use those callbacks directly rather // than opening our own ctx.ui.custom surface (which would steal focus and // leave onPrompt unable to receive keystrokes). const prompt = getPrompt(callbacks); const pat = await prompt({ - message: isQoderCNMode(mode) + message: !region.supportsBrowserLogin ? "Paste a Qoder CN Personal Access Token, or leave empty to cancel" : "Paste a Qoder Personal Access Token (pt-...), or leave empty for browser login", placeholder: "pt-...", @@ -57,7 +58,7 @@ export async function interactiveLogin( return patLogin(callbacks, pat.trim(), mode); } - if (isQoderCNMode(mode)) { + if (!region.supportsBrowserLogin) { throw new Error( "Qoder CN browser login is not supported here. Paste a Qoder CN PAT from https://qoder.com.cn/account/integrations or set QODERCN_PERSONAL_ACCESS_TOKEN.", ); @@ -73,11 +74,12 @@ async function patLogin( providedPat?: string, mode: string = getQoderMode(), ): Promise { + const region = getQoderRegionConfig(mode); let pat = providedPat; if (!pat) { const prompt = getPrompt(callbacks); const entered = await prompt({ - message: isQoderCNMode(mode) + message: !region.supportsBrowserLogin ? "Paste your Qoder CN Personal Access Token" : "Paste your Qoder Personal Access Token (pt-...)", placeholder: "pt-...", diff --git a/src/models.ts b/src/models.ts index 087a741..2310d00 100644 --- a/src/models.ts +++ b/src/models.ts @@ -7,6 +7,7 @@ import { getQoderBaseUrl, getQoderMode, getQoderModelListURL, + getQoderRegionConfig, isQoderCNMode, toQoderModelId, } from "./cosy.js"; @@ -71,12 +72,7 @@ export interface QoderModelDef { } function getQoderCachePath(mode?: string): string { - return join( - homedir(), - ".pi", - "agent", - isQoderCNMode(mode) ? "qoder-cn-models-cache.json" : "qoder-models-cache.json", - ); + return join(homedir(), ".pi", "agent", getQoderRegionConfig(mode).modelCacheFile); } export const staticModels: QoderModelDef[] = [ @@ -86,7 +82,7 @@ export const staticModels: QoderModelDef[] = [ name: "Auto", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: false, input: ["text", "image"], @@ -100,7 +96,7 @@ export const staticModels: QoderModelDef[] = [ name: "Ultimate", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: true, input: ["text", "image"], @@ -114,7 +110,7 @@ export const staticModels: QoderModelDef[] = [ name: "Performance", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: true, input: ["text", "image"], @@ -128,7 +124,7 @@ export const staticModels: QoderModelDef[] = [ name: "Efficient", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: false, supportsEffort: false, input: ["text", "image"], @@ -142,7 +138,7 @@ export const staticModels: QoderModelDef[] = [ name: "Lite", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: false, supportsEffort: false, input: ["text"], @@ -156,7 +152,7 @@ export const staticModels: QoderModelDef[] = [ name: "Qwen3.7 Plus", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: false, supportsEffort: false, input: ["text", "image"], @@ -170,7 +166,7 @@ export const staticModels: QoderModelDef[] = [ name: "Cantus", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: true, input: ["text", "image"], @@ -184,7 +180,7 @@ export const staticModels: QoderModelDef[] = [ name: "Qwen3.8-Max", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: true, input: ["text", "image"], @@ -198,7 +194,7 @@ export const staticModels: QoderModelDef[] = [ name: "Qwen3.7-Max", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: false, supportsEffort: false, input: ["text", "image"], @@ -212,7 +208,7 @@ export const staticModels: QoderModelDef[] = [ name: "DeepSeek-V4-Pro", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: true, input: ["text", "image"], @@ -226,7 +222,7 @@ export const staticModels: QoderModelDef[] = [ name: "DeepSeek-V4-Flash", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: true, input: ["text", "image"], @@ -240,7 +236,7 @@ export const staticModels: QoderModelDef[] = [ name: "GLM-5.2", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: true, supportsEffort: true, input: ["text", "image"], @@ -254,7 +250,7 @@ export const staticModels: QoderModelDef[] = [ name: "Kimi-K2.7-Code", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: false, supportsEffort: false, input: ["text", "image"], @@ -269,7 +265,7 @@ export const staticModels: QoderModelDef[] = [ name: "Kimi-K3", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: false, supportsEffort: false, input: ["text", "image"], @@ -283,7 +279,7 @@ export const staticModels: QoderModelDef[] = [ name: "MiniMax-M3", api: "qoder-api", provider: "qoder", - baseUrl: "https://api3.qoder.sh/", + baseUrl: getQoderBaseUrl("global"), reasoning: false, supportsEffort: false, input: ["text", "image"], @@ -647,7 +643,7 @@ export async function updateQoderModelsCache( id: modelInfo.id, name: modelInfo.name, api: "qoder-api", - provider: isQoderCNMode(mode) ? "qoder-cn" : "qoder", + provider: getQoderRegionConfig(mode).providerID, baseUrl: getQoderBaseUrl(mode), reasoning: isReasoning, supportsEffort, diff --git a/src/oauth.ts b/src/oauth.ts index 71432fb..a7c1580 100644 --- a/src/oauth.ts +++ b/src/oauth.ts @@ -3,7 +3,7 @@ import { homedir } from "node:os"; import { dirname, join } from "node:path"; import type { OAuthCredentials, OAuthLoginCallbacks } from "@earendil-works/pi-ai"; import * as PiCodingAgent from "@earendil-works/pi-coding-agent"; -import { getMachineId, getQoderMode, getQoderRefreshURL, getQoderUserEmailFallback, isQoderCNMode } from "./cosy.js"; +import { getMachineId, getQoderMode, getQoderRefreshURL, getQoderRegionConfig } from "./cosy.js"; import { interactiveLogin } from "./login.js"; import { updateQoderModelsCache } from "./models.js"; import { credentialsFromPat, decodePatRefresh, fetchUserInfo, isPatRefresh } from "./pat.js"; @@ -30,10 +30,11 @@ const AuthStorage = ( /** Return the PAT exposed through the environment for a provider mode. */ export function getQoderPatForMode(mode: string): string { - if (isQoderCNMode(mode)) { - return process.env.QODERCN_API_KEY || process.env.QODERCN_PERSONAL_ACCESS_TOKEN || process.env.QODERCN_PAT || ""; + for (const envName of getQoderRegionConfig(mode).patEnvNames) { + const value = process.env[envName]; + if (value) return value; } - return process.env.QODER_API_KEY || process.env.QODER_PERSONAL_ACCESS_TOKEN || process.env.QODER_PAT || ""; + return ""; } function saveCredentialsToAuthFile(providerID: string, credentials: OAuthCredentials): void { @@ -119,6 +120,7 @@ export async function resolveQoderIdentity( providerID: string, mode: string, ): Promise { + const region = getQoderRegionConfig(mode); const cached = getCachedCredentials(accessToken, providerID); if (cached?.userID) return cached; @@ -131,8 +133,8 @@ export async function resolveQoderIdentity( const creds: QoderCredentials = { access: accessToken, userID: info.userID || "qoder-user", - email: info.email || getQoderUserEmailFallback(mode), - name: info.name || (isQoderCNMode(mode) ? "Qoder CN User" : "Qoder User"), + email: info.email || region.userEmailFallback, + name: info.name || region.userNameFallback, machineID, refresh: "", expires: 0, @@ -143,7 +145,7 @@ export async function resolveQoderIdentity( } async function loginQoderForMode(callbacks: OAuthLoginCallbacks, mode: string): Promise { - const providerID = isQoderCNMode(mode) ? "qoder-cn" : "qoder"; + const providerID = getQoderRegionConfig(mode).providerID; // 1. Try environment variables first (PAT). A PAT (pt-...) must be exchanged // for a short-lived job token before it can be used — credentialsFromPat // handles the exchange + identity resolution. diff --git a/src/pat.ts b/src/pat.ts index c8a9d27..cc3c551 100644 --- a/src/pat.ts +++ b/src/pat.ts @@ -3,9 +3,10 @@ import { getMachineId, getQoderExchangeURL, getQoderMode, - getQoderUserEmailFallback, + getQoderRegionConfig, getQoderUserInfoURL, - isQoderCNMode, + QODER_CLIENT_TYPE, + QODER_OPENAPI_COSY_VERSION, } from "./cosy.js"; const UA = "pi-provider-qoder"; @@ -63,8 +64,8 @@ export async function exchangeJobToken(pat: string, mode: string = getQoderMode( "Content-Type": "application/json", Accept: "application/json", "User-Agent": UA, - "Cosy-Version": "1.0.1", - "Cosy-ClientType": "5", + "Cosy-Version": QODER_OPENAPI_COSY_VERSION, + "Cosy-ClientType": QODER_CLIENT_TYPE, }, body: JSON.stringify({ personal_token: pat }), }); @@ -115,8 +116,8 @@ export async function fetchUserInfo( Authorization: `Bearer ${jobToken}`, Accept: "application/json", "User-Agent": UA, - "Cosy-Version": "1.0.1", - "Cosy-ClientType": "5", + "Cosy-Version": QODER_OPENAPI_COSY_VERSION, + "Cosy-ClientType": QODER_CLIENT_TYPE, }, }); if (res.ok) { @@ -140,6 +141,7 @@ export async function fetchUserInfo( * into the refresh field so the token can be re-exchanged on expiry. */ export async function credentialsFromPat(pat: string, mode: string = getQoderMode()): Promise { + const region = getQoderRegionConfig(mode); const { jobToken, jobRefreshToken, expiresAt } = await exchangeJobToken(pat, mode); const { userID, email, name } = await fetchUserInfo(jobToken, mode); const machineID = getMachineId(); @@ -149,8 +151,8 @@ export async function credentialsFromPat(pat: string, mode: string = getQoderMod access: jobToken, expires: expiresAt - 5 * 60 * 1000, // 5 min buffer userID, - email: email || getQoderUserEmailFallback(mode), - name: name || (isQoderCNMode(mode) ? "Qoder CN User" : "Qoder User"), + email: email || region.userEmailFallback, + name: name || region.userNameFallback, machineID, } as OAuthCredentials; } diff --git a/src/stream.ts b/src/stream.ts index 225ffaf..e7045b6 100644 --- a/src/stream.ts +++ b/src/stream.ts @@ -17,7 +17,7 @@ import { getMachineId, getQoderChatURL, getQoderMode, - getQoderUserEmailFallback, + getQoderRegionConfig, isQoderCNMode, } from "./cosy.js"; import { getCachedModelConfig, MAX_OUTPUT_TOKENS } from "./models.js"; @@ -118,6 +118,7 @@ export function streamQoder( (async () => { try { const providerMode = model.provider === "qoder-cn" ? "cn" : getQoderMode(); + const region = getQoderRegionConfig(providerMode); const accessToken = options?.apiKey; if (!accessToken) { throw new Error( @@ -133,8 +134,8 @@ export function streamQoder( // it with "Login expired" (105). const ident = await resolveQoderIdentity(accessToken, model.provider, providerMode); const userID = ident.userID || "qoder-user"; - const name = ident.name || (isQoderCNMode(providerMode) ? "Qoder CN User" : "Qoder User"); - const email = ident.email || getQoderUserEmailFallback(providerMode); + const name = ident.name || region.userNameFallback; + const email = ident.email || region.userEmailFallback; const machineID = ident.machineID || getMachineId(); // Both providers expose the upstream display_name (whitespace stripped) diff --git a/src/usage.ts b/src/usage.ts index 69eeafb..10c5b9d 100644 --- a/src/usage.ts +++ b/src/usage.ts @@ -1,5 +1,5 @@ import type { OAuthCredentials } from "@earendil-works/pi-ai"; -import { getQoderManageUrl, getQoderMode, getQoderUsageURL, isQoderCNMode } from "./cosy.js"; +import { getQoderMode, getQoderRegionConfig, getQoderUsageURL } from "./cosy.js"; interface QoderQuota { total: number; @@ -34,6 +34,7 @@ export interface QoderProviderUsage { } async function fetchQoderUsageForMode(credentials: OAuthCredentials, mode: string): Promise { + const region = getQoderRegionConfig(mode); const response = await fetch(getQoderUsageURL(mode), { method: "GET", headers: { @@ -76,9 +77,9 @@ async function fetchQoderUsageForMode(credentials: OAuthCredentials, mode: strin return { summary: remainingText, - subscriptionTitle: isQoderCNMode(mode) ? "Qoder CN Plan" : "Qoder AI Plan", + subscriptionTitle: region.usageTitle, resetAt: raw.expiresAt ? new Date(raw.expiresAt).toISOString() : undefined, - manageUrl: getQoderManageUrl(mode), + manageUrl: region.manageUrl, usageBuckets, raw: raw as unknown as Record, };