dsh-opendesign-corouter 0.1.3 → 0.1.5

package/lib/generated/typert.host.js

@@ -7,6 +7,27 @@ function record(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
+// src/device-auth.ts
+function validateActivationUrl(value, userCode) {
+  if (typeof value !== "string" || value.length > 512 || !/^https:\/\/open-design\.ai\/cloud\/cli\/activate(?:\?[^#]*)?$/u.test(value) || /[\s\\]/u.test(value)) return null;
+  try {
+    const url = new URL(value);
+    if (url.origin !== "https://open-design.ai" || url.pathname !== "/cloud/cli/activate" || url.username || url.password || url.hash) return null;
+    const entries = [...url.searchParams];
+    if (entries.length > 1) return null;
+    if (entries.length) {
+      const entry = entries[0];
+      if (!["code", "user_code"].includes(entry[0]) || !validUserCode(entry[1]) || userCode !== void 0 && entry[1] !== userCode) return null;
+    }
+    return url.href;
+  } catch {
+    return null;
+  }
+}
+function validUserCode(value) {
+  return typeof value === "string" && /^[a-z0-9][a-z0-9-]{3,31}$/iu.test(value);
+}
+
 // src/protocol-options.ts
 var API_PROTOCOL_IDS = ["chat-completions", "responses", "messages"];
 
@@ -68,6 +89,7 @@ var MAX_API_KEY = 16384;
 var HTTP_ASCII = /^[\x21-\x7e]+$/u;
 var ENV_REF = /^[A-Za-z_][A-Za-z0-9_]*$/u;
 var MODEL_ID = /^[A-Za-z0-9._:/-]{1,128}$/u;
+var ACTIVATION_OPEN_CODES = ["opened", "no-link", "invalid-url", "unavailable", "failed"];
 var LOGIN_PHASES = ["idle", "launching", "waiting", "verifying", "success", "cancelled", "error"];
 var QUOTA_STATES = ["ok", "partial", "need-login", "error"];
 var SESSION_SOURCES = ["desktop", "login", "environment"];
@@ -155,9 +177,19 @@ function parseLoginState(value) {
   if (!record(value)) throw new Error("\u767B\u5F55\u72B6\u6001\u5FC5\u987B\u662F\u5BF9\u8C61");
   const jobId = value.jobId;
   if (jobId !== null && jobId !== void 0 && typeof jobId !== "string") throw new Error("\u767B\u5F55\u4EFB\u52A1 id \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\u6216 null");
+  const state = member(value.state, LOGIN_PHASES, "\u767B\u5F55\u9636\u6BB5");
+  let approval = {};
+  if (state === "waiting" && (value.activationUrl !== void 0 || value.userCode !== void 0 || value.expiresAt !== void 0)) {
+    const userCode = text(value.userCode, "\u8BBE\u5907\u6388\u6743\u7801", 64);
+    if (!/^[A-Za-z0-9-]+$/u.test(userCode)) throw new Error("\u8BBE\u5907\u6388\u6743\u7801\u683C\u5F0F\u65E0\u6548");
+    const activationUrl = validateActivationUrl(value.activationUrl, userCode);
+    if (activationUrl === null) throw new Error("\u8BBE\u5907\u6388\u6743\u94FE\u63A5\u65E0\u6548");
+    approval = { activationUrl, userCode, expiresAt: isoTime(value.expiresAt, "\u8BBE\u5907\u6388\u6743\u5230\u671F\u65F6\u95F4") };
+  }
   return {
     jobId: typeof jobId === "string" && jobId.length > 0 ? text(jobId, "\u767B\u5F55\u4EFB\u52A1 id", MAX_JOB_ID) : null,
-    state: member(value.state, LOGIN_PHASES, "\u767B\u5F55\u9636\u6BB5"),
+    state,
+    ...approval,
     ...value.message === void 0 ? {} : { message: text(value.message, "\u767B\u5F55\u8BF4\u660E", MAX_MESSAGE) },
     ...value.startedAt === void 0 ? {} : { startedAt: isoTime(value.startedAt, "\u767B\u5F55\u5F00\u59CB\u65F6\u95F4") },
     ...value.finishedAt === void 0 ? {} : { finishedAt: isoTime(value.finishedAt, "\u767B\u5F55\u7ED3\u675F\u65F6\u95F4") }
@@ -233,6 +265,10 @@ function parseSaveApiKeyRequest(value) {
   if (key.length > MAX_API_KEY) throw new Error(`API Key \u4E0D\u80FD\u8D85\u8FC7 ${MAX_API_KEY} \u5B57\u7B26`);
   return { value: key, expectedRevision: text(value.expectedRevision, "\u914D\u7F6E\u7248\u672C", MAX_REVISION) };
 }
+function parseActivationOpenState(value) {
+  if (!record(value)) throw new Error("\u6388\u6743\u9875\u6253\u5F00\u7ED3\u679C\u5FC5\u987B\u662F\u5BF9\u8C61");
+  return { code: member(value.code, ACTIVATION_OPEN_CODES, "\u6388\u6743\u9875\u6253\u5F00\u7ED3\u679C"), opened: flag(value.opened, "\u6388\u6743\u9875\u662F\u5426\u5DF2\u6253\u5F00") };
+}
 
 // src/generated/typert.remote-client.ts
 var StatusCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#Status", create: () => z.unknown().transform((value) => parseStatus(value)) };
@@ -240,6 +276,7 @@ var QuotaSnapshotCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#
 var LoginStateCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#LoginState", create: () => z.unknown().transform((value) => parseLoginState(value)) };
 var StartLoginRequestCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#StartLoginRequest", create: () => z.unknown().transform((value) => parseStartLoginRequest(value)) };
 var CancelLoginRequestCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#CancelLoginRequest", create: () => z.unknown().transform((value) => parseCancelLoginRequest(value)) };
+var ActivationOpenStateCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#ActivationOpenState", create: () => z.unknown().transform((value) => parseActivationOpenState(value)) };
 var SaveApiKeyRequestCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#SaveApiKeyRequest", create: () => z.unknown().transform((value) => parseSaveApiKeyRequest(value)) };
 var TYPERT_REMOTE = createTypertRemoteInfo({ package: "dsh-opendesign-corouter", methods: {
   "openDesignCoRouter/status": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [], result: StatusCodec },
@@ -249,6 +286,7 @@ var TYPERT_REMOTE = createTypertRemoteInfo({ package: "dsh-opendesign-corouter",
   "openDesignCoRouter/startLogin": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [{ name: "input", source: "json", codec: StartLoginRequestCodec, strictCodec: StartLoginRequestCodec }], result: LoginStateCodec },
   "openDesignCoRouter/loginStatus": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [], result: LoginStateCodec },
   "openDesignCoRouter/cancelLogin": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [{ name: "input", source: "json", codec: CancelLoginRequestCodec, strictCodec: CancelLoginRequestCodec }], result: LoginStateCodec },
+  "openDesignCoRouter/openActivationPage": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [], result: ActivationOpenStateCodec },
   "openDesignCoRouter/saveApiKey": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [{ name: "input", source: "json", codec: SaveApiKeyRequestCodec, strictCodec: SaveApiKeyRequestCodec }], result: StatusCodec }
 } }, z);
 var typert_remote_client_default = TYPERT_REMOTE;

package/lib/generated/typert.remote-client.d.ts

@@ -1,5 +1,5 @@
 import type { RemoteResult } from '@deepseek-ai/dsh-typert-protocol';
-import type { Status, QuotaSnapshot, LoginState, StartLoginRequest, CancelLoginRequest, SaveApiKeyRequest } from '../remote.js';
+import type { Status, QuotaSnapshot, LoginState, StartLoginRequest, CancelLoginRequest, ActivationOpenState, SaveApiKeyRequest } from '../remote.js';
 export type CoRouterRemote = {
     status: () => Promise<RemoteResult<Status>>;
     refreshModels: () => Promise<RemoteResult<Status>>;
@@ -8,6 +8,7 @@ export type CoRouterRemote = {
     startLogin: (input: StartLoginRequest) => Promise<RemoteResult<LoginState>>;
     loginStatus: () => Promise<RemoteResult<LoginState>>;
     cancelLogin: (input: CancelLoginRequest) => Promise<RemoteResult<LoginState>>;
+    openActivationPage: () => Promise<RemoteResult<ActivationOpenState>>;
     saveApiKey: (input: SaveApiKeyRequest) => Promise<RemoteResult<Status>>;
 };
 declare module '@deepseek-ai/dsh-typert-protocol' {

package/lib/generated/typert.remote-client.js

@@ -7,6 +7,27 @@ function record(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 
+// src/device-auth.ts
+function validateActivationUrl(value, userCode) {
+  if (typeof value !== "string" || value.length > 512 || !/^https:\/\/open-design\.ai\/cloud\/cli\/activate(?:\?[^#]*)?$/u.test(value) || /[\s\\]/u.test(value)) return null;
+  try {
+    const url = new URL(value);
+    if (url.origin !== "https://open-design.ai" || url.pathname !== "/cloud/cli/activate" || url.username || url.password || url.hash) return null;
+    const entries = [...url.searchParams];
+    if (entries.length > 1) return null;
+    if (entries.length) {
+      const entry = entries[0];
+      if (!["code", "user_code"].includes(entry[0]) || !validUserCode(entry[1]) || userCode !== void 0 && entry[1] !== userCode) return null;
+    }
+    return url.href;
+  } catch {
+    return null;
+  }
+}
+function validUserCode(value) {
+  return typeof value === "string" && /^[a-z0-9][a-z0-9-]{3,31}$/iu.test(value);
+}
+
 // src/protocol-options.ts
 var API_PROTOCOL_IDS = ["chat-completions", "responses", "messages"];
 
@@ -68,6 +89,7 @@ var MAX_API_KEY = 16384;
 var HTTP_ASCII = /^[\x21-\x7e]+$/u;
 var ENV_REF = /^[A-Za-z_][A-Za-z0-9_]*$/u;
 var MODEL_ID = /^[A-Za-z0-9._:/-]{1,128}$/u;
+var ACTIVATION_OPEN_CODES = ["opened", "no-link", "invalid-url", "unavailable", "failed"];
 var LOGIN_PHASES = ["idle", "launching", "waiting", "verifying", "success", "cancelled", "error"];
 var QUOTA_STATES = ["ok", "partial", "need-login", "error"];
 var SESSION_SOURCES = ["desktop", "login", "environment"];
@@ -155,9 +177,19 @@ function parseLoginState(value) {
   if (!record(value)) throw new Error("\u767B\u5F55\u72B6\u6001\u5FC5\u987B\u662F\u5BF9\u8C61");
   const jobId = value.jobId;
   if (jobId !== null && jobId !== void 0 && typeof jobId !== "string") throw new Error("\u767B\u5F55\u4EFB\u52A1 id \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\u6216 null");
+  const state = member(value.state, LOGIN_PHASES, "\u767B\u5F55\u9636\u6BB5");
+  let approval = {};
+  if (state === "waiting" && (value.activationUrl !== void 0 || value.userCode !== void 0 || value.expiresAt !== void 0)) {
+    const userCode = text(value.userCode, "\u8BBE\u5907\u6388\u6743\u7801", 64);
+    if (!/^[A-Za-z0-9-]+$/u.test(userCode)) throw new Error("\u8BBE\u5907\u6388\u6743\u7801\u683C\u5F0F\u65E0\u6548");
+    const activationUrl = validateActivationUrl(value.activationUrl, userCode);
+    if (activationUrl === null) throw new Error("\u8BBE\u5907\u6388\u6743\u94FE\u63A5\u65E0\u6548");
+    approval = { activationUrl, userCode, expiresAt: isoTime(value.expiresAt, "\u8BBE\u5907\u6388\u6743\u5230\u671F\u65F6\u95F4") };
+  }
   return {
     jobId: typeof jobId === "string" && jobId.length > 0 ? text(jobId, "\u767B\u5F55\u4EFB\u52A1 id", MAX_JOB_ID) : null,
-    state: member(value.state, LOGIN_PHASES, "\u767B\u5F55\u9636\u6BB5"),
+    state,
+    ...approval,
     ...value.message === void 0 ? {} : { message: text(value.message, "\u767B\u5F55\u8BF4\u660E", MAX_MESSAGE) },
     ...value.startedAt === void 0 ? {} : { startedAt: isoTime(value.startedAt, "\u767B\u5F55\u5F00\u59CB\u65F6\u95F4") },
     ...value.finishedAt === void 0 ? {} : { finishedAt: isoTime(value.finishedAt, "\u767B\u5F55\u7ED3\u675F\u65F6\u95F4") }
@@ -233,6 +265,10 @@ function parseSaveApiKeyRequest(value) {
   if (key.length > MAX_API_KEY) throw new Error(`API Key \u4E0D\u80FD\u8D85\u8FC7 ${MAX_API_KEY} \u5B57\u7B26`);
   return { value: key, expectedRevision: text(value.expectedRevision, "\u914D\u7F6E\u7248\u672C", MAX_REVISION) };
 }
+function parseActivationOpenState(value) {
+  if (!record(value)) throw new Error("\u6388\u6743\u9875\u6253\u5F00\u7ED3\u679C\u5FC5\u987B\u662F\u5BF9\u8C61");
+  return { code: member(value.code, ACTIVATION_OPEN_CODES, "\u6388\u6743\u9875\u6253\u5F00\u7ED3\u679C"), opened: flag(value.opened, "\u6388\u6743\u9875\u662F\u5426\u5DF2\u6253\u5F00") };
+}
 
 // src/generated/typert.remote-client.ts
 var StatusCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#Status", create: () => z.unknown().transform((value) => parseStatus(value)) };
@@ -240,6 +276,7 @@ var QuotaSnapshotCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#
 var LoginStateCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#LoginState", create: () => z.unknown().transform((value) => parseLoginState(value)) };
 var StartLoginRequestCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#StartLoginRequest", create: () => z.unknown().transform((value) => parseStartLoginRequest(value)) };
 var CancelLoginRequestCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#CancelLoginRequest", create: () => z.unknown().transform((value) => parseCancelLoginRequest(value)) };
+var ActivationOpenStateCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#ActivationOpenState", create: () => z.unknown().transform((value) => parseActivationOpenState(value)) };
 var SaveApiKeyRequestCodec = { mode: "strict", typeSymbol: "dsh-opendesign-corouter#SaveApiKeyRequest", create: () => z.unknown().transform((value) => parseSaveApiKeyRequest(value)) };
 var TYPERT_REMOTE = createTypertRemoteInfo({ package: "dsh-opendesign-corouter", methods: {
   "openDesignCoRouter/status": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [], result: StatusCodec },
@@ -249,6 +286,7 @@ var TYPERT_REMOTE = createTypertRemoteInfo({ package: "dsh-opendesign-corouter",
   "openDesignCoRouter/startLogin": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [{ name: "input", source: "json", codec: StartLoginRequestCodec, strictCodec: StartLoginRequestCodec }], result: LoginStateCodec },
   "openDesignCoRouter/loginStatus": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [], result: LoginStateCodec },
   "openDesignCoRouter/cancelLogin": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [{ name: "input", source: "json", codec: CancelLoginRequestCodec, strictCodec: CancelLoginRequestCodec }], result: LoginStateCodec },
+  "openDesignCoRouter/openActivationPage": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [], result: ActivationOpenStateCodec },
   "openDesignCoRouter/saveApiKey": { service: "openDesignCoRouter", invocation: { kind: "direct" }, parameters: [{ name: "input", source: "json", codec: SaveApiKeyRequestCodec, strictCodec: SaveApiKeyRequestCodec }], result: StatusCodec }
 } }, z);
 var typert_remote_client_default = TYPERT_REMOTE;

package/lib/index.d.ts

@@ -4,9 +4,11 @@ import { fetchModelCatalog } from './model-discovery.js';
 import type { CatalogModel } from './catalog.js';
 import { readConfig, type LiveConfig } from './config.js';
 import { resolveSession } from './auth.js';
+import { type LoginOptions } from './login.js';
+import { type ActivationLauncherOptions } from './browser-open.js';
 import { readQuota, type QuotaSnapshot } from './quota.js';
 import { readDesktopQuota } from './desktop-quota.js';
-import { type Status, type LoginState, type StartLoginRequest, type CancelLoginRequest, type SaveApiKeyRequest } from './remote.js';
+import { type Status, type LoginState, type StartLoginRequest, type CancelLoginRequest, type SaveApiKeyRequest, type ActivationOpenState } from './remote.js';
 export { Config } from './config.js';
 export { CoRouterAdapter } from './adapter.js';
 export { MODELS } from './catalog.js';
@@ -18,11 +20,14 @@ export interface HostDependencies {
     readDesktopQuota: typeof readDesktopQuota;
     fetchModels?: typeof fetchModelCatalog;
     modelsChanged?: () => void;
+    loginOptions?: LoginOptions;
+    activationOptions?: ActivationLauncherOptions;
 }
 export declare class OpenDesignCoRouterService extends TypertRemoteService {
     readonly dependencies: HostDependencies;
     private readonly _config;
     private readonly _login;
+    private readonly _activation;
     private readonly _lifetime;
     private _revision;
     private _fingerprint;
@@ -44,7 +49,9 @@ export declare class OpenDesignCoRouterService extends TypertRemoteService {
     modelCatalog(): readonly CatalogModel[];
     constructor(ctx: Context, config: () => ReturnType<typeof readConfig>, dependencies?: HostDependencies);
     private _credentials;
-    resolveApiKey(ref: string): Promise<string | undefined>;
+    private _key;
+    resolveApiKey(ref: string, baseURL?: string): Promise<string | undefined>;
+    private _invalidateModels;
     private _state;
     private _conflict;
     private _expect;
@@ -58,6 +65,7 @@ export declare class OpenDesignCoRouterService extends TypertRemoteService {
     startLogin(input: StartLoginRequest): Promise<LoginState>;
     loginStatus(): LoginState;
     cancelLogin(input: CancelLoginRequest): LoginState;
+    openActivationPage(): Promise<ActivationOpenState>;
     saveApiKey(input: SaveApiKeyRequest): Promise<Status>;
 }
 declare module '@deepseek-ai/cordis' {