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