dsh-llm-codebuddy 1.3.5 → 1.3.6

package/codebuddy-web.js

@@ -1,9 +1,32 @@
+import { randomBytes } from "node:crypto";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
-import { CODEBUDDY_SESSION_REF, loginCodeBuddy, serializeCodeBuddySession } from "./codebuddy-auth.js";
+import {
+  CODEBUDDY_API_KEYS_REF,
+  CODEBUDDY_SESSION_REF,
+  CODEBUDDY_SESSIONS_REF,
+  activeCodeBuddySession,
+  codeBuddyApiKeyEntries,
+  codeBuddySessionAccounts,
+  createCodeBuddyApiKeyStore,
+  createCodeBuddySessionStore,
+  parseCodeBuddyApiKeys,
+  loginCodeBuddy,
+  parseCodeBuddySession,
+  parseCodeBuddySessions,
+  refreshCodeBuddySession,
+  serializeCodeBuddyApiKeys,
+  serializeCodeBuddySession,
+  serializeCodeBuddySessions,
+  sessionNeedsRefresh,
+  upsertCodeBuddyApiKey,
+  upsertCodeBuddySession,
+} from "./codebuddy-auth.js";
+import { fetchCodeBuddyCredits } from "./codebuddy-credits.js";
 
 const PROVIDER = "codebuddy-cn";
 const API_KEY_ENV = "CODEBUDDY_API_KEY";
 const ROUTE = "/dsh-llm-codebuddy/auth";
+const ENV_SOURCES = new Set(["env", "user-env", "project-env"]);
 
 export function authenticationMode(config) {
   const profile = config?.providers?.[PROVIDER];
@@ -28,45 +51,323 @@ function localPost(req) {
   }
 }
 
-async function setMode(settings, mode) {
+async function requestBody(req) {
+  let raw = "";
+  for await (const chunk of req) {
+    raw += chunk.toString();
+    if (raw.length > 64 * 1024) throw new Error("请求体过大");
+  }
+  if (!raw.trim()) return {};
+  try {
+    const value = JSON.parse(raw);
+    return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+  } catch {
+    throw new Error("请求参数格式无效");
+  }
+}
+
+async function setMode(settings, mode, apiKeyRef = API_KEY_ENV) {
   const config = settings.get("llm-pi-ai");
   const exists = Object.hasOwn(config?.providers ?? {}, PROVIDER);
   const path = ["providers", PROVIDER];
   if (!exists) {
-    await settings.mutate("llm-pi-ai", [{ op: "set", path, value: mode === "token" ? {} : { apiKeyEnv: API_KEY_ENV } }]);
+    await settings.mutate("llm-pi-ai", [{ op: "set", path, value: mode === "token" ? {} : { apiKeyEnv: apiKeyRef } }]);
     return;
   }
   await settings.mutate("llm-pi-ai", [{
     op: mode === "token" ? "unset" : "set",
     path: [...path, "apiKeyEnv"],
-    ...(mode === "api-key" ? { value: API_KEY_ENV } : {}),
+    ...(mode === "api-key" ? { value: apiKeyRef } : {}),
   }]);
 }
 
+function configuredApiKeyRef(settings) {
+  return settings.get("llm-pi-ai")?.providers?.[PROVIDER]?.apiKeyEnv ?? API_KEY_ENV;
+}
+
+function maskApiKey(value) {
+  const text = typeof value === "string" ? value : "";
+  return text.length > 4 ? `••••${text.slice(-4)}` : text ? "••••" : "";
+}
+
+function textLabel(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : undefined;
+}
+
+function storedApiKeyRef() {
+  return `CODEBUDDY_API_KEY_DSH_${Date.now().toString(36).toUpperCase()}_${randomBytes(6).toString("hex").toUpperCase()}`;
+}
+
+async function readApiKeyStore(credentials) {
+  const stored = await credentials.resolve(credentialRef(CODEBUDDY_API_KEYS_REF));
+  if (!stored?.value) return createCodeBuddyApiKeyStore();
+  return parseCodeBuddyApiKeys(stored.value);
+}
+
+async function writeApiKeyStore(credentials, store) {
+  const normalized = createCodeBuddyApiKeyStore(store?.entries ?? [], store?.activeId);
+  if (normalized.entries.length === 0) {
+    await credentials.unset(credentialRef(CODEBUDDY_API_KEYS_REF));
+    return;
+  }
+  await credentials.set(credentialRef(CODEBUDDY_API_KEYS_REF), serializeCodeBuddyApiKeys(normalized));
+}
+
+async function currentApiKeyState(webCtx) {
+  const store = await readApiKeyStore(webCtx.credentials);
+  const apiMode = authenticationMode(webCtx.settings.get("llm-pi-ai")) === "api-key";
+  const ref = apiMode ? configuredApiKeyRef(webCtx.settings) : undefined;
+  const items = [];
+  const seenRefs = new Set();
+  const environment = await webCtx.credentials.resolve(credentialRef(API_KEY_ENV));
+  if (environment?.value) {
+    items.push({
+      id: `env:${API_KEY_ENV}`,
+      kind: "environment",
+      label: `环境变量 ${API_KEY_ENV}`,
+      ref: API_KEY_ENV,
+      configured: true,
+      masked: maskApiKey(environment.value),
+      source: environment.source,
+    });
+    seenRefs.add(API_KEY_ENV);
+  }
+  for (const entry of codeBuddyApiKeyEntries(store)) {
+    if (seenRefs.has(entry.ref)) continue;
+    const resolved = await webCtx.credentials.resolve(credentialRef(entry.ref));
+    items.push({
+      ...entry,
+      kind: "dsh",
+      configured: Boolean(resolved?.value),
+      ...(resolved?.value ? { masked: maskApiKey(resolved.value), source: resolved.source } : {}),
+    });
+    seenRefs.add(entry.ref);
+  }
+  if (ref && !seenRefs.has(ref)) {
+    const resolved = await webCtx.credentials.resolve(credentialRef(ref));
+    if (resolved?.value) {
+      items.push({
+        id: `dsh:${ref}`,
+        kind: ENV_SOURCES.has(resolved.source) ? "environment" : "dsh",
+        label: ENV_SOURCES.has(resolved.source) ? `环境变量 ${ref}` : "DSH 默认 API Key",
+        ref,
+        configured: true,
+        masked: maskApiKey(resolved.value),
+        source: resolved.source,
+      });
+    }
+  }
+  const configured = apiMode ? items.find((item) => item.ref === ref) : undefined;
+  const active = configured ?? items.find((item) => item.id === store.activeId) ?? items[0];
+  return {
+    apiKeys: items,
+    activeApiKeyId: active?.id ?? null,
+    apiKeyConfigured: Boolean(configured?.configured),
+  };
+}
+
+async function readSessionStore(credentials) {
+  const stored = await credentials.resolve(credentialRef(CODEBUDDY_SESSIONS_REF));
+  if (stored?.value) return parseCodeBuddySessions(stored.value);
+  const legacy = await credentials.resolve(credentialRef(CODEBUDDY_SESSION_REF));
+  if (!legacy?.value) return createCodeBuddySessionStore();
+  const session = parseCodeBuddySession(legacy.value);
+  return createCodeBuddySessionStore([session]);
+}
+
+async function writeSessionStore(credentials, store) {
+  const active = activeCodeBuddySession(store);
+  if (!active) {
+    await credentials.unset(credentialRef(CODEBUDDY_SESSIONS_REF));
+    await credentials.unset(credentialRef(CODEBUDDY_SESSION_REF));
+    return;
+  }
+  await credentials.set(credentialRef(CODEBUDDY_SESSIONS_REF), serializeCodeBuddySessions(store));
+  // Keep the old single-session reference as a compatibility pointer for older plugin versions.
+  await credentials.set(credentialRef(CODEBUDDY_SESSION_REF), serializeCodeBuddySession(active));
+}
+
+async function resolveSession(webCtx, accountId) {
+  const store = await readSessionStore(webCtx.credentials);
+  const requestedId = typeof accountId === "string" && accountId ? accountId : store.activeId;
+  let session = store.sessions.find((entry) => entry.id === requestedId) ?? activeCodeBuddySession(store);
+  if (!session) throw new Error("没有找到该 CodeBuddy 登录账号");
+  if (sessionNeedsRefresh(session)) {
+    session = { ...session, ...(await refreshCodeBuddySession(session)), updatedAt: Date.now() };
+    const nextStore = upsertCodeBuddySession({ ...store, activeId: session.id }, session);
+    await writeSessionStore(webCtx.credentials, nextStore);
+    session = activeCodeBuddySession(nextStore);
+  }
+  return session;
+}
+
 export function installCodeBuddyWeb(ctx) {
   ctx.inject(["webServer", "settings", "credentials"], (webCtx) => {
     let loginPromise;
-    const currentState = async () => ({
-      ok: true,
-      mode: authenticationMode(webCtx.settings.get("llm-pi-ai")),
-      authenticated: (await webCtx.credentials.describe(credentialRef(CODEBUDDY_SESSION_REF))).configured,
-    });
+    const currentState = async () => {
+      const store = await readSessionStore(webCtx.credentials);
+      const active = activeCodeBuddySession(store);
+      const apiKeys = await currentApiKeyState(webCtx);
+      return {
+        ok: true,
+        mode: authenticationMode(webCtx.settings.get("llm-pi-ai")),
+        authenticated: active !== undefined,
+        activeAccountId: active?.id ?? null,
+        accounts: codeBuddySessionAccounts(store),
+        ...apiKeys,
+      };
+    };
     const status = async (_req, res) => {
-      json(res, 200, await currentState());
+      try {
+        json(res, 200, await currentState());
+      } catch (error) {
+        json(res, 500, { ok: false, message: error instanceof Error ? error.message : "读取 CodeBuddy 认证状态失败" });
+      }
     };
     const apiKey = async (req, res) => {
       if (req.method !== "POST") return json(res, 405, { ok: false, message: "Method not allowed" });
       if (!localPost(req)) return json(res, 403, { ok: false, message: "只允许从本机 DSH 页面切换认证方式" });
-      await setMode(webCtx.settings, "api-key");
-      json(res, 200, await currentState());
+      try {
+        const body = await requestBody(req);
+        let ref = API_KEY_ENV;
+        if (typeof body.keyId === "string" && body.keyId) {
+          const state = await currentApiKeyState(webCtx);
+          const selected = state.apiKeys.find((entry) => entry.id === body.keyId);
+          if (!selected) return json(res, 404, { ok: false, message: "没有找到该 CodeBuddy API Key" });
+          if (!selected.configured) return json(res, 409, { ok: false, message: "该 API Key 已不可用，请删除后重新添加" });
+          ref = selected.ref;
+          const store = await readApiKeyStore(webCtx.credentials);
+          await writeApiKeyStore(webCtx.credentials, { ...store, activeId: selected.kind === "dsh" ? selected.id : null });
+        }
+        credentialRef(ref);
+        await setMode(webCtx.settings, "api-key", ref);
+        json(res, 200, await currentState());
+      } catch (error) {
+        json(res, 500, { ok: false, message: error instanceof Error ? error.message : "切换 API Key 失败" });
+      }
+    };
+    const addApiKey = async (req, res) => {
+      if (req.method !== "POST") return json(res, 405, { ok: false, message: "Method not allowed" });
+      if (!localPost(req)) return json(res, 403, { ok: false, message: "只允许从本机 DSH 页面保存 API Key" });
+      try {
+        const body = await requestBody(req);
+        const value = typeof body.key === "string" ? body.key.trim() : "";
+        if (!value) return json(res, 400, { ok: false, message: "请输入 API Key" });
+        if (value.length > 16 * 1024) return json(res, 413, { ok: false, message: "API Key 长度超出限制" });
+        const store = await readApiKeyStore(webCtx.credentials);
+        const ref = storedApiKeyRef();
+        const entry = {
+          id: `dsh:${ref}`,
+          ref,
+          label: textLabel(body.label) ?? `DSH API Key ${store.entries.length + 1}`,
+        };
+        await webCtx.credentials.set(credentialRef(ref), value);
+        try {
+          const next = upsertCodeBuddyApiKey(store, entry);
+          await writeApiKeyStore(webCtx.credentials, next);
+          await setMode(webCtx.settings, "api-key", ref);
+        } catch (error) {
+          await webCtx.credentials.unset(credentialRef(ref));
+          throw error;
+        }
+        json(res, 200, await currentState());
+      } catch (error) {
+        json(res, 500, { ok: false, message: error instanceof Error ? error.message : "保存 API Key 失败" });
+      }
+    };
+    const removeApiKey = async (req, res) => {
+      if (req.method !== "POST") return json(res, 405, { ok: false, message: "Method not allowed" });
+      if (!localPost(req)) return json(res, 403, { ok: false, message: "只允许从本机 DSH 页面删除 API Key" });
+      try {
+        const body = await requestBody(req);
+        const store = await readApiKeyStore(webCtx.credentials);
+        const entry = store.entries.find((item) => item.id === body.keyId);
+        if (!entry) return json(res, 404, { ok: false, message: "没有找到该 CodeBuddy API Key" });
+        const activeRef = configuredApiKeyRef(webCtx.settings);
+        await webCtx.credentials.unset(credentialRef(entry.ref));
+        const remaining = store.entries.filter((item) => item.id !== entry.id);
+        await writeApiKeyStore(webCtx.credentials, { version: 1, activeId: remaining[0]?.id, entries: remaining });
+        if (authenticationMode(webCtx.settings.get("llm-pi-ai")) === "api-key" && activeRef === entry.ref) {
+          const environment = await webCtx.credentials.resolve(credentialRef(API_KEY_ENV));
+          let fallback = API_KEY_ENV;
+          if (!environment?.value) {
+            for (const candidate of remaining) {
+              if ((await webCtx.credentials.resolve(credentialRef(candidate.ref)))?.value) {
+                fallback = candidate.ref;
+                break;
+              }
+            }
+          }
+          await setMode(webCtx.settings, "api-key", fallback);
+        }
+        json(res, 200, await currentState());
+      } catch (error) {
+        json(res, 500, { ok: false, message: error instanceof Error ? error.message : "删除 API Key 失败" });
+      }
     };
     const token = async (req, res) => {
       if (req.method !== "POST") return json(res, 405, { ok: false, message: "Method not allowed" });
       if (!localPost(req)) return json(res, 403, { ok: false, message: "只允许从本机 DSH 页面切换认证方式" });
-      const state = await currentState();
-      if (!state.authenticated) return json(res, 409, { ok: false, message: "尚未保存 CodeBuddy 登录令牌" });
-      await setMode(webCtx.settings, "token");
-      json(res, 200, await currentState());
+      try {
+        const body = await requestBody(req);
+        const store = await readSessionStore(webCtx.credentials);
+        const accountId = typeof body.accountId === "string" ? body.accountId : store.activeId;
+        const active = store.sessions.find((entry) => entry.id === accountId);
+        if (!active) return json(res, 409, { ok: false, message: "没有找到该 CodeBuddy 登录账号" });
+        await writeSessionStore(webCtx.credentials, { ...store, activeId: active.id });
+        await setMode(webCtx.settings, "token");
+        json(res, 200, await currentState());
+      } catch (error) {
+        json(res, 500, { ok: false, message: error instanceof Error ? error.message : "切换令牌账号失败" });
+      }
+    };
+    const credits = async (req, res) => {
+      if (req.method !== "POST") return json(res, 405, { ok: false, message: "Method not allowed" });
+      if (!localPost(req)) return json(res, 403, { ok: false, message: "只允许从本机 DSH 页面查询 CodeBuddy 积分" });
+      try {
+        if (authenticationMode(webCtx.settings.get("llm-pi-ai")) !== "token") {
+          return json(res, 200, {
+            ok: true,
+            accountId: null,
+            credits: null,
+            totalDosage: null,
+            segments: [],
+            unlimited: false,
+            cycleResetTime: null,
+            creditError: "积分查询仅支持 CodeBuddy 令牌登录",
+            todayUsage: null,
+            todayUsageError: "今日请求量查询仅支持 CodeBuddy 令牌登录",
+          });
+        }
+        const body = await requestBody(req);
+        const session = await resolveSession(webCtx, body.accountId);
+        const result = await fetchCodeBuddyCredits(session);
+        json(res, 200, {
+          ok: true,
+          accountId: session.id,
+          credits: result.credits,
+          totalDosage: result.totalDosage,
+          segments: result.segments,
+          unlimited: !!result.unlimited,
+          cycleResetTime: result.cycleResetTime ?? null,
+          creditError: result.creditError ?? null,
+          todayUsage: result.todayUsage ?? null,
+          todayUsageError: result.todayUsageError ?? null,
+        });
+      } catch (error) {
+        json(res, 200, {
+          ok: true,
+          accountId: null,
+          credits: null,
+          totalDosage: null,
+          segments: [],
+          unlimited: false,
+          cycleResetTime: null,
+          creditError: error instanceof Error ? error.message : "查询 CodeBuddy 积分失败",
+          todayUsage: null,
+          todayUsageError: error instanceof Error ? error.message : "查询 CodeBuddy 今日请求量失败",
+        });
+      }
     };
     const login = async (req, res) => {
       if (req.method !== "POST") return json(res, 405, { ok: false, message: "Method not allowed" });
@@ -74,23 +375,44 @@ export function installCodeBuddyWeb(ctx) {
       try {
         loginPromise ??= (async () => {
           const session = await loginCodeBuddy();
-          await webCtx.credentials.set(credentialRef(CODEBUDDY_SESSION_REF), serializeCodeBuddySession(session));
+          const store = await readSessionStore(webCtx.credentials);
+          await writeSessionStore(webCtx.credentials, upsertCodeBuddySession(store, session));
           await setMode(webCtx.settings, "token");
         })().finally(() => {
           loginPromise = undefined;
         });
         await loginPromise;
-        json(res, 200, { ok: true, mode: "token", authenticated: true });
+        json(res, 200, await currentState());
       } catch (error) {
         json(res, 500, { ok: false, message: error instanceof Error ? error.message : "CodeBuddy 登录失败" });
       }
     };
+    const remove = async (req, res) => {
+      if (req.method !== "POST") return json(res, 405, { ok: false, message: "Method not allowed" });
+      if (!localPost(req)) return json(res, 403, { ok: false, message: "只允许从本机 DSH 页面管理登录账号" });
+      try {
+        const body = await requestBody(req);
+        const store = await readSessionStore(webCtx.credentials);
+        const accountId = typeof body.accountId === "string" ? body.accountId : store.activeId;
+        const sessions = store.sessions.filter((entry) => entry.id !== accountId);
+        if (sessions.length === store.sessions.length) return json(res, 404, { ok: false, message: "没有找到该 CodeBuddy 登录账号" });
+        const activeId = accountId === store.activeId ? sessions[0]?.id : store.activeId;
+        await writeSessionStore(webCtx.credentials, { version: 1, activeId, sessions });
+        json(res, 200, await currentState());
+      } catch (error) {
+        json(res, 500, { ok: false, message: error instanceof Error ? error.message : "删除令牌账号失败" });
+      }
+    };
     webCtx.effect(() => {
       const dispose = [
         webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/status`, handler: status }),
         webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/api-key`, handler: apiKey }),
+        webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/api-key/add`, handler: addApiKey }),
+        webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/api-key/remove`, handler: removeApiKey }),
         webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/token`, handler: token }),
+        webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/credits`, handler: credits }),
         webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/login`, handler: login }),
+        webCtx.webServer.register({ kind: "exact", path: `${ROUTE}/remove`, handler: remove }),
       ];
       return () => dispose.forEach((fn) => fn());
     }, "llm-codebuddy: web login routes");

package/index.js

@@ -8,11 +8,17 @@ import * as openAICompletionsApi from "@earendil-works/pi-ai/api/openai-completi
 import { builtinProviders } from "@earendil-works/pi-ai/providers/all";
 import {
   CODEBUDDY_SESSION_REF,
+  CODEBUDDY_SESSIONS_REF,
+  activeCodeBuddySession,
+  createCodeBuddySessionStore,
   parseCodeBuddySession,
+  parseCodeBuddySessions,
   refreshCodeBuddySession,
   serializeCodeBuddySession,
+  serializeCodeBuddySessions,
   sessionCacheDeadline,
   sessionNeedsRefresh,
+  upsertCodeBuddySession,
 } from "./codebuddy-auth.js";
 import { installCodeBuddyWeb } from "./codebuddy-web.js";
 
@@ -263,8 +269,8 @@ export function apply(ctx, config) {
   let memoRaw;
   let memoGeneration = -1;
   let memoized;
-  let loginSession;
   let loginSessionPromise;
+  let remoteModelsKey;
   const builtins = new Map(builtinProviders().map((provider) => [provider.id, provider]));
   const apiKeyAuth = builtins.get("deepseek")?.auth;
   if (!apiKeyAuth) throw new Error(`${name}: pi-ai DeepSeek auth helper is unavailable`);
@@ -312,24 +318,37 @@ export function apply(ctx, config) {
   };
 
   const resolveLoginSession = async () => {
-    if (loginSession?.expiresAt > Date.now()) return loginSession;
     loginSessionPromise ??= (async () => {
       const credentials = ctx.get("credentials");
-      const ref = credentialRef(CODEBUDDY_SESSION_REF);
-      const stored = await credentials?.resolve(ref);
-      const value = stored?.value ?? launchEnvironmentOf(ctx).get(ref)?.value;
-      if (!value) throw new Error("未找到 CodeBuddy 登录凭据");
-      let session = parseCodeBuddySession(value);
+      const env = launchEnvironmentOf(ctx);
+      const sessionsRef = credentialRef(CODEBUDDY_SESSIONS_REF);
+      const storedSessions = await credentials?.resolve(sessionsRef);
+      const sessionsValue = storedSessions?.value ?? env.get(sessionsRef)?.value;
+      let store;
+      if (sessionsValue) {
+        store = parseCodeBuddySessions(sessionsValue);
+      } else {
+        const legacyRef = credentialRef(CODEBUDDY_SESSION_REF);
+        const storedLegacy = await credentials?.resolve(legacyRef);
+        const legacyValue = storedLegacy?.value ?? env.get(legacyRef)?.value;
+        if (!legacyValue) throw new Error("未找到 CodeBuddy 登录凭据");
+        const legacy = parseCodeBuddySession(legacyValue);
+        store = createCodeBuddySessionStore([legacy]);
+      }
+      const active = activeCodeBuddySession(store);
+      if (!active) throw new Error("未找到 CodeBuddy 登录账号");
+      let session = active;
       if (sessionNeedsRefresh(session)) {
-        session = await refreshCodeBuddySession(session);
-        await credentials?.set(ref, serializeCodeBuddySession(session));
+        session = { ...session, ...(await refreshCodeBuddySession(session)), updatedAt: Date.now() };
+        const nextStore = upsertCodeBuddySession({ ...store, activeId: active.id }, session);
+        await credentials?.set(sessionsRef, serializeCodeBuddySessions(nextStore));
+        await credentials?.set(credentialRef(CODEBUDDY_SESSION_REF), serializeCodeBuddySession(session));
       }
-      return { ...session, expiresAt: sessionCacheDeadline(session) };
+      return { ...session, sessionId: active.id, expiresAt: sessionCacheDeadline(session) };
     })().finally(() => {
       loginSessionPromise = undefined;
     });
-    loginSession = await loginSessionPromise;
-    return loginSession;
+    return loginSessionPromise;
   };
 
   const resolveCredential = async (provider, profile) => {
@@ -348,7 +367,7 @@ export function apply(ctx, config) {
         profile.headers["X-Tenant-Id"] = session.account.enterpriseId;
       }
       if (session.auth.domain) profile.headers["X-Domain"] = session.auth.domain;
-      return { value: assertUsableApiKey(session.auth.accessToken, name, "CodeBuddy login session"), kind: "bearer" };
+      return { value: assertUsableApiKey(session.auth.accessToken, name, "CodeBuddy login session"), kind: "bearer", sessionId: session.sessionId };
     }
     if (!ref) return { value: undefined, kind: "none" };
     const stored = await ctx.get("credentials")?.resolve(ref);
@@ -376,17 +395,22 @@ export function apply(ctx, config) {
   const listModels = adapter.listModels.bind(adapter);
   let refreshPromise;
   adapter.listModels = async (provider) => {
-    if (provider === PROVIDER && !remoteModels) {
+    if (provider === PROVIDER) {
       refreshPromise ??= (async () => {
         try {
           const profile = profiles().get(PROVIDER);
           const credential = await resolveCredential(PROVIDER, profile);
+          const cacheKey = credential.kind === "bearer" ? `token:${credential.sessionId ?? "active"}` : `api:${credential.ref ?? API_KEY_ENV}`;
+          if (remoteModels && remoteModelsKey === cacheKey) return;
           remoteModels = await fetchCodeBuddyModels(credential);
+          remoteModelsKey = cacheKey;
           generation += 1;
         } catch {
           // Keep the built-in catalog available while the key or network is absent.
         }
-      })();
+      })().finally(() => {
+        refreshPromise = undefined;
+      });
       await refreshPromise;
     }
     return listModels(provider);
@@ -416,6 +440,7 @@ export function apply(ctx, config) {
         ? { value: request.apiKey, kind: "api-key", ref: API_KEY_ENV }
         : await resolveCredential(PROVIDER, profile);
       remoteModels = await fetchCodeBuddyModels(credential, request.signal);
+      remoteModelsKey = credential.kind === "bearer" ? `token:${credential.sessionId ?? "active"}` : `api:${credential.ref ?? API_KEY_ENV}`;
       generation += 1;
       return remoteModels.map((model) => ({
         id: model.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-llm-codebuddy",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "通过 WorkBuddy API Key 或 CodeBuddy 登录令牌为 DeepSeek Harness 接入 CodeBuddy 模型",
   "author": "Axiaohungry",
   "keywords": [
@@ -32,6 +32,7 @@
   "files": [
     "index.js",
     "codebuddy-auth.js",
+    "codebuddy-credits.js",
     "codebuddy-web.js",
     "client.js",
     "cli.js",
@@ -41,7 +42,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "check": "node --check index.js && node --check codebuddy-auth.js && node --check codebuddy-web.js && node --check client.js && node --check cli.js && node --test test.js && node cli.js --self-test"
+    "check": "node --check index.js && node --check codebuddy-auth.js && node --check codebuddy-credits.js && node --check codebuddy-web.js && node --check client.js && node --check cli.js && node --test test.js && node cli.js --self-test"
   },
   "dsh": {
     "client": {