Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(claude): Claude 订阅只经内置 Claude Code CLI 自己的登录
Lizi7400091af1f0
diff --git a/apps/desktop/src/main/__tests__/makerEventHotPathOrdering.test.ts b/apps/desktop/src/main/__tests__/makerEventHotPathOrdering.test.tsindex db4a55e3fb..3d7e184560 100644--- a/apps/desktop/src/main/__tests__/makerEventHotPathOrdering.test.ts+++ b/apps/desktop/src/main/__tests__/makerEventHotPathOrdering.test.ts@@ -1060,22 +1060,20 @@ describe('maker:event hot path ordering', () => {expect(piDoneSource).toContain('await recordSchedulerTurnCost({');});- it('refreshes Claude credential cache before dropping mismatched header snapshots', () => {+ it('records Claude subscription quota events only while the native login is connected', () => {const listenerSource = usageSource.match(- /setClaudeRateLimitHeadersListener\(\(snapshot, requestBearerToken\) => \{[\s\S]*?\n {2}\}\);/,+ /setClaudeRateLimitInfoListener\(\(info\) => \{[\s\S]*?\n {2}\}\);/,)?.[0];expect(listenerSource).toBeTruthy();if (!listenerSource) return;- expect(listenerSource).toContain('let currentToken = _currentClaudeToken;');- expect(listenerSource).toContain(- 'currentToken = readClaudeCredentialsInfo()?.accessToken ?? null;',- );+ // 登出 / 断开后晚到的事件必须丢弃,不能复活刚清掉的快照。expectOrder(listenerSource,- 'currentToken = readClaudeCredentialsInfo()?.accessToken ?? null;',- 'if (requestBearerToken !== currentToken) return false;',+ 'if (!hasClaudeNativeLogin()) return;',+ 'void recordClaudeSubscriptionUsageSnapshot(',);+ expect(usageSource).not.toContain('setClaudeRateLimitHeadersListener');});});diff --git a/apps/desktop/src/main/__tests__/oauthResultPage.test.ts b/apps/desktop/src/main/__tests__/oauthResultPage.test.tsindex 3144af0534..4f207204b1 100644--- a/apps/desktop/src/main/__tests__/oauthResultPage.test.ts+++ b/apps/desktop/src/main/__tests__/oauthResultPage.test.ts@@ -281,11 +281,10 @@ describe('wave4 brand login callback card (pageKind=desktop-login)', () => {expect(html).toContain('data-cindy-oauth-copy="callback.neutral"');});- it('keeps every non-login caller on the legacy shell (ghost/claude/xai/generic 视觉零变化)', () => {+ it('keeps every non-login caller on the legacy shell (ghost/xai/generic 视觉零变化)', () => {for (const pageKind of [undefined,'ghost-oauth',- 'claude-oauth','xai-oauth','generic-oauth',] as const) {diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.tsindex 892010ffb5..b5843ed671 100644--- a/apps/desktop/src/main/bootstrap-electron.ts+++ b/apps/desktop/src/main/bootstrap-electron.ts@@ -692,7 +692,6 @@ import { clearModelVisibilityMirror } from './maker-host/model-visibility-mirrorimport { setClaudeSupportedModelsListener } from '@cindy/maker-core';import {noteAnthropicSdkSupportedModels,- refreshAnthropicModelsFromHttp,clearAnthropicDiscoveredModels,} from './maker-host/model-discovery/anthropic.js';import {@@ -808,12 +807,20 @@ import {resetImDefaultSettingsChannel,writeImDefaultSettingsPatch,} from './im/defaultSettingsStore.js';-import { hasClaudeAiOAuth } from './maker-host/claude-credentials-store.js';+import { hasClaudeNativeLogin } from './maker-host/claude-native-auth.js';import {- disconnectClaudeAiOAuth,- reconnectClaudeAiOAuth,-} from './maker-host/claude-oauth-refresh.js';-import { beginClaudeLocalLogin, cancelClaudeOAuthLogin } from './maker-host/claude-oauth-login.js';+ connectClaudeNativeLogin,+ disconnectClaudeNativeLogin,+} from './maker-host/claude-native-connection.js';+import {+ beginClaudeCliLogin,+ cancelClaudeCliLogin,+ onClaudeCliLoginStatusChange,+ readClaudeCliLoginStatus,+ runClaudeCliLogin,+} from './maker-host/claude-native-cli.js';+import { closeClaudeCliProxyBridge } from './maker-host/claude-cli-proxy-bridge.js';+import { isNativeProviderAuthBound, isNativeProviderAuthRevoked } from './maker-host/nativeProviderAuthBinding.js';import {runGrokOAuthLogin,cancelGrokOAuthLogin,@@ -2575,6 +2582,8 @@ registerGhostIpc();registerPluginMarketIpc();registerPluginPublisherIpc();setAppSessionCommitBoundaryHook(() => {+ // 进行中的 Claude Code 登录属于旧 owner:结束 CLI 子进程,不让它在新 owner 下完成。+ cancelClaudeCliLogin();clearAllSessionAttention();remoteDesktopViewerWindows.reset();ghostPanelWindowsController.closeForOwnerChange();@@ -5068,35 +5077,51 @@ const registerIpcHandlers = () => {tapWindowBroadcast(MAKER_PUSH.CLAUDE_SESSION_ROUTE_CHANGED, { sessionId, route });});- // ── 本机 Claude Code 订阅:只管理 Cindy 的使用许可 ─────────────────────────- // 与鉴权模式开关正交:管理订阅凭证本身(像 Codex 的 OAuth 登录独立于 API 模式)。+ // ── 本机 Claude Code 订阅:登录交给内置 CLI,Cindy 只管使用许可 ─────────────────+ // 登录 = 拉起 CLI 的 `claude auth login`(凭证由 CLI 自己保存,与终端 claude 共用);+ // 断开 = 撤销 Cindy 的使用许可,不登出 CLI。Cindy 不读取、不保存订阅凭证(claude-native-cli)。// Anthropic 模型清单动态发现接线(2026-07-19 统一重构):// - active-catalog 统一收口 capabilities 刷新 + revision 广播;// - SDK supportedModels 捕获(maker-core 会话 init 后上报)是能力字段权威。setClaudeSupportedModelsListener(noteAnthropicSdkSupportedModels);+ // CLI 登录态在 Cindy 之外变化(终端里登录 / 登出)时同步连接态;登出与手动断开同款收尾。+ onClaudeCliLoginStatusChange((status) => {+ void broadcastClaudeAuthStateChanged();+ syncClaudeSubscriptionUsageForAuthChange();+ if (!status.loggedIn) {+ resetProviderModelAutoRefreshCooldowns('anthropic');+ void clearAnthropicDiscoveredModels().catch(() => undefined);+ }+ });+ // 启动时后台读一次(不阻塞):已连接的用户由 provider 目录加载等这次结果;+ // 从未连接的用户据此自动沿用本机登录。明确断开过的用户不再读。+ if (!isNativeProviderAuthRevoked('anthropic')) void readClaudeCliLoginStatus();+ // 退出时结束进行中的登录子进程(CLI 的本机回调监听没有超时),并关闭 CLI 的代理桥。+ app.once('will-quit', () => {+ cancelClaudeCliLogin();+ void closeClaudeCliProxyBridge();+ });ipcMain.handle(MAKER_IPC_INVOKE.CLAUDE_OAUTH_STATUS, async () => {- return { authorized: hasClaudeAiOAuth() };+ // 没有使用许可时结论恒为 false,不必拉起 CLI(状态栏等常驻读取对所有用户都会调用)。+ if (isNativeProviderAuthBound('anthropic')) await readClaudeCliLoginStatus({ maxAgeMs: 30_000 });+ return { authorized: hasClaudeNativeLogin() };});ipcMain.handle(MAKER_IPC_INVOKE.CLAUDE_OAUTH_LOGIN, async (event, loginKey?: string) => {assertTrustedAppRendererEvent(event);const owner = activeOwnerScopeKey();if (isAppSessionBoundaryPending() || !getActiveAppSession().dataOwnerId)return { ok: false, reason: 'login_cancelled', authorized: false };- const signal = beginClaudeLocalLogin(loginKey);- resetProviderModelAutoRefreshCooldowns('anthropic');- await clearAnthropicDiscoveredModels();+ const signal = beginClaudeCliLogin(loginKey);+ const result = await runClaudeCliLogin(signal);if (signal.aborted || owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending())return { ok: false, reason: 'login_cancelled', authorized: false };- await ensureAnthropicCompatProxyReady();- if (signal.aborted || owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending())- return { ok: false, reason: 'login_cancelled', authorized: false };- if (!reconnectClaudeAiOAuth())- return { ok: false, reason: 'local_unavailable', authorized: false };+ if (!result.ok) return { ok: false, reason: result.reason, authorized: false };+ resetProviderModelAutoRefreshCooldowns('anthropic');// Binding is the commit point; auxiliary refresh must not prolong the cancellable login.+ connectClaudeNativeLogin();void broadcastClaudeAuthStateChanged();syncClaudeSubscriptionUsageForAuthChange();- void refreshAnthropicModelsFromHttp();- return { ok: true, authorized: hasClaudeAiOAuth() };+ return { ok: true, authorized: hasClaudeNativeLogin() };});ipcMain.handle(MAKER_IPC_INVOKE.CLAUDE_OAUTH_LOGOUT,@@ -5112,10 +5137,10 @@ const registerIpcHandlers = () => {) {throwIpcError('INVALID_PARAMS', 'Provider owner changed');}- // Cancel pending Cindy login/refresh before revoking the binding; keep native credentials.+ // Cancel a pending CLI login before revoking the binding; keep the CLI's own login.try {- cancelClaudeOAuthLogin();- await disconnectClaudeAiOAuth();+ cancelClaudeCliLogin();+ await disconnectClaudeNativeLogin();if (owner !== activeOwnerScopeKey() || isAppSessionBoundaryPending())return { authorized: false };resetProviderModelAutoRefreshCooldowns('anthropic');@@ -5132,13 +5157,13 @@ const registerIpcHandlers = () => {syncClaudeSubscriptionUsageForAuthChange();// 模型清单动态发现:登出完成前清空清单 + 删磁盘缓存,并等待旧 SDK 写盘收尾。await clearAnthropicDiscoveredModels();- return { authorized: hasClaudeAiOAuth() };+ return { authorized: hasClaudeNativeLogin() };},);ipcMain.handle(MAKER_IPC_INVOKE.CLAUDE_OAUTH_CANCEL, async (event, loginKey?: string) => {assertTrustedAppRendererEvent(event);- cancelClaudeOAuthLogin(loginKey);- return { authorized: hasClaudeAiOAuth() };+ cancelClaudeCliLogin(loginKey);+ return { authorized: hasClaudeNativeLogin() };});// 上游作废 xAI 凭证、收口自动登出后,走和手动登出完全一致的 UI 收尾(广播 + 清账号级diff --git a/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.ts b/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.tsindex 89a400925f..c525386674 100644--- a/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/activeCatalogDiscovery.test.ts@@ -90,18 +90,41 @@ function legacyCatalog(): Catalog {}describe('active-catalog discovered augment', () => {+ it('keeps Claude subscription models on Claude Code only, even when the source catalog declares Codex / Pi', () => {+ const catalog = bundledWithoutRegistry();+ const builtin = catalog.providers.find((provider) => provider.id === 'anthropic')!;+ const models = [fake('claude-sonnet-4-5'), fake('claude-sonnet-4-6')].map((model) => ({+ ...model,+ group: 'claude',+ }));+ // 远端目录形态:仍给 Claude 订阅声明 codex / pi 路由与清单。+ builtin.agents = ['claude-code', 'codex', 'pi'];+ builtin.routing = {+ ...builtin.routing,+ codex: { upstream: 'https://api.anthropic.com', authStrategy: 'provider-oauth-header' },+ pi: { upstream: 'https://api.anthropic.com', authStrategy: 'provider-oauth-header' },+ };+ builtin.models = { codex: models, 'claude-code': models, pi: models };+ setActiveCatalog({ ...catalog, providers: [builtin] });+ setAnthropicDiscoveredModels(models);+ const actual = getActiveCatalog().providers.find((provider) => provider.id === 'anthropic')!;+ expect(actual.agents).toEqual(['claude-code']);+ expect(Object.keys(actual.routing)).toEqual(['claude-code']);+ expect(actual.models['claude-code']?.map((model) => model.id)).toEqual(+ expect.arrayContaining(['claude-sonnet-4-5', 'claude-sonnet-4-6']),+ );+ expect(actual.models.codex).toBeUndefined();+ expect(actual.models.pi).toBeUndefined();+ });+it.each([- ['anthropic', 'claude', 'claude-sonnet-4-5', 'claude-sonnet-4-6'],['xai', 'xai', 'grok-4.5', 'grok-4.6'],] as const)('uses the same default selection for builtin and independent %s accounts',(id, native, oldId, newId) => {const catalog = bundledWithoutRegistry();const builtin = catalog.providers.find((provider) => provider.id === id)!;- const models = [fake(oldId), fake(newId)].map((model) => ({- ...model,- group: id === 'anthropic' ? 'claude' : 'grok',- }));+ const models = [fake(oldId), fake(newId)].map((model) => ({ ...model, group: 'grok' }));builtin.models = { codex: models, 'claude-code': models, pi: models };const account = {...builtin,@@ -116,7 +139,6 @@ describe('active-catalog discovered augment', () => {auth: { method: 'apiKey' as const },};setActiveCatalog({ ...catalog, providers: [builtin, account, api] });- if (id === 'anthropic') setAnthropicDiscoveredModels(models);const actual = getActiveCatalog();for (const agent of ['codex', 'claude-code', 'pi'] as const) {const listed = (providerId: string) =>@@ -131,10 +153,7 @@ describe('active-catalog discovered augment', () => {.map((model) => model.id).join(',')}`,).toBe(false);- // Claude's Codex bridge is explicitly disabled by default; keep it disabled.- expect(listed(providerId).find((model) => model.id === newId)?.defaultEnabled).toBe(- !(id === 'anthropic' && agent === 'codex'),- );+ expect(listed(providerId).find((model) => model.id === newId)?.defaultEnabled).toBe(true);}expect(listed(api.id).find((model) => model.id === oldId)?.defaultEnabled).toBe(true);}@@ -292,7 +311,7 @@ describe('active-catalog discovered augment', () => {});it.each(['builtin', 'independent'] as const)(- 'adds a discovered Claude model to the %s account Pi catalog',+ 'never projects a discovered Claude model into the %s account Pi catalog',(kind) => {const catalog = bundledWithoutRegistry();const providerId = kind === 'builtin' ? 'anthropic' : 'claude-second';@@ -310,13 +329,12 @@ describe('active-catalog discovered augment', () => {const discovered = { ...fake('claude-new'), group: 'anthropic' };if (kind === 'builtin') setAnthropicDiscoveredModels([discovered]);else setDiscoveredProviderModels(providerId, 'claude-code', [discovered]);- expect(- getActiveCatalog().providers.find((p) => p.id === providerId)!.models.pi,- ).toContainEqual(expect.objectContaining({ id: 'claude-new', piApi: 'anthropic-messages' }));+ const provider = getActiveCatalog().providers.find((p) => p.id === providerId)!;+ expect(provider.models.pi ?? []).toEqual([]);+ expect(provider.models.codex ?? []).toEqual([]);if (kind === 'independent') {- expect(- getActiveCatalog().providers.find((p) => p.id === 'anthropic')!.models.pi,- ).not.toContainEqual(expect.objectContaining({ id: 'claude-new' }));+ // 独立 Claude 账号已停用:不向任何 agent 提供模型。+ expect(provider.agents).toEqual([]);}},);@@ -823,18 +841,9 @@ describe('anthropic 发现条目的 modelRegistry 元数据基线', () => {.map((model) => model.id).sort(),).toEqual(['claude-fable-5-1', 'claude-haiku-4-5', 'claude-opus-5-5', 'claude-sonnet-5']);- expect(anthropicList('codex')).toEqual(- anthropicList('claude-code').map((model) => ({- ...model,- defaultEnabled: false,- supportsFastMode: false,- })),- );- expect(anthropicList('pi').map((model) => model.id)).toEqual(- BUNDLED_CATALOG.providers- .find((provider) => provider.id === 'anthropic')- ?.models.pi?.map((model) => model.id),- );+ // Claude 订阅只供 Claude Code:不投影 Codex bridge,也不给 Pi。+ expect(anthropicList('codex')).toEqual([]);+ expect(anthropicList('pi')).toEqual([]);expect(Object.fromEntries([diff --git a/apps/desktop/src/main/maker-host/__tests__/activeCatalogXdAvailability.test.ts b/apps/desktop/src/main/maker-host/__tests__/activeCatalogXdAvailability.test.tsindex 93e9c70262..47ca262b96 100644--- a/apps/desktop/src/main/maker-host/__tests__/activeCatalogXdAvailability.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/activeCatalogXdAvailability.test.ts@@ -862,10 +862,8 @@ describe('Anthropic 权威模型清单注入', () => {setAnthropicDiscoveredModels([opus]);expect(anthropicModels().map((m) => m.id)).toEqual(['claude-opus-4-8']);expect(anthropicModels()[0]).toMatchObject({ name: 'Opus 4.8', supportsFastMode: true });- expect(anthropicModels('codex')[0]).toMatchObject({- name: 'Opus 4.8',- supportsFastMode: false,- });+ // Claude 订阅只供 Claude Code,不再投影 Codex bridge。+ expect(anthropicModels('codex')).toEqual([]);setAnthropicDiscoveredModels([]);expect(anthropicModels()).toEqual([]);expect(anthropicModels('codex')).toEqual([]);diff --git a/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.ts b/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.tsindex cb475ea95a..4e32741122 100644--- a/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/anthropicModelDiscovery.test.ts@@ -1,13 +1,14 @@/*** model-discovery/anthropic 单测。*- * 覆盖:SDK ModelInfo 映射(别名过滤 / dated id 归一 / 能力字段在场 = 权威、全缺席 =- * 未知按确定性默认合成 / haiku 默认收起)、HTTP /v1/models 映射(能力字段容错 / haiku- * 例外 / max_input_tokens 优先 / dated 去重)、contextWindow 规则(HTTP 明示 > 目录 >- * 默认 1M / haiku 200k)、- * SDK 捕获入口的登录态门控与合并纪律(登出不注入 / 无能力信息保留已精化条目 /- * HTTP 明说窗口不被 SDK 打回猜测值 / 磁盘缓存恢复 explicitWindows)。- * HTTP 拉取的网络路径不在此测(登录态 + fetch 依赖,行为由代码注释契约覆盖)。+ * 覆盖:SDK ModelInfo 映射(别名过滤 / dated id 与 [1m] 归一 / 能力字段在场 = 权威、+ * 全缺席 = 未知按确定性默认合成 / haiku 默认收起)、contextWindow 规则(旧缓存明示 >+ * 目录 > 默认 1M / haiku 200k)、+ * SDK 捕获入口的登录态门控(hasClaudeNativeLogin)与合并纪律(登出不注入 / 无能力信息+ * 保留已精化条目 / 退化快照只合并能力补丁 / 旧版 HTTP 明说窗口不被 SDK 打回猜测值 /+ * 磁盘缓存恢复 explicitWindows)。+ * Claude 订阅凭证只在内置 Claude Code CLI 里,Cindy 不再直连 Anthropic `/v1/models`,+ * 因此这里没有 HTTP 通道:SDK 捕获路径也不得发出任何网络请求。*/import os from 'node:os';import path from 'node:path';@@ -27,37 +28,18 @@ vi.mock('electron', () => ({safeStorage: { isEncryptionAvailable: vi.fn(() => false) },}));+// 登录态门控:「Cindy 已连接本机 Claude Code 登录」(CLI 已登录 + Cindy 绑定)。const authState = vi.hoisted(() => ({ loggedIn: true }));-// refreshToken 决定「401 后没换到新 token」是暂时故障还是真的无从刷新(见归因分流)。-const credentialsMock = vi.hoisted(() => ({ refreshToken: 'refresh-token' as string | null }));-vi.mock('../claude-credentials-store.js', () => ({- hasClaudeAiOAuth: () => authState.loggedIn,- readClaudeAiOAuth: () =>- authState.loggedIn- ? { accessToken: 'test-token', refreshToken: credentialsMock.refreshToken }- : null,-}));-const oauthRefreshMock = vi.hoisted(() => ({- getValidClaudeAiOAuth: vi.fn(async () => null as unknown),-}));-vi.mock('../claude-oauth-refresh.js', () => oauthRefreshMock);--// HTTP discovery tests inject global fetch responses; keep the production-// proxy-aware transport out of this unit's network boundary.-vi.mock('../outbound-fetch.js', () => ({- outboundFetch: (input: RequestInfo | URL, init?: RequestInit) => globalThis.fetch(input, init),+vi.mock('../claude-native-auth.js', () => ({+ hasClaudeNativeLogin: () => authState.loggedIn,+ hasClaudeNativeLoginUnbound: () => authState.loggedIn,}));import {- evaluateHttpShrink,isDegenerateModelListShrink,mapAnthropicSdkModels,- mapAnthropicHttpModels,noteAnthropicSdkSupportedModels,loadAnthropicModelsFromDiskCache,- refreshAnthropicModelsFromHttp,- getAnthropicModelDiscoveryFailure,- setAnthropicDiscoveryFailureListener,clearAnthropicDiscoveredModels,resetAnthropicDiscoveryForTest,waitForAnthropicDiscoveryIdleForTest,@@ -169,6 +151,20 @@ describe('mapAnthropicSdkModels', () => {['claude-opus-4-5', 200_000],['claude-sonnet-4-5', 200_000],]);+ // 目录窗口是显式声明的真实上限,可用于收敛运行期上报值。+ expect(out.every(({ model }) => model.contextWindowVerified === true)).toBe(true);+ });++ it('未知新模型的启发式窗口不标记为已核实(不得拿它收敛上报值)', () => {+ const out = mapAnthropicSdkModels([+ { value: 'claude-sonnet-9-unknown', displayName: 'Sonnet 9' },+ { value: 'claude-haiku-9-unknown', displayName: 'Haiku 9' },+ ]);+ // 目录没有该模型、也没有旧缓存明示窗口 → 1M / 200k 是猜的,只能展示。+ expect(out[0].model.contextWindow).toBe(1_000_000);+ expect(out[0].model.contextWindowVerified).toBeUndefined();+ expect(out[1].model.contextWindow).toBe(200_000);+ expect(out[1].model.contextWindowVerified).toBeUndefined();});it('active registry 快照提供窗口和 effort 基线', () => {@@ -294,116 +290,6 @@ describe('mapAnthropicSdkModels', () => {});});-describe('mapAnthropicHttpModels', () => {- it('无能力信息 → 使用目录基线(两项来源都为 false);haiku 仍为 0 档 + 默认收起', () => {- const out = mapAnthropicHttpModels([- { id: 'claude-opus-4-8-20260401', display_name: 'Opus 4.8', type: 'model' },- { id: 'claude-haiku-4-5-20251001', display_name: 'Haiku 4.5', type: 'model' },- ]);- expect(out[0]).toMatchObject({ hasEffortInfo: false, hasFastModeInfo: false });- expect(out[0].explicitContextWindow).toBeNull();- expect(out[0].model).toMatchObject({- id: 'claude-opus-4-8',- contextWindow: 1_000_000,- efforts: ['low', 'medium', 'high', 'xhigh', 'max'],- defaultEffort: 'high',- supportsFastMode: false,- });- expect(out[1].model).toMatchObject({- id: 'claude-haiku-4-5',- contextWindow: 200_000,- efforts: [],- defaultEnabled: false,- });- });-- it('响应带完整能力信息时逐项标记来源,explicitContextWindow 单独记账', () => {- const out = mapAnthropicHttpModels([- {- id: 'claude-opus-4-8',- display_name: 'Opus 4.8',- max_input_tokens: 900_000,- capabilities: { efforts: ['low', 'high', 'max'], fast_mode: true },- },- ]);- expect(out[0]).toMatchObject({ hasEffortInfo: true, hasFastModeInfo: true });- expect(out[0].explicitContextWindow).toBe(900_000);- expect(out[0].model).toMatchObject({- contextWindow: 900_000, // max_input_tokens 优先于 1M 规则- // HTTP 明说的窗口是已核实的真实上限,可用于收敛运行期上报值。- contextWindowVerified: true,- efforts: ['low', 'high', 'max'],- supportsFastMode: true,- });- });-- it('HTTP 未下发 max_input_tokens 时使用目录中的官方窗口', () => {- setActiveCatalog(BUNDLED_CATALOG); // 这三例正要用 bundled registry 的官方窗口基线-- const out = mapAnthropicHttpModels([- { id: 'claude-opus-5', display_name: 'Opus 5', type: 'model' },- { id: 'claude-opus-4-5', display_name: 'Opus 4.5', type: 'model' },- { id: 'claude-sonnet-4-5', display_name: 'Sonnet 4.5', type: 'model' },- ]);- expect(out.map(({ model }) => [model.id, model.contextWindow])).toEqual([- ['claude-opus-5', 1_000_000],- ['claude-opus-4-5', 200_000],- ['claude-sonnet-4-5', 200_000],- ]);- });-- it('未知新模型的启发式窗口不标记为已核实(不得拿它收敛上报值)', () => {- const out = mapAnthropicHttpModels([- { id: 'claude-sonnet-9-unknown', display_name: 'Sonnet 9', type: 'model' },- ]);- // 目录没有该模型、HTTP 也没给 max_input_tokens → 1M 是猜的,只能展示。- expect(out[0].model.contextWindow).toBe(1_000_000);- expect(out[0].model.contextWindowVerified).toBeUndefined();- });-- it('HTTP 未知新模型缺 capability 时同样使用 5 档临时基线', () => {- const out = mapAnthropicHttpModels([- { id: 'claude-sonnet-6', display_name: 'Sonnet 6', type: 'model' },- ]);- expect(out[0]).toMatchObject({ hasEffortInfo: false });- expect(out[0].model).toMatchObject({- efforts: ['low', 'medium', 'high', 'xhigh', 'max'],- defaultEffort: 'high',- });- });-- it('HTTP 只声明 fast_mode 时不把目录 effort 基线标成明确能力', () => {- const out = mapAnthropicHttpModels([- {- id: 'claude-opus-4-8',- display_name: 'Opus 4.8',- capabilities: { fast_mode: true },- },- ]);- expect(out[0]).toMatchObject({ hasEffortInfo: false, hasFastModeInfo: true });- expect(out[0].model).toMatchObject({- efforts: ['low', 'medium', 'high', 'xhigh', 'max'],- supportsFastMode: true,- });- });-- it('dated 变体归一后 first-wins(API 新发布在前 = 保留最新);过滤非 model 条目与别名', () => {- const out = mapAnthropicHttpModels([- { id: 'claude-sonnet-5-20260601', display_name: 'Sonnet 5 (new)' },- { id: 'claude-sonnet-5-20260101', display_name: 'Sonnet 5 (old)' },- { id: 'not-a-claude-model', display_name: 'Other' },- { id: 'claude-opus-4-8', type: 'alias' },- ]);- expect(out.map((e) => e.model.id)).toEqual(['claude-sonnet-5']);- expect(out[0].model.name).toBe('Sonnet 5 (new)');- });-- it('坏输入安全', () => {- expect(mapAnthropicHttpModels(undefined)).toEqual([]);- expect(mapAnthropicHttpModels([null, {}, { id: 42 }])).toEqual([]);- });-});-describe('isDegenerateModelListShrink(退化快照护栏,纯函数)', () => {it('骤减(一次少 2 条以上且掉到不足现值一半)判退化;增长 / 持平 / 首次 / 单步递减放行', () => {// 事故形态:7 条被单条家族级响应打塌。@@ -420,88 +306,24 @@ describe('isDegenerateModelListShrink(退化快照护栏,纯函数)', () => {});});-describe('evaluateHttpShrink(HTTP 骤减收敛,review P2)', () => {- beforeEach(() => {- resetAnthropicDiscoveryForTest();- authState.loggedIn = true;- });-- afterEach(async () => {- await waitForAnthropicDiscoveryIdleForTest();- resetAnthropicDiscoveryForTest();- await fsp.rm(TEST_USER_DATA, { recursive: true, force: true });- });-- it('连续 3 次相同的骤减快照 = 确认真实下架,第 3 次放行;之前一直拒绝', () => {- expect(evaluateHttpShrink(7, ['claude-a', 'claude-b'])).toBe('reject');- expect(evaluateHttpShrink(7, ['claude-b', 'claude-a'])).toBe('reject'); // 顺序无关,签名相同- expect(evaluateHttpShrink(7, ['claude-a', 'claude-b'])).toBe('accept');- });-- it('签名变化(上游还在抖)重新计数;非骤减快照清零 streak', () => {- expect(evaluateHttpShrink(7, ['claude-a'])).toBe('reject');- expect(evaluateHttpShrink(7, ['claude-b'])).toBe('reject'); // 换了内容,streak 重回 1- expect(evaluateHttpShrink(7, ['claude-b'])).toBe('reject');- // 中间来了一次正常快照 → streak 清零,再骤减要重新累计。- expect(evaluateHttpShrink(7, ['1', '2', '3', '4', '5', '6', '7'].map((n) => `claude-${n}`))).toBe('accept');- expect(evaluateHttpShrink(7, ['claude-b'])).toBe('reject');- });-- it('记账跨重启持久化:落盘进缓存 pendingShrink,重启加载后继续累计(review P2 二轮回归)', async () => {- const cacheDir = path.join(TEST_USER_DATA, 'model-discovery');- const cacheFile = path.join(cacheDir, 'anthropic-models.json');- const cachedModel = {- id: 'claude-opus-4-8',- name: 'Opus 4.8',- group: 'anthropic',- sortOrder: 0,- contextWindow: 1_000_000,- efforts: ['low', 'medium', 'high'],- defaultEffort: 'high',- supportsFastMode: false,- status: 'active',- };- await fsp.mkdir(cacheDir, { recursive: true });- await fsp.writeFile(- cacheFile,- JSON.stringify({ fetchedAt: '2026-07-21T00:00:00.000Z', models: [cachedModel] }),- 'utf-8',- );-- // 进程 1:两次相同骤减被拒,记账落盘。- expect(evaluateHttpShrink(7, ['claude-x'])).toBe('reject');- expect(evaluateHttpShrink(7, ['claude-x'])).toBe('reject');- await waitForAnthropicDiscoveryIdleForTest();- const persisted = JSON.parse(await fsp.readFile(cacheFile, 'utf-8')) as {- pendingShrink?: { signature: string; streak: number };- };- expect(persisted.pendingShrink).toEqual({ signature: 'claude-x', streak: 2 });-- // 「重启」:清内存态 → 从缓存恢复 → 第 3 次相同骤减即确认放行。- resetAnthropicDiscoveryForTest();- await loadAnthropicModelsFromDiskCache();- expect(evaluateHttpShrink(7, ['claude-x'])).toBe('accept');- // 确认放行后记账清零并落盘(缓存里不再有 pendingShrink)。- await waitForAnthropicDiscoveryIdleForTest();- const cleared = JSON.parse(await fsp.readFile(cacheFile, 'utf-8')) as {- pendingShrink?: unknown;- };- expect(cleared.pendingShrink).toBeUndefined();+describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () => {+ // Cindy 不持有订阅凭证,发现路径(SDK 捕获 / 缓存加载 / 退化合并)一律不得直连网络。+ const fetchSpy = vi.fn(async () => {+ throw new Error('anthropic model discovery must not perform HTTP requests');});-});-describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () => {beforeEach(() => {resetAnthropicDiscoveryForTest();setAnthropicDiscoveredModels([]);authState.loggedIn = true;- oauthRefreshMock.getValidClaudeAiOAuth.mockReset();- oauthRefreshMock.getValidClaudeAiOAuth.mockResolvedValue(null);+ fetchSpy.mockClear();+ vi.stubGlobal('fetch', fetchSpy);});afterEach(async () => {await clearAnthropicDiscoveredModels();await waitForAnthropicDiscoveryIdleForTest();+ expect(fetchSpy).not.toHaveBeenCalled();resetAnthropicDiscoveryForTest();setAnthropicDiscoveredModels([]);vi.unstubAllGlobals();@@ -531,51 +353,75 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =const cache = path.join(TEST_USER_DATA, 'model-discovery', 'anthropic-models.json');await expect(fsp.access(cache)).resolves.toBeUndefined();- // 模拟 OAuth 成功后凭证已被 B 覆盖、但 B 的 HTTP / SDK 尚未返回任何清单。+ // 模拟 CLI 登录已换成账号 B、但 B 的 SDK 捕获尚未返回任何清单。await clearAnthropicDiscoveredModels();expect(anthropicIds()).toEqual([]);await expect(fsp.access(cache)).rejects.toMatchObject({ code: 'ENOENT' });});- it('HTTP 刷新落盘期间换号时返回未应用,不向设置页误报成功', async () => {- oauthRefreshMock.getValidClaudeAiOAuth.mockResolvedValue({ accessToken: 'test-token' });- vi.stubGlobal(- 'fetch',- vi.fn(async () => ({- ok: true,- json: async () => ({- data: [{ id: 'claude-opus-4-8', display_name: 'Account A Opus', type: 'model' }],- has_more: false,- }),- })),- );+ it('SDK 捕获落盘后重启可从磁盘缓存恢复,逐字段明确来源一起恢复', async () => {+ noteAnthropicSdkSupportedModels([+ {+ value: 'claude-fable-5',+ displayName: 'Fable 5',+ supportsEffort: true,+ supportedEffortLevels: ['low', 'high'],+ supportsFastMode: true,+ },+ ]);+ await waitForAnthropicDiscoveryIdleForTest();+ const cacheFile = path.join(TEST_USER_DATA, 'model-discovery', 'anthropic-models.json');+ const persisted = JSON.parse(await fsp.readFile(cacheFile, 'utf-8')) as Record<string, unknown>;+ expect(persisted.explicitEffortModelIds).toEqual(['claude-fable-5']);+ expect(persisted.explicitFastModeModelIds).toEqual(['claude-fable-5']);+ // HTTP 骤减收敛已随 HTTP 通道一起移除,缓存不再携带 pendingShrink 记账。+ expect(persisted).not.toHaveProperty('pendingShrink');- const originalWriteFile = fsp.writeFile.bind(fsp);- let releaseWrite!: () => void;- let signalWriteStarted!: () => void;- const writeGate = new Promise<void>((resolve) => { releaseWrite = resolve; });- const writeStarted = new Promise<void>((resolve) => { signalWriteStarted = resolve; });- const writeSpy = vi.spyOn(fsp, 'writeFile').mockImplementationOnce(async (...args) => {- signalWriteStarted();- await writeGate;- return originalWriteFile(...args);+ // 「重启」:清内存态后仅凭磁盘缓存恢复;明确 effort 不被目录基线刷新覆盖。+ resetAnthropicDiscoveryForTest();+ setAnthropicDiscoveredModels([]);+ expect(anthropicIds()).toEqual([]);+ await loadAnthropicModelsFromDiskCache();+ expect(anthropicModel('claude-fable-5')).toMatchObject({+ name: 'Fable 5',+ efforts: ['low', 'high'],+ supportsFastMode: true,});+ });- try {- const refreshPromise = refreshAnthropicModelsFromHttp();- await writeStarted;- authState.loggedIn = false;- const clearPromise = clearAnthropicDiscoveredModels();- releaseWrite();+ it('未连接本机 Claude Code 登录时不加载残留磁盘缓存', async () => {+ const cacheDir = path.join(TEST_USER_DATA, 'model-discovery');+ await fsp.mkdir(cacheDir, { recursive: true });+ await fsp.writeFile(+ path.join(cacheDir, 'anthropic-models.json'),+ JSON.stringify({+ fetchedAt: '2026-07-19T00:00:00.000Z',+ models: [+ {+ id: 'claude-opus-4-8',+ name: 'Opus 4.8',+ group: 'anthropic',+ sortOrder: 0,+ contextWindow: 1_000_000,+ efforts: ['low', 'medium', 'high'],+ defaultEffort: 'high',+ supportsFastMode: false,+ status: 'active',+ },+ ],+ }),+ 'utf-8',+ );- await expect(refreshPromise).resolves.toBe(false);- await clearPromise;- expect(anthropicIds()).toEqual([]);- } finally {- releaseWrite();- writeSpy.mockRestore();- }+ authState.loggedIn = false;+ await loadAnthropicModelsFromDiskCache();+ expect(anthropicIds()).toEqual([]);++ // 同一份缓存在已连接时正常恢复,证明上面是门控而非缓存本身无效。+ authState.loggedIn = true;+ await loadAnthropicModelsFromDiskCache();+ expect(anthropicIds()).toEqual(['claude-opus-4-8']);});it('登出删除排在旧 SDK 在途持久化之后,缓存不会死灰复燃(review P1 回归)', async () => {@@ -660,7 +506,6 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =]);expect(anthropicIds()).toHaveLength(4);// cc 只回当前模型一条:清单不塌,且只声明 fast 时不能清空已有 effort 基线。- oauthRefreshMock.getValidClaudeAiOAuth.mockClear();noteAnthropicSdkSupportedModels([{value: 'claude-fable-5',@@ -696,7 +541,8 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () ='xhigh','max',]);- expect(oauthRefreshMock.getValidClaudeAiOAuth).toHaveBeenCalled();+ // 退化快照不再触发任何 HTTP 兜底刷新(订阅凭证只在 CLI 内,Cindy 不直连 Anthropic)。+ expect(fetchSpy).not.toHaveBeenCalled();// 后续单条若不带能力字段,未知不能把刚精化的 xhigh 擦掉。noteAnthropicSdkSupportedModels([{ value: 'claude-fable-5', displayName: 'Fable' }]);expect(anthropicIds()).toHaveLength(4);@@ -775,20 +621,12 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () ='max',]);- oauthRefreshMock.getValidClaudeAiOAuth.mockResolvedValue({ accessToken: 'test-token' });- vi.stubGlobal(- 'fetch',- vi.fn(async () => ({- ok: true,- json: async () => ({- data: [{ id: 'claude-fable-5', display_name: 'Fable 5', type: 'model' }],- has_more: false,- }),- })),- );- await refreshAnthropicModelsFromHttp();+ // 下一次 SDK 捕获同样不带能力字段:目录基线沿用,来源仍记为非明确。+ noteAnthropicSdkSupportedModels([{ value: 'claude-fable-5', displayName: 'Fable 5' }]);+ await waitForAnthropicDiscoveryIdleForTest();expect(anthropicModel('claude-fable-5')).toMatchObject({+ name: 'Fable 5',efforts: ['low', 'medium', 'high', 'xhigh', 'max'],defaultEffort: 'high',});@@ -808,7 +646,7 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =expect(persisted.explicitFastModeModelIds).toEqual([]);});- it('HTTP fast-only 响应跨重启只更新 fast,保留已持久化的明确 effort', async () => {+ it('SDK fast-only 捕获跨重启只更新 fast,保留已持久化的明确 effort', async () => {const cacheDir = path.join(TEST_USER_DATA, 'model-discovery');const cacheFile = path.join(cacheDir, 'anthropic-models.json');await fsp.mkdir(cacheDir, { recursive: true });@@ -836,25 +674,10 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =);await loadAnthropicModelsFromDiskCache();- oauthRefreshMock.getValidClaudeAiOAuth.mockResolvedValue({ accessToken: 'test-token' });- vi.stubGlobal(- 'fetch',- vi.fn(async () => ({- ok: true,- json: async () => ({- data: [- {- id: 'claude-fable-5',- display_name: 'Fable 5',- type: 'model',- capabilities: { fast_mode: false },- },- ],- has_more: false,- }),- })),- );- await refreshAnthropicModelsFromHttp();+ noteAnthropicSdkSupportedModels([+ { value: 'claude-fable-5', displayName: 'Fable 5', supportsFastMode: false },+ ]);+ await waitForAnthropicDiscoveryIdleForTest();expect(anthropicModel('claude-fable-5')).toMatchObject({name: 'Fable 5',@@ -948,7 +771,7 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =});});- it('磁盘缓存恢复 explicitWindows:重启后 SDK 捕获不把 HTTP 明说窗口打回猜测值(review P2 回归)', async () => {+ it('磁盘缓存恢复 explicitWindows:重启后 SDK 捕获不把旧版 HTTP 明说窗口打回猜测值(review P2 回归)', async () => {const cacheDir = path.join(TEST_USER_DATA, 'model-discovery');await fsp.mkdir(cacheDir, { recursive: true });await fsp.writeFile(@@ -977,7 +800,7 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =noteAnthropicSdkSupportedModels([{ value: 'claude-opus-4-8', displayName: 'Opus 4.8', supportsEffort: true, supportedEffortLevels: ['low', 'high'] },]);- // SDK 覆盖能力字段,但窗口保留 HTTP 明说的 900k,不回退 contextWindowFor 的 1M。+ // SDK 覆盖能力字段,但窗口保留旧缓存里 HTTP 明说的 900k,不回退 contextWindowFor 的 1M。expect(anthropicModel('claude-opus-4-8')).toMatchObject({contextWindow: 900_000,efforts: ['low', 'high'],@@ -1021,11 +844,11 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =expect(reloaded?.contextWindowVerified).toBeUndefined();});- // 目录里**没有**的新模型:HTTP 的 max_input_tokens 是它唯一的已核实窗口。SDK 通道+ // 目录里**没有**的新模型:旧版缓存里 HTTP 记下的 max_input_tokens 是它唯一的已核实窗口。SDK 通道// 重新映射时走「无 explicit」分支(落到启发式、不带标记),恢复 explicitWindows 时// 只覆盖 contextWindow 会把 provenance 静默擦掉 —— 之后就不再用这个真实上限收敛// 虚高的上报值了。- it('SDK 重映射不得擦掉 HTTP 明说窗口的 provenance(目录未覆盖的新模型)', async () => {+ it('SDK 重映射不得擦掉旧缓存 HTTP 明说窗口的 provenance(目录未覆盖的新模型)', async () => {const cacheDir = path.join(TEST_USER_DATA, 'model-discovery');await fsp.mkdir(cacheDir, { recursive: true });await fsp.writeFile(@@ -1067,586 +890,3 @@ describe('noteAnthropicSdkSupportedModels(登录态门控 + 合并纪律)', () =});});});--describe('HTTP 发现失败的归因与选择性重试', () => {- const okResponse = {- ok: true,- json: async () => ({- data: [{ id: 'claude-opus-4-8', display_name: 'Opus 4.8', type: 'model' }],- has_more: false,- }),- };- /** 非 2xx 响应:归因要读正文,所以 stub 必须给 text()。 */- function errorResponse(status: number, body = '') {- return { ok: false, status, text: async () => body };- }- const REGION_BLOCK_BODY = JSON.stringify({- type: 'error',- error: {- type: 'unsupported_country_region_territory',- message:- 'Access to Anthropic models is not allowed from unsupported countries, regions, or territories.',- },- });-- beforeEach(() => {- resetAnthropicDiscoveryForTest();- setAnthropicDiscoveredModels([]);- authState.loggedIn = true;- credentialsMock.refreshToken = 'refresh-token';- oauthRefreshMock.getValidClaudeAiOAuth.mockReset();- oauthRefreshMock.getValidClaudeAiOAuth.mockResolvedValue({ accessToken: 'test-token' });- vi.useFakeTimers();- });-- afterEach(async () => {- vi.useRealTimers();- await clearAnthropicDiscoveredModels();- await waitForAnthropicDiscoveryIdleForTest();- resetAnthropicDiscoveryForTest();- setAnthropicDiscoveredModels([]);- vi.unstubAllGlobals();- await fsp.rm(TEST_USER_DATA, { recursive: true, force: true });- });-- it('连不上归 network,并把 undici 的 cause code 记进 detail', async () => {- const err = new TypeError('fetch failed');- (err as Error & { cause?: unknown }).cause = { code: 'ENOTFOUND' };- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(err));-- await refreshAnthropicModelsFromHttp();-- const failure = getAnthropicModelDiscoveryFailure();- expect(failure?.kind).toBe('network');- expect(failure?.detail).toContain('ENOTFOUND');- expect(typeof failure?.at).toBe('string');- });-- it('超时归 timeout(TimeoutError 与 connect 超时 code 都算)', async () => {- const timeoutError = new Error('The operation was aborted due to timeout');- timeoutError.name = 'TimeoutError';- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(timeoutError));- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('timeout');-- resetAnthropicDiscoveryForTest();- const connectTimeout = new TypeError('fetch failed');- (connectTimeout as Error & { cause?: unknown }).cause = { code: 'UND_ERR_CONNECT_TIMEOUT' };- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(connectTimeout));- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('timeout');- });-- it('地域拒绝按正文识别,403 与 400 都算(状态码不足以判定)', async () => {- vi.stubGlobal('fetch', vi.fn().mockResolvedValue(errorResponse(403, REGION_BLOCK_BODY)));- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('regionBlocked');-- resetAnthropicDiscoveryForTest();- vi.stubGlobal('fetch', vi.fn().mockResolvedValue(errorResponse(400, REGION_BLOCK_BODY)));- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('regionBlocked');- });-- it('同为 403 的 Cloudflare 式拒绝归 forbidden,不与地域拒绝混为一谈', async () => {- vi.stubGlobal(- 'fetch',- vi- .fn()- .mockResolvedValue(- errorResponse(403, JSON.stringify({ error: { type: 'forbidden', message: 'Request not allowed' } })),- ),- );- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('forbidden');- });-- it('401 归 unauthorized;408 归 timeout;5xx / 429 归 upstream;其它 4xx 归 rejected', async () => {- for (const [status, kind] of [- [401, 'unauthorized'],- // 408 是上游 / 中间代理说「这次超时了」,与本地超时同源 —— 必须可重试。- [408, 'timeout'],- [503, 'upstream'],- [429, 'upstream'],- [418, 'rejected'],- ] as const) {- resetAnthropicDiscoveryForTest();- vi.stubGlobal('fetch', vi.fn().mockResolvedValue(errorResponse(status)));- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe(kind);- }- });-- it('200 但正文坏掉归 upstream(破损代理 / CDN 截断),不能说成「连不上」', async () => {- vi.stubGlobal(- 'fetch',- vi.fn().mockResolvedValue({- ok: true,- json: async () => {- throw new SyntaxError('Unexpected end of JSON input');- },- }),- );- await refreshAnthropicModelsFromHttp();- const failure = getAnthropicModelDiscoveryFailure();- expect(failure?.kind).toBe('upstream');- expect(failure?.detail).toContain('malformed response body');- });-- it('401 先强制换一枚 token 重试一次;换到新 token 且成功就不该报「请重新连接」', async () => {- oauthRefreshMock.getValidClaudeAiOAuth.mockReset();- oauthRefreshMock.getValidClaudeAiOAuth- .mockResolvedValueOnce({ accessToken: 'stale-token' })- .mockResolvedValueOnce({ accessToken: 'fresh-token' })- .mockResolvedValue({ accessToken: 'fresh-token' });- const fetchMock = vi- .fn()- .mockResolvedValueOnce(errorResponse(401))- .mockResolvedValue(okResponse);- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();-- expect(oauthRefreshMock.getValidClaudeAiOAuth).toHaveBeenCalledWith(- expect.objectContaining({ forceRefresh: true, staleToken: 'stale-token' }),- );- expect(anthropicIds()).toEqual(['claude-opus-4-8']);- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- });-- it('强制换 token 后仍是 401 就如实报 unauthorized,不无限换', async () => {- oauthRefreshMock.getValidClaudeAiOAuth.mockReset();- oauthRefreshMock.getValidClaudeAiOAuth- .mockResolvedValueOnce({ accessToken: 'stale-token' })- .mockResolvedValue({ accessToken: 'fresh-token' });- const fetchMock = vi.fn().mockResolvedValue(errorResponse(401));- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();-- // 首次 + 换 token 后一次,不再继续。- expect(fetchMock).toHaveBeenCalledTimes(2);- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('unauthorized');- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- });-- it('换不到新 token(刷新失败 / 仍是同一枚)时直接如实报 unauthorized', async () => {- oauthRefreshMock.getValidClaudeAiOAuth.mockReset();- oauthRefreshMock.getValidClaudeAiOAuth.mockResolvedValue({ accessToken: 'stale-token' });- const fetchMock = vi.fn().mockResolvedValue(errorResponse(401));- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();-- expect(fetchMock).toHaveBeenCalledTimes(1);- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('unauthorized');- });-- it('200 但 data 不是 /v1/models 的形状归 upstream,不能一路走到 empty', async () => {- // 典型:代理生成的 {"error":...} 却带 200。静默跳过会落到确定性的 empty(不重试),- // 还会把上游故障说成「你的账号没有可用模型」。- for (const payload of [{ error: { message: 'proxy failure' } }, { data: 'nope' }]) {- resetAnthropicDiscoveryForTest();- vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => payload }));- await refreshAnthropicModelsFromHttp();- const failure = getAnthropicModelDiscoveryFailure();- expect(failure?.kind).toBe('upstream');- expect(failure?.detail).toContain('unexpected payload shape');- }- });-- it('200 但根不是对象(JSON null / 标量 / 数组)也归 upstream,不是 network', async () => {- // 直接取 .data 会抛 TypeError,落到 classifyDiscoveryError 的兜底就成了「连不上」,- // 让用户白查网络和 Proxy。- for (const payload of [null, 'oops', 42, [{ id: 'x' }]]) {- resetAnthropicDiscoveryForTest();- vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => payload }));- await refreshAnthropicModelsFromHttp();- const failure = getAnthropicModelDiscoveryFailure();- expect(failure?.kind).toBe('upstream');- expect(failure?.detail).toContain('unexpected payload root');- }- });-- it('has_more=true 但没有可用游标归 upstream,不把半截清单当完整清单', async () => {- // 静默收尾会把「只翻了一页的前缀」当成完整清单交出去,而它完全可能小到刚好落进 shrink- // 守卫的放行区间 —— 真清单被截断替换、失败态被清、也不排重试(PR #548 review)。- const model = (id: string) => ({ id, display_name: id, type: 'model' });- for (const bad of [{ has_more: true }, { has_more: true, last_id: 42 }, { has_more: true, last_id: '' }]) {- resetAnthropicDiscoveryForTest();- setAnthropicDiscoveredModels([]);- vi.stubGlobal(- 'fetch',- vi.fn().mockResolvedValue({- ok: true,- json: async () => ({ data: [model('claude-opus-4-8')], ...bad }),- }),- );- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('upstream');- // 半截结果一律不生效。- expect(anthropicIds()).toEqual([]);- }- });-- it('连接态由调用方给出时不再重读凭证库(macOS 上那是一次同步 Keychain 子进程)', async () => {- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new TypeError('fetch failed')));- await refreshAnthropicModelsFromHttp();-- // 显式传 false = 调用方已知未连接:不暴露失败态,且不去问凭证库。- authState.loggedIn = true;- expect(getAnthropicModelDiscoveryFailure(false)).toBeNull();- // 显式传 true 同理:即便凭证库此刻说未登录,也按调用方给的连接态走。- authState.loggedIn = false;- expect(getAnthropicModelDiscoveryFailure(true)?.kind).toBe('network');- // 不传时保持原有的自查语义。- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- });-- it('答复正常但没有可用模型归 empty', async () => {- vi.stubGlobal(- 'fetch',- vi.fn().mockResolvedValue({ ok: true, json: async () => ({ data: [], has_more: false }) }),- );- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('empty');- });-- it('data 非空却一条都映射不出来归 upstream(不是 empty),并继续重试', async () => {- // 「这个账号没有可用模型」是确定性事实,该停;「上游答的结构不对」是故障,该重试。- // 两者都会走到 mapped.length === 0,一律归 empty 就会既取消重试、又叫用户去查账号- // 权限(PR #548 review)。- const malformed = {- ok: true,- json: async () => ({ data: [{ type: 'model' }, { display_name: 'no id' }], has_more: false }),- };- const fetchMock = vi.fn().mockResolvedValueOnce(malformed).mockResolvedValue(okResponse);- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- const failure = getAnthropicModelDiscoveryFailure();- expect(failure?.kind).toBe('upstream');- expect(failure?.detail).toContain('2 entries');-- await vi.advanceTimersByTimeAsync(2_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- expect(anthropicIds()).toEqual(['claude-opus-4-8']);- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- });-- it('401 后强制刷新自身故障归 upstream(不是 unauthorized),重试链继续', async () => {- // token 端点超时 / 5xx / 拿不到刷新锁 ≠ 授权被拒。归 unauthorized 会取消全部重试、- // 还叫用户去断开重连,而 refresh token 很可能完全有效(PR #548 review)。- const fetchMock = vi.fn().mockResolvedValueOnce(errorResponse(401)).mockResolvedValue(okResponse);- vi.stubGlobal('fetch', fetchMock);- oauthRefreshMock.getValidClaudeAiOAuth- .mockResolvedValueOnce({ accessToken: 'test-token' }) // 首次取 token- .mockRejectedValueOnce(new Error('token endpoint 503')) // 强制刷新失败- .mockResolvedValue({ accessToken: 'test-token-2' });-- await refreshAnthropicModelsFromHttp();- const failure = getAnthropicModelDiscoveryFailure();- expect(failure?.kind).toBe('upstream');- expect(failure?.detail).toContain('yielded nothing');-- await vi.advanceTimersByTimeAsync(2_000);- expect(anthropicIds()).toEqual(['claude-opus-4-8']);- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- });-- it('强制刷新「返回 null」同样按 upstream 处理 —— 凭证还在且还能刷', async () => {- // getValidClaudeAiOAuth 对超时 / 5xx / 抢不到锁是**返回 null**,不 reject。只认异常- // 就会让这些最常见的暂时性失败仍旧落到 unauthorized(PR #548 review)。- const fetchMock = vi.fn().mockResolvedValue(errorResponse(401));- vi.stubGlobal('fetch', fetchMock);- oauthRefreshMock.getValidClaudeAiOAuth- .mockResolvedValueOnce({ accessToken: 'test-token' })- .mockResolvedValue(null); // 强制刷新没拿到新 token,也没抛-- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('upstream');- });-- it('凭证已被判定失效(没有 refresh token)时仍归 unauthorized', async () => {- // 与上一条相反的一侧:真的无从刷新,就该停下来告诉用户重新连接,而不是空转重试。- credentialsMock.refreshToken = null;- const fetchMock = vi.fn().mockResolvedValue(errorResponse(401));- vi.stubGlobal('fetch', fetchMock);- oauthRefreshMock.getValidClaudeAiOAuth- .mockResolvedValueOnce({ accessToken: 'test-token' })- .mockResolvedValue(null);-- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('unauthorized');- });-- it('暂时性失败(连不上)自动重试,成功即生效并清失败态', async () => {- const fetchMock = vi- .fn()- .mockRejectedValueOnce(new TypeError('fetch failed'))- .mockResolvedValue(okResponse);- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- expect(fetchMock).toHaveBeenCalledTimes(1);- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('network');-- await vi.advanceTimersByTimeAsync(2_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- expect(anthropicIds()).toEqual(['claude-opus-4-8']);- expect(getAnthropicModelDiscoveryFailure()).toBeNull();-- // 成功后退避计数归零,不再排下一次。- await vi.advanceTimersByTimeAsync(120_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- });-- it('上游 5xx 同样自动重试(服务端侧故障可能几秒后自愈)', async () => {- const fetchMock = vi- .fn()- .mockResolvedValueOnce(errorResponse(503))- .mockResolvedValue(okResponse);- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- await vi.advanceTimersByTimeAsync(2_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- expect(anthropicIds()).toEqual(['claude-opus-4-8']);- });-- it('暂时性失败持续不好转时退避有限次后停手,不做无限轮询', async () => {- const fetchMock = vi.fn().mockRejectedValue(new TypeError('fetch failed'));- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- // 首次 + 3 次退避重试(2s / 8s / 30s)后停手。- await vi.advanceTimersByTimeAsync(2_000);- await vi.advanceTimersByTimeAsync(8_000);- await vi.advanceTimersByTimeAsync(30_000);- expect(fetchMock).toHaveBeenCalledTimes(4);-- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(4);- });-- it('地域拒绝一次都不重试 —— 同一请求再发一百次也是同一答复', async () => {- const fetchMock = vi.fn().mockResolvedValue(errorResponse(403, REGION_BLOCK_BODY));- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- expect(fetchMock).toHaveBeenCalledTimes(1);-- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(1);- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('regionBlocked');- });-- it('凭证被拒 / 请求被拒 / 空清单同样不重试', async () => {- for (const [status, body] of [- [401, ''],- [403, JSON.stringify({ error: { type: 'forbidden' } })],- [418, ''],- ] as const) {- resetAnthropicDiscoveryForTest();- const fetchMock = vi.fn().mockResolvedValue(errorResponse(status, body));- vi.stubGlobal('fetch', fetchMock);- await refreshAnthropicModelsFromHttp();- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(1);- }- });-- it('确定性拒绝会取消上一轮暂时性失败排下的重试,失败理由不在两者间跳变', async () => {- const fetchMock = vi- .fn()- .mockRejectedValueOnce(new TypeError('fetch failed'))- .mockResolvedValue(errorResponse(403, REGION_BLOCK_BODY));- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('network');-- // 排下的那次重试跑出「地域拒绝」——此后不该再有任何自动重试。- await vi.advanceTimersByTimeAsync(2_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('regionBlocked');-- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- });-- it('退避耗尽后,外部触发重开一轮退避(手动重试 / 认领不能只剩单次请求)', async () => {- const fetchMock = vi.fn().mockRejectedValue(new TypeError('fetch failed'));- vi.stubGlobal('fetch', fetchMock);-- // 第一轮:首次 + 三档退避后停手。- await refreshAnthropicModelsFromHttp();- await vi.advanceTimersByTimeAsync(2_000);- await vi.advanceTimersByTimeAsync(8_000);- await vi.advanceTimersByTimeAsync(30_000);- expect(fetchMock).toHaveBeenCalledTimes(4);- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(4);-- // 用户点「重试」= 外部触发:必须重新开一轮退避,而不是只发一次就再次卡死。- await refreshAnthropicModelsFromHttp();- expect(fetchMock).toHaveBeenCalledTimes(5);- await vi.advanceTimersByTimeAsync(2_000);- expect(fetchMock).toHaveBeenCalledTimes(6);- await vi.advanceTimersByTimeAsync(8_000);- await vi.advanceTimersByTimeAsync(30_000);- expect(fetchMock).toHaveBeenCalledTimes(8);- });-- it('失败记账会通知收口,让已取走快照的 renderer 能重取到失败理由', async () => {- const onFailureChanged = vi.fn();- setAnthropicDiscoveryFailureListener(onFailureChanged);- try {- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new TypeError('fetch failed')));- await refreshAnthropicModelsFromHttp();- expect(onFailureChanged).toHaveBeenCalled();- } finally {- setAnthropicDiscoveryFailureListener(null);- }- });-- it('失败后成功但清单未变时同样通知 —— apply 的 early return 会吞掉这次广播', async () => {- // 先成功一次拿到清单,再失败,再用**同一份**清单成功:applyModels 因为 modelsChanged- // 为 false 直接 early return、不 markChanged,只有清失败态这条通知能让 UI 知道恢复了。- const fetchMock = vi- .fn()- .mockResolvedValueOnce(okResponse)- .mockRejectedValueOnce(new TypeError('fetch failed'))- .mockResolvedValue(okResponse);- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- expect(anthropicIds()).toEqual(['claude-opus-4-8']);-- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('network');-- const onFailureChanged = vi.fn();- setAnthropicDiscoveryFailureListener(onFailureChanged);- try {- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- expect(onFailureChanged).toHaveBeenCalled();- } finally {- setAnthropicDiscoveryFailureListener(null);- }- });-- it('通知收口抛错不打断发现流程', async () => {- setAnthropicDiscoveryFailureListener(() => {- throw new Error('broadcast boom');- });- try {- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new TypeError('fetch failed')));- await expect(refreshAnthropicModelsFromHttp()).resolves.toBe(false);- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('network');- } finally {- setAnthropicDiscoveryFailureListener(null);- }- });-- it('未登录时不暴露失败态(该讲的是「去连接」,不是上一个账号的失败理由)', async () => {- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new TypeError('fetch failed')));- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('network');-- authState.loggedIn = false;- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- });-- it('408 走重试链(不是被 rejected 挡死)', async () => {- const fetchMock = vi- .fn()- .mockResolvedValueOnce(errorResponse(408))- .mockResolvedValue(okResponse);- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- await vi.advanceTimersByTimeAsync(2_000);- expect(fetchMock).toHaveBeenCalledTimes(2);- expect(anthropicIds()).toEqual(['claude-opus-4-8']);- });-- it('首次就失败时,登出 / 换号仍要通知 —— applyModels([]) 那条路不广播', async () => {- // lastApplied 本来就是空,applyModels([]) 走「清单没变」早退;不补通知的话 device-link- // 对端会一直留着旧的失败理由(本地窗口只是碰巧有 auth 事件兜底)。- vi.stubGlobal('fetch', vi.fn().mockRejectedValue(new TypeError('fetch failed')));- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()).not.toBeNull();- expect(anthropicIds()).toEqual([]);-- const onFailureChanged = vi.fn();- setAnthropicDiscoveryFailureListener(onFailureChanged);- try {- await clearAnthropicDiscoveredModels();- expect(onFailureChanged).toHaveBeenCalled();- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- } finally {- setAnthropicDiscoveryFailureListener(null);- }- });-- it('快照被退化守卫拒绝 = 上游已经答了,过期的失败理由必须一起清掉', async () => {- // 有旧清单 + 上一轮记了 network:此刻上游其实已经能连上,只是这次回来的快照太短被守卫- // 挡下、旧清单原样留用 —— 用户手里明明有模型可选,UI 却还挂着「连不上」;而这条早退路径- // 既不记新失败也不排重试,过期理由会一直挂到下次成功发现(PR #548 review)。- const model = (id: string) => ({ id, display_name: id, type: 'model' });- const wide = {- ok: true,- json: async () => ({- data: ['claude-opus-4-8', 'claude-sonnet-4-8', 'claude-haiku-4-8', 'claude-opus-4-7'].map(model),- has_more: false,- }),- };- const shrunk = {- ok: true,- json: async () => ({ data: [model('claude-opus-4-8')], has_more: false }),- };- const fetchMock = vi- .fn()- .mockResolvedValueOnce(wide)- .mockRejectedValueOnce(new TypeError('fetch failed'))- .mockResolvedValue(shrunk);- vi.stubGlobal('fetch', fetchMock);-- await refreshAnthropicModelsFromHttp();- expect(anthropicIds()).toHaveLength(4);-- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()?.kind).toBe('network');-- const onFailureChanged = vi.fn();- setAnthropicDiscoveryFailureListener(onFailureChanged);- try {- // network 排的重试到点 —— 这次上游答了,但快照退化被拒。- await vi.advanceTimersByTimeAsync(2_000);- expect(anthropicIds()).toHaveLength(4); // 旧清单保住- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- expect(onFailureChanged).toHaveBeenCalled();- } finally {- setAnthropicDiscoveryFailureListener(null);- }- // 失败态已清 = 重试链也停了,不再按退避空转打网络。- const callsSoFar = fetchMock.mock.calls.length;- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(callsSoFar);- });-- it('登出 / 换号清掉失败态与待执行的重试', async () => {- const fetchMock = vi.fn().mockRejectedValue(new TypeError('fetch failed'));- vi.stubGlobal('fetch', fetchMock);- await refreshAnthropicModelsFromHttp();- expect(getAnthropicModelDiscoveryFailure()).not.toBeNull();-- await clearAnthropicDiscoveredModels();- expect(getAnthropicModelDiscoveryFailure()).toBeNull();- await vi.advanceTimersByTimeAsync(600_000);- expect(fetchMock).toHaveBeenCalledTimes(1);- });-});diff --git a/apps/desktop/src/main/maker-host/__tests__/autoReviewModelRouter.test.ts b/apps/desktop/src/main/maker-host/__tests__/autoReviewModelRouter.test.tsindex 4b3f9039b0..367e8f59f2 100644--- a/apps/desktop/src/main/maker-host/__tests__/autoReviewModelRouter.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/autoReviewModelRouter.test.ts@@ -3,6 +3,7 @@ import { afterEach, describe, expect, it, vi } from 'vitest';import type { UtilityTextResult } from '../../../shared/utilityTextResult.js';import { DEDICATED_AUTO_REVIEW_CANDIDATES } from '../../utility-model/oneShotCandidates.js';import {+ AUTO_REVIEW_CANDIDATE_TIMEOUT_MS,AUTO_REVIEW_CHAIN_TIMEOUT_MS,createAutoReviewModelRouter,} from '../auto-review-model-router.js';@@ -54,6 +55,12 @@ afterEach(() => {});describe('dedicated Auto-review candidate policy', () => {+ it('budgets exactly one full timeout per candidate plus a small margin', () => {+ expect(AUTO_REVIEW_CHAIN_TIMEOUT_MS).toBe(+ DEDICATED_AUTO_REVIEW_CANDIDATES.length * AUTO_REVIEW_CANDIDATE_TIMEOUT_MS + 4_000,+ );+ });+it('contains only the managed Gateway and supported subscription models in fixed order', () => {expect(DEDICATED_AUTO_REVIEW_CANDIDATES.map((candidate) => [candidate.providerId,@@ -62,10 +69,10 @@ describe('dedicated Auto-review candidate policy', () => {['xd', 'cindy/auto-review'],['openai', 'gpt-5.4-nano'],['openai', 'gpt-5.6-luna'],- ['anthropic', 'claude-haiku-4-5'],]);+ // Claude 订阅只供内置 Claude Code CLI 使用,不作为 Cindy 直连审阅的候选。expect(JSON.stringify(DEDICATED_AUTO_REVIEW_CANDIDATES)).not.toMatch(- /xai|deepseek|kimi|custom/i,+ /xai|deepseek|kimi|custom|anthropic|claude/i,);});@@ -80,9 +87,10 @@ describe('dedicated Auto-review candidate policy', () => {case 'chatgpt-nano':return failed(candidate, 'http_error', 400);case 'chatgpt-luna':- return failed(candidate, 'empty_response');- case 'claude-haiku':- return succeeded(candidate, '{"verdict":"allow","reason":"Routine"}');+ // 首次空响应在原位重试一次,重试成功即收口。+ return calls.filter((id) => id === 'chatgpt-luna').length === 1+ ? failed(candidate, 'empty_response')+ : succeeded(candidate, '{"verdict":"allow","reason":"Routine"}');default:throw new Error('Unexpected Auto-review candidate');}@@ -97,7 +105,6 @@ describe('dedicated Auto-review candidate policy', () => {'chatgpt-nano','chatgpt-luna','chatgpt-luna',- 'claude-haiku',]);});@@ -157,8 +164,9 @@ describe('dedicated Auto-review candidate policy', () => {await vi.advanceTimersByTimeAsync(AUTO_REVIEW_CHAIN_TIMEOUT_MS);await expect(pending).resolves.toBeNull();- expect(requestCandidate).toHaveBeenCalledTimes(5);- expect(observedSignals).toHaveLength(5);+ const attempts = Math.ceil(AUTO_REVIEW_CHAIN_TIMEOUT_MS / AUTO_REVIEW_CANDIDATE_TIMEOUT_MS);+ expect(requestCandidate).toHaveBeenCalledTimes(attempts);+ expect(observedSignals).toHaveLength(attempts);expect(observedSignals.every((signal) => signal.aborted)).toBe(true);});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeAuthAdapterOAuthEnv.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeAuthAdapterOAuthEnv.test.tsindex a167d1f723..26e464bcd0 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeAuthAdapterOAuthEnv.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeAuthAdapterOAuthEnv.test.ts@@ -1,35 +1,30 @@/**- * claudeAuthAdapterOAuthEnv.test.ts —— DesktopClaudeAuthAdapter.getAuthEnv 订阅分支回归。+ * claudeAuthAdapterOAuthEnv.test.ts —— DesktopClaudeAuthAdapter 的 Claude 订阅鉴权契约。*- * 固化 2026-07-03 事故的修复契约:连了 Claude.ai 订阅时,getAuthEnv 必须把订阅- * access token(及 scopes / subscriptionType / rateLimitTier)经 env 显式递给 cc 子进程- * —— cc >= 2.1.198 在 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST 下不再自读系统凭证库,- * 「不注入任何鉴权 env」的旧行为会让所有订阅会话毫秒级 "Not logged in"。- * 同时守住:订阅分支绝不注入 ANTHROPIC_API_KEY(与 OAuth 共存触发 cc shouldDisableAuth);- * gateway-key 模式不受影响、不带订阅 token。+ * Claude 订阅只经内置 Claude Code CLI 自己的登录使用(Anthropic 不允许第三方应用收集、+ * 存储或中转订阅凭证):+ * - 订阅会话(oauth-bearer)的 getAuthEnv 不递任何凭证,只补系统代理 env;+ * - 未指定来源时网关 key 优先(与未连订阅时一致),没有网关 key 才交给本机登录;+ * - 独立 Claude 账号已停用,不递凭证;+ * - gateway-key / provider-oauth 形态保持原样。*/import { beforeEach, describe, expect, it, vi } from 'vitest';import { buildClaudeEnv } from '../../../../../../packages/maker-core/src/agents/claude-code/env-builder.js';const h = vi.hoisted(() => ({- hasOAuth: true,- oauth: null as Record<string, unknown> | null,+ nativeLogin: true,+ bound: true,gatewayKey: 'sk-xd-gateway' as string | null,- cleared: 0,revoked: false,- revocationFails: false,- refresherInvalidated: 0,- invalidGrantHandler: null as ((digest: string) => void) | null,- rejectedDigest: undefined as string | undefined,- /** getValidClaudeAiOAuth 的可注入延迟(测回调超时用)。 */- refreshDelayMs: 0,- lastRefreshOpts: null as { staleToken?: string; forceRefresh?: boolean } | null,+ removedGatewayKey: 0,+ disconnects: 0,+ networkEnv: {} as Record<string, string>,encryptionAvailable: true,proxyReady: true,canUseGateway: true,- accounts: new Map<string, Record<string, unknown> | null>(),- refreshAccount: vi.fn(),+ accounts: new Map<string, 'claude' | 'xai'>(),retainPresentation: vi.fn(),+ readLoginCalls: [] as Array<{ maxAgeMs?: number } | undefined>,}));vi.mock('../provider-presentation-store.js', () => ({@@ -40,8 +35,6 @@ vi.mock('../provider-presentation-store.js', () => ({vi.mock('electron', () => ({app: {getPath: () => '/tmp/xdt-test-userdata-nonexistent',- // ripgrep 探测已惰性化(issue #1956):runtime-configs import 期不再读- // getAppPath / isPackaged,这里无需再补。},safeStorage: { isEncryptionAvailable: () => h.encryptionAvailable },}));@@ -55,51 +48,44 @@ vi.mock('../../appCapabilities.js', () => ({vi.mock('../nativeProviderAuthBinding.js', async (original) => ({...(await original<typeof import('../nativeProviderAuthBinding.js')>()),isNativeProviderAuthRevoked: () => h.revoked,- unbindNativeProviderAuth: (_provider: string, opts?: { rejectedCredentialDigest?: string }) => {- if (h.revocationFails) throw new Error('binding write failed');- h.revoked = true;- h.rejectedDigest = opts?.rejectedCredentialDigest;- },+ isNativeProviderAuthBound: () => h.bound,}));-vi.mock('../claude-credentials-store.js', () => ({- hasClaudeAiOAuth: () => h.hasOAuth,- clearClaudeAiOAuth: () => {- h.cleared += 1;- },+vi.mock('../claude-native-auth.js', () => ({+ hasClaudeNativeLogin: () => h.nativeLogin,+ hasClaudeNativeLoginUnbound: () => h.nativeLogin,}));-vi.mock('../claude-oauth-refresh.js', () => ({- getValidClaudeAiOAuth: async (opts?: { staleToken?: string }) => {- h.lastRefreshOpts = opts ?? null;- if (h.refreshDelayMs > 0) await new Promise((r) => setTimeout(r, h.refreshDelayMs));- return h.oauth;- },- getClaudeAiOAuthForSpawn: () => h.oauth,- invalidateClaudeOAuthRefresh: () => {- h.refresherInvalidated += 1;+vi.mock('../claude-native-connection.js', () => ({+ readClaudeNativeLogin: async (opts?: { maxAgeMs?: number }) => {+ h.readLoginCalls.push(opts);+ return h.nativeLogin ? { loggedIn: true, email: '[email protected]' } : null;},- // disconnect = invalidate → clear(唯一断开入口,logout/IPC 都必须走它)- disconnectClaudeAiOAuth: () => {- h.refresherInvalidated += 1;+ disconnectClaudeNativeLogin: async () => {+ h.disconnects += 1;h.revoked = true;},- setClaudeOAuthInvalidGrantHandler: (handler: ((digest: string) => void) | null) => {- h.invalidGrantHandler = handler;- },+}));++vi.mock('../claude-native-cli.js', () => ({+ claudeCliNetworkEnv: async () => ({ ...h.networkEnv }),+ claudeCliConfigDirOverride: () => undefined,}));vi.mock('../subscription-account-auth.js', () => ({- subscriptionAccountKind: (id: string) => h.accounts.has(id) ? 'claude' : null,- readClaudeAccountOAuth: (id: string) => h.accounts.get(id) ?? null,- subscriptionAccountState: (id: string) => ({ authenticated: !!h.accounts.get(id), authSource: 'oauth' }),- getValidClaudeAccountOAuth: (...args: unknown[]) => h.refreshAccount(...args),+ subscriptionAccountKind: (id: string) => h.accounts.get(id) ?? null,+ subscriptionAccountState: (id: string) => h.accounts.get(id) === 'claude'+ ? { authenticated: false, errorReason: 'claude_account_retired', authSource: 'oauth' }+ : { authenticated: true, authSource: 'oauth' },}));vi.mock('../../secrets/providerSecretStore.js', () => ({getProviderSecretStore: () => ({get: () => h.gatewayKey,- remove: () => ({ success: true }),+ remove: () => {+ h.removedGatewayKey += 1;+ return { success: true };+ },}),}));@@ -120,28 +106,31 @@ vi.mock('../anthropic-compat-proxy-host.js', () => ({isAnthropicCompatProxyHandleReady: () => h.proxyReady,}));-describe('DesktopClaudeAuthAdapter.getAuthEnv — 订阅 OAuth env 注入', () => {+const CREDENTIAL_KEYS = [+ 'ANTHROPIC_API_KEY',+ 'ANTHROPIC_AUTH_TOKEN',+ 'CLAUDE_CODE_OAUTH_TOKEN',+ 'CLAUDE_CODE_OAUTH_SCOPES',+ 'CLAUDE_CODE_SUBSCRIPTION_TYPE',+ 'CLAUDE_CODE_RATE_LIMIT_TIER',+ 'CINDY_CLAUDE_ACCOUNT_PROVIDER_ID',+] as const;++describe('DesktopClaudeAuthAdapter — Claude 订阅只经 CLI 自己的登录', () => {beforeEach(() => {- h.hasOAuth = true;- h.oauth = {- accessToken: 'at-live',- refreshToken: 'rt-live',- expiresAt: Date.now() + 3600_000,- scopes: ['user:inference', 'user:profile'],- subscriptionType: 'max',- rateLimitTier: 'default_claude_max_20x',- };+ h.nativeLogin = true;+ h.bound = true;h.gatewayKey = 'sk-xd-gateway';- h.cleared = 0;h.revoked = false;- h.revocationFails = false;- h.refresherInvalidated = 0;- h.refreshDelayMs = 0;+ h.removedGatewayKey = 0;+ h.disconnects = 0;+ h.networkEnv = {};h.encryptionAvailable = true;h.proxyReady = true;h.canUseGateway = true;h.accounts.clear();- h.refreshAccount.mockReset();+ h.retainPresentation.mockReset();+ h.readLoginCalls = [];});it('keeps the owner-scoped BYOK key readable when Cindy gateway access is disabled', async () => {@@ -154,80 +143,110 @@ describe('DesktopClaudeAuthAdapter.getAuthEnv — 订阅 OAuth env 注入', () =async function makeAdapter() {const mod = await import('../auth-adapters.js');- const adapter = new mod.DesktopClaudeAuthAdapter();- // 测试环境无 electron app 生命周期,skills 预热已 mock 成 no-op。- return adapter;+ return new mod.DesktopClaudeAuthAdapter();}- it('订阅模式:注入 CLAUDE_CODE_OAUTH_TOKEN 全家桶,且绝不带 ANTHROPIC_API_KEY', async () => {+ it('订阅会话:已连接即授权,且 getAuthEnv 不递任何凭证(只补代理 env)', async () => {+ h.networkEnv = { HTTPS_PROXY: 'http://127.0.0.1:7890' };const adapter = await makeAdapter();- const env = await adapter.getAuthEnv();- expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBe('at-live');- expect(env.CLAUDE_CODE_OAUTH_SCOPES).toBe('user:inference user:profile');- expect(env.CLAUDE_CODE_SUBSCRIPTION_TYPE).toBe('max');- expect(env.CLAUDE_CODE_RATE_LIMIT_TIER).toBe('default_claude_max_20x');- expect(env.ANTHROPIC_API_KEY).toBeUndefined();+ await expect(adapter.getState({ credentialMode: 'oauth-bearer' })).resolves.toEqual({+ authenticated: true, identity: 'Claude.ai · OAuth', authSource: 'oauth',+ });+ // 会话启动要结论:登录态缓存超过 60s 就重读 CLI。+ expect(h.readLoginCalls).toEqual([{ maxAgeMs: 60_000 }]);+ const env = await adapter.getAuthEnv({ credentialMode: 'oauth-bearer' });+ for (const key of CREDENTIAL_KEYS) expect(env[key]).toBeUndefined();+ expect(env.HTTPS_PROXY).toBe('http://127.0.0.1:7890');});- it('builds native OAuth environments for the selected independent accounts', async () => {- h.hasOAuth = false;- h.gatewayKey = null;+ it('订阅会话:未连接(CLI 未登录或 Cindy 未获许可)→ no_oauth', async () => {+ h.nativeLogin = false;const adapter = await makeAdapter();- for (const providerId of ['anthropic-a', 'anthropic-b']) {- h.accounts.set(providerId, { ...h.oauth, accessToken: `test-token-${providerId}` });- await expect(adapter.getState({ credentialMode: 'provider-oauth', providerId })).resolves.toMatchObject({- authenticated: true, authSource: 'oauth',- });- const env = await buildClaudeEnv(adapter, { endpoint: 'http://127.0.0.1:1' }, {- credentialMode: 'provider-oauth', sessionProviderId: providerId,- });- expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBe(`test-token-${providerId}`);- expect(env.CINDY_CLAUDE_ACCOUNT_PROVIDER_ID).toBe(providerId);- expect(env.CLAUDE_CODE_OAUTH_SCOPES).toBe('user:inference user:profile');- expect(env.CLAUDE_CODE_SUBSCRIPTION_TYPE).toBe('max');- expect(env.CLAUDE_CODE_RATE_LIMIT_TIER).toBe('default_claude_max_20x');- expect(env.ANTHROPIC_API_KEY).toBeUndefined();- expect(env.ANTHROPIC_AUTH_TOKEN).toBeUndefined();- }- h.refreshAccount.mockResolvedValue({ accessToken: 'test-refreshed-a' });- await expect(adapter.getFreshSubscriptionToken('test-token-anthropic-a', 'anthropic-a')).resolves.toBe('test-refreshed-a');- expect(h.refreshAccount).toHaveBeenCalledWith('anthropic-a', {- forceRefresh: true, staleToken: 'test-token-anthropic-a',+ await expect(adapter.getState({ credentialMode: 'oauth-bearer' })).resolves.toEqual({+ authenticated: false, errorReason: 'no_oauth',});});- it('keeps independent account startup closed when the proxy or account is unavailable', async () => {- const providerId = 'anthropic-a';- h.accounts.set(providerId, { accessToken: 'test-account-a' });- const adapter = await makeAdapter();+ it('订阅会话不依赖 loopback proxy(CLI 直连 Anthropic)', async () => {h.proxyReady = false;- await expect(adapter.getState({ credentialMode: 'provider-oauth', providerId })).resolves.toEqual({- authenticated: false, errorReason: 'proxy_not_ready',+ const adapter = await makeAdapter();+ await expect(adapter.getState({ credentialMode: 'oauth-bearer' })).resolves.toMatchObject({+ authenticated: true, authSource: 'oauth',});- h.proxyReady = true;- h.accounts.set(providerId, null);- await expect(adapter.getState({ credentialMode: 'provider-oauth', providerId })).resolves.toMatchObject({- authenticated: false,+ });++ it('buildClaudeEnv 端到端:订阅会话不走 proxy、不设 host 接管、不带凭证', async () => {+ const adapter = await makeAdapter();+ const env = await buildClaudeEnv(adapter, { endpoint: 'http://127.0.0.1:1' }, {+ credentialMode: 'oauth-bearer', nativeCliAuth: true, sessionProviderId: 'anthropic',});- await expect(adapter.getAuthEnv({ credentialMode: 'provider-oauth', providerId })).rejects.toThrow('Claude account requires login');+ expect(env.ANTHROPIC_BASE_URL).toBeUndefined();+ expect(env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBeUndefined();+ for (const key of CREDENTIAL_KEYS) expect(env[key]).toBeUndefined();});- it('订阅字段缺省时只注入 token 本体,不留空值 env', async () => {- h.oauth = { accessToken: 'at-live' };+ it('未指定来源 + 有网关 key:走网关,与未连订阅时一致(即便订阅已连接)', async () => {const adapter = await makeAdapter();+ await expect(adapter.getState()).resolves.toEqual({ authenticated: true });const env = await adapter.getAuthEnv();- expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBe('at-live');- expect(env.CLAUDE_CODE_OAUTH_SCOPES).toBeUndefined();- expect(env.CLAUDE_CODE_SUBSCRIPTION_TYPE).toBeUndefined();- expect(env.CLAUDE_CODE_RATE_LIMIT_TIER).toBeUndefined();+ expect(env.ANTHROPIC_API_KEY).toBe('sk-xd-gateway');+ expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBeUndefined();});- it('凭证刷新链拿不到 token(如已彻底失效)→ 不注入任何鉴权 env(与旧失败面等价,不裸奔 API key)', async () => {- h.oauth = null;+ it('未指定来源 + 无网关 key:交给本机 Claude Code 登录,不递凭证', async () => {+ h.gatewayKey = null;+ h.networkEnv = { HTTPS_PROXY: 'http://127.0.0.1:7890' };const adapter = await makeAdapter();+ await expect(adapter.getState()).resolves.toEqual({+ authenticated: true, identity: 'Claude.ai · OAuth', authSource: 'oauth',+ });const env = await adapter.getAuthEnv();- expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBeUndefined();- expect(env.ANTHROPIC_API_KEY).toBeUndefined();+ for (const key of CREDENTIAL_KEYS) expect(env[key]).toBeUndefined();+ expect(env.HTTPS_PROXY).toBe('http://127.0.0.1:7890');+ });++ it('未指定来源 + 无网关 key:非 Anthropic 模型不交给订阅,经 proxy 隐式桥(占位 key)', async () => {+ h.gatewayKey = null;+ const mod = await import('../auth-adapters.js');+ const adapter = new mod.DesktopClaudeAuthAdapter();+ // 没有 authSource → maker-core 不按订阅会话起 CLI,仍设 proxy BASE_URL。+ await expect(adapter.getState({ model: 'glm-5' })).resolves.toEqual({ authenticated: true });+ await expect(adapter.getAuthEnv({ model: 'glm-5' })).resolves.toMatchObject({+ ANTHROPIC_API_KEY: mod.CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY,+ });+ // Anthropic 一方模型照常交给本机登录。+ await expect(adapter.getState({ model: 'claude-opus-4-7' })).resolves.toMatchObject({ authSource: 'oauth' });+ const env = await adapter.getAuthEnv({ model: 'claude-opus-4-7' });+ for (const key of CREDENTIAL_KEYS) expect(env[key]).toBeUndefined();+ const endToEnd = await buildClaudeEnv(adapter, { endpoint: 'http://127.0.0.1:1' }, { authModel: 'glm-5' });+ expect(endToEnd.ANTHROPIC_BASE_URL).toBe('http://127.0.0.1:1');+ expect(endToEnd.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBe('1');+ expect(endToEnd.ANTHROPIC_API_KEY).toBe(mod.CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY);+ });++ it('未指定来源 + 无网关 key + 未连订阅 → no_key', async () => {+ h.gatewayKey = null;+ h.nativeLogin = false;+ const adapter = await makeAdapter();+ await expect(adapter.getState()).resolves.toEqual({ authenticated: false, errorReason: 'no_key' });+ const env = await adapter.getAuthEnv();+ for (const key of CREDENTIAL_KEYS) expect(env[key]).toBeUndefined();+ });++ it('独立 Claude 账号已停用:拒绝授权、不递任何凭证', async () => {+ const providerId = 'anthropic-a';+ h.accounts.set(providerId, 'claude');+ const adapter = await makeAdapter();+ await expect(adapter.getState({ credentialMode: 'provider-oauth', providerId })).resolves.toMatchObject({+ authenticated: false, errorReason: 'claude_account_retired',+ });+ const env = await adapter.getAuthEnv({ credentialMode: 'provider-oauth', providerId });+ for (const key of CREDENTIAL_KEYS) expect(env[key]).toBeUndefined();+ });++ it('adapter 不再提供订阅 token 刷新回调', async () => {+ const adapter = await makeAdapter();+ expect((adapter as { getFreshSubscriptionToken?: unknown }).getFreshSubscriptionToken).toBeUndefined();});it('gateway-key 模式:只注入 ANTHROPIC_API_KEY,不带订阅 token(即便订阅在连)', async () => {@@ -237,9 +256,8 @@ describe('DesktopClaudeAuthAdapter.getAuthEnv — 订阅 OAuth env 注入', () =expect(env.CLAUDE_CODE_OAUTH_TOKEN).toBeUndefined();});- it('provider-oauth 模式:无网关 key / Claude OAuth 也可用,且只注入占位 key', async () => {- h.hasOAuth = false;- h.oauth = null;+ it('provider-oauth 模式:无网关 key / 订阅也可用,且只注入占位 key', async () => {+ h.nativeLogin = false;h.gatewayKey = null;const mod = await import('../auth-adapters.js');const adapter = new mod.DesktopClaudeAuthAdapter();@@ -253,7 +271,7 @@ describe('DesktopClaudeAuthAdapter.getAuthEnv — 订阅 OAuth env 注入', () =});it('provider-oauth 模式在 loopback proxy 未就绪时保持 fail-closed', async () => {- h.hasOAuth = false;+ h.nativeLogin = false;h.gatewayKey = null;h.proxyReady = false;const adapter = await makeAdapter();@@ -264,81 +282,51 @@ describe('DesktopClaudeAuthAdapter.getAuthEnv — 订阅 OAuth env 注入', () =});});- it('getFreshSubscriptionToken:透传刷新结果的 accessToken 与 staleToken 基线', async () => {- const adapter = await makeAdapter();- await expect(adapter.getFreshSubscriptionToken('at-failed')).resolves.toBe('at-live');- expect(h.lastRefreshOpts).toMatchObject({ forceRefresh: true, staleToken: 'at-failed' });- h.oauth = null;- await expect(adapter.getFreshSubscriptionToken()).resolves.toBeNull();- });-- it('getFreshSubscriptionToken:超过回调预算快速返回 null(cc 落磁盘兜底)', async () => {+ it('getOneShotAuth:连了订阅时 host 直连请求固定走网关 key,绝不用订阅', async () => {const mod = await import('../auth-adapters.js');- // 刷新耗时 = 预算 + 3s → race 应在预算到点返回 null,而不是等刷新完成。- h.refreshDelayMs = mod.CLAUDE_OAUTH_CALLBACK_TIMEOUT_MS + 3000;const adapter = new mod.DesktopClaudeAuthAdapter();- vi.useFakeTimers();- try {- const pending = adapter.getFreshSubscriptionToken();- await vi.advanceTimersByTimeAsync(mod.CLAUDE_OAUTH_CALLBACK_TIMEOUT_MS + 1);- await expect(pending).resolves.toBeNull();- } finally {- vi.useRealTimers();- }+ await expect(adapter.getOneShotAuth()).resolves.toMatchObject({ apiKey: 'sk-xd-gateway' });+ h.nativeLogin = false;+ await expect(adapter.getOneShotAuth()).resolves.toBeNull();});- it('invalidate preserves native credentials and retains the provider before broadcasting', async () => {- const mod = await import('../auth-adapters.js');- const adapter = new mod.DesktopClaudeAuthAdapter();+ it('invalidate 只广播重新登录提示,不撤销 Cindy 的使用许可', async () => {+ const adapter = await makeAdapter();const broadcasts: string[] = [];adapter.setOnInvalidatedBroadcast((reason) => broadcasts.push(reason));- await adapter.invalidate('claude_oauth_refresh_invalid_grant');- expect(h.cleared).toBe(0);- expect(h.revoked).toBe(true);+ await adapter.invalidate('claude_cli_logged_out');+ expect(h.revoked).toBe(false);+ expect(h.disconnects).toBe(0);expect(h.retainPresentation).toHaveBeenCalledWith('anthropic');- expect(h.refresherInvalidated).toBe(1);- expect(broadcasts).toEqual(['claude_oauth_refresh_invalid_grant']);+ expect(broadcasts).toEqual(['claude_cli_logged_out']);});- it('broadcasts revocation before waiting for auxiliary presentation persistence', async () => {+ it('broadcasts before waiting for auxiliary presentation persistence', async () => {const adapter = await makeAdapter();let release!: () => void;h.retainPresentation.mockReturnValueOnce(new Promise<void>((resolve) => { release = resolve; }));const broadcast = vi.fn();adapter.setOnInvalidatedBroadcast(broadcast);- const pending = adapter.invalidate('old-credential-rejected');- expect(broadcast).toHaveBeenCalledWith('old-credential-rejected');- h.revoked = false;+ const pending = adapter.invalidate('claude_cli_logged_out');+ expect(broadcast).toHaveBeenCalledWith('claude_cli_logged_out');release();await pending;expect(broadcast).toHaveBeenCalledTimes(1);- expect(h.revoked).toBe(false);- });-- it('构造期接线 invalid_grant handler(刷新模块通知 → invalidate 链路可达)', async () => {- await makeAdapter();- expect(typeof h.invalidGrantHandler).toBe('function');- h.invalidGrantHandler?.('a'.repeat(64));- expect(h.rejectedDigest).toBe('a'.repeat(64));- expect(h.cleared).toBe(0);});- it('logout preserves native credentials and revokes Cindy access', async () => {+ it('logout 撤销 Cindy 的使用许可,不登出 CLI', async () => {const adapter = await makeAdapter();await adapter.logout();- expect(h.cleared).toBe(0);+ expect(h.disconnects).toBe(1);expect(h.revoked).toBe(true);- expect(h.refresherInvalidated).toBe(1);+ expect(h.removedGatewayKey).toBe(0);});- it('still retains and broadcasts automatic invalidation when persistence fails', async () => {+ it('logout 看绑定而非内存登录态:登录态未读到时也不误删网关 key', async () => {+ h.nativeLogin = false;const adapter = await makeAdapter();- const broadcast = vi.fn();- adapter.setOnInvalidatedBroadcast(broadcast);- h.revocationFails = true;- h.invalidGrantHandler?.('c'.repeat(64));- await vi.waitFor(() => expect(broadcast).toHaveBeenCalledWith('claude_oauth_refresh_invalid_grant'));- expect(h.retainPresentation).toHaveBeenCalledWith('anthropic');- expect(h.cleared).toBe(0);+ await adapter.logout();+ expect(h.disconnects).toBe(1);+ expect(h.removedGatewayKey).toBe(0);});});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.tsindex 5f116310d1..ac1c2d7b92 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeBehaviorFlags.test.ts@@ -4,10 +4,10 @@ import { claudeBehaviorFlagsForSpawn, claudeToolSearchMode } from '../claude-behimport { shouldCloseSessionForCredentialSwitch } from '../codex-credential-switch.js';describe('claudeBehaviorFlagsForSpawn', () => {- it('preserves native subscription flags for independent Claude accounts', () => {+ it('keeps Tool Search for retired independent Claude accounts; provider-oauth never keeps attribution', () => {const flags = claudeBehaviorFlagsForSpawn({ providerId: 'anthropic-work',nativeAuth: 'claude', credentialMode: 'provider-oauth', oauthConnected: () => true });- expect(flags.CLAUDE_CODE_ATTRIBUTION_HEADER).toBe('1');+ expect(flags.CLAUDE_CODE_ATTRIBUTION_HEADER).toBe('0');expect(flags.ENABLE_TOOL_SEARCH).toBe('auto');expect(claudeToolSearchMode('grok-work', 'provider-oauth', 'xai')).toBe('false');});@@ -22,12 +22,11 @@ describe('claudeBehaviorFlagsForSpawn', () => {expect(oauthConnected).not.toHaveBeenCalled();});- it('keeps the CLI attribution default for subscription-connected non-gateway spawns (issue #758)', () => {- // oauth-bearer / provider-oauth / 未显式指定:claude-* 请求(含分类器 scope-gate- // 回落)可能直连 api.anthropic.com,归因块必须保留,否则分类器子请求被上游 429。+ it('keeps the CLI attribution default for spawns that may use the local Claude Code login (issue #758)', () => {+ // oauth-bearer / 未显式指定:CLI 可能用本机登录直连 api.anthropic.com,归因块必须保留,+ // 否则分类器子请求被上游 429。const cases = [{ credentialMode: 'oauth-bearer', providerId: 'anthropic', toolSearch: 'auto' },- { credentialMode: 'provider-oauth', providerId: 'openrouter-custom', toolSearch: 'false' },{ credentialMode: undefined, providerId: undefined, toolSearch: 'auto' },] as const;for (const { credentialMode, providerId, toolSearch } of cases) {@@ -44,6 +43,18 @@ describe('claudeBehaviorFlagsForSpawn', () => {}});+ it('provider-oauth spawns always go through the proxy and disable attribution, subscription or not', () => {+ for (const oauthConnected of [true, false]) {+ const flags = claudeBehaviorFlagsForSpawn({+ credentialMode: 'provider-oauth',+ providerId: 'openrouter-custom',+ oauthConnected: () => oauthConnected,+ });+ expect(flags.CLAUDE_CODE_ATTRIBUTION_HEADER).toBe('0');+ expect(flags.ENABLE_TOOL_SEARCH).toBe('false');+ }+ });+it('disables attribution when no Claude.ai subscription is connected', () => {// 未连订阅 = 不存在订阅直连路径,保留网关 body 缓存优化。const flags = claudeBehaviorFlagsForSpawn({ oauthConnected: () => false });diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeCliProxyBridge.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeCliProxyBridge.test.tsnew file mode 100644index 0000000000..bb578c0a4f--- /dev/null+++ b/apps/desktop/src/main/maker-host/__tests__/claudeCliProxyBridge.test.ts@@ -0,0 +1,168 @@+/**+ * claude-cli-proxy-bridge —— 本机 CONNECT 端口,每条隧道按目标重新解析出口(直连 / HTTP 代理 /+ * SOCKS5);只做 TCP 转发、只接受 CONNECT。+ */+import http from 'node:http';+import { connect as netConnect, createServer, type Server, type Socket } from 'node:net';++import { afterEach, describe, expect, it, vi } from 'vitest';++vi.mock('../../logger.js', () => ({+ createLogger: () => ({ debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() }),+}));++import { startSocks5Stub, type Socks5Stub } from '../../../../../../packages/anthropic-compat-proxy/src/test-socks5-stub.js';+import { closeClaudeCliProxyBridge, ensureClaudeCliProxyBridge } from '../claude-cli-proxy-bridge.js';++const cleanups: Array<() => Promise<void> | void> = [];++afterEach(async () => {+ await closeClaudeCliProxyBridge();+ while (cleanups.length > 0) await cleanups.pop()!();+});++async function listen(server: Server | http.Server): Promise<number> {+ await new Promise<void>((resolve) => server.listen(0, '127.0.0.1', resolve));+ cleanups.push(() => new Promise<void>((resolve) => server.close(() => resolve())));+ const address = server.address();+ if (!address || typeof address === 'string') throw new Error('no port');+ return address.port;+}++function startEchoServer(): Promise<number> {+ return listen(createServer((socket) => socket.pipe(socket)));+}++/** 最小 HTTP CONNECT 代理:记录目标,一律接到 tunnelToPort。 */+async function startHttpConnectProxy(tunnelToPort: number): Promise<{ port: number; targets: string[] }> {+ const targets: string[] = [];+ const server = http.createServer((_req, res) => res.writeHead(405).end());+ server.on('connect', (req, client: Socket) => {+ targets.push(req.url ?? '');+ const upstream = netConnect(tunnelToPort, '127.0.0.1', () => {+ client.write('HTTP/1.1 200 Connection Established\r\n\r\n');+ upstream.pipe(client);+ client.pipe(upstream);+ });+ upstream.on('error', () => client.destroy());+ client.on('error', () => upstream.destroy());+ });+ return { port: await listen(server), targets };+}++async function startStub(options: Parameters<typeof startSocks5Stub>[0]): Promise<Socks5Stub> {+ const stub = await startSocks5Stub(options);+ cleanups.push(() => stub.close());+ return stub;+}++function bridgePort(url: string): number {+ return Number(new URL(url).port);+}++/** 向桥发一段原始请求;收到响应头后可再发数据,读到 `until` 出现(或连接关闭)为止。 */+function exchange(port: number, request: string, until: string, followUp?: string): Promise<string> {+ return new Promise((resolve, reject) => {+ const socket = netConnect(port, '127.0.0.1');+ let received = '';+ let sent = false;+ socket.on('data', (chunk) => {+ received += chunk.toString('utf8');+ if (followUp && !sent && received.includes('\r\n\r\n')) {+ sent = true;+ socket.write(followUp);+ }+ if (received.includes(until)) {+ socket.destroy();+ resolve(received);+ }+ });+ socket.on('error', reject);+ socket.on('close', () => resolve(received));+ socket.write(request);+ });+}++const connectTo = (authority: string) => `CONNECT ${authority} HTTP/1.1\r\nHost: ${authority}\r\n\r\n`;++describe('claude-cli-proxy-bridge', () => {+ it('SOCKS5 出口:经代理打隧道,域名交给代理解析,数据原样双向转发', async () => {+ const echoPort = await startEchoServer();+ const stub = await startStub({ tunnelToPort: echoPort });+ const resolver = vi.fn(async () => `socks5://127.0.0.1:${stub.port}`);+ const url = await ensureClaudeCliProxyBridge(resolver);+ expect(url).toMatch(/^http:\/\/127\.0\.0\.1:\d+$/);++ const received = await exchange(bridgePort(url), connectTo('api.anthropic.com:443'), 'ping', 'ping');+ expect(received).toContain('HTTP/1.1 200 Connection Established');+ expect(received).toContain('ping');+ expect(resolver).toHaveBeenCalledWith('https://api.anthropic.com/');+ expect(stub.requests).toEqual([expect.objectContaining({ host: 'api.anthropic.com', port: 443 })]);+ });++ it('HTTP 代理出口:经上游 CONNECT', async () => {+ const echoPort = await startEchoServer();+ const proxy = await startHttpConnectProxy(echoPort);+ const url = await ensureClaudeCliProxyBridge(async () => `http://127.0.0.1:${proxy.port}`);+ const received = await exchange(bridgePort(url), connectTo('claude.ai:443'), 'hello', 'hello');+ expect(received).toContain('HTTP/1.1 200 Connection Established');+ expect(received).toContain('hello');+ expect(proxy.targets).toEqual(['claude.ai:443']);+ });++ it('按目标逐条判定:PAC 例外 / 内网主机直连,其余走代理', async () => {+ const echoPort = await startEchoServer();+ const stub = await startStub({ tunnelToPort: echoPort });+ const resolver = vi.fn(async (target: string) =>+ target.startsWith('https://127.0.0.1') ? null : `socks5://127.0.0.1:${stub.port}`);+ const url = await ensureClaudeCliProxyBridge(resolver);++ const direct = await exchange(bridgePort(url), connectTo(`127.0.0.1:${echoPort}`), 'intranet', 'intranet');+ expect(direct).toContain('intranet');+ expect(resolver).toHaveBeenCalledWith(`https://127.0.0.1:${echoPort}/`);+ expect(stub.requests).toEqual([]);++ await exchange(bridgePort(url), connectTo('api.anthropic.com:443'), 'x', 'x');+ expect(stub.requests).toEqual([expect.objectContaining({ host: 'api.anthropic.com', port: 443 })]);+ });++ it('CONNECT 到 80 端口也能解析目标', async () => {+ const stub = await startStub({ tunnelToPort: await startEchoServer() });+ const resolver = vi.fn(async () => `socks5://127.0.0.1:${stub.port}`);+ const url = await ensureClaudeCliProxyBridge(resolver);+ await exchange(bridgePort(url), connectTo('example.test:80'), 'x', 'x');+ expect(resolver).toHaveBeenCalledWith('https://example.test:80/');+ expect(stub.requests).toEqual([expect.objectContaining({ host: 'example.test', port: 80 })]);+ });++ it('只接受 CONNECT:明文 HTTP 请求 405,不做正向代理', async () => {+ const resolver = vi.fn(async () => null);+ const url = await ensureClaudeCliProxyBridge(resolver);+ const received = await exchange(+ bridgePort(url),+ 'GET http://example.test/ HTTP/1.1\r\nHost: example.test\r\n\r\n',+ 'CONNECT only',+ );+ expect(received).toContain('405');+ expect(resolver).not.toHaveBeenCalled();+ });++ it('上游建隧道失败 → 502', async () => {+ const stub = await startStub({ replyCode: 0x05 });+ const url = await ensureClaudeCliProxyBridge(async () => `socks5://127.0.0.1:${stub.port}`);+ const received = await exchange(bridgePort(url), connectTo('api.anthropic.com:443'), '502');+ expect(received).toContain('HTTP/1.1 502 Bad Gateway');+ });++ it('复用同一个端口;新隧道用最近一次给的解析器', async () => {+ const echoPort = await startEchoServer();+ const first = await startStub({ tunnelToPort: echoPort });+ const second = await startStub({ tunnelToPort: echoPort });+ const urlA = await ensureClaudeCliProxyBridge(async () => `socks5://127.0.0.1:${first.port}`);+ const urlB = await ensureClaudeCliProxyBridge(async () => `socks5://127.0.0.1:${second.port}`);+ expect(urlB).toBe(urlA);+ await exchange(bridgePort(urlB), connectTo('claude.ai:443'), 'x', 'x');+ expect(first.requests).toEqual([]);+ expect(second.requests).toEqual([expect.objectContaining({ host: 'claude.ai', port: 443 })]);+ });+});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeCredentialsBlob.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeCredentialsBlob.test.tsdeleted file mode 100644index 592a6f3eeb..0000000000--- a/apps/desktop/src/main/maker-host/__tests__/claudeCredentialsBlob.test.ts+++ /dev/null@@ -1,94 +0,0 @@-/**- * claude-credentials-blob 纯逻辑单测。- *- * 这些函数承载本次修复的确定性核心(规则 9 / 14):- * - decideKeychainWriteMode:大 blob 必须改走 argv,否则 `security -i` 静默截断损坏值。- * - planClaudeAiOAuthClear:登出删 claudeAiOauth 时**不得**连带抹掉 cc 的 mcpOAuth 等字段。- * - blobRoundtrips:写后校验能识破截断 / 缺失 / 内容不符。- */--import { describe, expect, it } from 'vitest';--import {- KEYCHAIN_INTERACTIVE_LINE_LIMIT,- blobRoundtrips,- decideKeychainWriteMode,- planClaudeAiOAuthClear,-} from '../claude-credentials-blob.js';--describe('decideKeychainWriteMode', () => {- it('小 blob(不超阈值)走 stdin —— hex 不进 argv', () => {- expect(decideKeychainWriteMode(100)).toBe('stdin');- expect(decideKeychainWriteMode(KEYCHAIN_INTERACTIVE_LINE_LIMIT)).toBe('stdin');- });-- it('超阈值走 argv —— 规避 security -i 输入行截断', () => {- expect(decideKeychainWriteMode(KEYCHAIN_INTERACTIVE_LINE_LIMIT + 1)).toBe('argv');- expect(decideKeychainWriteMode(8000)).toBe('argv');- });-- it('阈值保守落在 security -i ~4096B 上限内', () => {- // 实测 ~4041B 仍 OK、~4141B 截断;阈值须明显小于硬上限,留足余量。- expect(KEYCHAIN_INTERACTIVE_LINE_LIMIT).toBeLessThan(4096);- });-});--describe('planClaudeAiOAuthClear', () => {- it('无 blob → noop', () => {- expect(planClaudeAiOAuthClear(null)).toEqual({ action: 'noop' });- });-- it('只有 claudeAiOauth → 删整条条目', () => {- expect(planClaudeAiOAuthClear({ claudeAiOauth: { accessToken: 'x' } })).toEqual({- action: 'delete',- });- });-- it('还有 mcpOAuth 等其它字段 → 写回裁剪块,保留它们(关键不变量:不抹掉 cc 的 MCP 登录)', () => {- const blob = {- claudeAiOauth: { accessToken: 'x' },- mcpOAuth: { 'plugin:design:asana|abc': { token: 't' } },- otherCcField: 1,- };- const plan = planClaudeAiOAuthClear(blob);- expect(plan.action).toBe('write');- if (plan.action !== 'write') throw new Error('unreachable');- expect(plan.next).toEqual({- mcpOAuth: { 'plugin:design:asana|abc': { token: 't' } },- otherCcField: 1,- });- expect(plan.next.claudeAiOauth).toBeUndefined();- });-- it('不修改入参(浅拷贝)', () => {- const blob = { claudeAiOauth: { accessToken: 'x' }, mcpOAuth: { a: 1 } };- planClaudeAiOAuthClear(blob);- expect(blob.claudeAiOauth).toBeDefined();- });-});--describe('blobRoundtrips', () => {- const blob = { mcpOAuth: { a: 1 }, k: 'v' };- const expectedJson = JSON.stringify(blob);-- it('keychain compact 存法逐字节一致 → true', () => {- expect(blobRoundtrips(expectedJson, JSON.stringify(blob))).toBe(true);- });-- it('文件 pretty 存法(2 空格)解析后等价 → true', () => {- expect(blobRoundtrips(expectedJson, JSON.stringify(blob, null, 2))).toBe(true);- });-- it('截断的非法 JSON → false(本 bug 的损坏签名)', () => {- const truncated = JSON.stringify(blob).slice(0, 5);- expect(blobRoundtrips(expectedJson, truncated)).toBe(false);- });-- it('缺失(null)→ false', () => {- expect(blobRoundtrips(expectedJson, null)).toBe(false);- });-- it('合法但内容不符 → false', () => {- expect(blobRoundtrips(expectedJson, JSON.stringify({ k: 'other' }))).toBe(false);- });-});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeLocalLoginCancellation.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeLocalLoginCancellation.test.tsdeleted file mode 100644index e85be8e8fc..0000000000--- a/apps/desktop/src/main/maker-host/__tests__/claudeLocalLoginCancellation.test.ts+++ /dev/null@@ -1,55 +0,0 @@-import { readFileSync } from 'node:fs';-import { ScriptTarget, transpileModule } from 'typescript';-import { expect, it, vi } from 'vitest';--vi.mock('electron', () => ({ shell: { openExternal: vi.fn() }, app: { getPath: () => '/unused-test-path' } }));-import { beginClaudeLocalLogin, cancelClaudeOAuthLogin } from '../claude-oauth-login.js';--const source = readFileSync(new URL('../../bootstrap-electron.ts', import.meta.url), 'utf8');-const start = source.search(/ipcMain\.handle\(\s*MAKER_IPC_INVOKE\.CLAUDE_OAUTH_LOGIN,/);-const end = source.search(/ipcMain\.handle\(\s*MAKER_IPC_INVOKE\.CLAUDE_OAUTH_LOGOUT,/);-if (start < 0 || end <= start) throw new Error('Claude login handler boundaries not found');-const compiled = transpileModule(source.slice(start, end), { compilerOptions: { target: ScriptTarget.ES2022 } }).outputText;--it.each(['scan', 'proxy'] as const)('does not bind a cancelled local login while waiting for %s', async (stage) => {- let resume!: () => void;- const pending = new Promise<void>(resolve => { resume = resolve; });- let handler!: () => Promise<{ ok: boolean; reason?: string }>;- const bind = vi.fn(() => true);- const proxy = vi.fn(() => stage === 'proxy' ? pending : Promise.resolve());- const deps = {- ipcMain: { handle: (_channel: string, callback: typeof handler) => { handler = callback; } },- MAKER_IPC_INVOKE: { CLAUDE_OAUTH_LOGIN: 'login' },- assertTrustedAppRendererEvent: vi.fn(),- activeOwnerScopeKey: () => 'owner',- isAppSessionBoundaryPending: () => false,- getActiveAppSession: () => ({ dataOwnerId: 'owner' }),- beginClaudeLocalLogin,- resetProviderModelAutoRefreshCooldowns: vi.fn(),- clearAnthropicDiscoveredModels: () => stage === 'scan' ? pending : Promise.resolve(),- ensureAnthropicCompatProxyReady: proxy,- reconnectClaudeAiOAuth: bind,- broadcastClaudeAuthStateChanged: vi.fn(),- syncClaudeSubscriptionUsageForAuthChange: vi.fn(),- refreshAnthropicModelsFromHttp: vi.fn(),- hasClaudeAiOAuth: () => true,- };- new Function(...Object.keys(deps), compiled)(...Object.values(deps));- const run = handler();- if (stage === 'proxy') await vi.waitFor(() => expect(proxy).toHaveBeenCalled());- cancelClaudeOAuthLogin();- resume();- await expect(run).resolves.toMatchObject({ ok: false, reason: 'login_cancelled' });- expect(bind).not.toHaveBeenCalled();-});--it('reuses cancellation for a replacement local login without aborting the replacement', () => {- const first = beginClaudeLocalLogin('old');- const second = beginClaudeLocalLogin('new');- expect(first.aborted).toBe(true);- expect(second.aborted).toBe(false);- cancelClaudeOAuthLogin('old');- expect(second.aborted).toBe(false);- cancelClaudeOAuthLogin('new');- expect(second.aborted).toBe(true);-});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeNativeCli.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeNativeCli.test.tsnew file mode 100644index 0000000000..b5a0781cad--- /dev/null+++ b/apps/desktop/src/main/maker-host/__tests__/claudeNativeCli.test.ts@@ -0,0 +1,254 @@+/**+ * claude-native-cli —— 内置 Claude Code CLI 的登录态读取、登录拉起与代理 env。+ * CLI 子进程用假 child 代替;代理解析与 SOCKS 桥 mock 掉。+ */+import { EventEmitter } from 'node:events';++import { beforeEach, describe, expect, it, vi } from 'vitest';++const h = vi.hoisted(() => ({+ binary: '/opt/cindy/claude' as string | null,+ envProxy: false,+ resolved: null as string | null,+ resolveError: null as Error | null,+ bridge: vi.fn(async () => 'http://127.0.0.1:5555'),+ spawn: vi.fn(),+}));++vi.mock('electron', () => ({ app: { isPackaged: true, getPath: () => '/tmp/cindy-test-user-data' } }));+vi.mock('@cindy/maker-core', () => ({ cleanProcessEnv: () => ({ PATH: '/usr/bin' }) }));+vi.mock('../../agent-binaries/index.js', () => ({ getReadyBinaryPath: () => h.binary }));+vi.mock('../../logger.js', () => ({+ createLogger: () => ({ debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn() }),+}));+vi.mock('../outbound-proxy-resolver.js', () => ({+ resolveDesktopOutboundProxy: async () => {+ if (h.resolveError) throw h.resolveError;+ return h.resolved;+ },+}));+vi.mock('@cindy/anthropic-compat-proxy', async (original) => ({+ ...(await original<typeof import('@cindy/anthropic-compat-proxy')>()),+ hasProxyEnvConfig: () => h.envProxy,+}));+vi.mock('../claude-cli-proxy-bridge.js', () => ({ ensureClaudeCliProxyBridge: h.bridge }));+vi.mock('node:child_process', () => ({ spawn: h.spawn }));++import {+ claudeCliNetworkEnv,+ parseClaudeCliLoginStatus,+ peekClaudeCliLoginStatus,+ readClaudeCliLoginStatus,+ refreshClaudeCliLoginStatus,+ resetClaudeNativeCliForTest,+ runClaudeCliLogin,+} from '../claude-native-cli.js';++type FakeChild = EventEmitter & { stdout: EventEmitter; stderr: EventEmitter; kill: ReturnType<typeof vi.fn> };++function fakeChild(result: { stdout?: string; code?: number; error?: Error } | 'hang'): FakeChild {+ const child = new EventEmitter() as FakeChild;+ child.stdout = new EventEmitter();+ child.stderr = new EventEmitter();+ child.kill = vi.fn(() => {+ setImmediate(() => child.emit('close', null));+ return true;+ });+ if (result !== 'hang') {+ setImmediate(() => {+ if (result.error) {+ child.emit('error', result.error);+ return;+ }+ if (result.stdout) child.stdout.emit('data', Buffer.from(result.stdout));+ child.emit('close', result.code ?? 0);+ });+ }+ return child;+}++const SUBSCRIPTION = JSON.stringify({+ loggedIn: true,+ authMethod: 'claude.ai',+ apiProvider: 'firstParty',+ email: '[email protected]',+ subscriptionType: 'max',+});+const API_KEY_LOGIN = JSON.stringify({ loggedIn: true, authMethod: 'api_key', apiProvider: 'firstParty', apiKeySource: 'ANTHROPIC_API_KEY' });+const LOGGED_OUT = JSON.stringify({ loggedIn: false, authMethod: 'none', apiProvider: 'firstParty' });++function argsOf(call: unknown[]): string[] {+ return call[1] as string[];+}++beforeEach(() => {+ resetClaudeNativeCliForTest();+ h.binary = '/opt/cindy/claude';+ h.envProxy = false;+ h.resolved = null;+ h.resolveError = null;+ h.bridge.mockClear();+ h.bridge.mockImplementation(async () => 'http://127.0.0.1:5555');+ h.spawn.mockReset();+});++describe('parseClaudeCliLoginStatus', () => {+ it('只把 Claude.ai 订阅账号的 OAuth 登录当作 Claude 订阅', () => {+ expect(parseClaudeCliLoginStatus(SUBSCRIPTION)).toEqual({+ loggedIn: true,+ authMethod: 'claude.ai',+ subscriptionType: 'max',+ email: '[email protected]',+ });+ });++ it.each([+ ['Console 账号(managed key)', { loggedIn: true, authMethod: 'claude.ai', apiProvider: 'firstParty', apiKeySource: '/login managed key' }],+ ['API Key', { loggedIn: true, authMethod: 'api_key', apiProvider: 'firstParty' }],+ ['apiKeyHelper', { loggedIn: true, authMethod: 'api_key_helper', apiProvider: 'firstParty' }],+ ['中转 token(ANTHROPIC_AUTH_TOKEN)', { loggedIn: true, authMethod: 'oauth_token', apiProvider: 'firstParty' }],+ ['第三方云', { loggedIn: true, authMethod: 'third_party', apiProvider: 'bedrock' }],+ ['订阅登录但指向第三方云', { loggedIn: true, authMethod: 'claude.ai', apiProvider: 'vertex' }],+ ])('%s → 已登录但不是订阅', (_label, payload) => {+ expect(parseClaudeCliLoginStatus(JSON.stringify(payload))).toEqual({ loggedIn: false, notSubscription: true });+ });++ it('未登录与异常输出', () => {+ expect(parseClaudeCliLoginStatus(LOGGED_OUT)).toEqual({ loggedIn: false });+ expect(parseClaudeCliLoginStatus('not json')).toBeNull();+ expect(parseClaudeCliLoginStatus('[]')).toBeNull();+ expect(parseClaudeCliLoginStatus('{"authMethod":"claude.ai"}')).toBeNull();+ });+});++describe('claudeCliNetworkEnv', () => {+ it('代理 env 已给出 HTTP 代理:不动,子进程直接继承', async () => {+ h.envProxy = true;+ h.resolved = 'http://127.0.0.1:7890';+ await expect(claudeCliNetworkEnv()).resolves.toEqual({});+ expect(h.bridge).not.toHaveBeenCalled();+ });++ it.each([+ ['HTTP', 'http://127.0.0.1:7890'],+ ['SOCKS5', 'socks5://127.0.0.1:7891'],+ ])('系统 %s 代理:HTTPS_PROXY 指向按目标解析出口的本机桥,不下发 HTTP_PROXY', async (_kind, proxy) => {+ h.resolved = proxy;+ await expect(claudeCliNetworkEnv()).resolves.toEqual({+ HTTPS_PROXY: 'http://127.0.0.1:5555',+ https_proxy: 'http://127.0.0.1:5555',+ NO_PROXY: 'localhost,127.0.0.1,::1',+ no_proxy: 'localhost,127.0.0.1,::1',+ });+ // 桥拿到的是逐目标解析器,而不是「对 api.anthropic.com 解析出的那一个代理」。+ expect(h.bridge).toHaveBeenCalledWith(expect.any(Function));+ });++ it('代理 env 只有 SOCKS5(如 ALL_PROXY):经桥覆盖 HTTPS_PROXY,保留用户自己的 NO_PROXY', async () => {+ h.envProxy = true;+ h.resolved = 'socks5://127.0.0.1:1080';+ await expect(claudeCliNetworkEnv()).resolves.toEqual({+ HTTPS_PROXY: 'http://127.0.0.1:5555',+ https_proxy: 'http://127.0.0.1:5555',+ });+ });++ it('直连、解析失败、桥起不来:都不下发', async () => {+ await expect(claudeCliNetworkEnv()).resolves.toEqual({});+ h.resolveError = new Error('resolver down');+ await expect(claudeCliNetworkEnv()).resolves.toEqual({});+ h.resolveError = null;+ h.resolved = 'socks5://127.0.0.1:7891';+ h.bridge.mockRejectedValueOnce(new Error('listen failed'));+ await expect(claudeCliNetworkEnv()).resolves.toEqual({});+ });+});++describe('登录态读取', () => {+ it('读失败后退避,期间不再反复拉起 CLI;force 绕过退避', async () => {+ h.spawn.mockImplementation(() => fakeChild({ error: new Error('ENOENT') }));+ await expect(refreshClaudeCliLoginStatus()).resolves.toEqual({ loggedIn: false });+ await expect(refreshClaudeCliLoginStatus()).resolves.toEqual({ loggedIn: false });+ expect(h.spawn).toHaveBeenCalledTimes(1);+ h.spawn.mockImplementation(() => fakeChild({ stdout: SUBSCRIPTION }));+ await expect(refreshClaudeCliLoginStatus({ force: true })).resolves.toMatchObject({ loggedIn: true });+ expect(h.spawn).toHaveBeenCalledTimes(2);+ expect(argsOf(h.spawn.mock.calls[1])).toEqual(['auth', 'status', '--json']);+ });++ it('staleWhileRevalidate:没有缓存时不等 CLI,后台读完再更新缓存', async () => {+ let release!: () => void;+ const gate = new Promise<void>((resolve) => { release = resolve; });+ h.spawn.mockImplementation(() => {+ const child = fakeChild('hang');+ void gate.then(() => {+ child.stdout.emit('data', Buffer.from(SUBSCRIPTION));+ child.emit('close', 0);+ });+ return child;+ });+ await expect(readClaudeCliLoginStatus({ maxAgeMs: 30_000, staleWhileRevalidate: true })).resolves.toEqual({+ loggedIn: false,+ });+ expect(h.spawn).toHaveBeenCalledTimes(1);+ release();+ await vi.waitFor(() => expect(peekClaudeCliLoginStatus()).toMatchObject({ loggedIn: true }));+ // 有新鲜缓存时直接返回,不再拉起。+ await expect(readClaudeCliLoginStatus({ maxAgeMs: 30_000, staleWhileRevalidate: true })).resolves.toMatchObject({+ loggedIn: true,+ });+ expect(h.spawn).toHaveBeenCalledTimes(1);+ });+});++describe('runClaudeCliLogin', () => {+ it('已登录直接返回,不拉起登录', async () => {+ h.spawn.mockImplementation(() => fakeChild({ stdout: SUBSCRIPTION }));+ await expect(runClaudeCliLogin(new AbortController().signal)).resolves.toMatchObject({ ok: true });+ expect(h.spawn).toHaveBeenCalledTimes(1);+ });++ it('CLI 用非订阅方式登录:返回 not_a_subscription,不替用户改 CLI 的登录', async () => {+ h.spawn.mockImplementation(() => fakeChild({ stdout: API_KEY_LOGIN }));+ await expect(runClaudeCliLogin(new AbortController().signal)).resolves.toEqual({+ ok: false,+ reason: 'not_a_subscription',+ });+ expect(h.spawn).toHaveBeenCalledTimes(1);+ expect(argsOf(h.spawn.mock.calls[0])).toEqual(['auth', 'status', '--json']);+ });++ it('拉起 `claude auth login --claudeai`,完成后以重读的登录态为结论', async () => {+ h.spawn+ .mockImplementationOnce(() => fakeChild({ stdout: LOGGED_OUT }))+ .mockImplementationOnce(() => fakeChild({ stdout: 'Login successful.', code: 0 }))+ .mockImplementationOnce(() => fakeChild({ stdout: SUBSCRIPTION }));+ await expect(runClaudeCliLogin(new AbortController().signal)).resolves.toMatchObject({+ ok: true,+ status: { loggedIn: true },+ });+ expect(argsOf(h.spawn.mock.calls[1])).toEqual(['auth', 'login', '--claudeai']);+ });++ it('取消时结束登录子进程', async () => {+ const login = fakeChild('hang');+ h.spawn+ .mockImplementationOnce(() => fakeChild({ stdout: LOGGED_OUT }))+ .mockImplementationOnce(() => login);+ const abort = new AbortController();+ const pending = runClaudeCliLogin(abort.signal);+ await vi.waitFor(() => expect(h.spawn).toHaveBeenCalledTimes(2));+ abort.abort();+ await expect(pending).resolves.toEqual({ ok: false, reason: 'login_cancelled' });+ expect(login.kill).toHaveBeenCalled();+ });++ it('内置 CLI 不可用 → local_unavailable', async () => {+ h.binary = null;+ await expect(runClaudeCliLogin(new AbortController().signal)).resolves.toEqual({+ ok: false,+ reason: 'local_unavailable',+ });+ expect(h.spawn).not.toHaveBeenCalled();+ });+});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeNativeConnection.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeNativeConnection.test.tsindex 5afd0f7643..2ed4169c43 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeNativeConnection.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeNativeConnection.test.ts@@ -1,90 +1,78 @@import { beforeEach, expect, it, vi } from 'vitest';const h = vi.hoisted(() => ({- available: true,- token: 'native-test-token',- rejected: null as string | null,+ bound: true,+ loggedIn: true,bind: vi.fn(),unbind: vi.fn(),presentation: vi.fn(),- write: vi.fn(),- clear: vi.fn(),-}));-vi.mock('../claude-credentials-store.js', async (original) => ({- ...(await original<typeof import('../claude-credentials-store.js')>()),- readClaudeAiOAuthUnbound: () => h.available ? { accessToken: h.token } : null,- readClaudeAiOAuth: () => null,- writeClaudeAiOAuth: h.write,- clearClaudeAiOAuth: h.clear,+ readStatus: vi.fn(),}));vi.mock('../nativeProviderAuthBinding.js', () => ({bindNativeProviderAuth: h.bind,unbindNativeProviderAuth: h.unbind,- isNativeProviderCredentialRejected: (_provider: string, digest: string) => digest === h.rejected,+ isNativeProviderAuthBound: () => h.bound,}));vi.mock('../override-settings-file.js', () => ({ createOverrideSettingsFile: () => ({invalidateIfChanged: vi.fn(), read: () => ({}), updateAtomic: async (updater: (state: { value: object }) => object) => h.presentation(updater({ value: {} })),}) }));-import { claudeOAuthCredentialDigest, disconnectClaudeAiOAuth, reconnectClaudeAiOAuth } from '../claude-oauth-refresh.js';+vi.mock('../claude-native-cli.js', () => ({+ readClaudeCliLoginStatus: h.readStatus,+}));+import {+ connectClaudeNativeLogin,+ disconnectClaudeNativeLogin,+ readClaudeNativeLogin,+} from '../claude-native-connection.js';beforeEach(() => {vi.clearAllMocks();- h.available = true;- h.token = 'native-test-token';- h.rejected = null;-});-it('rejects the revoked credential after disconnect but allows changed native credentials', async () => {- h.rejected = claudeOAuthCredentialDigest({ accessToken: h.token });- await disconnectClaudeAiOAuth();- expect(await reconnectClaudeAiOAuth()).toBe(false);- expect(h.bind).not.toHaveBeenCalled();- h.token = 'different-account-token';- expect(await reconnectClaudeAiOAuth()).toBe(true);- expect(h.write).not.toHaveBeenCalled();- expect(h.clear).not.toHaveBeenCalled();+ h.bound = true;+ h.loggedIn = true;+ h.readStatus.mockImplementation(async () => (h.loggedIn ? { loggedIn: true, email: '[email protected]' } : { loggedIn: false }));});-it('disconnect and reconnect only change the Cindy binding, never native credentials', async () => {- await disconnectClaudeAiOAuth();+it('connect and disconnect only change the Cindy binding; the CLI login is never touched', async () => {+ await disconnectClaudeNativeLogin();expect(h.unbind).toHaveBeenCalledWith('anthropic', { revoked: true });- expect(await reconnectClaudeAiOAuth()).toBe(true);+ connectClaudeNativeLogin();expect(h.bind).toHaveBeenCalledWith('anthropic', { sharedSystem: true });- expect(h.presentation).toHaveBeenCalledWith({ providers: { anthropic: { removed: false } } });- expect(h.write).not.toHaveBeenCalled();- expect(h.clear).not.toHaveBeenCalled();+ await vi.waitFor(() => expect(h.presentation).toHaveBeenCalledWith({ providers: { anthropic: { removed: false } } }));});-it('cannot attach a native source with no credentials', async () => {- h.available = false;- expect(await reconnectClaudeAiOAuth()).toBe(false);- expect(h.bind).not.toHaveBeenCalled();+it('reads the CLI login only when Cindy is allowed to use it', async () => {+ await expect(readClaudeNativeLogin({ maxAgeMs: 60_000 })).resolves.toEqual({ loggedIn: true, email: '[email protected]' });+ expect(h.readStatus).toHaveBeenCalledWith({ maxAgeMs: 60_000 });+ h.loggedIn = false;+ await expect(readClaudeNativeLogin()).resolves.toBeNull();+ h.bound = false;+ h.loggedIn = true;+ h.readStatus.mockClear();+ await expect(readClaudeNativeLogin()).resolves.toBeNull();+ expect(h.readStatus).not.toHaveBeenCalled();});-it('completes login synchronously while auxiliary presentation persistence is blocked', async () => {+it('completes connect synchronously while auxiliary presentation persistence is blocked', async () => {let release!: () => void;const pending = new Promise<void>((resolve) => { release = resolve; });h.presentation.mockReturnValueOnce(pending);- expect(reconnectClaudeAiOAuth()).toBe(true);+ connectClaudeNativeLogin();expect(h.bind).toHaveBeenCalledWith('anthropic', { sharedSystem: true });- expect(h.presentation).toHaveBeenCalled();expect(h.unbind).not.toHaveBeenCalled();release();await pending;});-it('preserves successful authentication if restoring the entry fails', async () => {+it('keeps the connection if restoring the entry fails', async () => {h.presentation.mockImplementationOnce(() => {throw new Error('disk full');});- expect(await reconnectClaudeAiOAuth()).toBe(true);+ expect(() => connectClaudeNativeLogin()).not.toThrow();+ expect(h.bind).toHaveBeenCalledWith('anthropic', { sharedSystem: true });expect(h.unbind).not.toHaveBeenCalled();- expect(h.write).not.toHaveBeenCalled();- expect(h.clear).not.toHaveBeenCalled();});-it('completes disconnect when display persistence fails without clearing native credentials', async () => {+it('completes disconnect when display persistence fails', async () => {h.presentation.mockImplementationOnce(() => { throw new Error('disk full'); });- await expect(disconnectClaudeAiOAuth()).resolves.toBeUndefined();+ await expect(disconnectClaudeNativeLogin()).resolves.toBeUndefined();expect(h.unbind).toHaveBeenCalledWith('anthropic', { revoked: true });expect(h.presentation).toHaveBeenCalled();- expect(h.write).not.toHaveBeenCalled();- expect(h.clear).not.toHaveBeenCalled();});it('still reports failure when the binding cannot be revoked', async () => {h.unbind.mockImplementationOnce(() => { throw new Error('binding write failed'); });- await expect(disconnectClaudeAiOAuth()).rejects.toThrow('binding write failed');+ await expect(disconnectClaudeNativeLogin()).rejects.toThrow('binding write failed');expect(h.presentation).not.toHaveBeenCalled();});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeOauthLoginErrorChain.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeOauthLoginErrorChain.test.tsdeleted file mode 100644index 30a532f46a..0000000000--- a/apps/desktop/src/main/maker-host/__tests__/claudeOauthLoginErrorChain.test.ts+++ /dev/null@@ -1,89 +0,0 @@-/**- * describeErrorChain 纯逻辑单测(规则 14)。- *- * 该函数承载 OAuth 换 token 失败日志的可诊断性:undici 把网络层失败包成裸- * 'fetch failed' TypeError,真正可行动的细节(每地址族的 connect ETIMEDOUT /- * ECONNREFUSED)藏在 cause 链与 AggregateError.errors 里。回归点:展开不丢层、- * code 补注、AggregateError 平铺、深度有界不被恶意/异常循环链拖死。- */--import { describe, expect, it, vi } from 'vitest';--vi.mock('electron', () => ({- shell: { openExternal: vi.fn() },- app: {- getPath: vi.fn(() => '/tmp/xdt-maker-test'),- getAppPath: vi.fn(() => '/tmp/xdt-maker-test/app'),- isPackaged: false,- },- safeStorage: { isEncryptionAvailable: vi.fn(() => false) },-}));--import { describeErrorChain } from '../claude-oauth-login.js';--describe('describeErrorChain', () => {- it('非 Error 输入回退 String()', () => {- expect(describeErrorChain('boom')).toBe('boom');- expect(describeErrorChain(42)).toBe('42');- });-- it('单层 Error 只输出 message', () => {- expect(describeErrorChain(new Error('plain failure'))).toBe('plain failure');- });-- it('undici 典型形态:fetch failed ← AggregateError(各地址族 connect 错误) 全部展开', () => {- // 复刻 happy-eyeballs 全地址族被掐后的真实错误形状- const v4 = Object.assign(new Error('connect ETIMEDOUT 160.79.104.10:443'), {- code: 'ETIMEDOUT',- });- const v6 = Object.assign(new Error('connect ENETUNREACH 2607:6bc0::10:443'), {- code: 'ENETUNREACH',- });- const aggregate = new AggregateError([v4, v6], '');- const top = new TypeError('fetch failed', { cause: aggregate });-- const out = describeErrorChain(top);- expect(out).toContain('fetch failed');- expect(out).toContain('connect ETIMEDOUT 160.79.104.10:443');- expect(out).toContain('connect ENETUNREACH 2607:6bc0::10:443');- expect(out).toContain(' <- ');- });-- it('message 不含 code 时补注 (CODE);已含时不重复', () => {- const bare = Object.assign(new Error('socket hang up'), { code: 'ECONNRESET' });- expect(describeErrorChain(bare)).toBe('socket hang up (ECONNRESET)');-- const withCode = Object.assign(new Error('connect ECONNREFUSED 127.0.0.1:443'), {- code: 'ECONNREFUSED',- });- expect(describeErrorChain(withCode)).toBe('connect ECONNREFUSED 127.0.0.1:443');- });-- it('空 message 时回退 code / name,不产出空段', () => {- const noMsg = Object.assign(new Error(''), { code: 'ETIMEDOUT' });- expect(describeErrorChain(noMsg)).toBe('ETIMEDOUT');- });-- it('AggregateError 分支同样补 code / 回退空 message,不在聚合段留空洞', () => {- const bareCode = Object.assign(new Error(''), { code: 'ECONNREFUSED' });- const needsAnnotation = Object.assign(new Error('socket hang up'), { code: 'ECONNRESET' });- const aggregate = new AggregateError([bareCode, needsAnnotation], '');- const top = new TypeError('fetch failed', { cause: aggregate });-- const out = describeErrorChain(top);- expect(out).toContain('[ECONNREFUSED; socket hang up (ECONNRESET)]');- });-- it('cause 链深度有界:超过上限截断,不无限展开', () => {- let leaf: Error = new Error('depth-7');- for (let i = 6; i >= 1; i -= 1) {- leaf = new Error(`depth-${i}`, { cause: leaf });- }- const out = describeErrorChain(leaf);- // MAX_CAUSE_DEPTH=4 → 最多 5 段(0..4)- expect(out.split(' <- ')).toHaveLength(5);- expect(out).toContain('depth-1');- expect(out).toContain('depth-5');- expect(out).not.toContain('depth-6');- });-});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeOauthRefresh.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeOauthRefresh.test.tsdeleted file mode 100644index 65367a00f0..0000000000--- a/apps/desktop/src/main/maker-host/__tests__/claudeOauthRefresh.test.ts+++ /dev/null@@ -1,607 +0,0 @@-/**- * claudeOauthRefresh.test.ts —— host 侧订阅 OAuth 刷新器(claude-oauth-refresh)单测。- *- * 背景:cc >= 2.1.198 在 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST 下不自读凭证库,- * 订阅 token 经 env 递入、到期刷新由 host 负责。覆盖:- * - 判定与容错:有效期直通 / 临期刷新 / forceRefresh 语义 / 服务端拒绝与网络失败降级;- * - 跨进程锁协议(与 cc 共享 <configDir>/.oauth_refresh.lock,真实 tmpdir 目录锁):- * 锁内重读他人已刷则直接用不刷(防 refresh token 连环旋转)、健康锁等待后放弃、- * stale 锁可抢;- * - 收尾语义:invalidate 后在途刷新不写回;invalid_grant 通知 onInvalidGrant;- * - spawn 非阻塞:getOAuthForSpawn 立即返回现值,临期只触发后台刷新。- * 全部走 createClaudeOAuthRefresher 依赖注入,不碰真实 keychain / 网络。- */-import fs from 'node:fs';-import os from 'node:os';-import path from 'node:path';-import { afterEach, describe, expect, it, vi } from 'vitest';--import {- createClaudeOAuthRefresher,- claudeOAuthCredentialDigest,- EXPIRY_MARGIN_MS,- type ClaudeOAuthRefresherDeps,-} from '../claude-oauth-refresh.js';-import type { ClaudeAiOAuth } from '../claude-credentials-store.js';--const NOW = 1_800_000_000_000;--const tmpDirs: string[] = [];-function makeLockDir(): string {- const d = fs.mkdtempSync(path.join(os.tmpdir(), 'xdt-oauth-lock-'));- tmpDirs.push(d);- return d;-}-afterEach(() => {- for (const d of tmpDirs.splice(0)) {- try { fs.rmSync(d, { recursive: true, force: true }); } catch { /* best-effort */ }- }-});--function fixtureOAuth(overrides: Partial<ClaudeAiOAuth> = {}): ClaudeAiOAuth {- return {- accessToken: 'at-old',- refreshToken: 'rt-old',- expiresAt: NOW + 8 * 3600_000,- scopes: ['user:inference', 'user:profile'],- subscriptionType: 'max',- rateLimitTier: 'default_claude_max_20x',- ...overrides,- };-}--function jsonResponse(status: number, body: unknown): Response {- return new Response(JSON.stringify(body), {- status,- headers: { 'Content-Type': 'application/json' },- });-}--function makeDeps(overrides: Partial<ClaudeOAuthRefresherDeps> = {}): {- deps: ClaudeOAuthRefresherDeps;- written: ClaudeAiOAuth[];- fetchMock: ReturnType<typeof vi.fn>;-} {- const written: ClaudeAiOAuth[] = [];- const fetchMock = vi.fn(async () =>- jsonResponse(200, {- access_token: 'at-new',- refresh_token: 'rt-new',- expires_in: 28800,- scope: 'user:inference user:profile',- }),- );- const deps: ClaudeOAuthRefresherDeps = {- readOAuth: () => fixtureOAuth(),- writeOAuth: (o) => {- written.push(o);- },- fetchFn: fetchMock as unknown as typeof fetch,- now: () => NOW,- lockDir: (() => {- const d = makeLockDir();- return () => d;- })(),- sleep: async () => undefined,- proactiveRenewal: false,- ...overrides,- };- return { deps, written, fetchMock };-}--describe('claude-oauth-refresh — 基础判定', () => {- it('未登录(无凭证)→ null,不发请求', async () => {- const { deps, fetchMock } = makeDeps({ readOAuth: () => null });- const r = createClaudeOAuthRefresher(deps);- expect(await r.getValidOAuth()).toBeNull();- expect(fetchMock).not.toHaveBeenCalled();- });-- it('token 距过期还早 → 原样返回,不发请求', async () => {- const { deps, fetchMock } = makeDeps();- const r = createClaudeOAuthRefresher(deps);- expect((await r.getValidOAuth())?.accessToken).toBe('at-old');- expect(fetchMock).not.toHaveBeenCalled();- });-- it('临期 → 刷新、按响应合并并写回;请求体对齐 cc 官方协议', async () => {- const current = fixtureOAuth({ expiresAt: NOW + EXPIRY_MARGIN_MS - 1 });- const { deps, written, fetchMock } = makeDeps({ readOAuth: () => current });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth();- expect(fetchMock).toHaveBeenCalledTimes(1);- const body = JSON.parse((fetchMock.mock.calls[0]![1] as RequestInit).body as string);- expect(body).toMatchObject({- grant_type: 'refresh_token',- refresh_token: 'rt-old',- scope: 'user:inference user:profile',- });- expect(typeof body.client_id).toBe('string');- expect(out).toMatchObject({- accessToken: 'at-new',- refreshToken: 'rt-new',- expiresAt: NOW + 28800 * 1000,- subscriptionType: 'max',- rateLimitTier: 'default_claude_max_20x',- });- expect(written).toHaveLength(1);- expect(written[0]!.accessToken).toBe('at-new');- });-- it('响应未旋转 refresh_token → 沿用旧值', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 });- const { deps } = makeDeps({- readOAuth: () => current,- fetchFn: (async () =>- jsonResponse(200, { access_token: 'at-new', expires_in: 60 })) as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- expect((await r.getValidOAuth())?.refreshToken).toBe('rt-old');- });-- it('forceRefresh:token 未过期也强制刷新', async () => {- const { deps, fetchMock } = makeDeps();- const r = createClaudeOAuthRefresher(deps);- expect((await r.getValidOAuth({ forceRefresh: true }))?.accessToken).toBe('at-new');- expect(fetchMock).toHaveBeenCalledTimes(1);- });-- it('staleToken 基线:库值已换代 → 直接返回库值,不消耗轮换(即便 forceRefresh)', async () => {- // 会话用 at-old spawn,后台预续期已把库刷成 at-renewed;该会话 401 回调带- // staleToken=at-old → 直接交出 at-renewed,不再刷(防长会话群体 401 连环旋转)。- const renewed = fixtureOAuth({ accessToken: 'at-renewed' });- const { deps, fetchMock } = makeDeps({ readOAuth: () => renewed });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth({ forceRefresh: true, staleToken: 'at-old' });- expect(out?.accessToken).toBe('at-renewed');- expect(fetchMock).not.toHaveBeenCalled();- });-- it('staleToken 基线:库值就是失败那枚 → 照常强刷', async () => {- const { deps, fetchMock } = makeDeps();- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth({ forceRefresh: true, staleToken: 'at-old' });- expect(out?.accessToken).toBe('at-new');- expect(fetchMock).toHaveBeenCalledTimes(1);- });-- it('无 refreshToken:非强制原样返回,强制返回 null,不发请求', async () => {- const current = fixtureOAuth({ refreshToken: null, expiresAt: NOW - 1 });- const { deps, fetchMock } = makeDeps({ readOAuth: () => current });- const r = createClaudeOAuthRefresher(deps);- expect((await r.getValidOAuth())?.accessToken).toBe('at-old');- expect(await r.getValidOAuth({ forceRefresh: true })).toBeNull();- expect(fetchMock).not.toHaveBeenCalled();- });-- it('网络失败:非强制退回现有 token,强制返回 null', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 });- const failFetch = (async () => {- throw new Error('fetch failed');- }) as unknown as typeof fetch;- const soft = createClaudeOAuthRefresher(- makeDeps({ readOAuth: () => current, fetchFn: failFetch }).deps,- );- expect((await soft.getValidOAuth())?.accessToken).toBe('at-old');- const hard = createClaudeOAuthRefresher(- makeDeps({ readOAuth: () => current, fetchFn: failFetch }).deps,- );- expect(await hard.getValidOAuth({ forceRefresh: true })).toBeNull();- });-- it('写回凭证库失败 → 仍返回刷新后的新 token(本次可用,错误已记日志)', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 });- const { deps } = makeDeps({- readOAuth: () => current,- writeOAuth: () => {- throw new Error('keychain write denied');- },- });- const r = createClaudeOAuthRefresher(deps);- expect((await r.getValidOAuth())?.accessToken).toBe('at-new');- });-- it('进程内 single-flight:并发调用共享一次刷新请求,结束后可再刷', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 });- let resolveFetch!: (r: Response) => void;- const gate = new Promise<Response>((res) => {- resolveFetch = res;- });- const fetchMock = vi.fn(() => gate);- const { deps } = makeDeps({- readOAuth: () => current,- fetchFn: fetchMock as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- const [a, b] = [r.getValidOAuth(), r.getValidOAuth({ forceRefresh: true })];- resolveFetch(- jsonResponse(200, { access_token: 'at-new', refresh_token: 'rt-new', expires_in: 60 }),- );- const [ra, rb] = await Promise.all([a, b]);- expect(fetchMock).toHaveBeenCalledTimes(1);- expect(ra?.accessToken).toBe('at-new');- expect(rb?.accessToken).toBe('at-new');- });-});--describe('claude-oauth-refresh — 订阅身份回填(review P2)', () => {- it('凭证缺 subscriptionType/rateLimitTier → token 先落盘,身份经后台二次写回', async () => {- // 经 XDMaker 浏览器 OAuth 登录的存量用户:subscriptionType null(旧链路靠 cc 刷新回填)。- // review 2026-07-04 P2:profile RTT 不得夹在「刷」与「写回」之间(rotated refresh- // token 落盘不能被推迟)—— 第一次写回必须是纯 token,身份字段走锁外回填二次写回。- const current = fixtureOAuth({- expiresAt: NOW - 1,- subscriptionType: null,- rateLimitTier: null,- });- const fetchMock = vi.fn(async (url: string) => {- if (String(url).includes('/oauth/profile')) {- return jsonResponse(200, {- organization: { organization_type: 'claude_max', rate_limit_tier: 'tier_x' },- });- }- return jsonResponse(200, { access_token: 'at-new', refresh_token: 'rt-new', expires_in: 60 });- });- // readOAuth 反映最近写入(真实凭证库语义)—— backfill 锁内重读校验的是写回后的新 token- const written: ClaudeAiOAuth[] = [];- const { deps } = makeDeps({- readOAuth: () => (written.length > 0 ? written[written.length - 1]! : current),- writeOAuth: (o) => {- written.push(o);- },- fetchFn: fetchMock as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth();- // 主流程返回值 = 纯刷新结果(不等 profile),rotated token 已在第一次写回落盘- expect(out?.accessToken).toBe('at-new');- expect(written[0]).toMatchObject({ accessToken: 'at-new', refreshToken: 'rt-new' });- expect(written[0]!.subscriptionType).toBeNull();- // 后台回填完成后二次写回,只补身份字段(claude_max → max,对齐 cc pCn 映射)- await vi.waitFor(() => {- expect(written.length).toBe(2);- });- expect(written[1]).toMatchObject({ subscriptionType: 'max', rateLimitTier: 'tier_x' });- });-- it('profile 拉取失败 → 刷新主流程不受影响,无二次写回,待下次再补', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1, subscriptionType: null, rateLimitTier: null });- const fetchMock = vi.fn(async (url: string) => {- if (String(url).includes('/oauth/profile')) throw new Error('profile down');- return jsonResponse(200, { access_token: 'at-new', expires_in: 60 });- });- const { deps, written } = makeDeps({- readOAuth: () => current,- fetchFn: fetchMock as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth();- expect(out?.accessToken).toBe('at-new');- // 等 profile 失败路径走完:仍只有第一次 token 写回- await new Promise((res) => setTimeout(res, 50));- expect(written).toHaveLength(1);- });-- it('profile 在途期间凭证被换(换账号/再刷新)→ 丢弃回填,防跨账号档位污染', async () => {- const stale = fixtureOAuth({ expiresAt: NOW - 1, subscriptionType: null, rateLimitTier: null });- const swapped = fixtureOAuth({- accessToken: 'at-other-account',- subscriptionType: null,- rateLimitTier: null,- });- let reads = 0;- const fetchMock = vi.fn(async (url: string) => {- if (String(url).includes('/oauth/profile')) {- return jsonResponse(200, {- organization: { organization_type: 'claude_max', rate_limit_tier: 'tier_x' },- });- }- return jsonResponse(200, { access_token: 'at-new', expires_in: 60 });- });- const { deps, written } = makeDeps({- // 主流程读序:①入口 ②锁内重读 ③写回前 postFetch 校验(均返回旧凭证,让 token- // 正常写回);backfill 锁内重读(第 4 次起)返回已被换掉的凭证 —— 模拟 profile- // 在途期间换登录。- readOAuth: () => (reads++ < 3 ? stale : swapped),- fetchFn: fetchMock as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- await r.getValidOAuth();- await new Promise((res) => setTimeout(res, 50));- expect(written).toHaveLength(1); // 只有 token 写回,无身份 merge 写回- expect(written[0]!.accessToken).toBe('at-new');- });-- it('身份字段齐全 → 不发 profile 请求', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 }); // fixture 自带 max/tier- const { deps, fetchMock } = makeDeps({ readOAuth: () => current });- const r = createClaudeOAuthRefresher(deps);- await r.getValidOAuth();- const profileCalls = fetchMock.mock.calls.filter((c) =>- String(c[0]).includes('/oauth/profile'),- );- expect(profileCalls).toHaveLength(0);- });-});--describe('claude-oauth-refresh — 跨进程锁协议', () => {- it('config dir 不存在(仅 Keychain 登录过)→ 自动建目录拿锁,刷新不被跳过', async () => {- // review P2:macOS 仅经 XDMaker OAuth 登录的用户 ~/.claude 可能从未创建,- // 锁 mkdir ENOENT 不能被当成「拿不到锁」跳过刷新。- const missingDir = path.join(makeLockDir(), 'not-created-yet', '.claude');- const current = fixtureOAuth({ expiresAt: NOW - 1 });- const { deps, written, fetchMock } = makeDeps({- lockDir: () => missingDir,- readOAuth: () => current,- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth();- expect(out?.accessToken).toBe('at-new');- expect(fetchMock).toHaveBeenCalledTimes(1);- expect(written).toHaveLength(1);- expect(fs.existsSync(missingDir)).toBe(true); // 父目录被补建- expect(fs.existsSync(path.join(missingDir, '.oauth_refresh.lock'))).toBe(false); // 锁已释放- });-- it('锁内重读发现他人已刷 → 直接采用新值,不再发刷新请求(防连环旋转)', async () => {- // 模拟:进锁前读到 at-old(过期);锁内重读时另一进程已写入 at-other。- const stale = fixtureOAuth({ expiresAt: NOW - 1 });- const renewed = fixtureOAuth({ accessToken: 'at-other', expiresAt: NOW + 3600_000 });- let reads = 0;- const { deps, fetchMock } = makeDeps({- readOAuth: () => (reads++ === 0 ? stale : renewed),- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth({ forceRefresh: true });- expect(out?.accessToken).toBe('at-other');- expect(fetchMock).not.toHaveBeenCalled();- });-- it('锁被健康进程持有 → 放弃前轮询,持有者稍后写回也能捡到', async () => {- // review P2:持有者刷新 HTTP 预算(10s)可能长于我们的锁等待(~7.5s),放弃前- // 在预算内轮询凭证库,写回一落地就采用,不 null 掉整个 turn。- const dir = makeLockDir();- fs.mkdirSync(path.join(dir, '.oauth_refresh.lock')); // 他人健康持锁- const stale = fixtureOAuth({ expiresAt: NOW - 1 });- const renewed = fixtureOAuth({ accessToken: 'at-other', expiresAt: NOW + 3600_000 });- let reads = 0;- const { deps, fetchMock } = makeDeps({- lockDir: () => dir,- now: () => Date.now(),- // 前几次读(含锁外首轮轮询)都是旧值,「持有者」在轮询中途才写回- readOAuth: () => (reads++ < 4 ? stale : renewed),- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth({ forceRefresh: true });- expect(out?.accessToken).toBe('at-other');- expect(fetchMock).not.toHaveBeenCalled();- });-- it('锁被健康进程持有 → 退避重试后放弃;锁外重读拿到他人成果则采用', async () => {- const dir = makeLockDir();- const lockPath = path.join(dir, '.oauth_refresh.lock');- fs.mkdirSync(lockPath); // 他人持锁,mtime = 现在(未 stale)- const stale = fixtureOAuth({ expiresAt: NOW - 1 });- const renewed = fixtureOAuth({ accessToken: 'at-other', expiresAt: NOW + 3600_000 });- let reads = 0;- const { deps, fetchMock } = makeDeps({- lockDir: () => dir,- // stat.mtime 是真实时间;now 用真实时间基准的 fixture 使锁不判 stale- now: () => Date.now(),- readOAuth: () => (reads++ === 0 ? stale : renewed),- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth({ forceRefresh: true });- expect(out?.accessToken).toBe('at-other'); // 放弃拿锁后锁外重读采用他人成果- expect(fetchMock).not.toHaveBeenCalled();- expect(fs.existsSync(lockPath)).toBe(true); // 不动别人健康的锁- });-- it('stale 锁(持有者已死)→ 抢占并正常刷新,释放后锁目录清掉', async () => {- const dir = makeLockDir();- const lockPath = path.join(dir, '.oauth_refresh.lock');- fs.mkdirSync(lockPath);- const old = new Date(Date.now() - 60_000); // mtime 60s 前 → 超过 stale 10s- fs.utimesSync(lockPath, old, old);- const current = fixtureOAuth({ expiresAt: Date.now() - 1 });- const { deps, written, fetchMock } = makeDeps({- lockDir: () => dir,- now: () => Date.now(),- readOAuth: () => current,- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth();- expect(out?.accessToken).toBe('at-new');- expect(fetchMock).toHaveBeenCalledTimes(1);- expect(written).toHaveLength(1);- expect(fs.existsSync(lockPath)).toBe(false); // 释放- });-- it('stale 接管 claim 到别人刚重建的健康锁 → rollback 还回,不删不刷', async () => {- // review 2026-07-04 P2 TOCTOU 回归(claim → compare → rollback 协议):rename 走的- // 若是别人在间隙重建的 fresh 锁(tomb 上比对 mtime 不符),必须原样还回、放弃接管,- // 绝不能出现双持锁并发刷新。- const dir = makeLockDir();- const lockPath = path.join(dir, '.oauth_refresh.lock');- fs.mkdirSync(lockPath);- const old = new Date(Date.now() - 60_000);- fs.utimesSync(lockPath, old, old); // stat 时判 stale- const current = fixtureOAuth({ expiresAt: Date.now() - 1 });- const realStat = fs.statSync.bind(fs);- // 模拟先手在 stat→rename 间隙完成接管:claim 后对 tomb 的比对返回 fresh mtime- const spy = vi.spyOn(fs, 'statSync').mockImplementation(((- pp: fs.PathLike,- ...rest: unknown[]- ) => {- const st = realStat(pp as string, ...(rest as []));- if (String(pp).includes('.oauth_refresh.stale-')) {- Object.defineProperty(st, 'mtimeMs', { value: Date.now(), configurable: true });- }- return st;- }) as typeof fs.statSync);- try {- const { deps, fetchMock } = makeDeps({- lockDir: () => dir,- now: () => Date.now(),- readOAuth: () => current,- });- const r = createClaudeOAuthRefresher(deps);- const out = await r.getValidOAuth({ forceRefresh: true });- expect(out).toBeNull(); // 拿不到锁 + 锁外重读无新值 + force → null- expect(fetchMock).not.toHaveBeenCalled(); // 绝不双持锁并发刷新- expect(fs.existsSync(lockPath)).toBe(true); // 他人的锁被 rollback 还回原位- // 无 tomb 残留- expect(- fs.readdirSync(dir).filter((f) => f.startsWith('.oauth_refresh.stale-')),- ).toHaveLength(0);- } finally {- spy.mockRestore();- }- });-- it('刷新全程持锁,成功后释放', async () => {- const dir = makeLockDir();- const lockPath = path.join(dir, '.oauth_refresh.lock');- const current = fixtureOAuth({ expiresAt: NOW - 1 });- let lockedDuringFetch = false;- const { deps } = makeDeps({- lockDir: () => dir,- readOAuth: () => current,- fetchFn: (async () => {- lockedDuringFetch = fs.existsSync(lockPath);- return jsonResponse(200, { access_token: 'at-new', expires_in: 60 });- }) as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- await r.getValidOAuth();- expect(lockedDuringFetch).toBe(true);- expect(fs.existsSync(lockPath)).toBe(false);- });-});--describe('claude-oauth-refresh — 收尾语义', () => {- it('刷新 HTTP 在途期间凭证库被换账号 → 丢弃刷新结果,采信库中新凭证', async () => {- // review P2:换账号登录不经锁、不 bump generation,旧账号刷新结果写回会静默撤销换号。- const stale = fixtureOAuth({ expiresAt: NOW - 1 });- const switched = fixtureOAuth({- accessToken: 'at-new-account',- refreshToken: 'rt-new-account',- expiresAt: NOW + 3600_000,- });- let swapped = false;- let resolveFetch!: (r: Response) => void;- const gate = new Promise<Response>((res) => {- resolveFetch = res;- });- const { deps, written } = makeDeps({- readOAuth: () => (swapped ? switched : stale),- fetchFn: (() => gate) as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- const pending = r.getValidOAuth({ forceRefresh: true });- await new Promise((res) => setTimeout(res, 10)); // 让流程推进到 HTTP 在途- swapped = true; // 换账号登录写库- resolveFetch(- jsonResponse(200, { access_token: 'at-new', refresh_token: 'rt-new', expires_in: 60 }),- );- const out = await pending;- expect(out?.accessToken).toBe('at-new-account'); // 采信新账号凭证- expect(written).toHaveLength(0); // 旧账号刷新结果绝不写回- });-- it('invalidate(登出)后在途刷新完成也不写回、不返回', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 });- let resolveFetch!: (r: Response) => void;- const gate = new Promise<Response>((res) => {- resolveFetch = res;- });- const { deps, written } = makeDeps({- readOAuth: () => current,- fetchFn: (() => gate) as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- const pending = r.getValidOAuth({ forceRefresh: true });- r.invalidate(); // 登出发生在刷新在途时- resolveFetch(- jsonResponse(200, { access_token: 'at-new', refresh_token: 'rt-new', expires_in: 60 }),- );- expect(await pending).toBeNull();- expect(written).toHaveLength(0); // 「已断开」状态凭证不复活- });-- it.each([false, true])('invalid_grant after account replacement or lost binding does not invalidate the new owner (%s)', async (lostBinding) => {- // review P2:旧账号刷新失败(invalid_grant)不能 invalidate 掉在途换号登录的新账号。- const stale = fixtureOAuth({ expiresAt: NOW - 1 });- const switched = fixtureOAuth({- accessToken: 'at-new-account',- refreshToken: 'rt-new-account',- expiresAt: NOW + 3600_000,- });- let swapped = false;- let resolveFetch!: (r: Response) => void;- const gate = new Promise<Response>((res) => {- resolveFetch = res;- });- const onInvalidGrant = vi.fn();- const { deps } = makeDeps({- readOAuth: () => (swapped ? (lostBinding ? null : switched) : stale),- onInvalidGrant,- fetchFn: (() => gate) as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- const pending = r.getValidOAuth({ forceRefresh: true });- await new Promise((res) => setTimeout(res, 10));- swapped = true; // HTTP 在途期间换账号登录- resolveFetch(jsonResponse(400, { error: 'invalid_grant' }));- const out = await pending;- expect(out?.accessToken).toBe(lostBinding ? undefined : 'at-new-account');- expect(onInvalidGrant).not.toHaveBeenCalled();- });-- it('invalid_grant(锁内确认)→ 通知 onInvalidGrant;传输类失败不通知', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 });- const onInvalidGrant = vi.fn();- const { deps } = makeDeps({- readOAuth: () => current,- onInvalidGrant,- fetchFn: (async () =>- jsonResponse(400, { error: 'invalid_grant' })) as unknown as typeof fetch,- });- const r = createClaudeOAuthRefresher(deps);- expect(await r.getValidOAuth({ forceRefresh: true })).toBeNull();- expect(onInvalidGrant).toHaveBeenCalledTimes(1);- expect(onInvalidGrant).toHaveBeenCalledWith(claudeOAuthCredentialDigest(current));-- const onInvalidGrant2 = vi.fn();- const { deps: deps2 } = makeDeps({- readOAuth: () => current,- onInvalidGrant: onInvalidGrant2,- fetchFn: (async () => jsonResponse(500, {})) as unknown as typeof fetch,- });- const r2 = createClaudeOAuthRefresher(deps2);- expect(await r2.getValidOAuth({ forceRefresh: true })).toBeNull();- expect(onInvalidGrant2).not.toHaveBeenCalled();- });-});--describe('claude-oauth-refresh — spawn 非阻塞', () => {- it('健康 token:同步返回现值,不触发刷新', () => {- const { deps, fetchMock } = makeDeps();- const r = createClaudeOAuthRefresher(deps);- expect(r.getOAuthForSpawn()?.accessToken).toBe('at-old');- expect(fetchMock).not.toHaveBeenCalled();- });-- it('临期 token:立即返回旧值(不阻塞),后台单飞完成刷新写回', async () => {- const current = fixtureOAuth({ expiresAt: NOW - 1 });- const { deps, written, fetchMock } = makeDeps({ readOAuth: () => current });- const r = createClaudeOAuthRefresher(deps);- const out = r.getOAuthForSpawn(); // 同步路径- expect(out?.accessToken).toBe('at-old'); // 注旧 token,401 回调兜底- await vi.waitFor(() => {- expect(fetchMock).toHaveBeenCalledTimes(1);- expect(written).toHaveLength(1);- });- expect(written[0]!.accessToken).toBe('at-new');- });-});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.tsindex 5dc9f7df35..a0a73f8a22 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.ts@@ -169,14 +169,50 @@ describe('cc routingTransform — xAI 会话的辅助请求回落默认路由 (iexpect(decision).toBeNull();});- it('claude-haiku 分类器请求(无网关 key 的 oauth-spawn)→ 直连 Anthropic 订阅', () => {+ it('无任何 Cindy 凭证的 claude-* 请求本地拒绝,绝不带着订阅凭证转发到 Anthropic', async () => {+ // 订阅会话由 CLI 直连、从不经 proxy;走到这里的只可能是 env 不对的请求。gatewayKey = null;+ const transform = createModelRoutingTransform();+ const decision = await Promise.resolve(transform(+ { model: 'claude-haiku-4-5-20251001' },+ ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),+ ));+ expect(decision).not.toHaveProperty('upstreamOverride');+ const writeHead = vi.fn();+ const end = vi.fn();+ await decision?.localHandler?.({ res: { writeHead, end } } as never);+ expect(writeHead).toHaveBeenCalledWith(403, expect.any(Object));+ expect(JSON.parse(end.mock.calls[0][0])).toMatchObject({+ error: { code: 'anthropic_subscription_cli_only' },+ });+ });++ it('显式 Claude 订阅会话的请求到了 proxy 也本地拒绝(订阅只由 CLI 直连)', async () => {+ setSessionProvider('sess-grok', 'anthropic');+ const transform = createModelRoutingTransform();+ const decision = await Promise.resolve(transform(+ { model: 'claude-opus-4-8' },+ ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),+ ));+ expect(decision).not.toHaveProperty('upstreamOverride');+ const writeHead = vi.fn();+ const end = vi.fn();+ await decision?.localHandler?.({ res: { writeHead, end } } as never);+ expect(writeHead).toHaveBeenCalledWith(403, expect.any(Object));+ expect(JSON.parse(end.mock.calls[0][0])).toMatchObject({+ error: { code: 'anthropic_subscription_cli_only' },+ });+ });++ it('网关 key 在时的 claude-* 默认路由不受影响:照常换网关 key', () => {const transform = createModelRoutingTransform();const decision = transform({ model: 'claude-haiku-4-5-20251001' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);- expect(decision).toEqual({ upstreamOverride: 'https://api.anthropic.com' });+ expect(decision).toEqual({+ headerOverride: { 'x-api-key': 'sk-gw', authorization: 'Bearer sk-gw' },+ });});it('显式选了供应商的会话,② 段回落不写入计费路由观察表(registry 只记默认路由会话)', () => {@@ -487,6 +523,23 @@ describe('cc routingTransform — owner boundary 不得把占位 key fail-open});});+/** Claude 订阅已不给 Pi:钉在 anthropic 上的 Pi 请求必须本地拒绝,不读 token、不出网。 */+async function expectLocalPiRefusal(decision: unknown, tokenReader: ReturnType<typeof vi.fn>): Promise<void> {+ const resolved = await Promise.resolve(decision) as {+ localHandler?: (args: { res: unknown }) => Promise<void>;+ upstreamOverride?: string;+ headerOverride?: Record<string, string>;+ } | null;+ expect(resolved?.localHandler).toEqual(expect.any(Function));+ expect(resolved?.upstreamOverride).toBeUndefined();+ expect(JSON.stringify(resolved?.headerOverride ?? {})).not.toContain('pi-claude-token');+ let status = 0;+ await resolved?.localHandler?.({ res: { writeHead: (code: number) => { status = code; }, end: () => {} } });+ expect(status).toBeGreaterThanOrEqual(400);+ expect(tokenReader).not.toHaveBeenCalledWith('anthropic', 'pi', expect.anything());+ expect(tokenReader).not.toHaveBeenCalledWith('anthropic', 'pi');+}+describe('pi routingTransform — xdt session header selects the Pi provider route', () => {afterEach(() => {clearSessionProvider('sess-pi');@@ -505,83 +558,54 @@ describe('pi routingTransform — xdt session header selects the Pi provider rouexpect(authenticatePiProxySession('sess-pi', 'stable-secret')).toBe(false);});- it('preserves Pi OAuth betas and fallbacks on the final upstream request while replacing placeholder auth', async () => {+ it('never forwards a Pi request pinned to the Claude subscription upstream', async () => {const placeholder = 'sk-ant-oat01';- const beta = 'claude-code-20250219,oauth-2025-04-20,server-side-fallback-2026-07-01';- const body = {- model: 'claude-opus-5',- messages: [{ role: 'user', content: 'ping' }],- max_tokens: 16,- fallbacks: [{ model: 'claude-opus-4-8' }],- };- const received: Array<{ headers: IncomingHttpHeaders; body: string }> = [];+ const received: string[] = [];const upstream = createServer(async (req, res) => {- let raw = '';- for await (const chunk of req) raw += chunk;- received.push({ headers: req.headers, body: raw });+ received.push(req.url ?? '');res.writeHead(200, { 'content-type': 'application/json' });res.end('{}');});let proxy: ProxyHandle | undefined;+ const tokenReader = vi.fn(() => 'pi-claude-token');try {await new Promise<void>((resolve) => upstream.listen(0, '127.0.0.1', resolve));const address = upstream.address();if (!address || typeof address === 'string') throw new Error('Missing test upstream address');- const upstreamUrl = `http://127.0.0.1:${address.port}`;setSessionProvider('sess-pi', 'anthropic');- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'pi' ? 'fixture-claude-token' : null,- );+ setProviderOAuthTokenReader(tokenReader);registerPiProxySession('sess-pi', 'session-secret', () => 'anthropic');- const route = createModelRoutingTransform();proxy = await createAnthropicCompatProxy({- upstream: upstreamUrl,- routingTransform: async (requestBody, ctx) => {- const decision = await route(requestBody, ctx);- expect(decision?.upstreamOverride).toBe('https://api.anthropic.com');- // Keep the real routing/header decision; only replace its network destination.- return { ...decision, upstreamOverride: upstreamUrl };- },+ upstream: `http://127.0.0.1:${address.port}`,+ routingTransform: createModelRoutingTransform(),});const response = await fetch(`${proxy.url}/v1/messages`, {method: 'POST',headers: {'content-type': 'application/json',authorization: `Bearer ${placeholder}`,- 'x-api-key': placeholder,- 'anthropic-beta': beta,'x-cindy-pi-session-id': 'sess-pi','x-cindy-pi-session-token': 'session-secret','x-cindy-pi-provider-id': 'anthropic',},- body: JSON.stringify(body),+ body: JSON.stringify({ model: 'claude-opus-5', messages: [{ role: 'user', content: 'ping' }], max_tokens: 16 }),signal: AbortSignal.timeout(5_000),});- expect(response.status).toBe(200);+ expect(response.status).toBeGreaterThanOrEqual(400);await response.text();- expect(received).toHaveLength(1);- expect(received[0].headers).toMatchObject({- authorization: 'Bearer fixture-claude-token',- 'anthropic-version': '2023-06-01',- 'anthropic-beta': beta,- });- for (const name of ['x-api-key', 'x-cindy-pi-session-id', 'x-cindy-pi-session-token', 'x-cindy-pi-provider-id']) {- expect(received[0].headers[name]).toBeUndefined();- }- expect(JSON.stringify(received[0])).not.toContain(placeholder);- expect(JSON.parse(received[0].body)).toEqual(body);+ expect(received).toEqual([]);+ expect(tokenReader).not.toHaveBeenCalled();} finally {await proxy?.dispose();await new Promise<void>((resolve, reject) => upstream.close((error) => error ? reject(error) : resolve()));}});- it('routes an Anthropic Pi request with host-managed OAuth and strips Pi placeholder auth', async () => {+ it('refuses an Anthropic Pi request locally instead of injecting host OAuth', async () => {setClaudeProxyGatewayKeyReader(() => 'sk-gw');setSessionProvider('sess-pi', 'anthropic');- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'pi' ? Promise.resolve('pi-claude-token') : null,- );+ const tokenReader = vi.fn(() => Promise.resolve('pi-claude-token'));+ setProviderOAuthTokenReader(tokenReader);registerPiProxySession('sess-pi', 'session-secret', () => 'anthropic');const decision = createModelRoutingTransform()({ model: 'claude-opus-5' },@@ -592,34 +616,20 @@ describe('pi routingTransform — xdt session header selects the Pi provider rou'x-api-key': 'cindy-pi-provider-auth-placeholder',}),);- await expect(Promise.resolve(decision)).resolves.toEqual({- upstreamOverride: 'https://api.anthropic.com',- headerOverride: {- 'anthropic-version': '2023-06-01',- authorization: 'Bearer pi-claude-token',- },- headerDelete: [- 'x-api-key',- 'x-cindy-pi-session-id',- 'x-cindy-pi-session-token',- 'x-cindy-pi-provider-id',- ],- });+ await expectLocalPiRefusal(decision, tokenReader);});it.each([['sk-gw'],[null],])(- 'pins an Anthropic Pi request to the subscription route when the session holds no explicit source (gateway key %s)',+ 'refuses an Anthropic-pinned Pi request with no explicit session source instead of falling back (gateway key %s)',async (gatewayKey) => {- // model-only set_model 与老会话 hydrate 都会让 session store 为空,而 Pi 已经跑在- // anthropic 原生 provider 上。掉回 ② 段默认路由 = 有网关 key 时静默改走网关计费,- // 无网关 key 时把 `sk-ant-oat` 占位 token 直发 api.anthropic.com。+ // model-only set_model 与老会话 hydrate 都会让 session store 为空。掉回 ② 段默认路由+ // = 有网关 key 时静默改走网关计费,无网关 key 时把占位 token 直发上游 —— 都不允许。setClaudeProxyGatewayKeyReader(() => gatewayKey);- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'pi' ? Promise.resolve('pi-claude-token') : null,- );+ const tokenReader = vi.fn(() => Promise.resolve('pi-claude-token'));+ setProviderOAuthTokenReader(tokenReader);registerPiProxySession('sess-pi', 'session-secret', () => 'anthropic');const decision = createModelRoutingTransform()({ model: 'claude-opus-5' },@@ -630,19 +640,7 @@ describe('pi routingTransform — xdt session header selects the Pi provider rouauthorization: 'Bearer sk-ant-oat01',}),);- await expect(Promise.resolve(decision)).resolves.toEqual({- upstreamOverride: 'https://api.anthropic.com',- headerOverride: {- 'anthropic-version': '2023-06-01',- authorization: 'Bearer pi-claude-token',- },- headerDelete: [- 'x-api-key',- 'x-cindy-pi-session-id',- 'x-cindy-pi-session-token',- 'x-cindy-pi-provider-id',- ],- });+ await expectLocalPiRefusal(decision, tokenReader);},);@@ -730,12 +728,11 @@ describe('pi routingTransform — xdt session header selects the Pi provider rou});});- it('routes an Anthropic Subagent by its pinned provider instead of the OpenAI parent route', async () => {+ it('refuses an Anthropic-pinned Subagent instead of using the OpenAI parent route', async () => {setClaudeProxyGatewayKeyReader(() => 'sk-gw');setSessionProvider('sess-pi', 'openai');- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'pi' ? Promise.resolve('pi-claude-token') : null,- );+ const tokenReader = vi.fn(() => Promise.resolve('pi-claude-token'));+ setProviderOAuthTokenReader(tokenReader);registerPiProxySession('sess-pi','anthropic-subagent-secret',@@ -751,20 +748,7 @@ describe('pi routingTransform — xdt session header selects the Pi provider rou'x-api-key': 'cindy-pi-provider-auth-placeholder',}),);-- await expect(Promise.resolve(decision)).resolves.toEqual({- upstreamOverride: 'https://api.anthropic.com',- headerOverride: {- 'anthropic-version': '2023-06-01',- authorization: 'Bearer pi-claude-token',- },- headerDelete: [- 'x-api-key',- 'x-cindy-pi-session-id',- 'x-cindy-pi-session-token',- 'x-cindy-pi-provider-id',- ],- });+ await expectLocalPiRefusal(decision, tokenReader);});it.each([@@ -944,13 +928,12 @@ describe('pi routingTransform — xdt session header selects the Pi provider rouexpect(response.body).toContain('pi_provider_mismatch');});- it('does not send an authenticated Anthropic PI request through the legacy prefix bridge', async () => {+ it('does not send an Anthropic-pinned PI request through the legacy prefix bridge', async () => {setClaudeProxyGatewayKeyReader(() => 'sk-gw');setSessionProvider('sess-pi', 'anthropic');registerPiProxySession('sess-pi', 'session-secret', () => 'anthropic');- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'pi' ? Promise.resolve('pi-claude-token') : null,- );+ const tokenReader = vi.fn(() => Promise.resolve('pi-claude-token'));+ setProviderOAuthTokenReader(tokenReader);const decision = createModelRoutingTransform()({ model: 'chatgpt/gpt-5.6-sol' },ctxWith({@@ -960,10 +943,7 @@ describe('pi routingTransform — xdt session header selects the Pi provider rou'x-api-key': 'cindy-pi-provider-auth-placeholder',}),);-- await expect(Promise.resolve(decision)).resolves.toMatchObject({- upstreamOverride: 'https://api.anthropic.com',- });+ await expectLocalPiRefusal(decision, tokenReader);});it('rejects a forged session id before provider credentials can be selected', async () => {diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeRevocationPersistence.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeRevocationPersistence.test.tsindex 0ceb547577..ea1e7d999e 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeRevocationPersistence.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeRevocationPersistence.test.ts@@ -3,9 +3,8 @@ import os from 'node:os';import path from 'node:path';import { afterEach, beforeEach, expect, it, vi } from 'vitest';-const h = vi.hoisted(() => ({ directory: '', blob: '', failWrite: false }));+const h = vi.hoisted(() => ({ directory: '', failWrite: false }));vi.mock('electron', () => ({ app: { getPath: () => h.directory } }));-vi.mock('node:child_process', () => ({ execFileSync: vi.fn(() => h.blob) }));vi.mock('../../appSessionState.js', () => ({getActiveAppSession: () => ({ dataOwnerId: 'test-owner', generation: 1 }),isAppSessionBoundaryPending: () => false,@@ -17,32 +16,33 @@ vi.mock('../../utils/atomicWriteFile.js', async (original) => {return actual.atomicWriteFileSync(...args);} };});-import { bindNativeProviderAuth, unbindNativeProviderAuth, isNativeProviderCredentialRejected } from '../nativeProviderAuthBinding.js';-import { claudeOAuthCredentialDigest, readClaudeAiOAuth, readClaudeAiOAuthUnbound } from '../claude-credentials-store.js';+import {+ bindNativeProviderAuth,+ isNativeProviderAuthBound,+ isNativeProviderCredentialRejected,+ unbindNativeProviderAuth,+} from '../nativeProviderAuthBinding.js';-function credential(token: string) {- h.blob = JSON.stringify({ claudeAiOauth: { accessToken: token } });- fs.writeFileSync(path.join(h.directory, '.credentials.json'), h.blob);-}beforeEach(() => {h.directory = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-revocation-'));h.failWrite = false;- vi.stubEnv('CLAUDE_CONFIG_DIR', h.directory);});afterEach(() => {- vi.unstubAllEnvs();fs.rmSync(h.directory, { recursive: true, force: true });});-it('stops bound reads after a failed revocation write without changing native credentials', () => {- credential('test-rejected');+it('keeps a rejected credential suppressed in memory when the revocation write fails', () => {bindNativeProviderAuth('anthropic', { sharedSystem: true });- const digest = claudeOAuthCredentialDigest({ accessToken: 'test-rejected' });+ expect(isNativeProviderAuthBound('anthropic')).toBe(true);+ const digest = 'a'.repeat(64);h.failWrite = true;expect(() => unbindNativeProviderAuth('anthropic', { revoked: true, rejectedCredentialDigest: digest })).toThrow();expect(isNativeProviderCredentialRejected('anthropic', digest)).toBe(true);- expect(readClaudeAiOAuth()).toBeNull();- expect(readClaudeAiOAuthUnbound()?.accessToken).toBe('test-rejected');- expect(fs.readFileSync(path.join(h.directory, '.credentials.json'), 'utf8')).toBe(h.blob);- credential('test-new-account');- expect(readClaudeAiOAuth()?.accessToken).toBe('test-new-account');+ expect(isNativeProviderCredentialRejected('anthropic', 'b'.repeat(64))).toBe(false);+});+it('an explicit revocation stops Cindy from using the native login until it is reconnected', () => {+ bindNativeProviderAuth('anthropic', { sharedSystem: true });+ unbindNativeProviderAuth('anthropic', { revoked: true });+ expect(isNativeProviderAuthBound('anthropic')).toBe(false);+ bindNativeProviderAuth('anthropic', { sharedSystem: true });+ expect(isNativeProviderAuthBound('anthropic')).toBe(true);});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.tsindex 34e20e69bf..6d7fbe0188 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.ts@@ -5,7 +5,7 @@* - gateway-spawn(带 x-api-key)passthrough → 记 'gateway'(即使本机 key 已清,* child 冻结凭证仍走网关 —— 观察值必须反映实际流量)* - oauth-spawn + 有网关 key(换 key 决策)→ 记 'gateway'- * - oauth-spawn + 无 key + Anthropic 模型(直连)→ 记 'subscription'+ * - 无任何 Cindy 凭证 + Anthropic 模型 → 本地拒绝(订阅只由 CLI 直连,proxy 不中转),不记录* - 无 key + 非 Anthropic 模型 passthrough(路由不明确)→ 不记录* - 请求无 session header → 正常路由, 不记录*/@@ -105,14 +105,14 @@ describe('claude session route observation (routing transform ② 段)', () => {expect(readClaudeSessionRoute('sess-1')).toBe('gateway');});- it('records subscription for oauth-spawn anthropic-direct requests (no gateway key)', () => {+ it('refuses no-credential anthropic requests locally instead of relaying them, and records nothing', () => {const transform = createModelRoutingTransform();const decision = transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);- expect(decision).toEqual({ upstreamOverride: 'https://api.anthropic.com' });- expect(readClaudeSessionRoute('sess-1')).toBe('subscription');+ expect(decision).toEqual({ localHandler: expect.any(Function) });+ expect(readClaudeSessionRoute('sess-1')).toBeNull();});it('records exact routes for explicitly selected XD and Anthropic providers', () => {@@ -128,17 +128,17 @@ describe('claude session route observation (routing transform ② 段)', () => {).toEqual({ headerOverride: { 'x-api-key': 'sk-gw' } });expect(takeClaudeRequestRoute(21)).toEqual({ sessionId: 'sess-1', route: 'gateway' });+ // Claude 订阅会话由 CLI 直连、从不经 proxy:到了这里本地拒绝,不解析路由也不记账。setSessionProvider('sess-1', 'anthropic');- routeMocks.resolveSessionRouteDecision.mockReturnValueOnce({- upstreamOverride: 'https://api.anthropic.com',- });+ routeMocks.resolveSessionRouteDecision.mockClear();expect(createModelRoutingTransform()({ model: 'claude-opus-4-8[1m]' },{ ...ctxWith(SESSION_HEADER), reqId: 22 } as never,),- ).toEqual({ upstreamOverride: 'https://api.anthropic.com' });- expect(takeClaudeRequestRoute(22)).toEqual({ sessionId: 'sess-1', route: 'subscription' });+ ).toEqual({ localHandler: expect.any(Function) });+ expect(routeMocks.resolveSessionRouteDecision).not.toHaveBeenCalled();+ expect(takeClaudeRequestRoute(22)).toBeNull();});it('records gateway for an explicitly selected XD passthrough with a frozen child key', () => {@@ -165,23 +165,24 @@ describe('claude session route observation (routing transform ② 段)', () => {});it('routes but does not record when the request has no session header', () => {+ gatewayKey = 'sk-live';const transform = createModelRoutingTransform();const decision = transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ authorization: 'Bearer sk-ant-oat01' }),);- expect(decision).toEqual({ upstreamOverride: 'https://api.anthropic.com' });+ expect(decision).toEqual({ headerOverride: { 'x-api-key': 'sk-live' } });expect(readClaudeSessionRoute('sess-1')).toBeNull();});it('corrects the recorded route when credentials change between requests', () => {const transform = createModelRoutingTransform();- // 第一笔: 无 key → 直连订阅。+ // 第一笔: 无 key → 本地拒绝,不记录。transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);- expect(readClaudeSessionRoute('sess-1')).toBe('subscription');+ expect(readClaudeSessionRoute('sess-1')).toBeNull();// 用户配上网关 key → 下一笔换 key 走网关, 观察值自动纠正。gatewayKey = 'sk-live';transform(diff --git a/apps/desktop/src/main/maker-host/__tests__/codexCredentialSwitch.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexCredentialSwitch.test.tsindex 899d0ed5b7..c9fd60b9cd 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexCredentialSwitch.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexCredentialSwitch.test.ts@@ -1,6 +1,9 @@import { afterEach, describe, expect, it, vi } from 'vitest';import { BUNDLED_CATALOG, buildUserProvider } from '@cindy/model-providers';+const nativeLogin = vi.hoisted(() => ({ connected: false }));+vi.mock('../claude-native-auth.js', () => ({ hasClaudeNativeLogin: () => nativeLogin.connected }));+import {isCodexThreadModelProviderIdentityMismatch,piProxyProviderIdentity,@@ -15,6 +18,7 @@ import { setActiveCatalog } from '../active-catalog.js';afterEach(() => {rehydrateCloseSuppression.resetForTest();setActiveCatalog(BUNDLED_CATALOG);+ nativeLogin.connected = false;});describe('shouldCloseSessionForCredentialSwitch codex mode', () => {@@ -479,6 +483,48 @@ describe('shouldCloseSessionForCredentialSwitch', () => {})).toBe(true);});+ describe('未指定来源的会话可能跑在本机 Claude Code 登录上', () => {+ const implicit = (next: { providerId: string | null; model: string }, current = 'claude-opus-4-7') => ({+ agentKind: 'claude-code' as const,+ currentProviderId: null,+ nextProviderId: next.providerId,+ currentModel: current,+ nextModel: next.model,+ });++ it('订阅已连接:隐式会话换到显式来源、或在 Claude 与非 Claude 模型间切换,都重建', () => {+ nativeLogin.connected = true;+ expect(shouldCloseSessionForCredentialSwitch(implicit({ providerId: 'xd', model: 'claude-opus-4-7' }))).toBe(true);+ expect(shouldCloseSessionForCredentialSwitch(implicit({ providerId: null, model: 'glm-5' }))).toBe(true);+ expect(shouldCloseSessionForCredentialSwitch({+ agentKind: 'claude-code', currentProviderId: 'xd', nextProviderId: null,+ currentModel: 'claude-opus-4-7', nextModel: 'claude-opus-4-7',+ })).toBe(true);+ });++ it('订阅已连接:隐式会话内 Claude 模型之间切换可热切', () => {+ nativeLogin.connected = true;+ expect(shouldCloseSessionForCredentialSwitch(implicit({ providerId: null, model: 'claude-sonnet-4-6' }))).toBe(false);+ });++ it('没连订阅:行为与改动前一致,不因此重建', () => {+ expect(shouldCloseSessionForCredentialSwitch(implicit({ providerId: null, model: 'glm-5' }))).toBe(false);+ expect(shouldCloseSessionForCredentialSwitch(implicit({ providerId: null, model: 'claude-sonnet-4-6' }))).toBe(false);+ expect(shouldCloseSessionForCredentialSwitch({+ agentKind: 'claude-code', currentProviderId: 'xd', nextProviderId: 'xd',+ currentModel: 'claude-opus-4-7', nextModel: 'claude-sonnet-4-6',+ })).toBe(false);+ });++ it('两侧都是显式来源:不受订阅连接状态影响', () => {+ nativeLogin.connected = true;+ expect(shouldCloseSessionForCredentialSwitch({+ agentKind: 'claude-code', currentProviderId: 'xd', nextProviderId: 'xd',+ currentModel: 'claude-opus-4-7', nextModel: 'claude-sonnet-4-6',+ })).toBe(false);+ });+ });+it('does not close remote Claude sessions for provider switches', () => {expect(shouldCloseSessionForCredentialSwitch({agentKind: 'claude-code',diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.tsindex 67fd2158e7..96a665681a 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts@@ -185,6 +185,22 @@ beforeAll(async () => {await import('../codex-proxy-host.js');}, 60_000);++/** 本地 403 拒绝的 localHandler:执行它并返回写出的状态码与响应体。 */+async function runLocalRefusal(decision: unknown): Promise<{ status: number; body: { error?: { code?: string } } }> {+ const handler = (decision as { localHandler?: (args: { res: unknown }) => Promise<void> }).localHandler;+ if (typeof handler !== 'function') throw new Error('expected a local refusal handler');+ let status = 0;+ let raw = '';+ await handler({+ res: {+ writeHead: (code: number) => { status = code; },+ end: (chunk?: string) => { raw += chunk ?? ''; },+ },+ });+ return { status, body: JSON.parse(raw) };+}+describe('withCodexUpstreamRecording', () => {const DEFAULT_UPSTREAM = 'https://gateway.example/v1';const ctxFor = (threadId?: string) => ({@@ -1183,34 +1199,12 @@ describe('chatBridgeCapabilitiesForRoute', () => {}});- it('routes the built-in Anthropic subscription through the bridge with host-owned Claude.ai OAuth', async () => {+ it('refuses a Codex session pinned to the Claude subscription locally, never borrowing Claude.ai credentials', async () => {const host = await freshCodexProxyHost();- const { setAnthropicDiscoveredModels } = await import('../active-catalog.js');const { setProviderOAuthTokenReader } = await import('../provider-route.js');const { setSessionProvider, clearSessionProvider } = await import('../session-provider-store.js');- setAnthropicDiscoveredModels([- {- id: 'claude-opus-5',- name: 'Opus 5',- contextWindow: 1_000_000,- efforts: ['low', 'medium', 'high'],- defaultEffort: 'high',- status: 'active',- },- {- id: 'claude-sonnet-4-5',- name: 'Sonnet 4.5',- contextWindow: 200_000,- efforts: ['low', 'medium', 'high'],- defaultEffort: 'high',- status: 'active',- },- ]);- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'codex'- ? Promise.resolve('claude-subscription-token')- : null,- );+ const tokenReader = vi.fn(() => Promise.resolve('claude-subscription-token'));+ setProviderOAuthTokenReader(tokenReader);host.registerComposed('session-anthropic-subscription','thread-anthropic-subscription',@@ -1219,76 +1213,34 @@ describe('chatBridgeCapabilitiesForRoute', () => {setSessionProvider('session-anthropic-subscription', 'anthropic');host.setCodexProxyAuthInjection('oauth-bearer');- const decision = await Promise.resolve(host.createModelRoutingTransform()(- {- model: 'claude-opus-5',- input: [{ role: 'user', content: 'hello' }],- },- {- reqId: 1,- method: 'POST',- url: '/responses',- headers: {- 'thread-id': 'thread-anthropic-subscription',- authorization: 'Bearer codex-openai-token-must-not-leak',- 'chatgpt-account-id': 'account-must-not-leak',+ try {+ const decision = await Promise.resolve(host.createModelRoutingTransform()(+ {+ model: 'claude-opus-5',+ input: [{ role: 'user', content: 'hello' }],},- },- ));-- expect(decision).toEqual(expect.objectContaining({ localHandler: expect.any(Function) }));- const anthropicHandlerCalls = mockState.createResponsesAnthropicHandler.mock.calls as unknown as Array<[- {- buildHeaders: () => Promise<Record<string, string>>;- rewriteModel: (model: string) => string;- },- ]>;- const config = anthropicHandlerCalls.at(-1)?.[0];- expect(config).toBeDefined();- if (!config) throw new Error('Anthropic subscription bridge config was not captured');- const headers = await config.buildHeaders();- expect(headers).toEqual(expect.objectContaining({- 'anthropic-version': '2023-06-01',- authorization: 'Bearer claude-subscription-token',- 'x-app': 'cli',- 'x-stainless-runtime': 'node',- 'x-claude-code-session-id': expect.any(String),- 'x-client-request-id': expect.any(String),- }));- expect(headers['anthropic-beta']?.split(',')).toEqual([- 'claude-code-20250219',- 'oauth-2025-04-20',- 'context-1m-2025-08-07',- ]);- expect(config.rewriteModel('claude-opus-5[1m]')).toBe('claude-opus-5');-- await Promise.resolve(host.createModelRoutingTransform()(- {- model: 'claude-sonnet-4-5',- input: [{ role: 'user', content: 'short context' }],- },- {- reqId: 2,- method: 'POST',- url: '/responses',- headers: {- 'thread-id': 'thread-anthropic-subscription',+ {+ reqId: 1,+ method: 'POST',+ url: '/responses',+ headers: {+ 'thread-id': 'thread-anthropic-subscription',+ authorization: 'Bearer codex-openai-token-must-not-leak',+ },},- },- ));- const ordinaryConfig = (mockState.createResponsesAnthropicHandler.mock.calls as unknown as Array<[- { buildHeaders: () => Promise<Record<string, string>> },- ]>).at(-1)?.[0];- expect(ordinaryConfig).toBeDefined();- if (!ordinaryConfig) throw new Error('ordinary Anthropic bridge config was not captured');- expect((await ordinaryConfig.buildHeaders())['anthropic-beta']?.split(',')).toEqual([- 'claude-code-20250219',- 'oauth-2025-04-20',- ]);+ ));- clearSessionProvider('session-anthropic-subscription');- setProviderOAuthTokenReader(() => null);- setAnthropicDiscoveredModels([]);+ // 不回落 ChatGPT 订阅 / 网关等默认上游,本地明确拒绝。+ expect(decision).not.toHaveProperty('upstreamOverride');+ const refusal = await runLocalRefusal(decision);+ expect(refusal.status).toBe(403);+ expect(refusal.body.error?.code).toBe('anthropic_subscription_claude_code_only');+ expect(mockState.createResponsesAnthropicHandler).not.toHaveBeenCalled();+ expect(tokenReader).not.toHaveBeenCalled();+ } finally {+ clearSessionProvider('session-anthropic-subscription');+ setProviderOAuthTokenReader(() => null);+ }});it('refreshes non-Anthropic provider OAuth without applying Claude.ai credentials or policy', async () => {@@ -2357,7 +2309,7 @@ describe('chatBridgeCapabilitiesForRoute', () => {setXdGatewayModels([]);});- it('fails the built-in Anthropic subscription bridge locally when Claude.ai OAuth is missing', async () => {+ it('refuses a pinned Claude subscription locally even with no credentials at all', async () => {const host = await freshCodexProxyHost();const { setProviderOAuthTokenReader } = await import('../provider-route.js');const { setSessionProvider, clearSessionProvider } = await import('../session-provider-store.js');@@ -2382,13 +2334,13 @@ describe('chatBridgeCapabilitiesForRoute', () => {},));- expect(decision).toEqual(expect.objectContaining({ localHandler: expect.any(Function) }));+ expect((await runLocalRefusal(decision)).status).toBe(403);expect(mockState.createResponsesAnthropicHandler).not.toHaveBeenCalled();clearSessionProvider('session-anthropic-no-auth');});- it('routes an implicit Anthropic-only model through the subscription bridge', async () => {+ it('never routes an implicit Claude-only model through the Claude subscription', async () => {const host = await freshCodexProxyHost();const {getActiveCatalog,@@ -2441,23 +2393,9 @@ describe('chatBridgeCapabilitiesForRoute', () => {},));- expect(decision).toEqual(expect.objectContaining({ localHandler: expect.any(Function) }));- const anthropicHandlerCalls = mockState.createResponsesAnthropicHandler.mock.calls as unknown as Array<[- {- upstreamBase: string;- authMode: string;- buildHeaders: () => Promise<Record<string, string>>;- },- ]>;- const config = anthropicHandlerCalls.at(-1)?.[0];- expect(config).toBeDefined();- if (!config) throw new Error('implicit Anthropic bridge config was not captured');- expect(config.upstreamBase).toBe('https://api.anthropic.com');- expect(config.authMode).toBe('oauth');- expect(await config.buildHeaders()).toEqual(expect.objectContaining({- authorization: 'Bearer claude-subscription-token',- 'x-app': 'cli',- }));+ // Claude 订阅不在 Codex 的来源里:不建 Anthropic 桥,也不读 Claude.ai token。+ expect(mockState.createResponsesAnthropicHandler).not.toHaveBeenCalled();+ expect(decision).not.toEqual(expect.objectContaining({ localHandler: expect.any(Function) }));} finally {host.unregister('session-implicit-anthropic');clearSessionProvider('session-implicit-anthropic');@@ -2467,7 +2405,7 @@ describe('chatBridgeCapabilitiesForRoute', () => {}});- it('falls back to connected Anthropic when XD advertises the model without credentials', async () => {+ it('does not fall back to the Claude subscription when XD advertises the model without credentials', async () => {const host = await freshCodexProxyHost();const {getActiveCatalog,@@ -2522,19 +2460,8 @@ describe('chatBridgeCapabilitiesForRoute', () => {},));- expect(decision).toEqual(expect.objectContaining({ localHandler: expect.any(Function) }));- const config = (mockState.createResponsesAnthropicHandler.mock.calls as unknown as Array<[- {- upstreamBase: string;- authMode: string;- buildHeaders: () => Promise<Record<string, string>>;- },- ]>).at(-1)?.[0];- expect(config?.upstreamBase).toBe('https://api.anthropic.com');- expect(config?.authMode).toBe('oauth');- expect(await config?.buildHeaders()).toEqual(expect.objectContaining({- authorization: 'Bearer claude-subscription-token',- }));+ expect(mockState.createResponsesAnthropicHandler).not.toHaveBeenCalled();+ expect(decision).not.toEqual(expect.objectContaining({ localHandler: expect.any(Function) }));} finally {host.unregister('session-connected-anthropic');clearSessionProvider('session-connected-anthropic');@@ -6875,102 +6802,10 @@ describe('codex proxy host', () => {});/**- * 额度回调的安装门(#2626)。桥的 localHandler 绕开 compat-proxy 的转发层, 转发层上的- * rate-limit observer 看不到这些响应, 只能由 host 在这里回喂 —— 但必须只对- * 「内置 Anthropic + 订阅 OAuth + 官方 hostname」这一种路由安装, 其余形态误装会把- * 别的账号 / 别的上游的数据写进 Claude 订阅快照。+ * 额度回调的安装门(#2626)。Claude 订阅已不经 Codex 桥,Codex 的 Anthropic 桥对任何形态都+ * 不装 Claude 订阅额度回调 —— 误装会把别的账号 / 别的上游的数据写进 Claude 订阅快照。*/describe('createModelRoutingTransform —— Anthropic 桥的额度回调安装门', () => {- it('installs the quota callback for builtin Anthropic subscription OAuth and feeds the shared recorder', async () => {- const host = await freshCodexProxyHost();- const {- getActiveCatalog,- setAnthropicDiscoveredModels,- setXdGatewayModels,- } = await import('../active-catalog.js');- const {- setProviderOAuthTokenReader,- setProviderViewsReader,- } = await import('../provider-route.js');- const { clearSessionProvider } = await import('../session-provider-store.js');- const {- resetClaudeRateLimitHeadersDedup,- setClaudeRateLimitHeadersListener,- } = await import('../claude-rate-limit-headers-observer.js');-- const model: import('@cindy/model-providers').CatalogModel = {- id: 'claude-quota-callback',- name: 'Quota Callback',- group: 'anthropic',- contextWindow: 200_000,- efforts: ['low', 'medium', 'high'],- defaultEffort: 'high',- status: 'active',- };- setAnthropicDiscoveredModels([model]);- setXdGatewayModels([{ id: model.id, agents: ['claude-code'] }]);- setProviderViewsReader(async () => getActiveCatalog().providers.map((provider) => ({- ...provider,- connected: provider.id === 'anthropic',- })));- setProviderOAuthTokenReader((providerId, agent) => (- providerId === 'anthropic' && agent === 'codex' ? 'claude-subscription-token' : null- ));- host.registerComposed('session-quota-callback', 'thread-quota-callback', 'PRODUCT_PROMPT');- clearSessionProvider('session-quota-callback');- host.setCodexProxyGatewayKeyReader(() => null);- host.setCodexProxyAuthInjection('oauth-bearer');- resetClaudeRateLimitHeadersDedup();- const listener = vi.fn();- setClaudeRateLimitHeadersListener(listener);-- try {- await Promise.resolve(host.createModelRoutingTransform()(- { model: model.id, input: [{ role: 'user', content: 'hello' }] },- {- reqId: 1,- method: 'POST',- url: '/responses',- headers: { 'thread-id': 'thread-quota-callback' },- },- ));-- const config = (mockState.createResponsesAnthropicHandler.mock.calls as unknown as Array<[- {- onUpstreamResponse?: (info: {- status: number;- responseHeaders: Headers;- requestHeaders: Readonly<Record<string, string>>;- }) => void;- },- ]>).at(-1)?.[0];- expect(config?.onUpstreamResponse).toBeTypeOf('function');-- // 回调真的把 headers 喂到了共用入口 —— 只断言「装上了」会漏掉接错线的情形。- config?.onUpstreamResponse?.({- status: 200,- responseHeaders: new Headers({- 'anthropic-ratelimit-unified-5h-utilization': '0.34',- 'anthropic-ratelimit-unified-status': 'allowed',- }),- requestHeaders: { authorization: 'Bearer claude-subscription-token' },- });- expect(listener).toHaveBeenCalledTimes(1);- expect(listener.mock.calls[0][0].fiveHour.utilization).toBeCloseTo(34, 5);- expect(listener.mock.calls[0][0].source).toBe('unified-headers');- expect(listener.mock.calls[0][1]).toBe('claude-subscription-token');- } finally {- host.unregister('session-quota-callback');- clearSessionProvider('session-quota-callback');- setProviderOAuthTokenReader(() => null);- setProviderViewsReader(async () => []);- setAnthropicDiscoveredModels([]);- setXdGatewayModels([]);- host.setCodexProxyGatewayKeyReader(() => null);- setClaudeRateLimitHeadersListener(() => undefined);- }- });-it('does not install it for a custom anthropic-compatible provider on an API key', async () => {const host = await freshCodexProxyHost();const { buildUserProvider } = await import('@cindy/model-providers');diff --git a/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.ts b/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.tsindex ca72c828b0..2084389e2f 100644--- a/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/model-context-limit-store.test.ts@@ -12,7 +12,7 @@ vi.mock('electron', () => ({}));// Budget reconciliation does not exercise native account credential IO.-vi.mock('../subscription-account-auth.js', () => ({ readClaudeAccountOAuth: () => null }));+vi.mock('../subscription-account-auth.js', () => ({ subscriptionAccountKind: () => null }));vi.mock('../logger-adapter.js', () => ({desktopMakerLogger: {diff --git a/apps/desktop/src/main/maker-host/__tests__/modelContextSettings.test.ts b/apps/desktop/src/main/maker-host/__tests__/modelContextSettings.test.tsindex 1a24d82aef..60ab947fd4 100644--- a/apps/desktop/src/main/maker-host/__tests__/modelContextSettings.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/modelContextSettings.test.ts@@ -9,7 +9,7 @@ vi.mock('../auth-adapters.js', () => ({readClaudeApiKey: () => state.gateway ? 'fixture-key' : null,desktopCodexAuthAdapter: { hasCodexOAuthLoginReadOnly: () => state.codexOAuth },}));-vi.mock('../claude-credentials-store.js', () => ({ hasClaudeAiOAuth: () => state.claudeOAuth }));+vi.mock('../claude-native-auth.js', () => ({ hasClaudeNativeLogin: () => state.claudeOAuth }));vi.mock('../provider-route.js', () => ({gatewayDefaultRouteDecision: () => state.gateway ? { upstreamOverride: 'https://example.invalid' } : null,}));diff --git a/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.ts b/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.tsindex 2d13f98c36..1e85b96d19 100644--- a/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/modelPlane.test.ts@@ -555,7 +555,7 @@ describe('registry presence 实体化', () => {);});- it('anthropic codex bridge 应用 perAgent.codex 后仍强制 fast=false', () => {+ it('registry 给 anthropic 声明 codex route 也不生成 Codex bridge(Claude 订阅只供 Claude Code)', () => {setActiveCatalog(baseCatalog([{@@ -583,11 +583,8 @@ describe('registry presence 实体化', () => {} as RegistryEntry,]),);- expect(models('anthropic', 'codex').find((m) => m.id === 'claude-next')).toMatchObject({- efforts: ['low', 'medium'],- defaultEffort: 'medium',- supportsFastMode: false,- });+ expect(models('anthropic', 'claude-code').map((m) => m.id)).toContain('claude-next');+ expect(models('anthropic', 'codex')).toEqual([]);});it('Gateway 无模型时 registry 也不能造 XD 实体(xd roots=∅)', () => {@@ -924,9 +921,20 @@ describe('本地 override(local 永远最高)', () => {expect(models('openai', 'pi').find((m) => m.id === 'chatgpt/gpt-6')?.status).toBe('alpha');});+ it('never exposes a Pi-only user addition for the Claude subscription', () => {+ setActiveCatalog(baseCatalog());+ const parsed = sanitizeModelCatalogOverrides({ additions: {+ 'anthropic:claude-manual': {+ agents: ['pi'], base: { name: 'User model', contextWindow: 600_000, efforts: ['high'], defaultEffort: 'high' },+ },+ } });+ setLocalCatalogOverrides(parsed.overrides);+ expect(models('anthropic', 'pi')).toEqual([]);+ setLocalCatalogOverrides(EMPTY_MODEL_CATALOG_OVERRIDES);+ });+it.each([['openai', 'gpt-manual', 'chatgpt/gpt-manual', 'openai-responses'],- ['anthropic', 'claude-manual', 'claude-manual', 'anthropic-messages'],['xai', 'xai/grok-manual', 'grok-manual', 'openai-responses'],] as const)('accepts a Pi-only user addition for %s and retains it across refreshes', (providerId, inputId, piId, api) => {setActiveCatalog(baseCatalog());diff --git a/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.ts b/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.tsindex 8978edbaa5..b2fbb69965 100644--- a/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/nativeProviderConnectionClaim.test.ts@@ -3,8 +3,9 @@** 回归的是 #294 同族缺陷的另一半:本机 CLI 凭证的自动继承只在「cloud 模式 + 持有* legacy 命名空间认领」时才由一次性迁移建立,local 模式 owner 与没跑到迁移的 cloud- * owner 永远拿不到 —— 设置页与聊天门禁于是各说各话。anthropic 还多一层:清单唯一- * 来源是动态发现,绑定建立后不补拉一次就会停在「已连接 + 零模型」。+ * owner 永远拿不到 —— 设置页与聊天门禁于是各说各话。anthropic 还多一层:启动期的磁盘+ * 清单加载因未绑定而早退,绑定建立后要补一次,否则只剩 Registry presence。Claude 订阅的+ * 登录态来自内置 CLI(`claude auth status`),Cindy 不读凭证、也不带凭证拉清单。*/import fs from 'node:fs';import os from 'node:os';@@ -20,18 +21,12 @@ const h = vi.hoisted(() => ({catalog: null as Catalog | null,claudeCredentialPresent: true,grokCredentialPresent: true,- refreshAnthropicModels: vi.fn(async () => true),refreshXaiModels: vi.fn(async () => true),loadXaiDiskCache: vi.fn(async () => false),refreshXaiMediaModels: vi.fn(async () => true),loadAnthropicDiskCache: vi.fn(async () => {}),codexLoginWithSideEffects: vi.fn(async () => false),codexLoginReadOnly: vi.fn(() => false),- anthropicDiscoveryFailure: null as {- kind: string;- at: string;- detail?: string;- } | null,}));vi.mock('electron', () => ({@@ -52,15 +47,20 @@ vi.mock('../../appSessionState.js', () => ({ownerScopedUserDataPath: (...segments: string[]) => path.join(h.userDataDir, ...segments),}));-// 本机凭证库:*Unbound 是「blob 里有凭证吗」,无绑定语义;带绑定的读取叠加 owner 校验,-// 与真实实现(readClaudeAiOAuth / hasGrokOAuthLogin)的分层一致。-vi.mock('../claude-credentials-store.js', () => ({- readClaudeAiOAuth: () =>+// 本机 CLI 登录态:*Unbound 是「CLI 登没登录」,无绑定语义;带绑定的读取叠加 owner 校验,+// 与真实实现(claude-native-auth / hasGrokOAuthLogin)的分层一致。+vi.mock('../claude-native-auth.js', () => ({+ hasClaudeNativeLoginUnbound: () => h.claudeCredentialPresent,+ hasClaudeNativeLogin: () => h.claudeCredentialPresent && isBoundToCurrentOwner('anthropic'),+}));+vi.mock('../claude-native-connection.js', () => ({+ readClaudeNativeLogin: async () =>h.claudeCredentialPresent && isBoundToCurrentOwner('anthropic')- ? { accessToken: 'fake-token', identity: '[email protected]' }+ ? { loggedIn: true, email: '[email protected]' }: null,- hasClaudeAiOAuthUnbound: () => h.claudeCredentialPresent,- hasClaudeAiOAuth: () => h.claudeCredentialPresent && isBoundToCurrentOwner('anthropic'),+}));+vi.mock('../claude-native-cli.js', () => ({+ readClaudeCliLoginStatus: async () => ({ loggedIn: h.claudeCredentialPresent }),}));vi.mock('../grok-oauth-login.js', () => ({grokAccountIdentity: () => '[email protected]',@@ -73,8 +73,6 @@ vi.mock('../grok-oauth-login.js', () => ({vi.mock('../model-discovery/anthropic.js', () => ({loadAnthropicModelsFromDiskCache: h.loadAnthropicDiskCache,- refreshAnthropicModelsFromHttp: h.refreshAnthropicModels,- getAnthropicModelDiscoveryFailure: () => h.anthropicDiscoveryFailure,}));vi.mock('../model-discovery/xai.js', () => ({clearXaiDiscoveredModels: vi.fn(),@@ -162,8 +160,6 @@ beforeEach(() => {h.catalog = BUNDLED_CATALOG;h.claudeCredentialPresent = true;h.grokCredentialPresent = true;- h.anthropicDiscoveryFailure = null;- h.refreshAnthropicModels.mockClear();h.refreshXaiModels.mockClear();h.loadXaiDiskCache.mockClear();h.refreshXaiMediaModels.mockClear();@@ -198,46 +194,35 @@ describe('native provider connection claim on read', () => {expect(switched.find((p) => p.id === id)?.subscriptionAccount?.identity).toBeUndefined();}});- it('认领本机 anthropic 凭证并补拉一次清单(修「已连接 + 零模型」)', async () => {+ it('认领本机 anthropic 登录并补载一次磁盘清单(修「已连接 + 零模型」)', async () => {expect(isNativeProviderAuthBound('anthropic')).toBe(false);expect((await connectedMap()).anthropic).toBe(true);expect(isNativeProviderAuthBound('anthropic')).toBe(true);expect(getNativeProviderAuthSource('anthropic')).toBe('native-harness-inherited');- // 绑定刚建立 —— 启动期那次发现早被登录态 gate 掉,必须在这里补一次。- expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1);- // 磁盘缓存同样要补:启动期那次 load 也因未绑定而早退了。不先摆出上次成功的清单,- // 这次 HTTP 一旦失败,明明有可用缓存用户还是零模型(PR #548 review)。- expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1);+ // 启动期那次磁盘清单加载因未绑定而早退了,绑定刚建立时必须补一次(PR #548 review)。+ await vi.waitFor(() => expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1));- // 已绑定后不再重复认领,也不再反复打网络。+ // 已绑定后不再重复认领,也不再重复加载。await connectedMap();- expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1);expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1);});- it('首次认领要等缓存与 HTTP 清单完成后再返回本次 provider 快照', async () => {+ it('首次认领要等磁盘清单补载完成后再返回本次 provider 快照', async () => {const anthropic = BUNDLED_CATALOG.providers.find((provider) => provider.id === 'anthropic')!;const modelSeed = BUNDLED_CATALOG.providers.find((provider) => provider.id === 'xd')!.models['claude-code']![0]!;const cachedModel = { ...modelSeed, id: 'claude-cached', name: 'Claude Cached' };- const discoveredModel = { ...modelSeed, id: 'claude-first-fire', name: 'Claude First Fire' };- const withAnthropicModel = (model: typeof modelSeed): Catalog => ({+ const cachedCatalog: Catalog = {...BUNDLED_CATALOG,providers: BUNDLED_CATALOG.providers.map((provider) =>provider.id === anthropic.id- ? {- ...provider,- models: { ...provider.models, 'claude-code': [model] },- }+ ? { ...provider, models: { ...provider.models, 'claude-code': [cachedModel] } }: provider,),- });- const cachedCatalog = withAnthropicModel(cachedModel);- const discoveredCatalog = withAnthropicModel(discoveredModel);+ };let releaseCache!: () => void;- let releaseRefresh!: () => void;h.loadAnthropicDiskCache.mockImplementationOnce(() =>new Promise<void>((resolve) => {@@ -247,15 +232,6 @@ describe('native provider connection claim on read', () => {};}),);- h.refreshAnthropicModels.mockImplementationOnce(- () =>- new Promise<boolean>((resolve) => {- releaseRefresh = () => {- h.catalog = discoveredCatalog;- resolve(true);- };- }),- );let settled = false;const providersPromise = listProviders(true, true).then((providers) => {@@ -266,85 +242,47 @@ describe('native provider connection claim on read', () => {await vi.waitFor(() => expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1));const settledBeforeCache = settled;releaseCache();- await vi.waitFor(() => expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1));- const settledBeforeRefresh = settled;- releaseRefresh();const providers = await providersPromise;expect(settledBeforeCache).toBe(false);- expect(settledBeforeRefresh).toBe(false);expect(providers.find((provider) => provider.id === 'anthropic')?.connected).toBe(true);expect(providers.find((provider) => provider.id === 'anthropic')?.models['claude-code'],- ).toEqual([discoveredModel]);+ ).toEqual([cachedModel]);});- it('普通可信 provider read 不等待首次清单网络,仍先返回 connected + LKG', async () => {+ it('普通可信 provider read 不等待首次磁盘清单补载,先返回 connected', async () => {let releaseCache!: () => void;- let releaseRefresh!: () => void;h.loadAnthropicDiskCache.mockImplementationOnce(() =>new Promise<void>((resolve) => {releaseCache = resolve;}),);- h.refreshAnthropicModels.mockImplementationOnce(- () =>- new Promise<boolean>((resolve) => {- releaseRefresh = () => resolve(true);- }),- );const providers = await listProviders();expect(providers.find((provider) => provider.id === 'anthropic')?.connected).toBe(true);await vi.waitFor(() => expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1));releaseCache();- await vi.waitFor(() => expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1));- releaseRefresh();await listProviders(true, true);});- it('fresh routing read 在 HTTP 失败时仍返回缓存 LKG 与 connected 状态', async () => {- const anthropic = BUNDLED_CATALOG.providers.find((provider) => provider.id === 'anthropic')!;- const modelSeed = BUNDLED_CATALOG.providers.find((provider) => provider.id === 'xd')!.models[- 'claude-code'- ]![0]!;- const cachedModel = { ...modelSeed, id: 'claude-cached', name: 'Claude Cached' };- h.catalog = {- ...BUNDLED_CATALOG,- providers: BUNDLED_CATALOG.providers.map((provider) =>- provider.id === anthropic.id- ? {- ...provider,- models: { ...provider.models, 'claude-code': [cachedModel] },- }- : provider,- ),- };- h.refreshAnthropicModels.mockRejectedValueOnce(new Error('network down'));+ it('fresh routing read 在磁盘清单补载失败时仍返回 connected 状态', async () => {+ h.loadAnthropicDiskCache.mockRejectedValueOnce(new Error('disk unreadable'));const providers = await listProviders(true, true);- const anthropicView = providers.find((provider) => provider.id === anthropic.id);- expect(anthropicView?.connected).toBe(true);- expect(anthropicView?.models['claude-code']).toEqual([cachedModel]);+ expect(providers.find((provider) => provider.id === 'anthropic')?.connected).toBe(true);});- it('并发读取要共等首次认领的同一趟清单刷新', async () => {+ it('并发读取要共等首次认领的同一趟清单补载', async () => {let releaseCache!: () => void;- let releaseRefresh!: () => void;h.loadAnthropicDiskCache.mockImplementationOnce(() =>new Promise<void>((resolve) => {releaseCache = resolve;}),);- h.refreshAnthropicModels.mockImplementationOnce(- () =>- new Promise<boolean>((resolve) => {- releaseRefresh = () => resolve(true);- }),- );const first = listProviders(true, true);await vi.waitFor(() => expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1));@@ -359,13 +297,8 @@ describe('native provider connection claim on read', () => {expect(secondSettled).toBe(false);releaseCache();- await vi.waitFor(() => expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1));- expect(secondSettled).toBe(false);-- releaseRefresh();const [firstProviders, secondProviders] = await Promise.all([first, second]);expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1);- expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1);expect(firstProviders.find((provider) => provider.id === 'anthropic')?.connected).toBe(true);expect(secondProviders.find((provider) => provider.id === 'anthropic')?.connected).toBe(true);});@@ -406,19 +339,12 @@ describe('native provider connection claim on read', () => {it('认领等待期间 owner generation 切换时不向新 owner 广播旧 claim', async () => {h.grokCredentialPresent = false; // 只观察 Anthropic 的异步认领广播let releaseCache!: () => void;- let releaseRefresh!: () => void;h.loadAnthropicDiskCache.mockImplementationOnce(() =>new Promise<void>((resolve) => {releaseCache = resolve;}),);- h.refreshAnthropicModels.mockImplementationOnce(- () =>- new Promise<boolean>((resolve) => {- releaseRefresh = () => resolve(true);- }),- );const onClaimed = vi.fn();setNativeProviderClaimListener(onClaimed);try {@@ -426,8 +352,6 @@ describe('native provider connection claim on read', () => {await vi.waitFor(() => expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1));h.generation = 2;releaseCache();- await vi.waitFor(() => expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1));- releaseRefresh();await providersPromise;expect(onClaimed).not.toHaveBeenCalled();} finally {@@ -449,18 +373,16 @@ describe('native provider connection claim on read', () => {it('不受信 sender(含 device-link 合成 event)只读,不触发认领与清单拉取', async () => {// 这条通道也服务 device-link 与可能不受信的渲染上下文:它们只该拿到只读快照,- // 不该顺带写绑定文件、读凭证缓存、发起带凭证的上游请求(PR #548 review)。+ // 不该顺带写绑定文件、改动清单(PR #548 review)。const connected = await connectedMap(false);expect(connected.anthropic).toBe(false);expect(connected.xai).toBe(false);expect(isNativeProviderAuthBound('anthropic')).toBe(false);- expect(h.refreshAnthropicModels).not.toHaveBeenCalled();expect(h.loadAnthropicDiskCache).not.toHaveBeenCalled();// 本机主页面读一次即恢复自愈。expect((await connectedMap(true)).anthropic).toBe(true);- await vi.waitFor(() => expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1));- expect(h.refreshAnthropicModels).toHaveBeenCalledTimes(1);+ await vi.waitFor(() => expect(h.loadAnthropicDiskCache).toHaveBeenCalledTimes(1));});it('openai 同样按 sender 分流:不受信只读,不触发 reconcile 的硬链与绑定写入', async () => {@@ -483,22 +405,14 @@ describe('native provider connection claim on read', () => {expect(connected.anthropic).toBe(false);expect(connected.xai).toBe(false);expect(isNativeProviderAuthBound('anthropic')).toBe(false);- expect(h.refreshAnthropicModels).not.toHaveBeenCalled();+ expect(h.loadAnthropicDiskCache).not.toHaveBeenCalled();});- it('清单发现失败时把归因挂到 ProviderView 上(UI 据此讲明理由而非「正在发现」)', async () => {- h.anthropicDiscoveryFailure = {- kind: 'network',- at: '2026-07-27T00:00:00.000Z',- detail: 'TypeError: fetch failed (ENOTFOUND)',- };-+ it('anthropic 没有 HTTP 清单发现通道,ProviderView 不带发现失败态', async () => {const providers = await listProviders();const anthropic = providers.find((p) => p.id === 'anthropic');expect(anthropic?.connected).toBe(true);- expect(anthropic?.modelDiscoveryFailure).toMatchObject({ kind: 'network' });- // 没有失败态的供应商不该凭空长出这个字段。- expect(providers.find((p) => p.id === 'xai')?.modelDiscoveryFailure).toBeUndefined();+ expect(anthropic?.modelDiscoveryFailure).toBeUndefined();});it('凭证已属于别的 owner 时保持 fail-closed', async () => {@@ -509,7 +423,7 @@ describe('native provider connection claim on read', () => {const connected = await connectedMap();expect(connected.anthropic).toBe(false);- expect(h.refreshAnthropicModels).not.toHaveBeenCalled();+ expect(h.loadAnthropicDiskCache).not.toHaveBeenCalled();});it('durable disconnect 后即使本机 Claude 凭证仍在,也不绑定、不发现、不回灌', async () => {@@ -522,6 +436,5 @@ describe('native provider connection claim on read', () => {expect(connected.anthropic).toBe(false);expect(isNativeProviderAuthBound('anthropic')).toBe(false);expect(h.loadAnthropicDiskCache).not.toHaveBeenCalled();- expect(h.refreshAnthropicModels).not.toHaveBeenCalled();});});diff --git a/apps/desktop/src/main/maker-host/__tests__/piAuthEnv.test.ts b/apps/desktop/src/main/maker-host/__tests__/piAuthEnv.test.tsindex 9a90946e7b..54f11b6685 100644--- a/apps/desktop/src/main/maker-host/__tests__/piAuthEnv.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/piAuthEnv.test.ts@@ -52,10 +52,14 @@ describe('DesktopPiAuthAdapter.getAuthEnv', () => {});it('writes the gateway placeholder only for shared cindy OAuth routes', async () => {- for (const providerId of ['anthropic', 'openai']) {- const env = await desktopPiAuthAdapter.getAuthEnv({ providerId });- expect(env[PI_API_KEY_ENV]).toBe(PLACEHOLDER);- }+ const env = await desktopPiAuthAdapter.getAuthEnv({ providerId: 'openai' });+ expect(env[PI_API_KEY_ENV]).toBe(PLACEHOLDER);+ });++ it('refuses the Claude subscription for Pi sessions (it only runs inside Claude Code)', async () => {+ await expect(desktopPiAuthAdapter.getState({ providerId: 'anthropic' })).resolves.toEqual({+ authenticated: false, errorReason: 'anthropic_oauth_unavailable',+ });});it('preserves the gateway key for xAI sessions and falls back when no gateway exists', async () => {diff --git a/apps/desktop/src/main/maker-host/__tests__/piNativeAutoCompactWiring.test.ts b/apps/desktop/src/main/maker-host/__tests__/piNativeAutoCompactWiring.test.tsindex 44c5f191a8..8d8cac6ef2 100644--- a/apps/desktop/src/main/maker-host/__tests__/piNativeAutoCompactWiring.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/piNativeAutoCompactWiring.test.ts@@ -53,8 +53,9 @@ vi.mock('../anthropic-compat-proxy-host.js', () => ({getClaudeEndpoint: () => 'http://127.0.0.1:9',}));-vi.mock('../claude-credentials-store.js', () => ({- hasClaudeAiOAuth: () => false,+vi.mock('../claude-native-auth.js', () => ({+ hasClaudeNativeLogin: () => false,+ hasClaudeNativeLoginUnbound: () => false,}));vi.mock('../grok-oauth-login.js', () => ({diff --git a/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.ts b/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.tsindex a74ce15ac4..a4422f2c5f 100644--- a/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/piNativeProviders.test.ts@@ -44,7 +44,7 @@ import {resolvePiBundledModelById,resolvePiCindyGatewayModelApi,resolvePiCindyGatewayModelSpec,- pruneAnthropicCompatForLink,+ pruneAnthropicCompatForGateway,type PiBundledModelInfo,} from '../pi-host.js';import { getActiveCatalog, setActiveCatalog, setDiscoveredCodexModels, setXdGatewayModels, setXaiDiscoveredModels, setLocalCatalogOverrides } from '../active-catalog.js';@@ -53,8 +53,17 @@ import { deriveAvailableModels } from '../catalog-to-descriptors.js';type Cfg = Parameters<typeof buildPiNativeProvidersFromConfigs>[0][number];+it('never projects retired independent Claude accounts into Pi', () => {+ const original = BUNDLED_CATALOG.providers.find(provider => provider.id === 'anthropic')!;+ const catalog: Catalog = { ...BUNDLED_CATALOG, providers: [...BUNDLED_CATALOG.providers,+ { ...original, id: 'anthropic-second', source: 'user', auth: { method: 'oauth', native: 'claude' } },+ ] };+ const result = buildPiSubscriptionNativeProviders(catalog, 'http://127.0.0.1:18765');+ expect(result.providers.some(provider => provider.sourceProviderId === 'anthropic-second')).toBe(false);+ expect(result.providers.some(provider => provider.sourceProviderId === 'anthropic')).toBe(false);+});+it.each([- ['anthropic', 'claude', 'anthropic-messages'],['xai', 'xai', 'openai-responses'],] as const)('keeps independent %s native Pi routes bound to their account', (brand, native, api) => {const original = BUNDLED_CATALOG.providers.find(provider => provider.id === brand)!;@@ -1025,18 +1034,12 @@ describe('buildPiNativeProvidersFromConfigs', () => {]),);- expect(providers.map((provider) => provider.id)).toEqual(['anthropic', 'openai-codex', 'xai']);+ // Claude 订阅只供内置 Claude Code CLI:即便目录残留 anthropic 的 Pi 清单,也不投影成+ // Pi provider,更不下发冒充 Claude Code 的 `sk-ant-oat` 占位 token。+ expect(providers.map((provider) => provider.id)).toEqual(['openai-codex', 'xai']);+ expect(providers.some((provider) => provider.sourceProviderId === 'anthropic')).toBe(false);+ expect(JSON.stringify(env)).not.toContain('sk-ant-oat');expect(providers[0]).toMatchObject({- sourceProviderId: 'anthropic',- baseUrl: 'http://127.0.0.1:4567/',- inheritModels: true,- apiKeyEnvVar: 'CINDY_PI_ANTHROPIC_PROXY_KEY',- models: [{ id: 'claude-opus-5', wireId: 'claude-opus-5' }],- });- // Pi 按 `sk-ant-oat` 前缀识别 OAuth 形态,才会自己拼 claude-code/oauth/server-side-fallback- // 等 beta 头与 Claude Code 身份;占位值不能是真 token 形态之外的普通字串。- expect(env.CINDY_PI_ANTHROPIC_PROXY_KEY).toContain('sk-ant-oat');- expect(providers[1]).toMatchObject({sourceProviderId: 'openai',baseUrl: 'http://127.0.0.1:4567/',inheritModels: true,@@ -1053,12 +1056,12 @@ describe('buildPiNativeProvidersFromConfigs', () => {},],});- expect(providers[1]?.models[0]?.catalogAddition).toBeUndefined();- expect(providers[1]?.models[0]).toMatchObject({+ expect(providers[0]?.models[0]?.catalogAddition).toBeUndefined();+ expect(providers[0]?.models[0]).toMatchObject({api: 'openai-codex-responses',contextWindow: 272_000,});- expect(providers[2]).toMatchObject({+ expect(providers[1]).toMatchObject({sourceProviderId: 'xai',baseUrl: 'http://127.0.0.1:4567/v1',inheritModels: true,@@ -1067,8 +1070,8 @@ describe('buildPiNativeProvidersFromConfigs', () => {{ id: 'xai/grok-4.20', wireId: 'grok-4.20', api: 'openai-responses' },],});- expect(providers[2]?.models[0]?.api).toBe('openai-responses');- const proxyJwt = env[providers[1]!.apiKeyEnvVar!];+ expect(providers[1]?.models[0]?.api).toBe('openai-responses');+ const proxyJwt = env[providers[0]!.apiKeyEnvVar!];expect(proxyJwt).toMatch(/^[^.]+\.[^.]+\.$/);expect(proxyJwt).not.toContain('Bearer');for (const provider of providers) {@@ -1597,10 +1600,8 @@ describe('buildPiNativeProvidersFromConfigs', () => {'http://127.0.0.1:4567/',bundled,).providers;- expect(providers.find((provider) => provider.id === 'anthropic')?.models[0]).toMatchObject({- wireId: 'claude-daily',- api: 'anthropic-messages',- });+ // Claude 订阅不给 Pi:目录残留的 anthropic Pi 清单不投影。+ expect(providers.find((provider) => provider.id === 'anthropic')).toBeUndefined();expect(providers.find((provider) => provider.id === 'openai-codex')?.models[0]).toMatchObject({ wireId: 'gpt-daily', catalogAddition: true },);@@ -2653,7 +2654,6 @@ describe('server metadata reaches every native Pi transport', () => {it.each([['openai', 'openai-codex', 'chatgpt/gpt-fixture', 'gpt-fixture', 'openai-responses', 'openai-codex-responses'],- ['anthropic', 'anthropic', 'claude-fixture', 'claude-fixture', 'anthropic-messages', 'anthropic-messages'],['xai', 'xai', 'grok-fixture', 'grok-fixture', 'openai-responses', 'openai-responses'],] as const)('materializes %s declarations with and without a native SDK entry',(providerId, nativeId, id, wireId, piApi, api) => {@@ -2771,7 +2771,7 @@ it('serializes mixed-protocol enterprise models with their own gateway base URLs}});-describe('Anthropic compat per-link pruning (#4982 / #4983)', () => {+describe('Anthropic compat per-link pruning (#4982)', () => {const probedClaude = (id: string): PiBundledModelInfo => ({...piBundledModel(id, 'anthropic-messages'),compat: {@@ -2783,7 +2783,7 @@ describe('Anthropic compat per-link pruning (#4982 / #4983)', () => {},});- it('subscription direct link drops the MidConvo flags but keeps strict and mid-conv system messages', () => {+ it('Pi gets no Claude subscription link, so probed Anthropic compat is never projected as one', () => {const catalog = JSON.parse(JSON.stringify(BUNDLED_CATALOG)) as Catalog;const bundled = probedClaude('claude-opus-5');const { providers } = buildPiSubscriptionNativeProviders(@@ -2791,29 +2791,23 @@ describe('Anthropic compat per-link pruning (#4982 / #4983)', () => {'http://127.0.0.1:4567/',new Map([['anthropic', new Map([['claude-opus-5', bundled]])]]),);- const anthropic = providers.find((provider) => provider.id === 'anthropic');- const model = anthropic?.models.find((candidate) => candidate.wireId === 'claude-opus-5');- expect(model?.compat).toEqual({- forceAdaptiveThinking: true,- supportsStrictTools: true,- supportsMidConvoSystemMessages: true,- });+ expect(providers.find((provider) => provider.id === 'anthropic')).toBeUndefined();// The probe catalog shared with other links must not be mutated.expect(bundled.compat).toMatchObject({ supportsMidConvoToolChanges: true, supportsMidConvoEffort: true });});- it('gateway link additionally drops strict tools and never touches non-Anthropic APIs', () => {- expect(pruneAnthropicCompatForLink({+ it('gateway link drops strict tools and MidConvo flags and never touches non-Anthropic APIs', () => {+ expect(pruneAnthropicCompatForGateway({forceAdaptiveThinking: true,supportsStrictTools: true,supportsMidConvoToolChanges: true,supportsMidConvoEffort: true,supportsMidConvoSystemMessages: true,- }, 'gateway')).toEqual({ forceAdaptiveThinking: true, supportsMidConvoSystemMessages: true });+ })).toEqual({ forceAdaptiveThinking: true, supportsMidConvoSystemMessages: true });// Nothing to prune → same reference (no needless clone) and undefined passthrough.const plain = { forceAdaptiveThinking: true };- expect(pruneAnthropicCompatForLink(plain, 'gateway')).toBe(plain);- expect(pruneAnthropicCompatForLink(undefined, 'subscription')).toBeUndefined();+ expect(pruneAnthropicCompatForGateway(plain)).toBe(plain);+ expect(pruneAnthropicCompatForGateway(undefined)).toBeUndefined();setXdGatewayModels([{ id: 'moonshot/kimi-k3', agents: ['pi'] }]);expect(resolvePiCindyGatewayModelSpec('xd', 'moonshot/kimi-k3')?.compat).toMatchObject({ thinkingFormat: 'openai' });});diff --git a/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.ts b/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.tsindex 953e022ab4..334dcee9b5 100644--- a/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/piRosterAssembly.test.ts@@ -45,8 +45,9 @@ vi.mock('../anthropic-compat-proxy-host.js', () => ({getClaudeEndpoint: () => 'http://127.0.0.1:9',}));-vi.mock('../claude-credentials-store.js', () => ({- hasClaudeAiOAuth: () => false,+vi.mock('../claude-native-auth.js', () => ({+ hasClaudeNativeLogin: () => false,+ hasClaudeNativeLoginUnbound: () => false,}));vi.mock('../grok-oauth-login.js', () => ({diff --git a/apps/desktop/src/main/maker-host/__tests__/providerCatalogRealmReload.test.ts b/apps/desktop/src/main/maker-host/__tests__/providerCatalogRealmReload.test.tsindex b8f66197de..590c70ed33 100644--- a/apps/desktop/src/main/maker-host/__tests__/providerCatalogRealmReload.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/providerCatalogRealmReload.test.ts@@ -117,10 +117,12 @@ vi.mock('../auth-adapters.js', () => ({hasCodexOAuthLoginUnbound: () => false,},}));-vi.mock('../claude-credentials-store.js', () => ({- hasClaudeAiOAuth: () => false,- hasClaudeAiOAuthUnbound: () => false,+vi.mock('../claude-native-auth.js', () => ({+ hasClaudeNativeLogin: () => false,+ hasClaudeNativeLoginUnbound: () => false,}));+vi.mock('../claude-native-connection.js', () => ({ readClaudeNativeLogin: async () => null }));+vi.mock('../claude-native-cli.js', () => ({ readClaudeCliLoginStatus: async () => ({ loggedIn: false }) }));vi.mock('../grok-oauth-login.js', () => ({getGrokAccessToken: h.getGrokAccessToken,peekGrokAccessToken: () => null,diff --git a/apps/desktop/src/main/maker-host/__tests__/providerRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/providerRoute.test.tsindex 5cae6f878c..ac1c165cbc 100644--- a/apps/desktop/src/main/maker-host/__tests__/providerRoute.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/providerRoute.test.ts@@ -176,7 +176,7 @@ describe('Pi per-model protocol routing', () => {});describe('implicit local bridge resume routing', () => {- it('keeps the connected source when a running session model becomes retired', async () => {+ it('never resolves a Codex session to the Claude subscription, even for a retired Claude model', async () => {setAnthropicDiscoveredModels([{id: 'claude-retired-live',@@ -191,10 +191,7 @@ describe('implicit local bridge resume routing', () => {await expect(resolveImplicitLocalBridgeRoute('claude-retired-live', 'codex'),- ).resolves.toMatchObject({- providerId: 'anthropic',- routing: { wireProtocol: 'anthropic-messages' },- });+ ).resolves.toBeNull();});});@@ -275,23 +272,10 @@ describe('codex: buildRouteDecision no-break 基线', () => {);});- it('Anthropic subscription → Claude.ai bearer + OAuth beta,不透传 Codex 账号头', () => {- const fromCatalog = buildRouteDecision(- descriptor('anthropic', 'codex'),- KEY,- 'codex',- null,- 'claude-subscription-token',- );- expect(fromCatalog).toEqual({- upstreamOverride: 'https://api.anthropic.com',- headerOverride: {- 'anthropic-version': '2023-06-01',- 'anthropic-beta': 'claude-code-20250219,oauth-2025-04-20',- authorization: 'Bearer claude-subscription-token',- },- headerDelete: CODEX_ACCOUNT_HEADER_DELETE,- });+ it('Claude 订阅没有 Codex 路由(订阅只归内置 Claude Code CLI)', () => {+ const anthropic = getActiveCatalog().providers.find((provider) => provider.id === 'anthropic');+ expect(anthropic?.routing.codex).toBeUndefined();+ expect(anthropic?.routing.pi).toBeUndefined();});});@@ -307,21 +291,14 @@ describe('pi: provider-aware Anthropic wire routing', () => {});});- it('Anthropic injects the host OAuth token and required OAuth beta headers', async () => {+ it('Pi 会话选 Claude 订阅 → 无路由(不注入 host OAuth,调用方本地拒绝)', async () => {setSessionProvider('s-pi', 'anthropic');- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'pi' ? Promise.resolve('claude-live-token') : null,- );+ const tokenReader = vi.fn(() => Promise.resolve('claude-live-token'));+ setProviderOAuthTokenReader(tokenReader);await expect(Promise.resolve(resolveSessionRouteDecision('s-pi', 'pi', KEY, 'claude-opus-5')),- ).resolves.toEqual({- upstreamOverride: ANTHROPIC_DIRECT_UPSTREAM,- headerOverride: {- 'anthropic-version': '2023-06-01',- authorization: 'Bearer claude-live-token',- },- headerDelete: ['x-api-key'],- });+ ).resolves.toBeNull();+ expect(tokenReader).not.toHaveBeenCalled();});});@@ -460,37 +437,13 @@ describe('resolveSessionRouteDecision (per-session 选择 → 路由;no-break fasetProviderOAuthTokenReader(() => null);});- it('codex 会话选 Anthropic → 本地桥读取 Claude.ai OAuth,缺失时也 fail closed', async () => {+ it('codex 会话选 Claude 订阅 → 无本地桥路由,也不读 Claude.ai token', async () => {setSessionProvider('s-anthropic-codex', 'anthropic');- setProviderOAuthTokenReader((providerId, agent) =>- providerId === 'anthropic' && agent === 'codex'- ? Promise.resolve('claude-subscription-token')- : null,- );- const route = await resolveSessionRoute('s-anthropic-codex', 'codex', 'claude-opus-5');- expect(route).toMatchObject({- providerId: 'anthropic',- providerSource: 'builtin',- oauthToken: 'claude-subscription-token',- routing: {- wireProtocol: 'anthropic-messages',- authStrategy: 'provider-oauth-header',- },- });- expect(buildLocalHandlerHeaders(route!, 'codex')).toEqual({- headers: {- 'anthropic-version': '2023-06-01',- 'anthropic-beta': 'claude-code-20250219,oauth-2025-04-20',- authorization: 'Bearer claude-subscription-token',- },- headerDelete: CODEX_ACCOUNT_HEADER_DELETE,- });-+ const tokenReader = vi.fn(() => Promise.resolve('claude-subscription-token'));+ setProviderOAuthTokenReader(tokenReader);+ await expect(resolveSessionRoute('s-anthropic-codex', 'codex', 'claude-opus-5')).resolves.toBeNull();+ expect(tokenReader).not.toHaveBeenCalled();setProviderOAuthTokenReader(() => null);- const missing = await resolveSessionRoute('s-anthropic-codex', 'codex', 'claude-opus-5');- expect(buildLocalHandlerHeaders(missing!, 'codex').headers.authorization).toBe(- 'Bearer xdt-missing-provider-oauth-token',- );});it('按 catalog modelIdRewrite 剥 xAI 内部前缀', () => {diff --git a/apps/desktop/src/main/maker-host/__tests__/remoteClaudeRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/remoteClaudeRoute.test.tsindex 3b1acbbd8f..9704476cf8 100644--- a/apps/desktop/src/main/maker-host/__tests__/remoteClaudeRoute.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/remoteClaudeRoute.test.ts@@ -1,11 +1,9 @@import { beforeEach, describe, expect, it, vi } from 'vitest';// remote-claude-route 只做纯路由 → cc env 翻译,带副作用的依赖全部 mock(其中-// auth-adapters 触 electron,必须 mock 掉)。claude-gateway-config 与-// claude-oauth-spawn-env 是纯函数,保留真实实现。+// auth-adapters 触 electron,必须 mock 掉)。Claude 订阅凭证只在本机 CLI 的登录里,+// 远端会话既不读取也不下发它。const readClaudeApiKey = vi.fn<() => string | null>(() => null);-const getClaudeAiOAuthForSpawn = vi.fn<() => unknown>(() => null);-const hasClaudeAiOAuth = vi.fn<() => boolean>(() => false);const getActiveCatalog = vi.fn<() => { providers: unknown[] }>(() => ({ providers: [] }));const resolveProviderRouteDecision = vi.fn<(...args: unknown[]) => Promise<unknown>>();const gatewayDefaultRouteDecision = vi.fn<(...args: unknown[]) => unknown>();@@ -17,10 +15,6 @@ vi.mock('../model-discovery/xai.js', () => ({}));vi.mock('../auth-adapters.js', () => ({ readClaudeApiKey: () => readClaudeApiKey() }));-vi.mock('../claude-oauth-refresh.js', () => ({- getClaudeAiOAuthForSpawn: () => getClaudeAiOAuthForSpawn(),-}));-vi.mock('../claude-credentials-store.js', () => ({ hasClaudeAiOAuth: () => hasClaudeAiOAuth() }));vi.mock('../active-catalog.js', () => ({ getActiveCatalog: () => getActiveCatalog() }));vi.mock('../provider-route.js', () => ({resolveProviderRouteDecision: (...args: unknown[]) => resolveProviderRouteDecision(...args),@@ -41,8 +35,6 @@ function parseCustomHeaders(serialized: string | undefined): Record<string, stribeforeEach(() => {readClaudeApiKey.mockReset().mockReturnValue(null);- getClaudeAiOAuthForSpawn.mockReset().mockReturnValue(null);- hasClaudeAiOAuth.mockReset().mockReturnValue(false);getActiveCatalog.mockReset().mockReturnValue({ providers: [] });resolveProviderRouteDecision.mockReset().mockResolvedValue(null);gatewayDefaultRouteDecision.mockReset().mockReturnValue(null);@@ -50,57 +42,14 @@ beforeEach(() => {});describe('resolveRemoteClaudeRoute — 默认路由(未显式选供应商)', () => {- it('连了订阅、没网关 key + Anthropic 原生模型 → 订阅直连(隐式上游 + OAuth token)', async () => {- hasClaudeAiOAuth.mockReturnValue(true);- getClaudeAiOAuthForSpawn.mockReturnValue({- accessToken: 'tok-sub',- scopes: ['user:inference'],- subscriptionType: 'max',- rateLimitTier: 'tier-1',- });- const route = await resolveRemoteClaudeRoute({ providerId: null, model: 'claude-opus-5' });- expect(route).not.toBeNull();- expect(route!.endpoint).toBe('https://api.anthropic.com');- expect(route!.env.CLAUDE_CODE_OAUTH_TOKEN).toBe('tok-sub');- expect(route!.env.CLAUDE_CODE_OAUTH_SCOPES).toBe('user:inference');- expect(route!.env.CLAUDE_CODE_SUBSCRIPTION_TYPE).toBe('max');- expect(route!.env.CLAUDE_CODE_RATE_LIMIT_TIER).toBe('tier-1');- // 订阅直连不塞 api key / bearer 门,凭证走 OAuth token- expect(route!.env.ANTHROPIC_API_KEY).toBeUndefined();- expect(route!.env.ANTHROPIC_AUTH_TOKEN).toBeUndefined();- });-- it('未连订阅 → null(回落网关远端路径)', async () => {- hasClaudeAiOAuth.mockReturnValue(false);- expect(await resolveRemoteClaudeRoute({ providerId: null, model: 'claude-opus-5' })).toBeNull();- });-- it('连了订阅但非 Anthropic 模型 → null(网关)', async () => {- hasClaudeAiOAuth.mockReturnValue(true);- getClaudeAiOAuthForSpawn.mockReturnValue({ accessToken: 'tok' });- expect(- await resolveRemoteClaudeRoute({ providerId: null, model: 'deepseek/deepseek-v4-flash' }),- ).toBeNull();- });-- it('连了订阅 + 有网关 key + Anthropic 模型 → null(镜像本地默认:全量换网关 key,不升级成直连)', async () => {- hasClaudeAiOAuth.mockReturnValue(true);- getClaudeAiOAuthForSpawn.mockReturnValue({ accessToken: 'tok-sub' });- readClaudeApiKey.mockReturnValue('gw-key');- gatewayDefaultRouteDecision.mockReturnValue({ headerOverride: { 'x-api-key': 'gw-key' } });- expect(- await resolveRemoteClaudeRoute({ providerId: null, model: 'claude-opus-5' }),- ).toBeNull();- expect(gatewayDefaultRouteDecision).toHaveBeenCalledWith('claude-code', 'gw-key');- });-- it('连了订阅、有网关 key 但网关不可用(decision null)→ Anthropic 模型仍订阅直连', async () => {- hasClaudeAiOAuth.mockReturnValue(true);- getClaudeAiOAuthForSpawn.mockReturnValue({ accessToken: 'tok-sub' });- readClaudeApiKey.mockReturnValue('gw-key');- gatewayDefaultRouteDecision.mockReturnValue(null);- const route = await resolveRemoteClaudeRoute({ providerId: null, model: 'claude-opus-5' });- expect(route!.env.CLAUDE_CODE_OAUTH_TOKEN).toBe('tok-sub');+ it.each([+ ['claude-opus-5', null],+ ['claude-opus-5', 'gw-key'],+ ['deepseek/deepseek-v4-flash', null],+ ] as const)('%s (gateway key %s) → null:远端恒走网关,不回落到 Claude 订阅', async (model, key) => {+ readClaudeApiKey.mockReturnValue(key);+ expect(await resolveRemoteClaudeRoute({ providerId: null, model })).toBeNull();+ expect(resolveProviderRouteDecision).not.toHaveBeenCalled();});});@@ -110,17 +59,15 @@ describe('resolveRemoteClaudeRoute — 显式供应商', () => {expect(resolveProviderRouteDecision).not.toHaveBeenCalled();});- it('显式 anthropic → native OAuth 订阅直连(不走 oauth-passthrough route)', async () => {- resolveProviderRouteDecision.mockResolvedValue({- providerId: 'anthropic',- routing: { upstream: 'https://api.anthropic.com', authStrategy: 'oauth-passthrough' },- decision: { upstreamOverride: 'https://api.anthropic.com' },- });- hasClaudeAiOAuth.mockReturnValue(true);- getClaudeAiOAuthForSpawn.mockReturnValue({ accessToken: 'tok-sub' });- const route = await resolveRemoteClaudeRoute({ providerId: 'anthropic', model: 'claude-opus-5' });- expect(route!.endpoint).toBe('https://api.anthropic.com');- expect(route!.env.CLAUDE_CODE_OAUTH_TOKEN).toBe('tok-sub');+ it('显式 Claude 订阅(内置 anthropic / 独立 Claude 账号)→ REMOTE_NATIVE_OAUTH_UNAVAILABLE,不下发凭证', async () => {+ getActiveCatalog.mockReturnValue({ providers: [+ { id: 'claude-work', auth: { method: 'oauth', native: 'claude' } },+ ] });+ for (const providerId of ['anthropic', 'claude-work']) {+ await expect(+ resolveRemoteClaudeRoute({ providerId, model: 'claude-opus-5' }),+ ).rejects.toThrow(/REMOTE_NATIVE_OAUTH_UNAVAILABLE/);+ }expect(resolveProviderRouteDecision).not.toHaveBeenCalled();});@@ -290,12 +237,4 @@ describe('resolveRemoteClaudeRoute — 远端无法表达的能力 → 明确报/REMOTE_PROVIDER_UNSUPPORTED/,);});-- it('订阅未连接但走到订阅直连路径 → REMOTE_NATIVE_OAUTH_UNAVAILABLE', async () => {- getClaudeAiOAuthForSpawn.mockReturnValue(null);- resolveProviderRouteDecision.mockResolvedValue(null);- await expect(- resolveRemoteClaudeRoute({ providerId: 'anthropic', model: 'claude-opus-5' }),- ).rejects.toThrow(/REMOTE_NATIVE_OAUTH_UNAVAILABLE/);- });});diff --git a/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts b/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.tsindex 367fbf3b93..947abf013b 100644--- a/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/runtimeConfigs.test.ts@@ -79,6 +79,29 @@ describe('runtime-configs', () => {expect(desktopCodexRuntimeConfig.makerMemoryEnabled).toBe(false);});+ it('Claude 订阅会话只注入 Anthropic 一方的子代理覆写;网关会话的覆写语义不变', async () => {+ let saved = 'chatgpt/gpt-5.5';+ vi.doMock('../memory-settings-store.js', () => ({+ readMemorySettings: () => memorySettings,+ }));+ vi.doMock('../subagent-model-settings-store.js', () => ({+ readSubagentModelSettings: () => ({ claudeCode: saved }),+ }));+ vi.doMock('../model-disable-store.js', () => ({ readModelDisableOverrides: () => ({}) }));+ const { buildDesktopClaudeRuntimeConfig } = await import('../runtime-configs.js');+ const config = buildDesktopClaudeRuntimeConfig(() => 'http://127.0.0.1:1234');+ const route = config.subagentModelForRoute!;++ // 订阅会话:CLI 直连 Anthropic,订阅桥 / 用户来源的模型用不了。+ expect(route('anthropic', 'oauth-bearer')).toBeUndefined();+ expect(route(null, 'oauth-bearer')).toBeUndefined();+ saved = 'glm-5';+ expect(route(null, 'oauth-bearer')).toBeUndefined();+ // 网关会话:订阅前缀由 proxy 按请求路由,照旧注入。+ saved = 'chatgpt/gpt-5.5';+ expect(route('xd', 'gateway-key')).toBe('chatgpt/gpt-5.5');+ });+it('places generic Cindy-side Skill precedence in Claude and Codex only', async () => {vi.doMock('../memory-settings-store.js', () => ({readMemorySettings: () => memorySettings,@@ -125,27 +148,27 @@ describe('runtime-configs', () => {});});-it('uses only the selected independent Claude credentials for native spawn flags', async () => {+it('never treats a retired independent Claude account as a connected subscription for spawn flags', async () => {vi.resetModules();- const readAccount = vi.fn(() => ({ accessToken: 'work-token' }));- const readBuiltin = vi.fn(() => false);+ const readBuiltin = vi.fn(() => true);vi.doMock('../active-catalog.js', () => ({ getActiveCatalog: () => ({ providers: [{ id: 'claude-work', auth: { method: 'oauth', native: 'claude' } },] }) }));- vi.doMock('../subscription-account-auth.js', () => ({ readClaudeAccountOAuth: readAccount }));- vi.doMock('../claude-credentials-store.js', () => ({ hasClaudeAiOAuth: readBuiltin }));+ vi.doMock('../claude-native-auth.js', () => ({ hasClaudeNativeLogin: readBuiltin }));try {const { buildDesktopClaudeRuntimeConfig } = await import('../runtime-configs.js');const flags = buildDesktopClaudeRuntimeConfig(() => 'http://localhost').behaviorFlags;if (typeof flags !== 'function') throw new Error('expected spawn flags');expect(flags({ credentialMode: 'provider-oauth', sessionProviderId: 'claude-work' } as never))- .toMatchObject({ CLAUDE_CODE_ATTRIBUTION_HEADER: '1', ENABLE_TOOL_SEARCH: 'auto' });- expect(readAccount).toHaveBeenCalledWith('claude-work');+ .toMatchObject({ CLAUDE_CODE_ATTRIBUTION_HEADER: '0', ENABLE_TOOL_SEARCH: 'auto' });+ // 独立账号不借用本机 Claude Code 登录的连接态。expect(readBuiltin).not.toHaveBeenCalled();+ expect(flags({ credentialMode: 'oauth-bearer', sessionProviderId: 'anthropic' } as never))+ .toMatchObject({ CLAUDE_CODE_ATTRIBUTION_HEADER: '1', ENABLE_TOOL_SEARCH: 'auto' });+ expect(readBuiltin).toHaveBeenCalledTimes(1);} finally {vi.doUnmock('../active-catalog.js');- vi.doUnmock('../subscription-account-auth.js');- vi.doUnmock('../claude-credentials-store.js');+ vi.doUnmock('../claude-native-auth.js');vi.resetModules();}});diff --git a/apps/desktop/src/main/maker-host/__tests__/subscription-account-auth.test.ts b/apps/desktop/src/main/maker-host/__tests__/subscription-account-auth.test.tsindex 1b7ba329bb..1d8036b359 100644--- a/apps/desktop/src/main/maker-host/__tests__/subscription-account-auth.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/subscription-account-auth.test.ts@@ -14,8 +14,6 @@ const state = vi.hoisted(() => ({secrets: new Map<string, string>(),login: vi.fn(),removeFails: false,- revokeDuringRefresh: false,- callbacks: [] as Array<() => void>,}));vi.mock('electron', () => ({ app: { getPath: () => state.directory } }));vi.mock('../../appSessionState.js', () => ({@@ -38,27 +36,6 @@ vi.mock('../../secrets/providerSecretStore.js', () => ({},},}));-vi.mock('../claude-credentials-store.js', () => ({- readClaudeAiOAuth: () => ({ accessToken: 'fake-local-token' }),-}));-vi.mock('../claude-oauth-refresh.js', () => ({- createClaudeOAuthRefresher: (deps: { readOAuth: () => unknown; onInvalidGrant: () => void }) => {- state.callbacks.push(deps.onInvalidGrant);- return ({- getValidOAuth: async () => {- const captured = deps.readOAuth();- if (state.revokeDuringRefresh) deps.onInvalidGrant();- return captured;- },- invalidate: vi.fn(),- backfillSubscriptionProfile: vi.fn(),- });- },-}));-vi.mock('../claude-oauth-login.js', () => ({- runClaudeOAuthLogin: (...args: unknown[]) => state.login(...args),- cancelClaudeOAuthLogin: vi.fn(),-}));vi.mock('../grok-oauth-login.js', () => ({runGrokOAuthLogin: (...args: unknown[]) => state.login(...args),getGrokAccessToken: async (id: string) => JSON.parse(state.secrets.get(`${state.scope}:${id}`) ?? 'null')?.access_token,@@ -72,26 +49,43 @@ vi.mock('../grok-oauth-login.js', () => ({vi.mock('../outbound-fetch.js', () => ({ outboundFetch: (...args: unknown[]) => state.fetch(...args) }));import {loginSubscriptionAccount,- readClaudeAccountOAuth,cancelSubscriptionAccountLogin,removeSubscriptionAccountCredentialsReversibly,resetSubscriptionAccountCaches,- getValidClaudeAccountOAuth,setSubscriptionAccountInvalidatedHandler,subscriptionAccountState,} from '../subscription-account-auth.js';+const storedToken = (id: string): string | undefined =>+ JSON.parse(state.secrets.get(`${state.scope}:${id}`) ?? 'null')?.access_token;+describe('independent subscription account credentials', () => {it.each(['result', 'throw'])('restores the previous account if login fails after persistence (%s)', async failure => {- state.secrets.set(`${state.scope}:claude-a`, JSON.stringify({ accessToken: 'fake-original' }));+ putToken('grok-a', 'fake-original');state.login.mockImplementation(async opts => {- opts.persist({ accessToken: 'fake-uncommitted' });+ opts.persist({ access_token: 'fake-uncommitted' });if (failure === 'throw') throw new Error('login failed');return { ok: false, reason: 'login failed' };});- if (failure === 'throw') await expect(loginSubscriptionAccount('claude-a', () => true)).rejects.toThrow('login failed');- else expect((await loginSubscriptionAccount('claude-a', () => true)).ok).toBe(false);- expect(readClaudeAccountOAuth('claude-a')?.accessToken).toBe('fake-original');+ if (failure === 'throw') await expect(loginSubscriptionAccount('grok-a', () => true)).rejects.toThrow('login failed');+ else expect((await loginSubscriptionAccount('grok-a', () => true)).ok).toBe(false);+ expect(storedToken('grok-a')).toBe('fake-original');+ });+ it('retired independent Claude accounts never log in, refresh or expose credentials', async () => {+ putToken('claude-a', 'fake-stored');+ await expect(loginSubscriptionAccount('claude-a', () => true)).resolves.toEqual({+ ok: false, reason: 'claude_account_retired',+ });+ expect(state.login).not.toHaveBeenCalled();+ expect(subscriptionAccountState('claude-a')).toEqual({+ authenticated: false, errorReason: 'claude_account_retired', authSource: 'oauth',+ });+ expect(await refreshSubscriptionAccountModels('claude-a')).toBe(false);+ expect(state.fetch).not.toHaveBeenCalled();+ // 已存的凭证不被静默删除;用户删除账号时才清。+ expect(storedToken('claude-a')).toBe('fake-stored');+ removeSubscriptionAccountCredentialsReversibly('claude-a');+ expect(storedToken('claude-a')).toBeUndefined();});beforeEach(async () => {state.directory = await fsp.mkdtemp(path.join(os.tmpdir(), 'cindy-account-discovery-'));@@ -107,87 +101,45 @@ describe('independent subscription account credentials', () => {state.pending = false;state.secrets.clear();state.login.mockReset();- state.callbacks = [];state.removeFails = false;- state.revokeDuringRefresh = false;setSubscriptionAccountInvalidatedHandler(() => {});});- it.each([false, true])('invalid grant disconnects only the failed account even when removal fails=%s', async (removeFails) => {- state.secrets.set(`${state.scope}:claude-a`, JSON.stringify({ accessToken: 'fake-a' }));- state.secrets.set(`${state.scope}:claude-b`, JSON.stringify({ accessToken: 'fake-b' }));- await getValidClaudeAccountOAuth('claude-a');- respondModels('claude-account-only-old');- await refreshSubscriptionAccountModels('claude-a');- await refreshSubscriptionAccountModels('claude-b');- const broadcast = vi.fn();- setSubscriptionAccountInvalidatedHandler(broadcast);- state.removeFails = removeFails;- state.callbacks[0]();- expect(broadcast).toHaveBeenCalledWith('claude-a');- expect(discoveredIds('claude-a').some(m => m.includes('account-only-old'))).toBe(false);- expect(discoveredIds('claude-b').some(m => m.includes('account-only-old'))).toBe(true);- expect(subscriptionAccountState('claude-a').authenticated).toBe(false);- expect(await getValidClaudeAccountOAuth('claude-a')).toBeNull();- expect(readClaudeAccountOAuth('claude-b')?.accessToken).toBe('fake-b');- expect(readClaudeAccountOAuth()?.accessToken).toBe('fake-local-token');- state.login.mockImplementation(async opts => { opts.persist({ accessToken: 'fake-new' }); return { ok: true }; });- await loginSubscriptionAccount('claude-a', () => true);- expect(readClaudeAccountOAuth('claude-a')?.accessToken).toBe('fake-new');- });- it('late invalid grant from an old owner cannot clear or broadcast the new owner', async () => {- await getValidClaudeAccountOAuth('claude-a');- const broadcast = vi.fn();- setSubscriptionAccountInvalidatedHandler(broadcast);- state.scope = 'owner-b:2';- state.secrets.set(`${state.scope}:claude-a`, JSON.stringify({ accessToken: 'fake-new-owner' }));- state.callbacks[0]();- expect(broadcast).not.toHaveBeenCalled();- expect(readClaudeAccountOAuth('claude-a')?.accessToken).toBe('fake-new-owner');- });- it('does not return the refresher fallback credential on the invalid-grant request itself', async () => {- state.secrets.set(`${state.scope}:claude-a`, JSON.stringify({ accessToken: 'fake-revoked' }));- state.revokeDuringRefresh = true;- state.removeFails = true;- expect(await getValidClaudeAccountOAuth('claude-a')).toBeNull();- expect(readClaudeAccountOAuth('claude-a')).toBeNull();- });- it('commits each login to its provider, preserving the local account and supporting rollback', async () => {+ it('commits each login to its provider and supports rollback', async () => {state.login.mockImplementation(async (opts) => {- opts.persist({ accessToken: 'fake-a' });+ opts.persist({ access_token: 'fake-a' });return { ok: true };});- const a = await loginSubscriptionAccount('claude-a', () => true);+ const a = await loginSubscriptionAccount('grok-a', () => true);state.login.mockImplementation(async (opts) => {- opts.persist({ accessToken: 'fake-b' });+ opts.persist({ access_token: 'fake-b' });return { ok: true };});- await loginSubscriptionAccount('claude-b', () => true);- expect(readClaudeAccountOAuth('claude-a')?.accessToken).toBe('fake-a');- expect(readClaudeAccountOAuth('claude-b')?.accessToken).toBe('fake-b');- expect(readClaudeAccountOAuth()?.accessToken).toBe('fake-local-token');+ await loginSubscriptionAccount('grok-b', () => true);+ expect(storedToken('grok-a')).toBe('fake-a');+ expect(storedToken('grok-b')).toBe('fake-b');expect(a.rollbackCredentials?.()).toBe(true);- expect(readClaudeAccountOAuth('claude-a')).toBeNull();- expect(readClaudeAccountOAuth('claude-b')?.accessToken).toBe('fake-b');+ expect(storedToken('grok-a')).toBeUndefined();+ expect(storedToken('grok-b')).toBe('fake-b');});it('cancelled late authorization cannot persist credentials', async () => {state.login.mockImplementation(async (opts) => {- cancelSubscriptionAccountLogin('claude-a');- expect(() => opts.persist({ accessToken: 'fake-late' })).toThrow('login_cancelled');+ cancelSubscriptionAccountLogin('grok-a');+ expect(() => opts.persist({ access_token: 'fake-late' })).toThrow('login_cancelled');return { ok: false };});- expect((await loginSubscriptionAccount('claude-a', () => true)).ok).toBe(false);- expect(readClaudeAccountOAuth('claude-a')).toBeNull();+ expect((await loginSubscriptionAccount('grok-a', () => true)).ok).toBe(false);+ expect(storedToken('grok-a')).toBeUndefined();});it('owner switch rejects a late result without writing to the new owner', async () => {state.login.mockImplementation(async (opts) => {state.scope = 'owner-b:2';- expect(() => opts.persist({ accessToken: 'fake-late' })).toThrow('login_cancelled');+ expect(() => opts.persist({ access_token: 'fake-late' })).toThrow('login_cancelled');return { ok: false };});- expect((await loginSubscriptionAccount('claude-a', () => true)).ok).toBe(false);+ expect((await loginSubscriptionAccount('grok-a', () => true)).ok).toBe(false);expect(state.secrets.size).toBe(0);});- it.each(['claude', 'grok'])('%s reports failed credential restoration when cancelled during catalog cleanup', async kind => {+ it.each(['grok'])('%s reports failed credential restoration when cancelled during catalog cleanup', async kind => {const id = `${kind}-a`;let checks = 0;state.login.mockImplementation(async opts => {@@ -204,7 +156,7 @@ describe('independent subscription account credentials', () => {setActiveCatalog(BUNDLED_CATALOG);await fsp.rm(state.directory, { recursive: true, force: true });});- it.each(['claude', 'grok'])('%s reconnect failure cannot reuse the previous account models', async kind => {+ it.each(['grok'])('%s reconnect failure cannot reuse the previous account models', async kind => {const id = `${kind}-a`, peer = `${kind}-b`;putToken(id, 'fake-old'); putToken(peer, 'fake-peer');respondModels('claude-account-only-old');@@ -231,7 +183,7 @@ describe('independent subscription account credentials', () => {await expect(fsp.stat(path.join(state.directory, state.scope.replaceAll(':', '_'), 'model-discovery', `${peer}-models.json`))).resolves.toBeDefined();}});- it.each(['claude', 'grok'])('%s removal and credential rollback clear only that connection discovery', async kind => {+ it.each(['grok'])('%s removal and credential rollback clear only that connection discovery', async kind => {const id = `${kind}-a`, peer = `${kind}-b`;putToken(id, 'fake-old'); putToken(peer, 'fake-peer');respondModels('claude-account-only-old');@@ -251,14 +203,15 @@ describe('independent subscription account credentials', () => {expect(discoveredIds(peer).some(m => m.includes('account-only-old'))).toBe(true);});it('credential removal is reversible and cannot replace a newer login', async () => {- state.secrets.set('owner-a:1:claude-a', JSON.stringify({ accessToken: 'fake-a' }));- const restore = removeSubscriptionAccountCredentialsReversibly('claude-a');- expect(readClaudeAccountOAuth('claude-a')).toBeNull();+ putToken('grok-a', 'fake-a');+ const restore = removeSubscriptionAccountCredentialsReversibly('grok-a');+ expect(storedToken('grok-a')).toBeUndefined();expect(restore()).toBe(true);- const staleRestore = removeSubscriptionAccountCredentialsReversibly('claude-a');- state.secrets.set('owner-a:1:claude-a', JSON.stringify({ accessToken: 'fake-new' }));+ expect(storedToken('grok-a')).toBe('fake-a');+ const staleRestore = removeSubscriptionAccountCredentialsReversibly('grok-a');+ putToken('grok-a', 'fake-new');expect(staleRestore()).toBe(false);- expect(readClaudeAccountOAuth('claude-a')?.accessToken).toBe('fake-new');+ expect(storedToken('grok-a')).toBe('fake-new');});});diff --git a/apps/desktop/src/main/maker-host/active-catalog.ts b/apps/desktop/src/main/maker-host/active-catalog.tsindex c484c3b240..d582154fa1 100644--- a/apps/desktop/src/main/maker-host/active-catalog.ts+++ b/apps/desktop/src/main/maker-host/active-catalog.ts@@ -46,6 +46,7 @@ import {BUNDLED_CATALOG,PI_REASONING_EFFORTS,buildUserProvider,+ claudeSubscriptionOnlyForClaudeCode,runtimeUserModelMetadata,clampEffortToSupported,modelDefaultEffort,@@ -1155,6 +1156,8 @@ function computeMerged(): Catalog {const remoteXdIndex = b.providers.findIndex((provider) => provider.id === 'xd');const providerSources = b.providers.filter((provider) => provider.id !== 'xd')+ // 远端目录若仍给 Claude 订阅声明 Codex / Pi 路由,按客户端合规边界收窄(见 builtin.ts)。+ .map(claudeSubscriptionOnlyForClaudeCode).map((provider) =>projectProviderMediaModels(provider, b.modelRegistry, { addDeclared: true }),);@@ -1312,43 +1315,10 @@ function computeMerged(): Catalog {};}if (providerCatalogId(p) === 'anthropic') {+ // Claude 订阅只供 Claude Code(内置 CLI 用它自己的登录),不向 Codex / Pi 投影。const seed = p.id === 'anthropic' && anthropicModels.length > 0 ? anthropicModels : (p.models['claude-code'] ?? []);const root = assembleRoot('anthropic', 'claude-code', seed, plan, false, p.id);- const remoteExcluded =- plan.roots.get(rootPlanKey('anthropic', 'claude-code'))?.bridgeExcluded ??- new Set<string>();- const excluded = resolveLocalBridgeExclusions(- p.id,- 'codex',- remoteExcluded,- localOverrides,- 'anthropic',- );- // Codex bridge 受 membership 门控且 fast=false;Pi 只用原始发现补新型号。- const codexBridge = root- .filter((m) => !excluded.has(m.id))- .map((model) =>- applyLocalConsumerOverrides(- p.id,- 'codex',- model.id,- applyLayeredConsumer(model, 'anthropic', 'codex', plan),- localOverrides,- plan.warnings,- 'anthropic',- ),- )- .map((model) => ({ ...model, supportsFastMode: false }));- return {- ...p,- models: {- ...p.models,- 'claude-code': root,- codex: codexBridge,- pi: declaredPiModels('anthropic', p.id === 'anthropic'- ? anthropicModels : discoveredByProvider.get(p.id)?.['claude-code'] ?? []),- },- };+ return { ...p, models: { 'claude-code': root } };}if (providerCatalogId(p) === 'xai') {const discovered = p.id === 'xai' ? xaiDiscoveredModels : xaiAccountModels.get(p.id) ?? null;diff --git a/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts b/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.tsindex e074f2d5a2..8d558afbf9 100644--- a/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts+++ b/apps/desktop/src/main/maker-host/anthropic-compat-proxy-host.ts@@ -45,14 +45,14 @@ import {} from '@cindy/anthropic-compat-proxy';import { buildVisionBridgeProxyTransform } from '../vision-bridge/vision-bridge-controller.js';-import { ANTHROPIC_DIRECT_UPSTREAM, CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY, anthropicCatalogModelIds, isAnthropicWireModel } from './claude-gateway-config.js';+import { CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY, anthropicCatalogModelIds, isAnthropicWireModel } from './claude-gateway-config.js';import { getActiveCatalog } from './active-catalog.js';import { providerModelRecord } from '@cindy/model-providers';import { outboundFetch } from './outbound-fetch.js';import { invocationModelRecord, requiresNativeProviderAuth } from './pi-provider-transport.js';import { createClaudeProviderBridge } from './claude-provider-bridge.js';import { isOpenAiSubscriptionProviderId } from './codex-account-auth.js';-import { isXaiSubscriptionProviderId } from './subscription-account-auth.js';+import { isClaudeSubscriptionProviderId, isXaiSubscriptionProviderId } from './subscription-account-auth.js';import {getPiNativeSubscriptionHandler,getResponsesBridgeHandler,@@ -177,10 +177,10 @@ export function setClaudeProxyGatewayKeyReader(fn: () => string | null): void {_readGatewayKey = fn;}-// cc 是否处于 oauth-spawn —— 由 host 注入(hasClaudeAiOAuth)。退役全局 authMode 后,cc 的 spawn-// 凭证形态完全由「是否连了 Claude.ai 订阅」决定(见 auth-adapters.getAuthEnv):连了 = oauth-spawn-// (带 OAuth bearer,默认须换网关 key),否则 = gateway-spawn(自带网关 key,默认 passthrough)。-// 默认 false:未注入时按 gateway-spawn 处理(passthrough),与未连订阅用户字节级一致。+// cc 是否处于 oauth-spawn(带订阅 OAuth bearer 经过本 proxy)。Claude 订阅会话现由内置 CLI+// 用它自己的登录直连 Anthropic、不经本 proxy(见 claude-native-cli),desktop 不再注入 checker:+// 经 proxy 的 cc 进程一律带网关 key / 占位 key,恒按 gateway-spawn 处理(passthrough)。+// 保留注入口只为兼容单测与其它 host。let _isOAuthSpawn: () => boolean = () => false;export function setClaudeProxyOAuthSpawnChecker(fn: () => boolean): void {_isOAuthSpawn = fn;@@ -258,6 +258,31 @@ function refuseExclusiveXaiDefaultGateway(wireModel: string): RoutingDecision {};}+/**+ * Claude 订阅只由 CLI 用自己的登录直连 Anthropic(env-builder nativeCliAuth),从不经本 proxy。+ * 请求走到需要订阅凭证的分支说明子进程 env 不对:本地拒绝,绝不把请求(可能带着 CLI 的+ * 订阅凭证)转发到 Anthropic。+ */+function refuseClaudeSubscriptionViaProxy(): RoutingDecision {+ return {+ localHandler: async ({ res }) => {+ const payload = JSON.stringify({+ type: 'error',+ error: {+ type: 'permission_error',+ code: 'anthropic_subscription_cli_only',+ message: 'The Claude subscription is only used by Claude Code with its own login.',+ },+ });+ res.writeHead(403, {+ 'content-type': 'application/json; charset=utf-8',+ 'cache-control': 'no-store',+ });+ res.end(payload);+ },+ };+}+function refuseAmbiguousImplicitProviderRoute(wireModel: string): RoutingDecision {return {localHandler: async ({ res }) => {@@ -504,7 +529,7 @@ function unavailablePiProviderRoute(providerId: string): RoutingDecision {* - 带 x-api-key(= gateway-spawn,cc 自带网关 key)→ passthrough,字节级不变。* - 不带 x-api-key(= oauth-spawn,cc 带订阅 OAuth bearer)→ 默认全量换网关 key* (覆盖 bearer + 删 anthropic-beta,防订阅 token 泄漏到网关);要走订阅须 per-session 选 Anthropic。- * **为什么看请求头而非 hasClaudeAiOAuth() live 读**:cc 进程的凭证在 spawn 时冻结,而 OAuth 连接态+ * **为什么看请求头而非连接态 live 读**:cc 进程的凭证在 spawn 时冻结,而 OAuth 连接态* 可能在会话中途变化(用户在供应商页连/断);live 读(还会每请求 shell-out 读 keychain,慢且与并发的* keychain 写竞争)会与 cc 实际持有的凭证发散,导致 OAuth bearer 被误判 passthrough 泄漏到网关 → 401。* 请求头反映的就是 cc 此刻真正握着的凭证,稳健且零 syscall(规则 10 热路径)。@@ -735,6 +760,9 @@ export function createModelRoutingTransform(): RoutingTransform {// ① 该会话显式选了供应商 → 据 catalog 统一路由。// x-claude-code-session-id = cc sdkSessionId,经注入的 resolver 反解成 xdt sessionId。if (sessionId) {+ if (requestAgent === 'claude-code' && selectedProviderId && isClaudeSubscriptionProviderId(selectedProviderId)) {+ return refuseClaudeSubscriptionViaProxy();+ }// wireModel 传给 scope 门:cc 内部辅助调用(权限 auto 分类器等 claude-* 小模型请求)// 不在订阅直连供应商(xai / openai-cc)声明的 modelPrefixes 范围内 → 返回 null,// 落到下方 ② 段 spawn 默认路由,分类器照常走网关/直连(issue #886)。@@ -882,15 +910,15 @@ export function createModelRoutingTransform(): RoutingTransform {log.warn('provider-oauth cc spawn 占位 key 且无网关 key; passthrough (预期 401)', { wireModel });return null;}- // 没网关 key:Anthropic 模型只能直连(唯一出路),其余 passthrough + 记一条诊断。- // 判据 = 前缀地板 ∪ 目录 anthropic 供应商模型集合(新家族改 OSS 目录即可,无需发版)。+ // 没有任何 Cindy 注入的凭证:Anthropic 模型只剩「带着 CLI 自己的订阅凭证直连」一条路,+ // 而订阅会话从不经本 proxy —— 本地拒绝,不中转。判据 = 前缀地板 ∪ 目录 anthropic 模型集合。if (isAnthropicWireModel(wireModel, anthropicCatalogModelIds(getActiveCatalog()))) {- recordResolvedDefaultRoute('subscription');- return { upstreamOverride: ANTHROPIC_DIRECT_UPSTREAM };+ log.warn('claude request without Cindy credentials refused (subscription is CLI-only)', { wireModel });+ return refuseClaudeSubscriptionViaProxy();}if (wireModel) {// 无 key 的非 Anthropic 模型 passthrough 大概率 401 —— 路由归属不明确, 不记录。- log.warn('claude oauth-spawn but no gateway key; non-anthropic passthrough (可能 401)', { wireModel });+ log.warn('claude request without key or gateway key; non-anthropic passthrough (可能 401)', { wireModel });}return null;}diff --git a/apps/desktop/src/main/maker-host/auth-adapters.ts b/apps/desktop/src/main/maker-host/auth-adapters.tsindex 659d5d098c..78ecd90658 100644--- a/apps/desktop/src/main/maker-host/auth-adapters.ts+++ b/apps/desktop/src/main/maker-host/auth-adapters.ts@@ -1,5 +1,5 @@import { retainInvalidatedProviderPresentation, retainProviderPresentationAfterAuthChange } from './provider-presentation-store.js';-import { subscriptionAccountKind, subscriptionAccountState, readClaudeAccountOAuth, getValidClaudeAccountOAuth } from './subscription-account-auth.js';+import { subscriptionAccountKind, subscriptionAccountState } from './subscription-account-auth.js';/*** apps/desktop/src/main/maker-host/auth-adapters.ts*@@ -54,7 +54,6 @@ import {import { getCodexCliAuthPath, getPreferredSharedCodexAuthPath, getReleaseCodexAuthPath } from './codex-shared-auth.js';export { resolveWindowsAclPrincipal } from './codex-auth-link.js';-import { claudeOAuthSpawnEnv } from './claude-oauth-spawn-env.js';import {CODEX_USER_DISCONNECT_REASON,clearInvalidatedSystemCodexAuthMarker,@@ -84,17 +83,10 @@ import {CODEX_GATEWAY_ENV_KEY,CODEX_PROVIDER_OAUTH_PLACEHOLDER_KEY,} from './codex-gateway-config.js';-import { CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY } from './claude-gateway-config.js';-import {- hasClaudeAiOAuth,-} from './claude-credentials-store.js';-import {- disconnectClaudeAiOAuth,- getClaudeAiOAuthForSpawn,- getValidClaudeAiOAuth,- invalidateClaudeOAuthRefresh,- setClaudeOAuthInvalidGrantHandler,-} from './claude-oauth-refresh.js';+import { CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY, isAnthropicWireModel } from './claude-gateway-config.js';+import { hasClaudeNativeLogin } from './claude-native-auth.js';+import { disconnectClaudeNativeLogin, readClaudeNativeLogin } from './claude-native-connection.js';+import { claudeCliConfigDirOverride, claudeCliNetworkEnv } from './claude-native-cli.js';import { isAnthropicCompatProxyHandleReady } from './anthropic-compat-proxy-host.js';import { claudeUpstreamEndpoint } from './runtime-configs.js';import { getProviderSecretStore } from '../secrets/providerSecretStore.js';@@ -551,11 +543,30 @@ export function readClaudeApiKey(): string | null {}/**- * cc 401 回调(getFreshSubscriptionToken)的总预算。必须显著小于 cc 侧- * oauth_token_refresh control 请求的 30s 超时(反编译 eqf=30000),超时快速返回 null- * 让 cc 落磁盘兜底,不把 turn 吊在锁等待 + 慢网络上。+ * 会话启动判定 Claude 订阅登录态时可接受的缓存年龄。登录态可能在 Cindy 之外变化+ * (终端里 `claude auth logout`),过期即重读 `claude auth status`(约 0.1–0.3s)。*/-export const CLAUDE_OAUTH_CALLBACK_TIMEOUT_MS = 12_000;+const CLAUDE_CLI_STATUS_MAX_AGE_MS = 60_000;++/**+ * Claude 订阅(本机 Claude Code 登录)的会话鉴权态。凭证只在 CLI 里:这里只看+ * CLI 登录态与 Cindy 使用许可,不读、不递任何 token。+ */+async function claudeNativeLoginState(): Promise<AuthState> {+ const login = await readClaudeNativeLogin({ maxAgeMs: CLAUDE_CLI_STATUS_MAX_AGE_MS });+ return login+ ? { authenticated: true, identity: 'Claude.ai · OAuth', authSource: 'oauth' }+ : { authenticated: false, errorReason: 'no_oauth' };+}++/**+ * 未指定来源的会话能否交给本机 Claude Code 登录:订阅只服务 Anthropic 一方模型。+ * 其它模型(用户来源的裸 id 等)CLI 直连会被 Anthropic 拒,仍经 loopback proxy 的+ * 隐式桥按模型路由(凭证由 host 注入,子进程只带占位 key)。未传模型的旧调用方按可服务处理。+ */+function claudeSubscriptionServesModel(model: string | undefined): boolean {+ return model === undefined || isAnthropicWireModel(model);+}/** Claude AuthAdapter —— 只回鉴权 env, endpoint / behavior flag 走 runtime-configs.ts。 */export class DesktopClaudeAuthAdapter implements AuthAdapter {@@ -564,38 +575,17 @@ export class DesktopClaudeAuthAdapter implements AuthAdapter {/** invalidate() 触发时把 auth state 推给 renderer(maker-host 装配注入,对齐 codex)。 */private onInvalidatedBroadcast?: (reason: string) => void;- constructor() {- // 订阅 refresh token 被服务端作废(锁内确认的 invalid_grant)→ 清态 + 广播重登提示,- // 不让用户停在「显示已连接、会话连环 401」的假状态。纯内存接线,构造期零文件系统- // 副作用(authAdaptersImportPurity 约定)。- setClaudeOAuthInvalidGrantHandler((digest) => {- void this.invalidateNativeCredential('claude_oauth_refresh_invalid_grant', digest).catch((error) => {- log.warn('claude invalidation cleanup failed', { error: error instanceof Error ? error.message : String(error) });- });- });- }-/** maker-host 注入: invalidate() 触发后给 renderer push auth state。 */setOnInvalidatedBroadcast(cb: (reason: string) => void): void {this.onInvalidatedBroadcast = cb;}/**- * 订阅凭证被服务端作废时:停止刷新、撤销 Cindy 使用许可并广播重新登录提示。- * 保留系统 Claude Code 凭证。+ * 本机 Claude Code 登录已失效(如在终端里 `claude auth logout`):广播重新登录提示。+ * 不撤销 Cindy 的使用许可 —— 用户在 CLI 里重新登录后无需再到 Cindy 里授权一次。*/- invalidate(reason: string): Promise<void> {- return this.invalidateNativeCredential(reason);- }-- private async invalidateNativeCredential(reason: string, rejectedCredentialDigest?: string): Promise<void> {+ async invalidate(reason: string): Promise<void> {log.warn('claude auth invalidated', { reason });- invalidateClaudeOAuthRefresh();- try {- unbindNativeProviderAuth('anthropic', { revoked: true, ...(rejectedCredentialDigest ? { rejectedCredentialDigest } : {}) });- } catch (error) {- log.warn('claude credential revocation could not be persisted', { error: error instanceof Error ? error.message : String(error) });- }const presentation = retainInvalidatedProviderPresentation('anthropic');if (this.onInvalidatedBroadcast) {try {@@ -687,37 +677,30 @@ export class DesktopClaudeAuthAdapter implements AuthAdapter {}return { authenticated: true, identity: 'Provider · Proxy', authSource: 'api-key' };}- // 连了 Claude.ai 订阅(系统 Claude Code 凭证库有 OAuth 登录,或经本 app 浏览器授权写入)- // → cc 走 oauth-spawn:子进程携带订阅 OAuth token,因此「Anthropic 订阅」成为本会话可- // per-session 选中的来源(选中即直连 api.anthropic.com)。默认仍走网关(网关 key 由 proxy- // 旁路按请求注入)。授权≠自动走订阅,要在模型列表显式选中才走。- // per-session / 默认路由强依赖 loopback proxy,proxy 没起来直接拒授权,fail-closed ——- // 不让「OAuth token + 直连」裸奔(规则 9)。- if (hasClaudeAiOAuth()) {- if (!isAnthropicCompatProxyHandleReady()) {- return { authenticated: false, errorReason: 'proxy_not_ready' };- }- return { authenticated: true, identity: 'Claude.ai · OAuth', authSource: 'oauth' };- }+ // Claude 订阅:由 CLI 用本机 Claude Code 的登录直连 Anthropic(不经 loopback proxy)。if (options?.credentialMode === 'oauth-bearer') {- return { authenticated: false, errorReason: 'no_oauth' };+ return claudeNativeLoginState();}- // 未连订阅 → gateway-spawn:鉴权前提 = XD 网关 key 存在(现状,字节级不变)。- const apiKey = readClaudeApiKey();- return apiKey ? { authenticated: true } : { authenticated: false, errorReason: 'no_key' };+ // 未指定来源:有网关 key 就走网关(与未连订阅时一致);没有才交给本机 Claude Code+ // 登录(authSource 'oauth' → maker-core 按订阅会话起 CLI,见 env-builder nativeCliAuth)。+ // 非 Anthropic 模型不交给订阅:不带 authSource,仍经 proxy 隐式桥(getAuthEnv 给占位 key)。+ if (readClaudeApiKey()) return { authenticated: true };+ const native = await claudeNativeLoginState();+ if (!native.authenticated) return { authenticated: false, errorReason: 'no_key' };+ return claudeSubscriptionServesModel(options?.model) ? native : { authenticated: true };}async triggerLogin(): Promise<AuthState> {- // Claude 登录入口在 renderer:gateway 模式走 useApiKey hook 填 gateway key;- // oauth 模式走 Settings 里粘贴 `claude setup-token` 产出的 token(CLAUDE_OAUTH_TOKEN_SET IPC)。- // main 侧无 spawn 式登录流程,保留此位为扩展位。- throw new Error('use renderer (useApiKey / Claude OAuth token paste) to trigger Claude login');+ // Claude 登录入口在 renderer:网关 key 走 useApiKey hook;Claude 订阅走设置页的+ // CLAUDE_OAUTH_LOGIN IPC(拉起内置 CLI 的 `claude auth login`,见 claude-native-cli)。+ throw new Error('use renderer (useApiKey / Claude Code login in Settings) to trigger Claude login');}async logout(): Promise<void> {// Only disconnect Cindy's native subscription binding; keep system and Gateway credentials.- if (hasClaudeAiOAuth() || isNativeProviderAuthRevoked('anthropic')) {- await disconnectClaudeAiOAuth();+ // 看绑定而不是内存里的 CLI 登录态:登录态未读到时也不能误删网关 key。+ if (isNativeProviderAuthBound('anthropic') || isNativeProviderAuthRevoked('anthropic')) {+ await disconnectClaudeNativeLogin();return;}// 经统一 store 移除本机 XD 网关 key。store.remove 把"文件本不存在"视为成功@@ -736,39 +719,25 @@ export class DesktopClaudeAuthAdapter implements AuthAdapter {await this.ensureSharedGlobalSkills();const env: Record<string, string> = {};if (options?.providerId && subscriptionAccountKind(options.providerId) === 'claude') {- const oauth = readClaudeAccountOAuth(options.providerId);- if (!oauth) throw new Error('Claude account requires login');- Object.assign(env, claudeOAuthSpawnEnv(oauth), { CINDY_CLAUDE_ACCOUNT_PROVIDER_ID: options.providerId });+ // 独立 Claude 账号已停用(getState 拒绝授权),不递任何凭证。} else if (options?.credentialMode === 'gateway-key') {const apiKey = readClaudeApiKey();if (apiKey) env.ANTHROPIC_API_KEY = apiKey;} else if (options?.credentialMode === 'provider-oauth') {// 真实供应商凭证只留在 host/proxy;占位 key 仅用于通过 CC CLI 本地鉴权检查。env.ANTHROPIC_API_KEY = CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY;- } else if (hasClaudeAiOAuth()) {- // 连了订阅(oauth-spawn):经 CLAUDE_CODE_OAUTH_TOKEN 显式把订阅 access token 递给- // cc 子进程(官方桌面宿主协议)。cc 2.1.198 起 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST- // (env-builder 无条件注入) 的语义扩大为「凭证也由 host 全权提供」—— 设了 flag 的子进程- // **完全不读**系统凭证库,旧的「不注入、让 cc 自读 ~/.claude」方案在新 CLI 上直接- // "Not logged in"(2026-07-03 线上事故:0.0.139 升 cc 2.1.186→2.1.198 后订阅会话全挂)。- // token 到期刷新随之转移到 host:getClaudeAiOAuthForSpawn **不阻塞 spawn**——立即- // 注入现值,临期只触发后台单飞刷新(新会话首响应不吃刷新 RTT,规则 10);旧 token 若- // 已彻底失效,turn 中的 401 由 SDK getOAuthToken 回调走 getFreshSubscriptionToken 兜底。- // scopes / subscriptionType / rateLimitTier 一并递入 —— cc env-token 分支默认 scopes 只有- // user:inference,不递会丢订阅身份细节(feature gate / beta header 判定用)。- // **绝不**注入 ANTHROPIC_API_KEY —— 它与 OAuth 共存会触发 cc 的 shouldDisableAuth 反而- // 关掉 Anthropic 鉴权(计划 R4)。provider 路由模型要用的 gateway key 不走子进程 env,- // 由本地 proxy 旁路注入(setClaudeProxyGatewayKeyReader)。- // (getState 已 gate:无凭证 / proxy 没起来时不授权,不会裸奔到这里 spawn。)- const oauth = getClaudeAiOAuthForSpawn();- if (oauth?.accessToken) {- Object.assign(env, claudeOAuthSpawnEnv(oauth));- }} else if (options?.credentialMode === 'oauth-bearer') {- // 显式订阅模式没有 OAuth 时,getState 已 fail-closed;这里保持不注入 key。+ // Claude 订阅:不递凭证,CLI 读自己的登录;只补系统代理(CLI 不读系统代理设置)。+ Object.assign(env, await claudeCliNetworkEnv());} else {+ // 未指定来源:与 getState 同序 —— 有网关 key 走网关;否则 Anthropic 模型交给本机+ // Claude Code 登录,其它模型经 proxy 隐式桥(只带占位 key,真实凭证由 proxy 注入)。const apiKey = readClaudeApiKey();if (apiKey) env.ANTHROPIC_API_KEY = apiKey;+ else if (hasClaudeNativeLogin()) {+ if (claudeSubscriptionServesModel(options?.model)) Object.assign(env, await claudeCliNetworkEnv());+ else env.ANTHROPIC_API_KEY = CLAUDE_PROVIDER_AUTH_PLACEHOLDER_KEY;+ }}// dev 多实例隔离:设了 XDT_USER_DATA_DIR(device-link 本地联调跑多实例)时,把// Claude Code 的配置目录也切到 userData 下。否则多实例共用全局 ~/.claude@@ -776,57 +745,27 @@ export class DesktopClaudeAuthAdapter implements AuthAdapter {// 仅 dev(非 packaged)生效,生产忽略;auth 走 ANTHROPIC_API_KEY,重定向 config// dir 不影响鉴权。process.env 路线行不通(CLAUDE_CONFIG_DIR 在 boot 期被// stripSensitiveAnthropicEnv 清掉),故经 getAuthEnv 注入子进程 env(覆盖优先)。- if (process.env.XDT_USER_DATA_DIR && !app.isPackaged && !process.env.CLAUDE_CONFIG_DIR) {- env.CLAUDE_CONFIG_DIR = path.join(app.getPath('userData'), 'claude-home');- }+ const configDir = claudeCliConfigDirOverride();+ if (configDir) env.CLAUDE_CONFIG_DIR = configDir;return env;}/*** host 侧直连 LLM 调用(oneShot 起标题 / skillReview)的凭证。*- * 仅连了订阅(oauth-spawn)时需要特殊处理:此时 getAuthEnv() 不带 ANTHROPIC_API_KEY(只注入订阅 token),- * oneShot 拿不到 key。固定回 gateway key + **直连 gateway endpoint**(绕开 loopback proxy 的- * 路由)—— 避免 oneShot 这种无 system prompt 的轻任务被路由去 api.anthropic.com 撞- * claude.ai OAuth 策略(无 Claude Code 身份段会被拒)。+ * 连了 Claude 订阅时固定回 gateway key + **直连 gateway endpoint**(绕开 loopback proxy 的+ * 路由)—— host 自己的请求绝不使用订阅(订阅只归 CLI)。* 未连订阅回 null → oneShot 走旧路径(getAuthEnv.ANTHROPIC_API_KEY + runtimeConfig.endpoint),零改动。*/async getOneShotAuth(): Promise<{ apiKey: string; baseURL?: string } | null> {- if (!hasClaudeAiOAuth()) return null;+ if (!hasClaudeNativeLogin()) return null;const apiKey = readClaudeApiKey();if (!apiKey) return null;return { apiKey, baseURL: claudeUpstreamEndpoint() };}- /**- * cc 子进程 turn 中途 401 时经 SDK oauth_token_refresh control 回调走到这里- * (见 maker-core claude-code getOAuthToken 接线)。forceRefresh 语义 = 锁内比对后- * 按需刷:凭证库已比失败 token 新 → 直接返回不刷(防多会话同时 401 连环旋转);- * 仍旧才单飞刷新;失败返回 null(绝不把已知坏 token 递回去)。- *- * 超时预算 12s —— 必须显著小于 cc 侧 control 请求的 30s(反编译 eqf=30000):- * 超时快速返回 null 让 cc 落磁盘兜底(host 刷新总会写回凭证库,在途刷新即使超过- * 预算也会完成写回,cc 第二条恢复路 tengu_oauth_401_recovered_from_disk 能捡到),- * 不把整个 turn 吊在一次慢网络上。- */- async getFreshSubscriptionToken(staleToken?: string, providerId?: string): Promise<string | null> {- if (providerId && subscriptionAccountKind(providerId) !== 'claude') return null;- const timeout = new Promise<null>((resolve) =>- setTimeout(() => resolve(null), CLAUDE_OAUTH_CALLBACK_TIMEOUT_MS).unref?.(),- );- // staleToken = 该会话实际撞 401 的那枚(spawn 注入 / 上次回调返回)。库值已比它新- // (后台预续期换代)时刷新器直接返回库值,不再消耗一次轮换 —— 防多个长会话对同- // 一枚旧 token 群体 401 时串行连环旋转。- const refresh = (providerId- ? getValidClaudeAccountOAuth(providerId, { forceRefresh: true, staleToken })- : getValidClaudeAiOAuth({ forceRefresh: true, staleToken })).then(- (oauth) => oauth?.accessToken ?? null,- );- return Promise.race([refresh, timeout]);- }-- // cancelLogin 不实现 —— Claude 走 renderer useApiKey hook 的同步弹窗式登录,- // 没有需要 abort 的子进程。BaseAgent.cancelLogin 调到这里时是 no-op (interface 可选)。+ // getFreshSubscriptionToken 不实现 —— 订阅 token 由 CLI 自己刷新,Cindy 不持有。+ // cancelLogin 不实现 —— Claude 登录由设置页经 CLAUDE_OAUTH_LOGIN IPC 拉起 CLI(可取消)。}// ═════════════════════════════════════════════════════════════════════════════diff --git a/apps/desktop/src/main/maker-host/auto-review-model-router.ts b/apps/desktop/src/main/maker-host/auto-review-model-router.tsindex 722bb626ee..8c4d92d7f9 100644--- a/apps/desktop/src/main/maker-host/auto-review-model-router.ts+++ b/apps/desktop/src/main/maker-host/auto-review-model-router.ts@@ -9,7 +9,12 @@ import {import { parseAutoPermissionReviewDecision } from './auto-permission-reviewer.js';export const AUTO_REVIEW_CANDIDATE_TIMEOUT_MS = 12_000;-export const AUTO_REVIEW_CHAIN_TIMEOUT_MS = 52_000;+/**+ * 整条链的预算 = 每个候选一次完整超时 + 4s 余量。按候选数推导:预算只够「逐个兜底」,+ * 一个候选整段超时后直接让给下一个,而不是在原位重试吃掉后续候选的时间。+ */+export const AUTO_REVIEW_CHAIN_TIMEOUT_MS =+ DEDICATED_AUTO_REVIEW_CANDIDATES.length * AUTO_REVIEW_CANDIDATE_TIMEOUT_MS + 4_000;export const AUTO_REVIEW_ROUTER_GUARD_TIMEOUT_MS = AUTO_REVIEW_CHAIN_TIMEOUT_MS + 1_000;const AUTO_REVIEW_TRANSIENT_RETRY_ATTEMPTS = 2;const AUTO_REVIEW_TRANSIENT_RETRY_BACKOFF_MS = 100;diff --git a/apps/desktop/src/main/maker-host/claude-behavior-flags.ts b/apps/desktop/src/main/maker-host/claude-behavior-flags.tsindex 524b86929a..0bce1de137 100644--- a/apps/desktop/src/main/maker-host/claude-behavior-flags.ts+++ b/apps/desktop/src/main/maker-host/claude-behavior-flags.ts@@ -10,17 +10,16 @@* system 数组第一个 text block 注入 body)能提升网关按完整 body 缓存的命中率* → 保持 '0'(与 remote-ssh/claude-env.ts 一致)。**此分支不读钥匙串**。*- * - 其余形态(oauth-bearer / provider-oauth / 未显式指定)且连了 Claude.ai 订阅:- * claude-* 请求(含 Auto 分类器的 scope-gate 回落)可能被 compat proxy 路由到- * api.anthropic.com 直连,Anthropic 一方 API 会对**无归因**的 Auto 权限分类器+ * - oauth-bearer(显式 Claude 订阅)或未显式指定来源,且连了 Claude 订阅:CLI 可能用+ * 本机登录直连 api.anthropic.com,Anthropic 一方 API 会对**无归因**的 Auto 权限分类器* 子请求回 429 —— 分类器 100% 失败,auto 模式所有写操作 fail-closed,用户无法- * 自救。保持 CLI 默认(带归因);代价只是该 spawn 中路由到网关的请求丢缓存归一化- * (慢一点,功能无损)。未连订阅时不存在直连路径,回到 '0'。+ * 自救。保持 CLI 默认(带归因);代价只是隐式会话中走网关的请求丢缓存归一化+ * (慢一点,功能无损)。+ * - provider-oauth 恒经 compat proxy,而 proxy 不再直连 Anthropic;未连订阅时也不存在+ * 直连路径 —— 都回到 '0'。*- * oauth 判据与 compat proxy 的 oauth-spawn 判定同源(hasClaudeAiOAuth,见- * anthropic-compat-proxy-host.ts setClaudeProxyOAuthSpawnChecker),经 `oauthConnected`- * 回调惰性注入 —— 只在非 gateway-key 分支才求值,每次 spawn 至多一次钥匙串读- * (与 spawn 期 auth gate 的既有读取同级,非 per-request 路径)。本模块保持零依赖,+ * oauth 判据是「Cindy 已连接本机 Claude Code 登录」(hasClaudeNativeLogin,内存缓存),经+ * `oauthConnected` 回调惰性注入 —— 只在非 gateway-key 分支才求值。本模块保持零依赖,* 便于单测。*/@@ -53,7 +52,11 @@ export interface ClaudeSpawnFlagsContext {}export function claudeBehaviorFlagsForSpawn(ctx: ClaudeSpawnFlagsContext): Record<string, string> {- const keepAttribution = ctx.credentialMode !== 'gateway-key' && ctx.oauthConnected();+ // 只有可能由 CLI 用本机登录直连 Anthropic 的 spawn 才保留归因:显式 Claude 订阅+ // (oauth-bearer),或未指定来源且连了订阅。provider-oauth 恒经 proxy(proxy 也不再直连+ // Anthropic),与未连订阅时一样禁归因。+ const keepAttribution =+ (ctx.credentialMode === 'oauth-bearer' || ctx.credentialMode === undefined) && ctx.oauthConnected();// 保留归因也要**显式**写 '1',不能只是不设置:local spawn 继承宿主 process.env// (env-builder cleanProcessEnv),用户 shell 若 export 过 CLAUDE_CODE_ATTRIBUTION_HEADER=0,// 缺席的 key 压不住继承值,#758 会原样复现。CLI 判定(cli.js c5):仅diff --git a/apps/desktop/src/main/maker-host/claude-cli-proxy-bridge.ts b/apps/desktop/src/main/maker-host/claude-cli-proxy-bridge.tsnew file mode 100644index 0000000000..2c018d2bfa--- /dev/null+++ b/apps/desktop/src/main/maker-host/claude-cli-proxy-bridge.ts@@ -0,0 +1,215 @@+/**+ * claude-cli-proxy-bridge —— 给 Claude Code CLI 用的本机 CONNECT 代理,按目标逐条套用系统代理。+ *+ * Claude 订阅会话由 CLI 直连 Anthropic(见 claude-native-cli)。CLI 只认 HTTPS_PROXY 环境+ * 变量,不读系统代理 / PAC,也不支持 SOCKS;而环境变量对整棵进程树生效 —— 直接把「对+ * api.anthropic.com 解析出的系统代理」写进去,Bash 工具里的 git / npm 访问内网也会被强制+ * 走这个代理,系统的例外列表与 PAC 规则全部丢失。+ *+ * 这里在 127.0.0.1 起一个只接受 CONNECT 的端口,每条隧道按**目标主机**重新解析出口+ * (与本地 proxy 同一个解析器:代理 env 优先,其次系统代理 / PAC):+ * - 直连 / PAC 例外 → 直接连目标;+ * - HTTP 代理 → 经上游 CONNECT;+ * - SOCKS5 代理 → 经 SOCKS5 打隧道。+ * 纯 TCP 转发,TLS 在客户端与目标之间端到端,这里看不到请求内容与凭证。明文 HTTP 请求+ * 一律 405,不做正向代理。只监听回环地址,按需启动,整个进程生命周期复用一个端口。+ */++import http from 'node:http';+import { connect as netConnect, type Socket } from 'node:net';++import { parseOutboundProxyUrl, socks5Connect, type OutboundProxyTarget } from '@cindy/anthropic-compat-proxy';++import { createLogger } from '../logger.js';++const log = createLogger('claude-cli-proxy-bridge');++/** 上游建连(直连 / CONNECT / SOCKS 握手)整体超时。 */+const UPSTREAM_CONNECT_TIMEOUT_MS = 15_000;++/** 按目标 URL 解析出口:返回代理地址(http:// / socks5://),null = 直连。 */+export type ClaudeCliProxyResolver = (+ targetUrl: string,+) => string | null | undefined | Promise<string | null | undefined>;++let server: http.Server | null = null;+let listening: Promise<string> | null = null;+let resolveRoute: ClaudeCliProxyResolver | null = null;+const sockets = new Set<Socket>();++function parseConnectAuthority(authority: string | undefined): { host: string; port: number } | null {+ if (!authority) return null;+ let url: URL;+ try {+ url = new URL(`http://${authority}`);+ } catch {+ return null;+ }+ // URL 会把 http 默认端口 80 规范化成空串,空串时从原始 authority 取。+ const port = Number(url.port || /:(\d+)$/.exec(authority)?.[1] || '');+ if (!url.hostname || !Number.isInteger(port) || port <= 0 || port > 65535) return null;+ if (url.pathname !== '/' || url.search || url.username || url.password) return null;+ const host = url.hostname.startsWith('[') ? url.hostname.slice(1, -1) : url.hostname;+ return { host, port };+}++/** `host:port`,IPv6 字面量加方括号。 */+function formatAuthority(host: string, port: number): string {+ return host.includes(':') ? `[${host}]:${port}` : `${host}:${port}`;+}++/** 解析器按 URL 判定出口(PAC / NO_PROXY 都按主机名与端口匹配)。 */+function targetUrlOf(host: string, port: number): string {+ const hostPart = host.includes(':') ? `[${host}]` : host;+ return port === 443 ? `https://${hostPart}/` : `https://${hostPart}:${port}/`;+}++function track(socket: Socket): void {+ sockets.add(socket);+ socket.once('close', () => sockets.delete(socket));+}++function connectDirect(host: string, port: number): Promise<Socket> {+ return new Promise((resolve, reject) => {+ const socket = netConnect({ host, port });+ const timer = setTimeout(() => socket.destroy(new Error(`connect ${host}:${port} timed out`)), UPSTREAM_CONNECT_TIMEOUT_MS);+ timer.unref?.();+ socket.once('connect', () => {+ clearTimeout(timer);+ socket.removeListener('error', reject);+ resolve(socket);+ });+ socket.once('error', (err) => {+ clearTimeout(timer);+ reject(err);+ });+ });+}++function connectViaHttpProxy(proxy: OutboundProxyTarget, host: string, port: number): Promise<Socket> {+ const authority = formatAuthority(host, port);+ return new Promise((resolve, reject) => {+ const req = http.request({+ host: proxy.hostname,+ port: proxy.port,+ method: 'CONNECT',+ path: authority,+ headers: {+ host: authority,+ ...(proxy.authHeader ? { 'proxy-authorization': proxy.authHeader } : {}),+ },+ agent: false,+ timeout: UPSTREAM_CONNECT_TIMEOUT_MS,+ });+ req.once('connect', (res, socket, head) => {+ if (res.statusCode !== 200) {+ socket.destroy();+ reject(new Error(`outbound proxy ${proxy.url} CONNECT ${authority} failed: HTTP ${res.statusCode}`));+ return;+ }+ if (head.length > 0) socket.unshift(head);+ resolve(socket);+ });+ req.once('timeout', () => req.destroy(new Error(`outbound proxy ${proxy.url} CONNECT ${authority} timed out`)));+ req.once('error', reject);+ req.end();+ });+}++async function openUpstream(host: string, port: number): Promise<Socket> {+ const raw = resolveRoute ? await resolveRoute(targetUrlOf(host, port)) : null;+ const proxy = parseOutboundProxyUrl(raw);+ if (!proxy) return connectDirect(host, port);+ if (proxy.kind === 'socks5') return socks5Connect(proxy, host, port);+ return connectViaHttpProxy(proxy, host, port);+}++function handleConnect(req: http.IncomingMessage, client: Socket, head: Buffer): void {+ track(client);+ client.on('error', () => client.destroy());+ const target = parseConnectAuthority(req.url);+ if (!target) {+ client.end('HTTP/1.1 400 Bad Request\r\n\r\n');+ return;+ }+ openUpstream(target.host, target.port).then(+ (remote) => {+ track(remote);+ if (client.destroyed) {+ remote.destroy();+ return;+ }+ const closeBoth = () => {+ remote.destroy();+ client.destroy();+ };+ remote.on('error', closeBoth);+ client.on('error', closeBoth);+ remote.once('close', () => client.destroy());+ client.once('close', () => remote.destroy());+ client.write('HTTP/1.1 200 Connection Established\r\n\r\n');+ if (head.length > 0) remote.write(head);+ remote.pipe(client);+ client.pipe(remote);+ },+ (err: unknown) => {+ log.warn('proxy bridge tunnel failed', {+ target: formatAuthority(target.host, target.port),+ message: err instanceof Error ? err.message : String(err),+ });+ if (!client.destroyed) client.end('HTTP/1.1 502 Bad Gateway\r\n\r\n');+ },+ );+}++/**+ * 确保桥已监听,返回可作为 HTTPS_PROXY 的地址(`http://127.0.0.1:<port>`)。+ * resolver 按目标解析出口;之后新建的隧道都用最近一次给的 resolver。+ */+export function ensureClaudeCliProxyBridge(resolver: ClaudeCliProxyResolver): Promise<string> {+ resolveRoute = resolver;+ if (listening) return listening;+ const srv = http.createServer((_req, res) => {+ res.writeHead(405, { 'content-type': 'text/plain', connection: 'close' });+ res.end('CONNECT only\n');+ });+ srv.on('connect', handleConnect);+ srv.on('clientError', (_err, socket) => socket.destroy());+ const pending = new Promise<string>((resolve, reject) => {+ srv.once('error', reject);+ srv.listen(0, '127.0.0.1', () => {+ srv.off('error', reject);+ srv.on('error', (err) => log.warn('proxy bridge server error', { message: err.message }));+ const address = srv.address();+ if (!address || typeof address === 'string') {+ reject(new Error('proxy bridge has no port'));+ return;+ }+ srv.unref();+ log.info('proxy bridge listening', { port: address.port });+ resolve(`http://127.0.0.1:${address.port}`);+ });+ });+ server = srv;+ listening = pending;+ pending.catch((err: unknown) => {+ log.warn('proxy bridge failed to start', { message: err instanceof Error ? err.message : String(err) });+ if (listening === pending) {+ listening = null;+ server = null;+ }+ });+ return pending;+}++/** 关闭桥与所有隧道(app 退出、单测)。 */+export function closeClaudeCliProxyBridge(): Promise<void> {+ const srv = server;+ server = null;+ listening = null;+ resolveRoute = null;+ for (const socket of sockets) socket.destroy();+ sockets.clear();+ if (!srv) return Promise.resolve();+ return new Promise((resolve) => srv.close(() => resolve()));+}diff --git a/apps/desktop/src/main/maker-host/claude-credentials-blob.ts b/apps/desktop/src/main/maker-host/claude-credentials-blob.tsdeleted file mode 100644index c8c01e3f95..0000000000--- a/apps/desktop/src/main/maker-host/claude-credentials-blob.ts+++ /dev/null@@ -1,79 +0,0 @@-/**- * claude-credentials-blob —— Claude Code 共享凭证 blob 的**纯逻辑** helper。- *- * 故意不 import electron / logger / fs —— 这样可脱离 Electron 直接单测(规则 14),- * 也把「写策略决策 / 登出裁剪计划 / 写后校验」这几处确定性逻辑从 IO 里拆出来(规则 9)。- * 真正的 keychain / 文件 IO 在 claude-credentials-store.ts。- */--/**- * macOS `security -i`(stdin 交互解释器)的输入行缓冲上限约 4096 字节。超过后它会- * **静默截断**那一行、用截断后的 hex 解码出半截 JSON 写进 keychain,并以 exit 1 收场 ——- * 即「写失败 + 留下损坏值」。实测:整条命令行(add-generic-password 前缀 + hex + 引号)- * ≈4041B 仍 OK、≈4141B 即截断。阈值按整行长度判定,留足余量到 3900。- */-export const KEYCHAIN_INTERACTIVE_LINE_LIMIT = 3900;--/**- * 决定 keychain 写入走哪条路:- * - 'stdin': 经 `security -i` 喂命令(hex 不出现在 argv/ps,隐私更好),仅适用于不超限的小 blob。- * - 'argv' : 直接 `security add-generic-password ... -X <hex>`,hex 走 argv(ARG_MAX≈1MB,- * 远超 keychain 实际体量,不会被截断)。代价是 hex 短暂出现在同用户可见的 argv。- *- * @param interactiveCommandLength 走 stdin 时那一整行命令(含前缀与 hex)的字符长度。- */-export function decideKeychainWriteMode(interactiveCommandLength: number): 'stdin' | 'argv' {- return interactiveCommandLength <= KEYCHAIN_INTERACTIVE_LINE_LIMIT ? 'stdin' : 'argv';-}--/** 登出(清除 claudeAiOauth)的落地计划。 */-export type ClaudeOAuthClearPlan =- /** 凭证库本就没有任何 blob —— 什么都不做。 */- | { action: 'noop' }- /** 删掉 claudeAiOauth 后整个 blob 空了 —— 可以删掉整条 keychain 条目 / 文件。 */- | { action: 'delete' }- /** blob 里还有其它字段(cc 的 mcpOAuth 等)—— 必须写回裁剪后的整块,不能删条目。 */- | { action: 'write'; next: Record<string, unknown> };--/**- * 计算「清除 claudeAiOauth」该如何落地。- *- * 关键不变量:Claude Code 把它**所有**凭证(claudeAiOauth 订阅登录 + 每个 MCP server 的- * mcpOAuth token + 其它)塞在同一个 keychain 值里。删掉 claudeAiOauth 后若仍有其它字段,- * 必须写回裁剪后的整块、而**不能**删掉整条条目 —— 否则会连带抹掉用户本机 `claude` CLI 的- * MCP 登录等数据。返回 'write' 时 next 已剔除 claudeAiOauth、保留其余字段(浅拷贝,不改入参)。- */-export function planClaudeAiOAuthClear(- blob: Record<string, unknown> | null,-): ClaudeOAuthClearPlan {- if (!blob) return { action: 'noop' };- const next = { ...blob };- delete next.claudeAiOauth;- if (Object.keys(next).length === 0) return { action: 'delete' };- return { action: 'write', next };-}--/**- * 写后回读校验:把回读到的**原始文本**解析后与期望逐字节比对(re-stringify 后比 compact JSON,- * 故 keychain 的 compact 存法与文件的 pretty 存法都能正确匹配)。- *- * 任一后端若写入被截断 / 部分写,回读文本要么 JSON.parse 失败、要么内容对不上 —— 都返 false,- * 调用方据此抛错,杜绝「写坏了却无人察觉」(本 bug 根因)。- *- * @param expectedJson 期望写入的 compact JSON(= `JSON.stringify(blob)`)。- * @param actualStoredText 回读到的原始存储文本;null 表示条目缺失 / 读不到。- */-export function blobRoundtrips(expectedJson: string, actualStoredText: string | null): boolean {- if (actualStoredText == null) return false;- let parsed: unknown;- try {- parsed = JSON.parse(actualStoredText.trim());- } catch {- return false;- }- try {- return JSON.stringify(parsed) === expectedJson;- } catch {- return false;- }-}diff --git a/apps/desktop/src/main/maker-host/claude-credentials-store.ts b/apps/desktop/src/main/maker-host/claude-credentials-store.tsdeleted file mode 100644index e13fd17e20..0000000000--- a/apps/desktop/src/main/maker-host/claude-credentials-store.ts+++ /dev/null@@ -1,243 +0,0 @@-/**- * claude-credentials-store —— 读/写系统 Claude Code 的 OAuth 凭证(claudeAiOauth)。- *- * 设计目标:'oauth' 模式下与**本地已登录的 Claude Code 自动兼容**(像 Codex reconcile- * ~/.codex/auth.json 那样),并让 Cindy 的浏览器授权结果落到同一处,cc 子进程原生读取。- *- * 存储位置(与 cc-code utils/secureStorage 完全一致,默认 config dir = ~/.claude):- * - macOS → 系统 Keychain 的 generic-password,service = "Claude Code-credentials"- * (经 /usr/bin/security CLI 读写 —— 与 cc 同一访问者二进制,不触发额外 ACL 弹窗)- * - 其它 → <~/.claude>/.credentials.json 明文文件- *- * blob 形态(顶层对象,可能含 cc 写的其它字段,**读改写时保留**):- * { "claudeAiOauth": { accessToken, refreshToken, expiresAt, scopes, subscriptionType, ... }, ... }- *- * 我们只读 / 写 `claudeAiOauth` 这一段。token 到期刷新由 host 负责(claude-oauth-refresh,- * 刷新结果写回本 store)—— cc >= 2.1.198 在 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST 下不再- * 自读本凭证库,凭证经 env 显式递入子进程,cc 侧无 refresh token 可用(见 auth-adapters)。- */--import os from 'node:os';-import path from 'node:path';-import fs from 'node:fs';-import { createHash } from 'node:crypto';-import { execFileSync } from 'node:child_process';--import { desktopMakerLogger } from './logger-adapter.js';-import {- blobRoundtrips,- decideKeychainWriteMode,- planClaudeAiOAuthClear,-} from './claude-credentials-blob.js';-import { isNativeProviderAuthBound, isNativeProviderCredentialRejected } from './nativeProviderAuthBinding.js';--const log = desktopMakerLogger.child('claude-credentials-store');--/** 默认 config dir(prod、无 CLAUDE_CONFIG_DIR override 时)= ~/.claude。 */-function claudeConfigDir(): string {- return process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');-}--/** macOS Keychain service 名 —— 对齐 cc getMacOsKeychainStorageServiceName(prod 默认目录无后缀)。 */-const KEYCHAIN_SERVICE = 'Claude Code-credentials';--function keychainAccount(): string {- try {- return process.env.USER || os.userInfo().username;- } catch {- return 'claude-code-user';- }-}--function credentialsFilePath(): string {- return path.join(claudeConfigDir(), '.credentials.json');-}--/** OAuth 凭证段(claudeAiOauth)。 */-export interface ClaudeAiOAuth {- accessToken: string;- refreshToken?: string | null;- expiresAt?: number | null;- scopes?: string[];- subscriptionType?: string | null;- rateLimitTier?: string | null;- [k: string]: unknown;-}--// ── 整个 blob 的读写(保留 claudeAiOauth 以外的字段) ───────────────────────────--/** 读 keychain 条目的**原始文本值**(JSON 字符串);条目不存在 / 读不到 → null。 */-function readBlobRawMac(): string | null {- try {- const out = execFileSync(- 'security',- ['find-generic-password', '-a', keychainAccount(), '-w', '-s', KEYCHAIN_SERVICE],- { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] },- );- const text = out.trim();- return text.length > 0 ? text : null;- } catch {- // 条目不存在 → 视为无凭证- return null;- }-}--/**- * 写 keychain 条目。- *- * 历史坑:原实现固定走 `security -i`(stdin 交互模式,目的是 hex 不出现在 ps/argv)。但该- * 交互解释器输入行缓冲 ~4096B,**大 blob 会被静默截断**写入损坏值并 exit 1 —— 用户在同一- * keychain 条目里存了多个 cc mcpOAuth token 时极易触发(登录 / 登出都中招)。- * 现按整行命令长度分流:不超限走 stdin(保留隐私属性),超限改走直接 argv 传 hex- * (ARG_MAX≈1MB,不截断),代价仅是大 blob 时 hex 短暂出现在同用户可见的 argv(规则 9:- * 用代码确保写入确定性,而非赌 blob 不会变大)。- */-function writeBlobMac(blob: Record<string, unknown>): void {- const json = JSON.stringify(blob);- const hex = Buffer.from(json, 'utf-8').toString('hex');- const interactiveCmd = `add-generic-password -U -a "${keychainAccount()}" -s "${KEYCHAIN_SERVICE}" -X "${hex}"\n`;- if (decideKeychainWriteMode(interactiveCmd.length) === 'stdin') {- execFileSync('security', ['-i'], { input: interactiveCmd, stdio: ['pipe', 'ignore', 'ignore'] });- } else {- execFileSync(- 'security',- ['add-generic-password', '-U', '-a', keychainAccount(), '-s', KEYCHAIN_SERVICE, '-X', hex],- { stdio: ['ignore', 'ignore', 'ignore'] },- );- }-}--function deleteItemMac(): void {- try {- execFileSync(- 'security',- ['delete-generic-password', '-a', keychainAccount(), '-s', KEYCHAIN_SERVICE],- { stdio: ['ignore', 'ignore', 'ignore'] },- );- } catch {- /* 条目不存在 → no-op */- }-}--/** 读 ~/.claude/.credentials.json 的**原始文本值**;文件不存在 / 空 → null。 */-function readBlobRawFile(): string | null {- try {- const text = fs.readFileSync(credentialsFilePath(), 'utf-8').trim();- return text.length > 0 ? text : null;- } catch {- return null;- }-}--function writeBlobFile(blob: Record<string, unknown>): void {- // 文件后端整块原子写(tmp + rename),无 keychain 那种行长度上限 —— Win/Linux 不受截断 bug 影响。- const file = credentialsFilePath();- fs.mkdirSync(path.dirname(file), { recursive: true });- const tmp = `${file}.tmp`;- fs.writeFileSync(tmp, JSON.stringify(blob, null, 2), { encoding: 'utf-8', mode: 0o600 });- fs.renameSync(tmp, file);- try { fs.chmodSync(file, 0o600); } catch { /* best-effort */ }-}--/** 平台分流读原始文本。 */-function readBlobRaw(): string | null {- return process.platform === 'darwin' ? readBlobRawMac() : readBlobRawFile();-}--function readBlob(): Record<string, unknown> | null {- const raw = readBlobRaw();- if (raw == null) return null;- try {- return JSON.parse(raw) as Record<string, unknown>;- } catch {- // 解析失败(含历史截断损坏值)→ 视为无凭证,不抛- return null;- }-}--/**- * 写 blob 并**写后回读校验**。任一后端若写入被截断 / 部分写,回读对不上即抛 ——- * 绝不让损坏值静默留在凭证库(本 bug 根因正是「写失败 + 留下截断值」无人察觉)。- * 校验通过才返回,失败则抛,由调用方决定如何反馈。- */-function writeBlob(blob: Record<string, unknown>): void {- if (process.platform === 'darwin') writeBlobMac(blob);- else writeBlobFile(blob);- if (!blobRoundtrips(JSON.stringify(blob), readBlobRaw())) {- throw new Error('claude credential store write verification failed (value missing or corrupted after write)');- }-}--// ── 公开 API ─────────────────────────────────────────────────────────────────--/**- * 读取当前 Claude.ai OAuth 凭证(claudeAiOauth 段);无 / 解析失败 → null。- * getState 自动兼容本地登录 + 登录后状态判定都用它。- */-export function readClaudeAiOAuth(): ClaudeAiOAuth | null {- if (!isNativeProviderAuthBound('anthropic')) return null;- const oauth = readClaudeAiOAuthUnbound();- return oauth && !isNativeProviderCredentialRejected('anthropic', claudeOAuthCredentialDigest(oauth)) ? oauth : null;-}--/** Only token identity matters; profile and expiry metadata may change independently. */-export function claudeOAuthCredentialDigest(oauth: ClaudeAiOAuth): string {- return createHash('sha256').update(JSON.stringify([oauth.accessToken, oauth.refreshToken ?? null])).digest('hex');-}--/** Read native credentials for an explicit reattachment without changing their owner. */-export function readClaudeAiOAuthUnbound(): ClaudeAiOAuth | null {- const blob = readBlob();- const oauth = blob?.claudeAiOauth as ClaudeAiOAuth | undefined;- if (oauth && typeof oauth.accessToken === 'string' && oauth.accessToken.length > 0) {- return oauth;- }- return null;-}--/** 是否存在可用的 Claude.ai OAuth 登录(有 accessToken)。 */-export function hasClaudeAiOAuth(): boolean {- return readClaudeAiOAuth() != null;-}--/** Legacy upgrade probe; intentionally bypasses owner binding once at migration time. */-export function hasClaudeAiOAuthUnbound(): boolean {- return readClaudeAiOAuthUnbound() !== null;-}--/**- * 写入 Claude.ai OAuth 凭证 —— 读改写,保留 blob 里 claudeAiOauth 以外的字段- * (cc 可能存了其它内容)。失败抛错让上层反馈。- */-export function writeClaudeAiOAuth(oauth: ClaudeAiOAuth): void {- const blob = readBlob() ?? {};- blob.claudeAiOauth = oauth;- writeBlob(blob);- log.info('claude oauth credential written', {- storage: process.platform === 'darwin' ? 'keychain' : 'file',- hasRefresh: Boolean(oauth.refreshToken),- });-}--/**- * 清除 Claude.ai OAuth 凭证(登出)。- * ⚠️ 这是系统级 Claude Code 凭证库,清除会**同时**登出本地 `claude` CLI —— 调用方需在- * UI confirm 里讲清。读改写删 claudeAiOauth;若 blob 删空了则连条目/文件一起删。- */-export function clearClaudeAiOAuth(): void {- const plan = planClaudeAiOAuthClear(readBlob());- switch (plan.action) {- case 'noop':- return;- case 'delete':- // 整个 blob 只有 claudeAiOauth → 删掉整条条目 / 文件。- if (process.platform === 'darwin') deleteItemMac();- else { try { fs.unlinkSync(credentialsFilePath()); } catch { /* no-op */ } }- break;- case 'write':- // 还有 cc 的 mcpOAuth 等其它字段 → 写回裁剪后的整块(保留它们);writeBlob 自带写后校验。- writeBlob(plan.next);- break;- }- log.info('claude oauth credential cleared');-}diff --git a/apps/desktop/src/main/maker-host/claude-native-auth.ts b/apps/desktop/src/main/maker-host/claude-native-auth.tsnew file mode 100644index 0000000000..a0e354eace--- /dev/null+++ b/apps/desktop/src/main/maker-host/claude-native-auth.ts@@ -0,0 +1,24 @@+/**+ * claude-native-auth —— 「Cindy 能否使用本机 Claude Code 登录」的唯一判定(同步、只读缓存)。+ *+ * 两个条件同时成立才算已连接:+ * 1. 内置 CLI 已登录(claude-native-cli 的 `auth status` 结果,Cindy 不读凭证);+ * 2. 当前 owner 授权了 Cindy 使用这份登录(nativeProviderAuthBinding,可被「断开」撤销)。+ *+ * 断开只撤销第 2 条,CLI 的登录(也是终端里 `claude` 的登录)保持不动。需要重读登录态、+ * 连接 / 断开时用 claude-native-connection。+ */++import { isNativeProviderAuthBound } from './nativeProviderAuthBinding.js';+import { peekClaudeCliLoginStatus } from './claude-native-cli-status.js';++/** 已连接(CLI 已登录 + Cindy 已获使用许可)。同步读缓存,未读到过登录态时为 false。 */+export function hasClaudeNativeLogin(): boolean {+ // 先看内存缓存,未登录时不必读绑定文件。+ return peekClaudeCliLoginStatus()?.loggedIn === true && isNativeProviderAuthBound('anthropic');+}++/** CLI 是否已登录,不看 Cindy 的使用许可(自动认领 / 升级迁移用)。 */+export function hasClaudeNativeLoginUnbound(): boolean {+ return peekClaudeCliLoginStatus()?.loggedIn === true;+}diff --git a/apps/desktop/src/main/maker-host/claude-native-cli-status.ts b/apps/desktop/src/main/maker-host/claude-native-cli-status.tsnew file mode 100644index 0000000000..492d7daae6--- /dev/null+++ b/apps/desktop/src/main/maker-host/claude-native-cli-status.ts@@ -0,0 +1,79 @@+/**+ * claude-native-cli-status —— 内置 Claude Code CLI 登录态的内存缓存(纯内存、无 IO)。+ *+ * 由 claude-native-cli 的 `claude auth status` 读取结果写入;只需要判断「连没连上」的+ * 模块读这里即可,不必连带加载 CLI 拉起 / 代理解析等依赖。+ */++export interface ClaudeCliLoginStatus {+ /** CLI 用 Claude.ai 订阅账号登录(只有这种才算「Claude 订阅」)。 */+ loggedIn: boolean;+ /**+ * CLI 已登录,但不是 Claude.ai 订阅(Console 账号、API Key、apiKeyHelper、中转 token 等)。+ * 这类登录按 API 计费或指向别的上游,Cindy 不把它当订阅使用。仅 loggedIn=false 时出现。+ */+ notSubscription?: true;+ /** CLI 报告的登录方式;仅作展示。 */+ authMethod?: string;+ subscriptionType?: string;+ email?: string;+}++let cachedStatus: ClaudeCliLoginStatus | null = null;+let cachedAt = 0;+const statusListeners = new Set<(status: ClaudeCliLoginStatus) => void>();+let onListenerError: (error: unknown) => void = () => {};++/** 最近一次读到的 CLI 登录态;尚未读过时为 null(调用方按未登录处理)。 */+export function peekClaudeCliLoginStatus(): ClaudeCliLoginStatus | null {+ return cachedStatus;+}++/** 缓存是否不超过 maxAgeMs(从未读到过 = 不新鲜)。 */+export function isClaudeCliLoginStatusFresh(maxAgeMs: number): boolean {+ return cachedStatus !== null && Date.now() - cachedAt <= maxAgeMs;+}++/** 登录态变化(含首次读到)时回调;返回取消订阅函数。 */+export function onClaudeCliLoginStatusChange(listener: (status: ClaudeCliLoginStatus) => void): () => void {+ statusListeners.add(listener);+ return () => statusListeners.delete(listener);+}++/** @internal claude-native-cli 注入监听器异常的日志出口。 */+export function setClaudeCliLoginStatusListenerErrorHandler(handler: (error: unknown) => void): void {+ onListenerError = handler;+}++function sameStatus(a: ClaudeCliLoginStatus | null, b: ClaudeCliLoginStatus): boolean {+ return (+ a !== null &&+ a.loggedIn === b.loggedIn &&+ a.notSubscription === b.notSubscription &&+ a.email === b.email &&+ a.subscriptionType === b.subscriptionType &&+ a.authMethod === b.authMethod+ );+}++/** @internal 由 claude-native-cli 写入最新读取结果;变化时通知监听器。 */+export function publishClaudeCliLoginStatus(status: ClaudeCliLoginStatus): void {+ const changed = !sameStatus(cachedStatus, status);+ cachedStatus = status;+ cachedAt = Date.now();+ if (!changed) return;+ for (const listener of statusListeners) {+ try {+ listener(status);+ } catch (err) {+ onListenerError(err);+ }+ }+}++/** @internal 单测用。 */+export function resetClaudeCliLoginStatusForTest(): void {+ cachedStatus = null;+ cachedAt = 0;+ statusListeners.clear();+}diff --git a/apps/desktop/src/main/maker-host/claude-native-cli.ts b/apps/desktop/src/main/maker-host/claude-native-cli.tsnew file mode 100644index 0000000000..f74f9299a1--- /dev/null+++ b/apps/desktop/src/main/maker-host/claude-native-cli.ts@@ -0,0 +1,341 @@+/**+ * claude-native-cli —— Claude 订阅的唯一接入面:Cindy 内置的官方 Claude Code CLI。+ *+ * Anthropic 只允许用户用自己的订阅登录**未修改的 Claude Code**;第三方应用不得提供+ * Claude.ai 登录,也不得收集、存储或中转订阅凭证(Claude Code 法律与合规文档)。所以:+ *+ * - 登录 = 拉起内置 CLI 的 `claude auth login --claudeai`。浏览器授权与 token 交换+ * 全在 CLI 里完成,凭证落在 CLI 的默认凭证库(macOS 钥匙串 / ~/.claude),与终端里+ * 的 `claude` 共用同一份;+ * - 登录态 = `claude auth status --json` 的结果。Cindy 从不读取凭证库本身;+ * - 会话 = SDK 拉起同一个 CLI,由它自己读取、刷新凭证并直连 Anthropic+ * (maker-core env-builder `nativeCliAuth`)。+ *+ * 「断开」只撤销 Cindy 的使用许可(nativeProviderAuthBinding),不登出 CLI。+ */++import { spawn, type ChildProcess } from 'node:child_process';+import path from 'node:path';++import { app } from 'electron';+import { cleanProcessEnv } from '@cindy/maker-core';+import { hasProxyEnvConfig, parseOutboundProxyUrl } from '@cindy/anthropic-compat-proxy';++import { getReadyBinaryPath } from '../agent-binaries/index.js';+import { createLogger } from '../logger.js';+import { resolveDesktopOutboundProxy } from './outbound-proxy-resolver.js';+import { ensureClaudeCliProxyBridge } from './claude-cli-proxy-bridge.js';+import {+ isClaudeCliLoginStatusFresh,+ peekClaudeCliLoginStatus,+ publishClaudeCliLoginStatus,+ resetClaudeCliLoginStatusForTest,+ setClaudeCliLoginStatusListenerErrorHandler,+ type ClaudeCliLoginStatus,+} from './claude-native-cli-status.js';++export {+ onClaudeCliLoginStatusChange,+ peekClaudeCliLoginStatus,+ type ClaudeCliLoginStatus,+} from './claude-native-cli-status.js';++const log = createLogger('claude-native-cli');+setClaudeCliLoginStatusListenerErrorHandler((err) => {+ log.warn('claude cli status listener failed', { error: String(err) });+});++const STATUS_TIMEOUT_MS = 10_000;+/** 读登录态失败(CLI 未就绪 / 超时 / 输出异常)后,这段时间内不再重复拉起 CLI。 */+const STATUS_FAILURE_BACKOFF_MS = 30_000;+const LOGIN_TIMEOUT_MS = 5 * 60 * 1000;+const ANTHROPIC_API_ORIGIN = 'https://api.anthropic.com';++/**+ * dev 多实例(XDT_USER_DATA_DIR)把 Claude Code 的配置目录切到 userData 下,+ * 否则多实例共用 ~/.claude 互相干扰。生产恒为 undefined(用 CLI 默认目录)。+ * process.env 的 CLAUDE_CONFIG_DIR 在 boot 期已被剥离,只能经子进程 env 注入。+ */+export function claudeCliConfigDirOverride(): string | undefined {+ if (process.env.XDT_USER_DATA_DIR && !app.isPackaged && !process.env.CLAUDE_CONFIG_DIR) {+ return path.join(app.getPath('userData'), 'claude-home');+ }+ return undefined;+}++const LOOPBACK_NO_PROXY = 'localhost,127.0.0.1,::1';++/**+ * 让 CLI 走用户的代理。CLI 只认 HTTPS_PROXY 环境变量、不读系统代理 / PAC,也不支持+ * SOCKS;GUI 启动的 Cindy 拿不到 shell env,开「系统代理」模式的用户直连会失败。+ * 出口按与本地 proxy 相同的规则解析(代理 env 优先,其次系统代理 / PAC):+ * - Anthropic 直连 / 解析失败:不下发,CLI 进程树的环境保持原样;+ * - 代理 env 给的 HTTP 代理:不动(子进程继承,保留用户自己的 NO_PROXY 语义);+ * - 系统代理,或代理 env 给的 SOCKS5:HTTPS_PROXY 指向本机 CONNECT 桥+ * (claude-cli-proxy-bridge)。环境变量对整棵进程树生效(含 Bash 工具里的 git / npm),+ * 所以桥对每个目标重新按系统代理 / PAC 决定直连还是走代理,内网例外照旧直连;+ * 明文 HTTP 不下发代理,保持直连。+ * 用户在 ~/.claude/settings.json 的 env 里配的代理由 CLI 自己应用,优先于这里。+ * HTTPS 经代理走 CONNECT 隧道,TLS 端到端,代理、桥与 Cindy 都看不到凭证。+ */+export async function claudeCliNetworkEnv(): Promise<Record<string, string>> {+ const fromEnv = hasProxyEnvConfig();+ let raw: string | null | undefined = null;+ try {+ raw = await resolveDesktopOutboundProxy(ANTHROPIC_API_ORIGIN);+ } catch (err) {+ log.debug('proxy resolution failed; CLI connects directly', {+ message: err instanceof Error ? err.message : String(err),+ });+ return {};+ }+ const target = parseOutboundProxyUrl(raw);+ if (!raw || !target) return {};+ if (fromEnv && target.kind === 'http') return {};+ let bridge: string;+ try {+ bridge = await ensureClaudeCliProxyBridge(resolveDesktopOutboundProxy);+ } catch {+ return {};+ }+ const noProxy: Record<string, string> = fromEnv ? {} : { NO_PROXY: LOOPBACK_NO_PROXY, no_proxy: LOOPBACK_NO_PROXY };+ return { HTTPS_PROXY: bridge, https_proxy: bridge, ...noProxy };+}++function cliBinaryPath(): string | null {+ return getReadyBinaryPath('claude-code') ?? null;+}++async function cliEnv(options: { network: boolean }): Promise<NodeJS.ProcessEnv> {+ const configDir = claudeCliConfigDirOverride();+ return {+ ...cleanProcessEnv(),+ ...(options.network ? await claudeCliNetworkEnv() : {}),+ ...(configDir ? { CLAUDE_CONFIG_DIR: configDir } : {}),+ };+}++function optionalString(value: unknown): string | undefined {+ return typeof value === 'string' && value.trim() ? value.trim() : undefined;+}++/** 解析 `claude auth status --json`;形状不符按未登录处理(不抛)。 */+export function parseClaudeCliLoginStatus(stdout: string): ClaudeCliLoginStatus | null {+ let parsed: unknown;+ try {+ parsed = JSON.parse(stdout.trim());+ } catch {+ return null;+ }+ if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return null;+ const record = parsed as Record<string, unknown>;+ if (typeof record.loggedIn !== 'boolean') return null;+ const authMethod = optionalString(record.authMethod);+ const apiProvider = optionalString(record.apiProvider);+ if (!record.loggedIn || authMethod === 'none') return { loggedIn: false };+ // 只认 Claude.ai 订阅账号的 OAuth 登录。CLI 对 Console 账号(`/login managed key`)也报+ // authMethod 'claude.ai',但会同时给出 apiKeySource;API Key / apiKeyHelper / 中转 token+ // (ANTHROPIC_AUTH_TOKEN 等)与 Bedrock / Vertex 等第三方云都不是「Claude 订阅」。+ const subscription =+ authMethod === 'claude.ai' &&+ optionalString(record.apiKeySource) === undefined &&+ (apiProvider === undefined || apiProvider === 'firstParty');+ if (!subscription) return { loggedIn: false, notSubscription: true };+ const subscriptionType = optionalString(record.subscriptionType);+ const email = optionalString(record.email);+ return {+ loggedIn: true,+ ...(authMethod ? { authMethod } : {}),+ ...(subscriptionType ? { subscriptionType } : {}),+ ...(email ? { email } : {}),+ };+}++function runCli(+ args: string[],+ options: { env: NodeJS.ProcessEnv; timeoutMs: number; signal?: AbortSignal },+): Promise<{ code: number | null; stdout: string; stderr: string; reason?: 'timeout' | 'cancelled' }> {+ const binary = cliBinaryPath();+ if (!binary) return Promise.reject(new Error('claude cli unavailable'));+ return new Promise((resolve, reject) => {+ let child: ChildProcess;+ try {+ child = spawn(binary, args, { env: options.env, stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true });+ } catch (err) {+ reject(err);+ return;+ }+ let stdout = '';+ let stderr = '';+ let reason: 'timeout' | 'cancelled' | undefined;+ const stop = (why: 'timeout' | 'cancelled') => {+ if (reason) return;+ reason = why;+ child.kill();+ };+ const timer = setTimeout(() => stop('timeout'), options.timeoutMs);+ const onAbort = () => stop('cancelled');+ if (options.signal?.aborted) onAbort();+ else options.signal?.addEventListener('abort', onAbort, { once: true });+ child.stdout?.on('data', (chunk: Buffer) => {+ stdout += chunk.toString('utf8');+ });+ child.stderr?.on('data', (chunk: Buffer) => {+ stderr += chunk.toString('utf8');+ });+ child.once('error', (err) => {+ clearTimeout(timer);+ options.signal?.removeEventListener('abort', onAbort);+ reject(err);+ });+ child.once('close', (code) => {+ clearTimeout(timer);+ options.signal?.removeEventListener('abort', onAbort);+ resolve({ code, stdout, stderr, ...(reason ? { reason } : {}) });+ });+ });+}++// ── 登录态 ────────────────────────────────────────────────────────────────────++let statusInflight: Promise<ClaudeCliLoginStatus> | null = null;+let lastStatusFailureAt: number | null = null;++function statusFallback(): ClaudeCliLoginStatus {+ return peekClaudeCliLoginStatus() ?? { loggedIn: false };+}++/**+ * 读 CLI 登录态(`claude auth status --json`,约 0.1–0.3s)。同一时刻只跑一个;+ * 读失败(CLI 未就绪 / 超时 / 输出异常)时保留上一次结果,从未读到过则视为未登录,+ * 并在 STATUS_FAILURE_BACKOFF_MS 内不再重试(force 除外,如用户主动登录)。+ */+export function refreshClaudeCliLoginStatus(options?: { force?: boolean }): Promise<ClaudeCliLoginStatus> {+ if (statusInflight) return statusInflight;+ if (+ options?.force !== true &&+ lastStatusFailureAt !== null &&+ Date.now() - lastStatusFailureAt < STATUS_FAILURE_BACKOFF_MS+ ) {+ return Promise.resolve(statusFallback());+ }+ const flight = (async () => {+ try {+ const result = await runCli(['auth', 'status', '--json'], {+ env: await cliEnv({ network: false }),+ timeoutMs: STATUS_TIMEOUT_MS,+ });+ const status = parseClaudeCliLoginStatus(result.stdout);+ if (!status) {+ lastStatusFailureAt = Date.now();+ log.warn('claude auth status returned an unexpected payload', {+ code: result.code,+ reason: result.reason ?? null,+ });+ return statusFallback();+ }+ lastStatusFailureAt = null;+ publishClaudeCliLoginStatus(status);+ return status;+ } catch (err) {+ lastStatusFailureAt = Date.now();+ log.warn('claude auth status failed', { error: err instanceof Error ? err.message : String(err) });+ return statusFallback();+ }+ })();+ statusInflight = flight;+ void flight.finally(() => {+ if (statusInflight === flight) statusInflight = null;+ });+ return flight;+}++/**+ * 缓存不超过 maxAgeMs 时直接返回,否则重读。登录态可能在 Cindy 之外变化(终端里+ * `claude auth logout`),会话启动这类要结论的调用方传较短的 maxAgeMs。+ *+ * staleWhileRevalidate:有缓存(哪怕过期)就立即返回它,过期时在后台重读;从未读到过+ * 时也不等待,按未登录返回。结果变化由 onClaudeCliLoginStatusChange 通知。用于列表类+ * 读取,不让与 Claude 订阅无关的操作等 CLI 进程。+ */+export async function readClaudeCliLoginStatus(options?: {+ maxAgeMs?: number;+ staleWhileRevalidate?: boolean;+}): Promise<ClaudeCliLoginStatus> {+ const cached = peekClaudeCliLoginStatus();+ if (cached && isClaudeCliLoginStatusFresh(options?.maxAgeMs ?? Number.POSITIVE_INFINITY)) return cached;+ if (options?.staleWhileRevalidate === true) {+ void refreshClaudeCliLoginStatus();+ return statusFallback();+ }+ return refreshClaudeCliLoginStatus();+}++// ── 登录 ──────────────────────────────────────────────────────────────────────++let currentLogin: { key: string | undefined; abort: AbortController } | null = null;++/** 开始一次登录;同一时刻只保留一个,新登录会取消旧的。 */+export function beginClaudeCliLogin(loginKey?: string): AbortSignal {+ cancelClaudeCliLogin();+ const abort = new AbortController();+ currentLogin = { key: loginKey, abort };+ return abort.signal;+}++/** 取消进行中的登录(传 loginKey 时只取消同一次)。 */+export function cancelClaudeCliLogin(loginKey?: string): void {+ if (!currentLogin) return;+ if (loginKey && currentLogin.key !== loginKey) return;+ currentLogin.abort.abort();+ currentLogin = null;+}++export type ClaudeCliLoginResult =+ | { ok: true; status: ClaudeCliLoginStatus }+ | {+ ok: false;+ reason: 'login_cancelled' | 'timeout' | 'local_unavailable' | 'login_failed' | 'not_a_subscription';+ };++/**+ * 已登录则直接返回;否则拉起 `claude auth login --claudeai`,由 CLI 打开浏览器并等待+ * 授权回调。CLI 退出后重读登录态作为结论。+ *+ * CLI 已用非订阅方式登录(API Key、中转 token 等)时直接返回 not_a_subscription,不替用户+ * 改 CLI 的登录:这类配置在 CLI 里优先于订阅登录,改了也用不上,还会影响终端里的 claude。+ */+export async function runClaudeCliLogin(signal: AbortSignal): Promise<ClaudeCliLoginResult> {+ const before = await refreshClaudeCliLoginStatus({ force: true });+ if (signal.aborted) return { ok: false, reason: 'login_cancelled' };+ if (before.loggedIn) return { ok: true, status: before };+ if (before.notSubscription) return { ok: false, reason: 'not_a_subscription' };+ if (!cliBinaryPath()) return { ok: false, reason: 'local_unavailable' };+ try {+ const result = await runCli(['auth', 'login', '--claudeai'], {+ env: await cliEnv({ network: true }),+ timeoutMs: LOGIN_TIMEOUT_MS,+ signal,+ });+ if (result.reason === 'cancelled') return { ok: false, reason: 'login_cancelled' };+ if (result.reason === 'timeout') return { ok: false, reason: 'timeout' };+ if (result.code !== 0) {+ log.warn('claude auth login exited with an error', { code: result.code });+ }+ } catch (err) {+ log.warn('claude auth login failed to start', { error: err instanceof Error ? err.message : String(err) });+ return { ok: false, reason: 'local_unavailable' };+ }+ const after = await refreshClaudeCliLoginStatus({ force: true });+ if (signal.aborted) return { ok: false, reason: 'login_cancelled' };+ if (after.loggedIn) return { ok: true, status: after };+ return { ok: false, reason: after.notSubscription ? 'not_a_subscription' : 'login_failed' };+}++/** @internal 单测用。 */+export function resetClaudeNativeCliForTest(): void {+ resetClaudeCliLoginStatusForTest();+ statusInflight = null;+ lastStatusFailureAt = null;+ currentLogin = null;+}diff --git a/apps/desktop/src/main/maker-host/claude-native-connection.ts b/apps/desktop/src/main/maker-host/claude-native-connection.tsnew file mode 100644index 0000000000..12de5e8f21--- /dev/null+++ b/apps/desktop/src/main/maker-host/claude-native-connection.ts@@ -0,0 +1,33 @@+/**+ * claude-native-connection —— 本机 Claude Code 登录的连接 / 断开与按需重读。+ *+ * 登录本身由内置 CLI 完成(claude-native-cli);这里只管 Cindy 的使用许可+ * (nativeProviderAuthBinding)与供应商展示态。判定是否已连接用 claude-native-auth。+ */++import {+ bindNativeProviderAuth,+ isNativeProviderAuthBound,+ unbindNativeProviderAuth,+} from './nativeProviderAuthBinding.js';+import { retainProviderPresentationAfterAuthChange } from './provider-presentation-store.js';+import { readClaudeCliLoginStatus, type ClaudeCliLoginStatus } from './claude-native-cli.js';++/** 按需重读 CLI 登录态。已连接时返回登录态,否则 null。 */+export async function readClaudeNativeLogin(options?: { maxAgeMs?: number }): Promise<ClaudeCliLoginStatus | null> {+ if (!isNativeProviderAuthBound('anthropic')) return null;+ const status = await readClaudeCliLoginStatus(options);+ return status.loggedIn ? status : null;+}++/** 授权 Cindy 使用本机 Claude Code 登录(登录由 CLI 完成,这里只记使用许可)。 */+export function connectClaudeNativeLogin(): void {+ bindNativeProviderAuth('anthropic', { sharedSystem: true });+ void retainProviderPresentationAfterAuthChange('anthropic');+}++/** 撤销 Cindy 的使用许可;不登出 CLI。 */+export async function disconnectClaudeNativeLogin(): Promise<void> {+ unbindNativeProviderAuth('anthropic', { revoked: true });+ await retainProviderPresentationAfterAuthChange('anthropic');+}diff --git a/apps/desktop/src/main/maker-host/claude-oauth-login.ts b/apps/desktop/src/main/maker-host/claude-oauth-login.tsdeleted file mode 100644index 4277363d5b..0000000000--- a/apps/desktop/src/main/maker-host/claude-oauth-login.ts+++ /dev/null@@ -1,394 +0,0 @@-/**- * claude-oauth-login —— Claude.ai 订阅 OAuth 浏览器登录(忠实移植 cc-code services/oauth)。- *- * 为什么自己驱动而非调二进制:cc 没有 `codex login` 那种 headless 登录子命令- * (`setup-token` / `/login` 都需要 TTY),agent SDK 也未公开 `claude_authenticate`。- * 所以把 cc 的 OAuth 流程(PKCE + localhost 回调 + 浏览器 + token 交换)搬到 main 自己跑,- * 拿到的完整可刷新凭证写进系统 ~/.claude 凭证库(claude-credentials-store),cc 子进程原生读取 + 自动刷新。- *- * 常量取自 cc-code constants/oauth.ts 的 **prod** 配置(client_id / authorize / token URL / scopes)。- * 流程对齐 services/oauth/{index,client,auth-code-listener,crypto}.ts。- */--import { createHash, randomBytes } from 'node:crypto';-import { createServer, type Server, type IncomingMessage, type ServerResponse } from 'node:http';-import type { AddressInfo } from 'node:net';-import { shell } from 'electron';--import { BRAND_NAME } from '@cindy/maker-shared/branding';--import {- buildOAuthReturnAction,- getProviderOAuthResultCopy,- OAUTH_RESULT_HTML_LANG,- pickOAuthResultPageLang,- renderOAuthResultPage,- type OAuthResultPageLang,-} from '../oauthResultPage.js';-import { describeErrorChain } from '../utils/errorChain.js';-import { desktopMakerLogger } from './logger-adapter.js';-import { outboundFetch } from './outbound-fetch.js';-import { writeClaudeAiOAuth, type ClaudeAiOAuth } from './claude-credentials-store.js';-import { bindNativeProviderAuth } from './nativeProviderAuthBinding.js';-import { backfillClaudeSubscriptionProfile } from './claude-oauth-refresh.js';--const log = desktopMakerLogger.child('claude-oauth-login');--// ── prod OAuth 配置(对齐 cc constants/oauth.ts PROD_OAUTH_CONFIG) ──────────────-const CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e';-// claude.ai 登录入口(307 跳到 claude.ai/oauth/authorize);用 claude.ai 流程(订阅用户)。-const CLAUDE_AI_AUTHORIZE_URL = 'https://claude.com/cai/oauth/authorize';-const TOKEN_URL = 'https://platform.claude.com/v1/oauth/token';-const CLAUDEAI_SUCCESS_URL = 'https://platform.claude.com/oauth/code/success?app=claude-code';-const CLAUDE_AI_INFERENCE_SCOPE = 'user:inference';-// ALL_OAUTH_SCOPES = union(CONSOLE, CLAUDE_AI),完整登录请求全 scope(含 user:inference)。-const ALL_OAUTH_SCOPES = [- 'org:create_api_key',- 'user:profile',- 'user:inference',- 'user:sessions:claude_code',- 'user:mcp_servers',- 'user:file_upload',-];--const LOGIN_TIMEOUT_MS = 5 * 60 * 1000;--// ── PKCE(对齐 crypto.ts) ─────────────────────────────────────────────────────-function base64URLEncode(buffer: Buffer): string {- return buffer.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');-}-function generateCodeVerifier(): string {- return base64URLEncode(randomBytes(32));-}-function generateCodeChallenge(verifier: string): string {- return base64URLEncode(createHash('sha256').update(verifier).digest());-}-function generateState(): string {- return base64URLEncode(randomBytes(32));-}--function parseScopes(scopeString?: string): string[] {- return scopeString?.split(' ').filter(Boolean) ?? [];-}--// 实现搬到 main/utils/errorChain.ts(device-link OSS 上传也要展开 undici 的-// 裸 'fetch failed');这里保留导出,原有调用方与单测的 import 路径不变。-export { describeErrorChain };--function buildAuthUrl(opts: { codeChallenge: string; state: string; port: number }): string {- const url = new URL(CLAUDE_AI_AUTHORIZE_URL);- url.searchParams.append('code', 'true'); // 让登录页展示 Claude Max upsell- url.searchParams.append('client_id', CLIENT_ID);- url.searchParams.append('response_type', 'code');- url.searchParams.append('redirect_uri', `http://localhost:${opts.port}/callback`);- url.searchParams.append('scope', ALL_OAUTH_SCOPES.join(' '));- url.searchParams.append('code_challenge', opts.codeChallenge);- url.searchParams.append('code_challenge_method', 'S256');- url.searchParams.append('state', opts.state);- return url.toString();-}--interface TokenExchangeResponse {- access_token: string;- refresh_token?: string;- expires_in?: number;- scope?: string;-}--async function exchangeCodeForTokens(- code: string,- state: string,- codeVerifier: string,- port: number,- signal: AbortSignal,-): Promise<TokenExchangeResponse> {- // outboundFetch:换 token 是 main 自己发的 HTTPS 请求,不经浏览器。裸 undici fetch- // 不吃系统代理,代理软件跑「系统代理」模式时授权页正常、这一步却直连出网,被上游按- // 来源拒(实测 403)。- const res = await outboundFetch(TOKEN_URL, {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({- grant_type: 'authorization_code',- code,- redirect_uri: `http://localhost:${port}/callback`,- client_id: CLIENT_ID,- code_verifier: codeVerifier,- state,- }),- signal,- });- if (res.status !== 200) {- throw new Error(- res.status === 401- ? 'Authentication failed: invalid authorization code'- : `Token exchange failed (${res.status})`,- );- }- return (await res.json()) as TokenExchangeResponse;-}--/**- * localhost 回调监听(精简移植 auth-code-listener.ts)。捕获- * `http://localhost:<port>/callback?code=...&state=...`,校验 state(CSRF),拿到 code 后把浏览器- * 重定向到官方成功页。- */-class CallbackListener {- private server: Server;- private port = 0;- private expectedState = '';- private pendingRes: ServerResponse | null = null;- private callbackLang: OAuthResultPageLang = 'en';- private resolve: ((code: string) => void) | null = null;- private reject: ((err: Error) => void) | null = null;-- constructor() {- this.server = createServer();- }-- async start(): Promise<number> {- return new Promise((resolve, reject) => {- this.server.once('error', (err) =>- reject(new Error(`OAuth callback server failed: ${err.message}`)),- );- this.server.listen(0, 'localhost', () => {- this.port = (this.server.address() as AddressInfo).port;- resolve(this.port);- });- });- }-- /** 等回调拿 code。state 校验失败 / 无 code → reject。 */- waitForCode(state: string): Promise<string> {- this.expectedState = state;- return new Promise<string>((resolve, reject) => {- this.resolve = resolve;- this.reject = reject;- this.server.on('request', (req: IncomingMessage, res: ServerResponse) =>- this.onRequest(req, res),- );- });- }-- private onRequest(req: IncomingMessage, res: ServerResponse): void {- const parsed = new URL(req.url || '', `http://${req.headers.host || 'localhost'}`);- if (parsed.pathname !== '/callback') {- res.writeHead(404);- res.end();- return;- }- const lang = pickOAuthResultPageLang(- typeof req.headers['accept-language'] === 'string'- ? req.headers['accept-language']- : undefined,- );- this.callbackLang = lang;- const copy = getProviderOAuthResultCopy(lang, 'Claude', BRAND_NAME);- const action = buildOAuthReturnAction(lang, 'claude-oauth', BRAND_NAME);- const code = parsed.searchParams.get('code') ?? undefined;- const state = parsed.searchParams.get('state') ?? undefined;- if (!code) {- res.writeHead(400, { 'content-type': 'text/html; charset=utf-8' });- res.end(- renderOAuthResultPage({- htmlLang: OAUTH_RESULT_HTML_LANG[lang],- variant: 'error',- title: copy.errorTitle,- body: copy.missingCodeBody,- detail:- parsed.searchParams.get('error_description') ??- parsed.searchParams.get('error') ??- undefined,- action,- }),- );- this.reject?.(new Error('No authorization code received'));- return;- }- if (state !== this.expectedState) {- res.writeHead(400, { 'content-type': 'text/html; charset=utf-8' });- res.end(- renderOAuthResultPage({- htmlLang: OAUTH_RESULT_HTML_LANG[lang],- variant: 'error',- title: copy.errorTitle,- body: copy.invalidStateBody,- action,- }),- );- this.reject?.(new Error('Invalid state parameter'));- return;- }- this.pendingRes = res; // 留到 token 交换成功后再 302 到成功页- this.resolve?.(code);- }-- /** code 交换成功后把浏览器重定向到官方成功页。 */- redirectToSuccess(): void {- if (!this.pendingRes) return;- this.pendingRes.writeHead(302, { Location: CLAUDEAI_SUCCESS_URL });- this.pendingRes.end();- this.pendingRes = null;- }-- fail(detail?: string): void {- if (!this.pendingRes) return;- try {- const copy = getProviderOAuthResultCopy(this.callbackLang, 'Claude', BRAND_NAME);- this.pendingRes.writeHead(500, { 'content-type': 'text/html; charset=utf-8' });- this.pendingRes.end(- renderOAuthResultPage({- htmlLang: OAUTH_RESULT_HTML_LANG[this.callbackLang],- variant: 'error',- title: copy.errorTitle,- body: copy.exchangeFailedBody,- detail,- action: buildOAuthReturnAction(this.callbackLang, 'claude-oauth', BRAND_NAME),- }),- );- } catch {- /* 回执通道已关闭,登录结果仍由调用链决定 */- }- this.pendingRes = null;- }-- close(): void {- if (this.pendingRes) {- this.fail();- }- try {- this.server.removeAllListeners();- this.server.close();- } catch {- /* no-op */- }- }-}--let _currentListener: CallbackListener | null = null;-let _currentAbort: AbortController | null = null;-let _currentLoginKey: string | undefined;--/** Local attachment uses the same cancellation boundary as browser login. */-export function beginClaudeLocalLogin(loginKey?: string): AbortSignal {- cancelClaudeOAuthLogin();- _currentListener = null;- _currentLoginKey = loginKey;- _currentAbort = new AbortController();- return _currentAbort.signal;-}--export interface ClaudeOAuthLoginResult {- ok: boolean;- /** 失败原因(reason)— 'login_cancelled' / 'timeout' / 具体错误信息。 */- reason?: string;-}--/**- * 跑一次 Claude.ai 订阅 OAuth 浏览器登录。成功后把完整可刷新凭证写入系统 ~/.claude 凭证库。- * 幂等取消:cancelClaudeOAuthLogin() 会关监听 + abort 交换请求,让本函数以 login_cancelled 返回。- */-export async function runClaudeOAuthLogin(opts?: {- onProgress?: (msg: string) => void;- isCurrent?: () => boolean;- loginKey?: string;- persist?: (oauth: ClaudeAiOAuth) => void;- backfill?: (token: string) => Promise<void>;-}): Promise<ClaudeOAuthLoginResult> {- // 同一时刻只允许一个登录流;新登录前先取消旧的。- cancelClaudeOAuthLogin();-- const verifier = generateCodeVerifier();- const challenge = generateCodeChallenge(verifier);- const state = generateState();- const listener = new CallbackListener();- const abort = new AbortController();- _currentListener = listener;- _currentAbort = abort;- _currentLoginKey = opts?.loginKey;-- let timer: ReturnType<typeof setTimeout> | null = null;- try {- const port = await listener.start();- const authUrl = buildAuthUrl({ codeChallenge: challenge, state, port });-- opts?.onProgress?.('opening-browser');- log.info('opening browser for claude oauth', { port });- // 等回调,带 5min 超时 + 取消。- const codePromise = new Promise<string>((resolve, reject) => {- if (abort.signal.aborted) {- reject(new Error('login_cancelled'));- return;- }- timer = setTimeout(() => reject(new Error('timeout')), LOGIN_TIMEOUT_MS);- abort.signal.addEventListener('abort', () => reject(new Error('login_cancelled')), {- once: true,- });- listener.waitForCode(state).then(resolve, reject);- });- // Register the callback before opening a browser with an existing login.- // Observe rejection even if opening the browser itself fails.- void codePromise.catch(() => {});- await shell.openExternal(authUrl);- const code = await codePromise;-- opts?.onProgress?.('exchanging');- const tokens = await exchangeCodeForTokens(code, state, verifier, port, abort.signal);- const scopes = parseScopes(tokens.scope);-- if (!scopes.includes(CLAUDE_AI_INFERENCE_SCOPE)) {- // 没拿到 inference scope = 不是订阅账号(或只授权了 Console),订阅模式用不了。- listener.fail('not_a_subscription');- return { ok: false, reason: 'not_a_subscription' };- }-- // 取消窗口收口:token 交换是网络往返,期间用户可能已点取消(cancelClaudeOAuthLogin- // abort 掉 controller)—— 写凭证前显式检查,取消了就不落盘,避免「用户已取消、- // 账号却连上了」(review 2026-07-04 P2)。- if (abort.signal.aborted || opts?.isCurrent?.() === false) {- return { ok: false, reason: 'login_cancelled' };- }- // 凭证立即落盘 + 立即跳成功页 —— 不 await profile(最长 10s RTT 不能挡在登录- // 成功路径上,review P1)。订阅身份(subscriptionType / rateLimitTier)由- // backfillClaudeSubscriptionProfile 后台补:cc >= 2.1.198 在 MANAGED_BY_HOST 下- // 不读凭证库,旧的「cc 子进程 refresh 时自行补全」路径已失效,这些字段现由 host- // 注入 env(auth-adapters);回填失败静默,首次刷新时再补。- (opts?.persist ?? writeClaudeAiOAuth)({- accessToken: tokens.access_token,- refreshToken: tokens.refresh_token ?? null,- expiresAt: tokens.expires_in ? Date.now() + tokens.expires_in * 1000 : null,- scopes,- subscriptionType: null,- rateLimitTier: null,- });- if (!opts?.persist) bindNativeProviderAuth('anthropic');- void (opts?.backfill ?? backfillClaudeSubscriptionProfile)(tokens.access_token).catch((e) =>- log.warn('post-login subscription profile backfill failed', {- error: e instanceof Error ? e.message : String(e),- }),- );- listener.redirectToSuccess();- log.info('claude oauth login success', { scopes });- return { ok: true };- } catch (err) {- const msg = err instanceof Error ? err.message : String(err);- listener.fail(msg);- log.warn('claude oauth login failed', { error: describeErrorChain(err) });- return { ok: false, reason: abort.signal.aborted ? 'login_cancelled' : msg };- } finally {- if (timer) clearTimeout(timer);- listener.close();- if (_currentListener === listener) _currentListener = null;- if (_currentAbort === abort) {- _currentAbort = null;- _currentLoginKey = undefined;- }- }-}--/** 取消进行中的登录(用户在浏览器授权流半路反悔时调)。 */-export function cancelClaudeOAuthLogin(loginKey?: string): void {- if (loginKey && _currentLoginKey !== loginKey) return;- _currentAbort?.abort();- _currentListener?.close();-}diff --git a/apps/desktop/src/main/maker-host/claude-oauth-refresh.ts b/apps/desktop/src/main/maker-host/claude-oauth-refresh.tsdeleted file mode 100644index de992a6847..0000000000--- a/apps/desktop/src/main/maker-host/claude-oauth-refresh.ts+++ /dev/null@@ -1,768 +0,0 @@-/**- * claude-oauth-refresh —— Claude.ai 订阅 OAuth access token 的 host 侧到期刷新。- *- * 为什么 host 要管刷新(cc >= 2.1.19x 语义变化):- * Cindy 给 cc 子进程注入 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST=1(防 workdir- * settings.json 覆盖 app 注入的 provider 路由,见 env-builder.ts)。cc 2.1.198 起- * 该 flag 的语义从「过滤 settings 来源的 provider env」扩大为「凭证也由 host 全权- * 提供」——设了 flag 后 cc **完全不再读**系统凭证库(keychain / .credentials.json)- * 的 claudeAiOauth;host 必须经 CLAUDE_CODE_OAUTH_TOKEN env 显式递入订阅 access- * token(官方桌面宿主协议)。env 递入的是纯 access token(cc 侧 refreshToken=null),- * cc 无法自行刷新,到期刷新责任随之转移到 host:- * - spawn 前:getAuthEnv 经 getOAuthForSpawn 注入现值(**不阻塞**——临期只触发- * 后台刷新,新会话首响应不吃刷新 RTT;真撞上刷新失败就注旧 token,靠 401 回调兜底);- * - turn 中途 401:cc 经 SDK control 协议(oauth_token_refresh)回调 host- * (见 maker-core claude-code getOAuthToken),host 锁内比对后按需刷新;- * - 后台预续期:离过期 < EXPIRY_MARGIN_MS 提前刷,让 spawn 几乎总是缓存命中。- *- * 跨进程互斥(阻塞级约束):- * refresh token 是轮换制;并发刷新者不止本进程——用户终端里的 standalone `claude`- * (没被注 flag,自己会刷)、dev + release 双开的另一个 Cindy 实例。基于旧值刷新- * 会触发服务端 refresh-token 复用检测把两边同时登出,陈旧整块回写还会静默回滚- * 凭证 blob 里 cc 的 mcpOAuth 等字段。cc 自己的刷新走跨进程锁协议- * (反编译 2.1.198:proper-lockfile,lockfilePath = <configDir>/.oauth_refresh.lock,- * stale 10s,冲突时 1-2s 退避重试最多 5 次)。host 刷新遵守**同一把锁**:- * 锁内重读凭证库 → 别人已经刷过就直接用、不再刷 → 仍旧才刷 → 写回 → 释放。- * 锁实现为 proper-lockfile 兼容语义:mkdir 原子建目录 = 持锁,mtime 超 stale 视为- * 死锁可抢,持锁期间周期 touch 防被误判 stale。- *- * 刷新协议(对齐 cc 官方实现,字段/端点从 2.1.198 核实):- * POST https://platform.claude.com/v1/oauth/token (JSON)- * { grant_type: "refresh_token", refresh_token, client_id, scope: "<空格分隔>" }- * 200 → { access_token, refresh_token?(缺省沿用旧值), expires_in(秒), scope? }- * 结果读改写回系统凭证库(claude-credentials-store,保留 blob 其它字段),与本地- * `claude` CLI 共享同一份凭证——谁先刷新都对双方生效;这也让 cc 401 恢复链的- * 磁盘兜底(tengu_oauth_401_recovered_from_disk)自动成立。- *- * 失效收尾:- * - 登出:invalidate() 令 generation 递增 + 撤销预续期 timer,在途刷新完成后不写回- * ——否则「已断开」状态下在途刷新回写会让凭证复活;- * - invalid_grant(锁内重读仍旧 + 服务端明确拒绝)= refresh token 已被作废,刷新- * 无望,经 onInvalidGrant 通知 adapter 走 invalidate 广播让 UI 提示重登,- * 不让用户停在「显示已连接、会话连环 401」的假状态。- */--import fs from 'node:fs';-import os from 'node:os';-import path from 'node:path';--import {- claudeOAuthCredentialDigest,- readClaudeAiOAuthUnbound,- readClaudeAiOAuth,- writeClaudeAiOAuth,- type ClaudeAiOAuth,-} from './claude-credentials-store.js';-import { bindNativeProviderAuth, isNativeProviderCredentialRejected, unbindNativeProviderAuth } from './nativeProviderAuthBinding.js';-import { retainProviderPresentationAfterAuthChange } from './provider-presentation-store.js';-import { desktopMakerLogger } from './logger-adapter.js';-import { outboundFetch } from './outbound-fetch.js';--const log = desktopMakerLogger.child('claude-oauth-refresh');--// 对齐 claude-oauth-login.ts 的 prod 常量(cc constants/oauth.ts PROD_OAUTH_CONFIG)。-const CLIENT_ID = '9d1c250a-e61b-44d9-88ed-5944d1962f5e';-const TOKEN_URL = 'https://platform.claude.com/v1/oauth/token';-/** 订阅身份 profile 端点(反编译 cc n0e:GET + Bearer,10s 超时)。 */-const PROFILE_URL = 'https://api.anthropic.com/api/oauth/profile';-const PROFILE_TIMEOUT_MS = 10_000;--/** 距 expiresAt 不足此余量即视为「临期」:spawn 触发后台刷、预续期 timer 的提前量。 */-export const EXPIRY_MARGIN_MS = 5 * 60 * 1000;-/**- * 刷新 HTTP 超时。必须显著小于 cc 侧 oauth_token_refresh control 请求的 30s 超时- * (反编译 eqf=30000),给锁等待(最多 ~7.5s)留出预算,让回调路径总耗时可控。- */-const REFRESH_TIMEOUT_MS = 10_000;--// ── 跨进程锁参数(必须与 cc 的 proper-lockfile 配置一致,反编译 Lzr/Mzr) ────────-const LOCK_FILENAME = '.oauth_refresh.lock';-const LOCK_STALE_MS = 10_000;-/** 持锁期间 touch 周期 —— proper-lockfile 语义 update=stale/2,取更保守值防误判。 */-const LOCK_TOUCH_INTERVAL_MS = 4_000;-const LOCK_RETRY_MAX = 5;-const LOCK_RETRY_BASE_DELAY_MS = 1_000;-/**- * 拿锁失败(健康持有者在刷)后的凭证轮询:持有者的刷新 HTTP 预算 10s 可能比我们- * ~7.5s 的锁等待长,放弃前再等一小段捡它的写回结果,避免「差 1-2 秒」的 turn 失败。- * 7.5s 锁等待 + 3s 轮询 ≈ 10.5s,仍在 401 回调 12s 预算内。- */-const LOCK_LOSER_POLL_ATTEMPTS = 6;-const LOCK_LOSER_POLL_INTERVAL_MS = 500;--/** 预续期 timer 最短延迟 —— 防 expiresAt 异常值导致 0ms 自旋。 */-const PROACTIVE_MIN_DELAY_MS = 30_000;--interface RefreshTokenResponse {- access_token: string;- refresh_token?: string;- expires_in?: number;- scope?: string;-}--/** cc pCn 的 organization_type → subscriptionType 映射(逐字对齐反编译)。 */-const ORG_TYPE_TO_SUBSCRIPTION: Record<string, string> = {- claude_max: 'max',- claude_pro: 'pro',- claude_enterprise: 'enterprise',- claude_team: 'team',-};--export interface SubscriptionProfile {- subscriptionType: string | null;- rateLimitTier: string | null;- identity?: string;-}--/**- * best-effort 拉订阅身份 profile(subscriptionType / rateLimitTier)。- *- * 为什么需要:经 Cindy 浏览器 OAuth 登录写入的凭证 subscriptionType 为 null——- * 旧链路靠「cc 子进程读凭证后自行 refresh 时拉 profile 回填」,而本修复后 cc 不再- * 读凭证库,回填责任随刷新一起转移到 host。协议对齐反编译 cc n0e/pCn:- * GET /api/oauth/profile + Bearer,organization.organization_type 映射档位。- * 失败返回 null(不阻塞刷新主流程,身份字段缺失只影响档位判定不影响鉴权)。- */-export async function fetchSubscriptionProfile(- accessToken: string,- fetchFn: typeof fetch = outboundFetch,-): Promise<SubscriptionProfile | null> {- try {- const res = await fetchFn(PROFILE_URL, {- method: 'GET',- headers: {- Authorization: `Bearer ${accessToken}`,- 'Content-Type': 'application/json',- 'Cache-Control': 'no-cache',- },- signal: AbortSignal.timeout(PROFILE_TIMEOUT_MS),- });- if (res.status !== 200) return null;- const data = (await res.json()) as {- organization?: { organization_type?: string; rate_limit_tier?: string };- account?: { email?: unknown; display_name?: unknown };- };- const orgType = data.organization?.organization_type;- return {- subscriptionType: (orgType && ORG_TYPE_TO_SUBSCRIPTION[orgType]) || null,- rateLimitTier: data.organization?.rate_limit_tier ?? null,- ...(typeof data.account?.email === 'string' ? { identity: data.account.email } : {}),- };- } catch (e) {- log.warn('subscription profile fetch failed (best-effort)', {- error: e instanceof Error ? e.message : String(e),- });- return null;- }-}--export interface ClaudeOAuthRefresherDeps {- readOAuth: () => ClaudeAiOAuth | null;- writeOAuth: (oauth: ClaudeAiOAuth) => void;- fetchFn: typeof fetch;- now: () => number;- /** 跨进程锁所在目录(= cc config dir);锁路径 <lockDir>/.oauth_refresh.lock。 */- lockDir: () => string;- /** 锁冲突退避 sleep(测试注入 0 延迟)。 */- sleep?: (ms: number) => Promise<void>;- /** refresh token 被服务端作废(invalid_grant)时通知 —— adapter 接 invalidate 广播。 */- onInvalidGrant?: (credentialDigest: string) => void;- /** 预续期开关(测试关掉避免悬挂 timer)。默认开。 */- proactiveRenewal?: boolean;-}--export interface GetValidOAuthOptions {- /**- * true = cc 已经用当前 token 撞了 401(本地 expiresAt 判断不可信)。行为:进锁重读,- * 凭证库里的 token 已比进锁前新 → 直接返回不刷(防多会话同时 401 引发连环旋转);- * 仍是同一枚 → 单飞刷新;刷新失败返回 null,绝不把已知坏 token 再递回去。- */- forceRefresh?: boolean;- /**- * 撞 401 的那枚 token(会话 spawn 时注入 / 上次回调返回的)。凭证库当前值 ≠ 它时,- * 说明后台预续期 / 其它会话早已换代,库值本身就是「新 token」—— 直接返回,即便- * forceRefresh 也不再消耗一次轮换(长会话群体 401 时防串行连环旋转)。- * 不传时退回「以库值为基线」的旧语义(仅锁内比对挡回调间并发)。- */- staleToken?: string;-}--const defaultSleep = (ms: number): Promise<void> => new Promise((r) => setTimeout(r, ms));--/**- * 刷新器工厂 —— 依赖注入版,single-flight / generation / timer 状态挂在实例闭包上- * (测试各自 create 隔离)。生产用模块底部的默认实例。- */-export function createClaudeOAuthRefresher(deps: ClaudeOAuthRefresherDeps): {- getValidOAuth: (opts?: GetValidOAuthOptions) => Promise<ClaudeAiOAuth | null>;- /** spawn 注入专用:立即返回现值,临期只触发后台刷新,绝不阻塞。 */- getOAuthForSpawn: () => ClaudeAiOAuth | null;- /** 登出 / 凭证作废时调:在途刷新不写回、撤销预续期 timer。 */- invalidate: () => void;- /** 订阅身份后台回填(登录后调):锁外拉 profile → 拿锁重读 → 缺才 merge 写回。 */- backfillSubscriptionProfile: (accessToken: string) => Promise<void>;-} {- const sleep = deps.sleep ?? defaultSleep;- let inflight: Promise<ClaudeAiOAuth | null> | null = null;- // generation:invalidate() 递增;在途刷新拿着进入时的 gen,完成时 gen 变了就丢弃结果。- let generation = 0;- let proactiveTimer: NodeJS.Timeout | null = null;-- // ── proper-lockfile 兼容的跨进程锁 ────────────────────────────────────────────- function lockPath(): string {- return path.join(deps.lockDir(), LOCK_FILENAME);- }-- /** 尝试拿锁一次:mkdir 原子成功 = 持锁;EEXIST 且 mtime 超 stale → 清掉死锁重试。 */- function tryAcquireOnce(): boolean {- const p = lockPath();- try {- fs.mkdirSync(p);- return true;- } catch (e) {- const code = (e as NodeJS.ErrnoException).code;- if (code === 'ENOENT') {- // 父目录(config dir)不存在:macOS 上仅经 Cindy 浏览器 OAuth 登录的用户凭证- // 在 Keychain,~/.claude 可能从未被创建 —— 锁拿不到会导致刷新永远被跳过,- // 过期后订阅会话全断。先建父目录再重试一次(recursive 幂等)。- try {- fs.mkdirSync(deps.lockDir(), { recursive: true });- fs.mkdirSync(p);- return true;- } catch (e2) {- if ((e2 as NodeJS.ErrnoException).code !== 'EEXIST') {- log.warn('oauth refresh lock mkdir failed after creating config dir', {- error: e2 instanceof Error ? e2.message : String(e2),- });- return false;- }- // EEXIST → 建父目录期间他人抢到锁,走下方 stale 判定- }- } else if (code !== 'EEXIST') {- // 其它异常:锁目录建不出来就退化为「拿不到锁」,走锁外语义,不炸调用方。- log.warn('oauth refresh lock mkdir failed', {- error: e instanceof Error ? e.message : String(e),- });- return false;- }- }- try {- const st = fs.statSync(p);- if (deps.now() - st.mtimeMs <= LOCK_STALE_MS) return false; // 健康锁 → 退避等待- // stale 锁(持有者已死)接管 —— claim → compare → commit/rollback,无 TOCTOU:- // 1) claim: rename 原子转移占有权(同一路径只有一个竞争者 rename 成功,失败者- // ENOENT 退避)。⚠️ rename 走的可能是「st 之后刚被别人重建的健康新锁」,所以- // 此刻还不能删;- // 2) compare: 在 tomb 上比对 mtime —— tomb 已被本进程独占,比对无竞态。mtime- // 等于刚才判 stale 的值 = 确实是那把死锁;- // 3) commit: rm tomb + mkdir 原子竞争建新锁;- // 4) rollback: mtime 不符(claim 到了别人的健康锁)→ rename 原样还回。还锁若撞- // EEXIST(第三者已建新锁)则清掉 tomb 响亮记错 —— 三方同时抢同一把 stale 锁- // 的嵌套竞态,受害者的 touch/release 对 ENOENT 均静默,不炸。- // (review 2026-07-04 P2 ×2:先前的「re-stat 后无条件 rename」在 re-stat 与- // rename 之间仍有单 syscall 窗口;compare-after-claim 把比对挪到独占对象上,- // 主路径彻底原子。)- const tomb = path.join(- deps.lockDir(),- `.oauth_refresh.stale-${process.pid}-${deps.now().toString(36)}`,- );- fs.renameSync(p, tomb); // claim(原子)- const claimed = fs.statSync(tomb);- if (claimed.mtimeMs !== st.mtimeMs) {- // claim 到的是别人刚重建的健康锁 → 原样还回- try {- fs.renameSync(tomb, p);- } catch {- try {- fs.rmSync(tomb, { recursive: true, force: true });- } catch { /* 尽力清理 */ }- log.error('oauth refresh lock rollback failed (three-way stale takeover race); a healthy holder lost its lock');- }- return false;- }- try {- fs.rmSync(tomb, { recursive: true, force: true });- } catch {- /* tomb 残留是无害空目录,不影响锁语义 */- }- fs.mkdirSync(p);- return true;- } catch {- /* 竞态(别人同时抢 / rename ENOENT / mkdir EEXIST)→ 本轮失败,退避后重试 */- }- return false;- }-- interface LockHandle {- release: () => void;- /** 锁已易主(inode 变化 / 目录消失)—— 持有者必须放弃写回。 */- isCompromised: () => boolean;- }-- /**- * 拿锁 + 持锁期间周期 touch。返回句柄;拿不到(对齐 cc 重试 5 次)返回 null。- * ownership 守卫:mkdir 成功后记录锁目录 inode;touch 时 inode 变化 / ENOENT =- * 锁被别人接管(嵌套竞态的最后兜底)→ 置 compromised、停止 touch(绝不 touch 别人- * 的锁)、release 不删;refreshWithLock 写回前检查该标志放弃写回 —— 把理论上的- * 「双持锁双写」降级为「单写 + 一方放弃」(对齐 proper-lockfile onCompromised 语义)。- */- async function acquireLock(): Promise<LockHandle | null> {- for (let attempt = 0; attempt <= LOCK_RETRY_MAX; attempt++) {- if (tryAcquireOnce()) {- let myIno: bigint | number | null = null;- try {- myIno = fs.statSync(lockPath()).ino;- } catch {- /* stat 失败 → 无法校验归属,保守按可疑处理 */- }- let compromised = myIno === null;- const touch = setInterval(() => {- try {- const st = fs.statSync(lockPath());- if (myIno !== null && st.ino !== myIno) {- compromised = true;- clearInterval(touch);- log.warn('oauth refresh lock compromised (taken over by another process); abandoning write-back');- return;- }- const t = new Date(deps.now());- fs.utimesSync(lockPath(), t, t);- } catch {- compromised = true;- clearInterval(touch);- }- }, LOCK_TOUCH_INTERVAL_MS);- return {- isCompromised: () => compromised,- release: () => {- clearInterval(touch);- if (compromised) return; // 锁已是别人的,不许删- try {- const st = fs.statSync(lockPath());- if (myIno !== null && st.ino !== myIno) return;- fs.rmdirSync(lockPath());- } catch {- /* 已被抢走 / 已释放 → no-op */- }- },- };- }- if (attempt < LOCK_RETRY_MAX) {- // 对齐 cc Mzr:1000ms + 抖动退避。抖动用 attempt 序号而非随机数即可满足打散目的。- await sleep(LOCK_RETRY_BASE_DELAY_MS + (attempt * 250));- }- }- log.warn('oauth refresh lock acquire timed out; skip refreshing (holder still active)');- return null;- }-- // ── 刷新请求(纯协议层) ─────────────────────────────────────────────────────- async function requestRefresh(- current: ClaudeAiOAuth,- ): Promise<{ oauth: ClaudeAiOAuth | null; invalidGrant: boolean }> {- const refreshToken = current.refreshToken;- if (!refreshToken) return { oauth: null, invalidGrant: false };- const scopes = Array.isArray(current.scopes) ? current.scopes.filter(Boolean) : [];- const startedAt = deps.now();- let res: Response;- try {- res = await deps.fetchFn(TOKEN_URL, {- method: 'POST',- headers: { 'Content-Type': 'application/json' },- body: JSON.stringify({- grant_type: 'refresh_token',- refresh_token: refreshToken,- client_id: CLIENT_ID,- ...(scopes.length > 0 ? { scope: scopes.join(' ') } : {}),- }),- signal: AbortSignal.timeout(REFRESH_TIMEOUT_MS),- });- } catch (e) {- log.warn('claude oauth refresh request failed (network)', {- error: e instanceof Error ? e.message : String(e),- elapsedMs: deps.now() - startedAt,- });- return { oauth: null, invalidGrant: false };- }- if (res.status !== 200) {- let errorCode = '';- try {- const body = (await res.json()) as { error?: string };- errorCode = typeof body.error === 'string' ? body.error : '';- } catch {- /* 非 JSON 响应 → 只留 status */- }- log.error('claude oauth refresh rejected by server', {- status: res.status,- errorCode,- elapsedMs: deps.now() - startedAt,- });- return { oauth: null, invalidGrant: errorCode === 'invalid_grant' };- }- let data: RefreshTokenResponse;- try {- data = (await res.json()) as RefreshTokenResponse;- } catch (e) {- log.error('claude oauth refresh: malformed 200 response', {- error: e instanceof Error ? e.message : String(e),- });- return { oauth: null, invalidGrant: false };- }- if (!data.access_token) {- log.error('claude oauth refresh: 200 response missing access_token');- return { oauth: null, invalidGrant: false };- }- const next: ClaudeAiOAuth = {- ...current,- accessToken: data.access_token,- // 服务端可能旋转 refresh token;未返回时沿用旧值(对齐 cc 行为)。- refreshToken: data.refresh_token ?? refreshToken,- expiresAt:- typeof data.expires_in === 'number' ? deps.now() + data.expires_in * 1000 : null,- scopes: data.scope ? data.scope.split(' ').filter(Boolean) : current.scopes,- };- // ⚠️ 此处不做订阅身份回填 —— rotated refresh token 必须最快落盘(写回在调用方- // refreshWithLock),profile RTT(最长 10s)不能夹在「刷」与「写回」之间:旧 refresh- // token 此刻已在服务端作废,落盘前进程崩溃 = 凭证库剩已作废值 → 下次 invalid_grant- // 被迫重登;也不能拉长锁临界区 / 吃掉 401 回调 12s 预算。回填走锁外的- // backfillSubscriptionProfile(review 2026-07-04 P2)。- return { oauth: next, invalidGrant: false };- }-- /**- * 订阅身份回填(锁外后台,best-effort):经 Cindy 浏览器 OAuth 登录的凭证- * subscriptionType/rateLimitTier 为 null(旧链路由 cc 刷新时补全,本修复后 cc 不读- * 凭证库)。刷新主流程落盘后异步触发:锁外拉 profile(纯网络,不占临界区)→ 重新拿锁- * → 锁内重读最新凭证 → 字段仍缺才 merge 写回(只补身份字段、不动 token —— 期间他人- * 刷新出的新 token 不会被覆盖)。失败静默,下次刷新再试。- */- async function backfillSubscriptionProfile(accessToken: string): Promise<void> {- const gen = generation;- const profile = await fetchSubscriptionProfile(accessToken, deps.fetchFn);- if (!profile || (profile.subscriptionType == null && profile.rateLimitTier == null)) return;- if (generation !== gen) return; // 拉取期间登出 → 丢弃- const lock = await acquireLock();- if (!lock) return;- try {- if (generation !== gen) return;- if (lock.isCompromised()) return;- const fresh = deps.readOAuth();- if (!fresh?.accessToken) return;- if (fresh.accessToken !== accessToken) {- // 凭证库在 profile 在途期间被换过(换账号登录 / 又一轮刷新)。profile 数据只- // 允许贴到「拉它时所用那枚 token」对应的凭证上 —— token 轮换与换账号无法- // 区分,保守丢弃防跨账号档位污染;字段仍缺的话下次刷新会再补。- log.info('subscription profile backfill discarded: credential changed while fetching');- return;- }- if (fresh.subscriptionType != null && fresh.rateLimitTier != null) return;- deps.writeOAuth({- ...fresh,- subscriptionType: fresh.subscriptionType ?? profile.subscriptionType,- rateLimitTier: fresh.rateLimitTier ?? profile.rateLimitTier,- ...(profile.identity ? { identity: profile.identity } : {}),- });- log.info('subscription profile backfilled', {- subscriptionType: fresh.subscriptionType ?? profile.subscriptionType,- });- } catch (e) {- log.warn('subscription profile backfill write failed', {- error: e instanceof Error ? e.message : String(e),- });- } finally {- lock.release();- }- }-- // ── 锁内刷新流程(single-flight 包裹) ─────────────────────────────────────────- /**- * @param preLockToken 进锁前观察到的 accessToken —— 锁内重读若已不同,说明其它- * 进程/调用刚刷过,直接采用新值不再刷(评审「比对后按需刷新」语义,防连环旋转)。- * @param force 锁内重读后即使未临期也刷(401 场景本地过期判断不可信,但仅当 token- * 仍是进锁前那枚 —— 已换新的直接信任)。- */- async function refreshWithLock(- preLockToken: string,- force: boolean,- ): Promise<ClaudeAiOAuth | null> {- const gen = generation;- const lock = await acquireLock();- if (!lock) {- // 拿不到锁:持有者(本机另一实例 / standalone claude)正在刷,其 HTTP 预算(10s)- // 可能比我们的锁等待(~7.5s)长 —— 放弃前在剩余回调预算内轮询凭证库,写回一落地- // 就用,避免「对方 1-2 秒后就写好、我们却已 null 掉整个 turn」。轮询到头仍没有- // 新值才放弃(调用方按 force 语义降级)。- for (let i = 0; i <= LOCK_LOSER_POLL_ATTEMPTS; i++) {- const reread = deps.readOAuth();- if (reread?.accessToken && reread.accessToken !== preLockToken) return reread;- if (generation !== gen) return null; // 等待期间登出- if (i < LOCK_LOSER_POLL_ATTEMPTS) await sleep(LOCK_LOSER_POLL_INTERVAL_MS);- }- return null;- }- try {- const fresh = deps.readOAuth();- if (!fresh?.accessToken) return null;- if (fresh.accessToken !== preLockToken) {- // 别人已经刷过(锁内重读是唯一可信判定)→ 直接用,不再消耗一次轮换。- log.info('claude oauth refresh skipped: credential already renewed by another writer');- return fresh;- }- const expiresAt = typeof fresh.expiresAt === 'number' ? fresh.expiresAt : null;- const expiringSoon = expiresAt !== null && expiresAt - deps.now() < EXPIRY_MARGIN_MS;- if (!force && !expiringSoon) return fresh;-- const startedAt = deps.now();- const { oauth: next, invalidGrant } = await requestRefresh(fresh);- if (generation !== gen) {- // 刷新期间发生登出:结果作废,绝不写回(否则「已断开」状态凭证复活)。- log.info('claude oauth refresh discarded: invalidated mid-flight (logout)');- return null;- }- if (!next) {- if (invalidGrant) {- // 与下方成功路径同款换代守卫:invalid_grant 报的是**本次刷新用的那枚**- // refresh token;若 HTTP 在途期间凭证库已被换账号登录替换,invalidate 会把- // 刚登录的新账号一并清掉 —— 先重读比对,库已换则采信新凭证、不触发失效。- const postFail = deps.readOAuth();- // Owner switch or unbinding removed access while the request was in flight.- if (!postFail?.accessToken) return null;- if (- postFail?.accessToken &&- (postFail.accessToken !== fresh.accessToken ||- postFail.refreshToken !== fresh.refreshToken)- ) {- log.warn('invalid_grant hit a replaced credential; keeping the newly stored one');- return postFail;- }- // 库仍是失败那套凭证且服务端明确作废 → 刷新无望,通知 UI 重登。- log.error('claude oauth refresh token revoked by server (invalid_grant)');- try {- deps.onInvalidGrant?.(claudeOAuthCredentialDigest(fresh));- } catch (e) {- log.warn('onInvalidGrant handler threw', {- error: e instanceof Error ? e.message : String(e),- });- }- }- return null;- }- if (lock.isCompromised()) {- // 锁在刷新期间易主(嵌套竞态兜底):对方可能正持锁刷新,双写会互相回滚 ——- // 放弃写回与返回,把「双持锁双写」降级为「单写 + 本方放弃」。- log.warn('claude oauth refresh discarded: lock compromised mid-refresh');- return null;- }- const postFetch = deps.readOAuth();- if (- !postFetch?.accessToken ||- postFetch.accessToken !== fresh.accessToken ||- postFetch.refreshToken !== fresh.refreshToken- ) {- // 刷新 HTTP 在途期间凭证库被外部替换 —— 换账号登录 / standalone claude 登录- // 都不经本锁、不 bump generation(登出走 disconnect 已被 gen 检查拦住)。- // 用旧账号的刷新结果写回会静默撤销用户换号 → 丢弃本次结果,采信库中当前凭证。- log.warn('claude oauth refresh discarded: credential store replaced mid-refresh (account switch?)');- return postFetch?.accessToken ? postFetch : null;- }- try {- deps.writeOAuth(next);- } catch (e) {- // 写回失败也返回内存新凭证让本次能用;若服务端旋转了 refresh token,凭证库里- // 留的是已作废旧值,下次刷新会 invalid_grant → 被迫重登,必须响亮记错。- log.error('claude oauth refresh: token refreshed but credential store write failed', {- error: e instanceof Error ? e.message : String(e),- });- }- log.info('claude oauth token refreshed', {- trigger: force ? 'callback-or-force' : 'expiry',- rotatedRefreshToken: next.refreshToken !== fresh.refreshToken,- expiresAt: next.expiresAt,- elapsedMs: deps.now() - startedAt,- });- scheduleProactiveRenewal(next);- // 身份字段缺失 → 锁外后台回填(token 已落盘,不占本次临界区 / 回调预算)。- if (next.subscriptionType == null || next.rateLimitTier == null) {- void backfillSubscriptionProfile(next.accessToken).catch((e) =>- log.warn('subscription profile backfill failed', {- error: e instanceof Error ? e.message : String(e),- }),- );- }- return next;- } finally {- lock.release();- }- }-- // ── 预续期:离过期 < margin 提前后台刷,spawn 几乎永远缓存命中 ────────────────- function scheduleProactiveRenewal(oauth: ClaudeAiOAuth | null): void {- if (deps.proactiveRenewal === false) return;- if (proactiveTimer) {- clearTimeout(proactiveTimer);- proactiveTimer = null;- }- const expiresAt = typeof oauth?.expiresAt === 'number' ? oauth.expiresAt : null;- if (!oauth?.refreshToken || expiresAt === null) return;- const delay = Math.max(expiresAt - deps.now() - EXPIRY_MARGIN_MS, PROACTIVE_MIN_DELAY_MS);- const gen = generation;- proactiveTimer = setTimeout(() => {- proactiveTimer = null;- if (generation !== gen) return;- log.info('claude oauth proactive renewal firing', { expiresAt });- void getValidOAuth().catch((e) =>- log.warn('proactive renewal failed', {- error: e instanceof Error ? e.message : String(e),- }),- );- }, delay);- // Electron main 常驻,unref 防 timer 阻止测试进程退出。- proactiveTimer.unref?.();- }-- // ── 对外 API ─────────────────────────────────────────────────────────────────- async function getValidOAuth(opts?: GetValidOAuthOptions): Promise<ClaudeAiOAuth | null> {- const current = deps.readOAuth();- if (!current?.accessToken) return null;-- if (opts?.staleToken && current.accessToken !== opts.staleToken) {- // 库值已比失败的那枚新(后台预续期 / 其它会话换代)→ 直接交出,不消耗轮换。- return current;- }-- const expiresAt = typeof current.expiresAt === 'number' ? current.expiresAt : null;- const expiringSoon = expiresAt !== null && expiresAt - deps.now() < EXPIRY_MARGIN_MS;- if (!opts?.forceRefresh && !expiringSoon) {- scheduleProactiveRenewal(current);- return current;- }-- if (!current.refreshToken) {- // 无 refresh token 无从刷新:非强制场景把现有 token 原样交出(可能还有残余寿命);- // 强制场景(401 后)返回 null 让上层报 auth 错。- return opts?.forceRefresh ? null : current;- }-- if (!inflight) {- inflight = refreshWithLock(current.accessToken, opts?.forceRefresh ?? false).finally(- () => {- inflight = null;- },- );- }- const refreshed = await inflight;- if (refreshed) return refreshed;- // 刷新失败:非强制场景退回现有 token(临期未必已失效,让请求自然成败);- // 强制场景绝不复用已确认失效的 token。- return opts?.forceRefresh ? null : current;- }-- function getOAuthForSpawn(): ClaudeAiOAuth | null {- const current = deps.readOAuth();- if (!current?.accessToken) return null;- const expiresAt = typeof current.expiresAt === 'number' ? current.expiresAt : null;- const expiringSoon = expiresAt !== null && expiresAt - deps.now() < EXPIRY_MARGIN_MS;- if (expiringSoon && current.refreshToken) {- // 后台单飞刷新,不 await —— spawn 首响应不吃刷新 RTT(规则 10 返回速度约束)。- // 本次注入旧 token:若它已彻底失效,401 回调链路会兜底换新。- void getValidOAuth().catch((e) =>- log.warn('background refresh (spawn-triggered) failed', {- error: e instanceof Error ? e.message : String(e),- }),- );- } else {- scheduleProactiveRenewal(current);- }- return current;- }-- function invalidate(): void {- generation += 1;- if (proactiveTimer) {- clearTimeout(proactiveTimer);- proactiveTimer = null;- }- log.info('claude oauth refresher invalidated (logout / credential cleared)');- }-- return { getValidOAuth, getOAuthForSpawn, invalidate, backfillSubscriptionProfile };-}--// ── 生产默认实例(懒初始化,import 零副作用 —— 见 authAdaptersImportPurity 约定) ──--/** 默认 config dir(prod、无 CLAUDE_CONFIG_DIR override)= ~/.claude,与凭证库同根。 */-function defaultLockDir(): string {- return process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');-}--let defaultRefresher: ReturnType<typeof createClaudeOAuthRefresher> | null = null;-let invalidGrantHandler: ((credentialDigest: string) => void) | null = null;--function getDefaultRefresher(): ReturnType<typeof createClaudeOAuthRefresher> {- if (!defaultRefresher) {- defaultRefresher = createClaudeOAuthRefresher({- readOAuth: readClaudeAiOAuth,- writeOAuth: writeClaudeAiOAuth,- // 刷新与 profile 回填都打境外端点,必须吃系统代理(见 outbound-fetch.ts)。- fetchFn: outboundFetch,- now: Date.now,- lockDir: defaultLockDir,- onInvalidGrant: (digest) => invalidGrantHandler?.(digest),- });- }- return defaultRefresher;-}--/**- * 取「当前有效」的 Claude.ai 订阅 OAuth 凭证:未登录 → null;临期 / forceRefresh →- * 跨进程锁内比对后按需刷新;失败按 forceRefresh 语义降级(见 GetValidOAuthOptions)。- */-export function getValidClaudeAiOAuth(- opts?: GetValidOAuthOptions,-): Promise<ClaudeAiOAuth | null> {- return getDefaultRefresher().getValidOAuth(opts);-}--/** spawn 注入专用:立即返回现值不阻塞;临期触发后台刷新。 */-export function getClaudeAiOAuthForSpawn(): ClaudeAiOAuth | null {- return getDefaultRefresher().getOAuthForSpawn();-}--/** 登出 / 凭证清除时调:放弃在途刷新写回、撤销预续期 timer。 */-export function invalidateClaudeOAuthRefresh(): void {- defaultRefresher?.invalidate();-}--/**- * 后台补订阅身份字段(登录后 fire-and-forget 调用):锁外拉 profile → 拿锁 → 锁内- * 重读 → 字段仍缺才 merge 写回。login 流程不得 await 它(登录成功页不吃 profile RTT,- * review 2026-07-04 P1);失败静默,首次刷新时会再补。- */-export function backfillClaudeSubscriptionProfile(accessToken: string): Promise<void> {- return getDefaultRefresher().backfillSubscriptionProfile(accessToken);-}--/** Stop Cindy refreshes and revoke only Cindy's use of the native subscription. */-export async function disconnectClaudeAiOAuth(): Promise<void> {- invalidateClaudeOAuthRefresh();- unbindNativeProviderAuth('anthropic', { revoked: true });- await retainProviderPresentationAfterAuthChange('anthropic');-}--/** Reattach the existing native login; never write or remove system credentials. */-export function reconnectClaudeAiOAuth(): boolean {- const oauth = readClaudeAiOAuthUnbound();- if (!oauth || isNativeProviderCredentialRejected('anthropic', claudeOAuthCredentialDigest(oauth), { explicitReconnect: true })) return false;- invalidateClaudeOAuthRefresh();- bindNativeProviderAuth('anthropic', { sharedSystem: true });- // Binding commits login synchronously; auxiliary disk contention must not keep Cancel open.- void retainProviderPresentationAfterAuthChange('anthropic');- return true;-}--/** refresh token 被服务端作废时的通知接线(auth-adapters 装配,内存操作零副作用)。 */-export function setClaudeOAuthInvalidGrantHandler(handler: ((credentialDigest: string) => void) | null): void {- invalidGrantHandler = handler;-}--export { claudeOAuthCredentialDigest } from './claude-credentials-store.js';diff --git a/apps/desktop/src/main/maker-host/claude-oauth-spawn-env.ts b/apps/desktop/src/main/maker-host/claude-oauth-spawn-env.tsdeleted file mode 100644index e3bdca705e..0000000000--- a/apps/desktop/src/main/maker-host/claude-oauth-spawn-env.ts+++ /dev/null@@ -1,28 +0,0 @@-/**- * claude-oauth-spawn-env —— 订阅 OAuth 凭证 → cc 子进程 env 字段的唯一翻译点。- *- * token + 身份元数据(scopes / subscriptionType / rateLimitTier)必须一起递:cc- * env-token 分支默认 scopes 只有 user:inference,不递会丢订阅身份细节(feature- * gate / beta header 判定用)。本地 oauth-spawn(auth-adapters getAuthEnv)与远端- * 路由 materialization(remote-claude-route)共用本函数 —— 两处各写一份时,新增- * 身份字段会静默漂移。- *- * 纯函数、无 electron / fs 依赖:remote-claude-route 的单测 mock 掉了- * auth-adapters / claude-credentials-store,本模块保持真实实现参与测试。- */--import type { ClaudeAiOAuth } from './claude-credentials-store.js';--export function claudeOAuthSpawnEnv(oauth: ClaudeAiOAuth): Record<string, string> {- const env: Record<string, string> = { CLAUDE_CODE_OAUTH_TOKEN: oauth.accessToken };- if (Array.isArray(oauth.scopes) && oauth.scopes.length > 0) {- env.CLAUDE_CODE_OAUTH_SCOPES = oauth.scopes.join(' ');- }- if (typeof oauth.subscriptionType === 'string' && oauth.subscriptionType) {- env.CLAUDE_CODE_SUBSCRIPTION_TYPE = oauth.subscriptionType;- }- if (typeof oauth.rateLimitTier === 'string' && oauth.rateLimitTier) {- env.CLAUDE_CODE_RATE_LIMIT_TIER = oauth.rateLimitTier;- }- return env;-}diff --git a/apps/desktop/src/main/maker-host/codex-credential-switch.ts b/apps/desktop/src/main/maker-host/codex-credential-switch.tsindex 79b19a5aca..a4511839ff 100644--- a/apps/desktop/src/main/maker-host/codex-credential-switch.ts+++ b/apps/desktop/src/main/maker-host/codex-credential-switch.ts@@ -9,6 +9,8 @@ import {} from '@cindy/maker-core';import { claudeToolSearchMode } from './claude-behavior-flags.js';+import { isAnthropicWireModel } from './claude-gateway-config.js';+import { hasClaudeNativeLogin } from './claude-native-auth.js';import {CODEX_CINDY_COMPACT_PROVIDER_ID,CODEX_SUMMARY_COMPACT_PROVIDER_ID,@@ -346,6 +348,15 @@ export function shouldCloseSessionForCredentialSwitch(if (currentProviderId !== nextProviderId && [current, next].some(provider => provider && providerCatalogId(provider) === 'anthropic',)) return true;+ // 未指定来源的会话在没有网关 key 时,Anthropic 模型跑在本机 Claude Code 登录上(CLI 直连,+ // 进程里没有 proxy 地址),其它模型经 proxy。是哪种取决于 spawn 那一刻,这里回看不到:+ // 订阅已连接时,隐式一侧换来源、或在 Anthropic 与非 Anthropic 模型之间切换,一律重建。+ if (+ (currentProviderId === null || nextProviderId === null) &&+ (currentProviderId !== nextProviderId ||+ isAnthropicWireModel(input.currentModel) !== isAnthropicWireModel(input.nextModel)) &&+ hasClaudeNativeLogin()+ ) return true;// Tool Search is also spawn-time state, independent of the credential family.if (claudeToolSearchMode(currentProviderId, currentMode, current?.auth.native) !==claudeToolSearchMode(nextProviderId, nextMode, next?.auth.native)) return true;diff --git a/apps/desktop/src/main/maker-host/codex-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.tsindex 7b4c4e1d02..ed1c70d04a 100644--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts@@ -74,7 +74,7 @@ import {type ChatBridgeCapabilities,} from '@cindy/responses-chat-bridge';import { createResponsesAnthropicHandler } from '@cindy/responses-anthropic-bridge';-import { createHash, randomUUID } from 'node:crypto';+import { randomUUID } from 'node:crypto';import fs from 'node:fs';import path from 'node:path';@@ -115,10 +115,7 @@ import {} from './provider-route.js';import type { CodexSubagentRouteSnapshot } from './codex-subagent-config.js';import { getSessionProvider } from './session-provider-store.js';-import {- composeResponseObservers,- recordClaudeRateLimitHeaders,-} from './claude-rate-limit-headers-observer.js';+import { composeResponseObservers } from './claude-rate-limit-headers-observer.js';import { createProviderUpstreamErrorObserver, reportProviderUpstreamError } from './provider-upstream-error-observer.js';import { createXaiProxyAuthInvalidationObserver } from './xai-auth-invalidation-host.js';import { xaiServerSideTools } from './xai-server-side-tools.js';@@ -1333,42 +1330,34 @@ function appendCommaSeparatedHeaderToken(headers[name] = values.join(',');}-function claudeCodeSessionId(token: string): string {- const hash = createHash('sha256')- .update(`claude-code-session:${token}`, 'utf8')- .digest('hex');- const variant = ((Number.parseInt(hash[16], 16) & 0x3) | 0x8).toString(16);- return `${hash.slice(0, 8)}-${hash.slice(8, 12)}-4${hash.slice(13, 16)}-${variant}${hash.slice(17, 20)}-${hash.slice(20, 32)}`;-}--function claudeOAuthHeaders(- base: Record<string, string>,- token: string,-): Record<string, string> {- return {- ...base,- authorization: `Bearer ${token}`,- 'anthropic-beta': 'claude-code-20250219,oauth-2025-04-20',- 'user-agent': '@anthropic-ai/sdk/0.74.0',- 'x-app': 'cli',- 'x-stainless-retry-count': '0',- 'x-stainless-runtime': 'node',- 'x-stainless-lang': 'js',- 'x-stainless-timeout': '600',- 'x-stainless-arch': process.arch,- 'x-stainless-os': process.platform,- 'x-stainless-package-version': '0.74.0',- 'x-stainless-runtime-version': process.version.slice(1),- 'x-claude-code-session-id': claudeCodeSessionId(token),- 'x-client-request-id': randomUUID(),- };-}-/*** Responses → Anthropic Messages local bridge. The bridge owns both request and* response translation; this host layer only resolves the selected provider, supplies* provider-owned credentials, and restores preprocessing skipped by localHandler.*/+/**+ * Claude 订阅只供内置 Claude Code CLI 用它自己的登录使用,Codex 不得借用。目录已不向 Codex+ * 提供 Claude 订阅;旧会话 / 远端目录残留的选择在本地明确拒绝,绝不回落到默认上游+ * (否则会按 ChatGPT 订阅或网关另行计费)。+ */+function claudeSubscriptionCodexRefusalDecision(): RoutingDecision {+ return {+ localHandler: async ({ res }) => {+ res.writeHead(403, {+ 'content-type': 'application/json; charset=utf-8',+ 'cache-control': 'no-store',+ });+ res.end(JSON.stringify({+ error: {+ type: 'permission_error',+ code: 'anthropic_subscription_claude_code_only',+ message: 'Claude subscriptions are only available in Claude Code. Choose another model for Codex.',+ },+ }));+ },+ };+}+function createAnthropicBridgeDecision(route: Awaited<ReturnType<typeof resolveSessionRoute>>,instructions: string | undefined,@@ -1398,42 +1387,15 @@ function createAnthropicBridgeDecision(},};}- // For Codex, provider-oauth-header is the subscription-safe route: the host- // injects the Claude.ai token and never forwards the Codex/OpenAI bearer.- if (- isClaudeSubscriptionProviderId(route.providerId)- && route.routing.authStrategy === 'provider-oauth-header'- && !route.oauthToken- ) {- return {- localHandler: async ({ res }) => {- res.writeHead(401, {- 'content-type': 'application/json; charset=utf-8',- 'cache-control': 'no-store',- });- res.end(JSON.stringify({- error: {- type: 'authentication_error',- code: 'anthropic_subscription_auth_required',- message: 'Connect a Claude.ai subscription before using Anthropic models in Codex.',- },- }));- },- };- }+ if (isClaudeSubscriptionProviderId(route.providerId)) return claudeSubscriptionCodexRefusalDecision();const usesProviderOAuth = route.routing.authStrategy === 'provider-oauth-header';- const isAnthropicSubscriptionOAuth =- usesProviderOAuth- && isClaudeSubscriptionProviderId(route.providerId);const buildProviderHeaders = (token: string | null): Record<string, string> => {const { headers: baseHeaders } = buildLocalHandlerHeaders(token === route.oauthToken ? route : { ...route, oauthToken: token },'codex',);- let headers = { ...baseHeaders };- if (isAnthropicSubscriptionOAuth) {- if (token) headers = claudeOAuthHeaders(headers, token);- } else if (route.routing.authStrategy === 'api-key-header') {+ const headers = { ...baseHeaders };+ if (route.routing.authStrategy === 'api-key-header') {if (route.apiKey) {headers['x-api-key'] = route.apiKey;} else if (!headerValue(headers, 'x-api-key')) {@@ -1483,7 +1445,7 @@ function createAnthropicBridgeDecision(const handler = createResponsesAnthropicHandler({upstreamBase,...(route.routing.requestPath ? { requestPath: route.routing.requestPath } : {}),- authMode: isAnthropicSubscriptionOAuth ? 'oauth' : 'api-key',+ authMode: 'api-key',buildHeaders: async () => buildProviderHeaders(route.oauthToken),...(usesProviderOAuth? {@@ -1516,29 +1478,6 @@ function createAnthropicBridgeDecision(: () => false,imageCodec: desktopAnthropicImageCodec,...(onUpstreamError ? { onUpstreamError } : {}),- // 账号额度旁路 —— 只给「内置 Anthropic + 订阅 OAuth + 官方 hostname」这一种路由- // 装。桥的 localHandler 绕开了 compat-proxy 的转发层, 转发层上的- // createClaudeRateLimitHeadersObserver 看不到这些响应(见 #2626), 所以额度只能- // 从这里回喂; 解析与去抖仍走 observer 那份共用状态, 不复制第二份。- //- // 其余形态一律不装: API key / 自定义兼容供应商 / XD Gateway 的响应要么没有- // unified headers, 要么根本不属于这个 Claude 订阅账号, 误写会污染快照。- ...(isAnthropicSubscriptionOAuth && isOfficialAnthropicUpstream(upstreamBase)- ? {- onUpstreamResponse: ({ responseHeaders, requestHeaders }: {- responseHeaders: Headers;- requestHeaders: Readonly<Record<string, string>>;- }) => {- // Fetch `Headers` 不支持索引取值, 直接传下去会被静默解析成 null;- // 迭代出的 key 一律小写, 正是解析函数要求的形态。- recordClaudeRateLimitHeaders({- upstreamBase,- responseHeaders: Object.fromEntries(responseHeaders),- requestHeaders,- });- },- }- : {}),}, {logger: log,fetchImpl: outboundFetch,@@ -2819,6 +2758,10 @@ export function createModelRoutingTransform(const model = subagentRoute?.catalogModel ?? reportedModel;const explicitProviderId = subagentRoute?.providerId?? (sessionId ? getSessionProvider(sessionId) : null);+ // 推理请求钉在 Claude 订阅上(旧会话 / 子代理快照):本地拒绝,不落任何默认上游。+ if (model && explicitProviderId && isClaudeSubscriptionProviderId(explicitProviderId)) {+ return claudeSubscriptionCodexRefusalDecision();+ }const pendingRoute = sessionId && !subagentRoute? resolvePendingSessionRouteDecision(sessionId, model || undefined): null;diff --git a/apps/desktop/src/main/maker-host/createDesktopProviderService.ts b/apps/desktop/src/main/maker-host/createDesktopProviderService.tsindex 9cd4667578..ee122d6151 100644--- a/apps/desktop/src/main/maker-host/createDesktopProviderService.ts+++ b/apps/desktop/src/main/maker-host/createDesktopProviderService.ts@@ -1,6 +1,6 @@import { readProviderPresentation } from './provider-presentation-store.js';import { filterLegacyGptContextProfiles } from './legacy-context-profiles.js';-import { subscriptionAccountKind, subscriptionAccountState, isXaiSubscriptionProviderId, getValidClaudeAccountOAuth, resetSubscriptionAccountCaches } from './subscription-account-auth.js';+import { subscriptionAccountState, isXaiSubscriptionProviderId, resetSubscriptionAccountCaches } from './subscription-account-auth.js';/*** createDesktopProviderService —— 桌面端目录加载落地 + provider-service 接线。*@@ -15,7 +15,7 @@ import { subscriptionAccountKind, subscriptionAccountState, isXaiSubscriptionPro* 启动期(splash)由 bootstrap-electron 在构造 Maker 前 await 一次(见 registerMakerIpcsAfterSplash)。* 2. `getDesktopProviderService`:把 active-catalog + 连接状态读取器注入 provider-service。* 连接状态直接复用现有凭证存储——XD = 托管 gateway key 是否存在、- * Anthropic = 系统 Claude.ai OAuth 是否登录、OpenAI = Codex 是否 OAuth 登录。+ * Anthropic = 内置 Claude Code CLI 是否已登录(且 Cindy 获准使用)、OpenAI = Codex 是否 OAuth 登录。* 与设置页现有 auth 流程同源,不另立通道。*/@@ -68,11 +68,7 @@ import {readCodexDiscoveredModels,readCodexDiscoveredModelsForAuthRefresh,} from './codex-model-discovery.js';-import {- getAnthropicModelDiscoveryFailure,- loadAnthropicModelsFromDiskCache,- refreshAnthropicModelsFromHttp,-} from './model-discovery/anthropic.js';+import { loadAnthropicModelsFromDiskCache } from './model-discovery/anthropic.js';import {clearXaiDiscoveredModels,loadXaiModelsFromDiskCache,@@ -109,12 +105,9 @@ import {readCustomProviderHeaders,readCustomProviderKey,} from '../secrets/providerSecretStore.js';-import {- hasClaudeAiOAuth,- hasClaudeAiOAuthUnbound,- readClaudeAiOAuth,-} from './claude-credentials-store.js';-import { getValidClaudeAiOAuth } from './claude-oauth-refresh.js';+import { hasClaudeNativeLogin, hasClaudeNativeLoginUnbound } from './claude-native-auth.js';+import { readClaudeNativeLogin } from './claude-native-connection.js';+import { readClaudeCliLoginStatus } from './claude-native-cli.js';import {getGrokAccessToken,hasGrokOAuthLogin,@@ -134,6 +127,8 @@ import { getAppCapabilities } from '../appCapabilities.js';import {claimDetectedNativeProviderAuth,getNativeProviderAuthSource,+ isNativeProviderAuthBound,+ isNativeProviderAuthRevoked,migrateLegacyNativeProviderAuthBindings,} from './nativeProviderAuthBinding.js';import { hasLegacyOwnerNamespaceClaim } from '../ownerNamespaceMigration.js';@@ -463,15 +458,8 @@ export function ensureActiveCatalogLoaded(): Promise<Catalog> {setCustomProviderHeaderReader(readCustomProviderHeaders);setProviderOAuthTokenReader((providerId, agent, options) => {if (isXaiSubscriptionProviderId(providerId)) return readXaiProviderOAuthToken(options, providerId);- if (subscriptionAccountKind(providerId) === 'claude') {- return getValidClaudeAccountOAuth(providerId, options).then(oauth => oauth?.accessToken ?? null);- }- // Codex and Pi processes do not carry Claude Code's native OAuth credential.- // Their Anthropic bridges read the host-owned Claude.ai token and allow the- // existing refresher to rotate it when needed.- if (providerId === 'anthropic' && (agent === 'codex' || agent === 'pi')) {- return getValidClaudeAiOAuth(options).then((oauth) => oauth?.accessToken ?? null);- }+ // Claude 订阅凭证只在内置 Claude Code CLI 里,Cindy 从不读取;因此不为任何+ // provider 路由(含 Codex / Pi bridge)提供 Claude 订阅 token。return null;});// 测试连接探测与路由同源读 key(同 setter 模式,见 provider-diagnostics.ts)。@@ -546,10 +534,13 @@ export function ensureActiveCatalogLoaded(): Promise<Catalog> {/* 读/映射失败:保持现值,不影响启动 */}// Anthropic 动态清单:同步加载磁盘缓存(上次成功结果,登录态 gate 在内部),- // 让首次 maker 构建的 availableModels 派生就包含它;HTTP 刷新放后台,- // 不阻塞 splash(失败保留现值,语义见 model-discovery/anthropic.ts)。- await loadAnthropicModelsFromDiskCache();- void refreshAnthropicModelsFromHttp();+ // 让首次 maker 构建的 availableModels 派生就包含它。gate 读的是 CLI 登录态:只有+ // 已连接 Claude 订阅的用户才等一次 `claude auth status`(约 0.1–0.3s),其余用户的+ // 启动不等 CLI 进程(未绑定时缓存加载本就早退)。此后由会话 init 的 SDK 捕获刷新。+ if (isNativeProviderAuthBound('anthropic')) {+ await readClaudeCliLoginStatus();+ await loadAnthropicModelsFromDiskCache();+ }// xAI 账号成员同样先恢复当前 owner 的成功 LKG,再后台读官方账号清单。// 无 LKG / 刷新失败时 active-catalog 才继续使用 server Catalog → bundled 救急。await loadXaiModelsFromDiskCache();@@ -934,10 +925,9 @@ function refreshAnthropicCatalogAfterClaim(): Promise<void> {if (anthropicClaimDiscoveryInflight) return anthropicClaimDiscoveryInflight;const flight = (async () => {- // 启动期两条加载都可能因尚未绑定而早退。先恢复最后一次成功的磁盘清单,再刷新- // HTTP;任一失败都保留已有目录,不把连接态读取整条打穿。+ // 启动期的磁盘清单加载可能因尚未绑定而早退,认领后补一次;失败保留已有目录,+ // 不把连接态读取整条打穿。之后由会话 init 的 SDK 捕获刷新(Cindy 不带订阅凭证拉清单)。await loadAnthropicModelsFromDiskCache().catch(() => undefined);- await refreshAnthropicModelsFromHttp().catch(() => false);})();anthropicClaimDiscoveryInflight = flight;const clear = () => {@@ -991,7 +981,7 @@ export function getDesktopProviderService(): ProviderService {hasLegacyOwnerNamespaceClaim(ownerId)) {migrateLegacyNativeProviderAuthBindings(ownerId, {- anthropic: hasClaudeAiOAuthUnbound(),+ anthropic: hasClaudeNativeLoginUnbound(),openai: desktopCodexAuthAdapter.hasCodexOAuthLoginUnbound(),// 这是升级迁移,不是 CLI 自动发现:旧 xAI blob 只可能由 Cindy OAuth 写入,// nativeProviderAuthBinding 会把它记为 explicit-provider-oauth。@@ -1010,19 +1000,18 @@ export function getDesktopProviderService(): ProviderService {// 自愈会写绑定文件、读凭证作用域缓存并发起带凭证的上游请求。listProviders 这条通道// 同时服务 device-link 与可能不受信的渲染上下文,所以副作用只在本机主页面发起时// 才放行,其余降级为纯读(PR #548 review)。- if (!allowSideEffects) return hasClaudeAiOAuth();+ // 明确断开过:不认领、也不必读 CLI。+ if (!isNativeProviderAuthBound('anthropic') && isNativeProviderAuthRevoked('anthropic')) return false;+ // 列表类读取不等 CLI 进程:用缓存(过期则后台重读,变化经登录态监听广播)。+ // 需要结论的读取(waitForDiscovery,如刚登录后的目录补拉)才等待。+ await readClaudeCliLoginStatus({ maxAgeMs: 30_000, staleWhileRevalidate: waitForDiscovery !== true });+ if (!allowSideEffects) return hasClaudeNativeLogin();await claimNativeProviderAuthOnRead('anthropic',- hasClaudeAiOAuthUnbound,+ hasClaudeNativeLoginUnbound,() => {- // anthropic 的 live entitlement 证据只来自动态发现,而发现只在启动期与- // 显式 OAuth 登录成功时触发。绑定是在这两个时机之后才建立的,启动期那次- // 早被登录态 gate 掉——不在认领成功时补拉,目录虽可能有 Registry presence,- // 运行时仍缺少当前账号的可用性证据。- //- // 磁盘缓存要先补:启动期的 loadAnthropicModelsFromDiskCache 同样因当时未绑定而- // 早退了。先把上次成功的清单摆出来,再去拉最新的 —— 否则这次 HTTP 一旦超时或- // 失败,明明有可用的缓存清单,用户还是一个模型都选不了(PR #548 review)。+ // 启动期的 loadAnthropicModelsFromDiskCache 因当时未绑定而早退了:认领成功时+ // 把上次成功的清单摆出来,否则只剩 Registry presence(PR #548 review)。return refreshAnthropicCatalogAfterClaim();},waitForDiscovery === true,@@ -1032,7 +1021,7 @@ export function getDesktopProviderService(): ProviderService {if (waitForDiscovery === true && anthropicClaimDiscoveryInflight) {await anthropicClaimDiscoveryInflight;}- return hasClaudeAiOAuth();+ return hasClaudeNativeLogin();},// openai 的自愈挂在 adapter 的 reconcile 收口里(#294 既有形态),这里同样要受开关约束:// hasCodexOAuthLogin() 经 getAccessToken 触发 reconcileWithSystemCodex,它会把本机 CLI@@ -1053,12 +1042,12 @@ export function getDesktopProviderService(): ProviderService {subscriptionAccountConnected: (providerId) => subscriptionAccountState(providerId).authenticated,subscriptionAccountInfo: async (providerId) => {if (providerId === 'anthropic') {- const oauth = readClaudeAiOAuth();+ const login = await readClaudeNativeLogin();const source = getNativeProviderAuthSource('anthropic');return {source: source === 'native-harness-inherited' ? 'local': source === 'explicit-provider-oauth' ? 'oauth' : 'unknown',- identity: typeof oauth?.identity === 'string' ? oauth.identity : undefined,+ identity: login?.email,};}if (providerId === 'xai') {@@ -1103,14 +1092,6 @@ export function getDesktopProviderService(): ProviderService {.map((model) => ({ providerId: 'xd', id: model.id })): []),],- // 动态发现失败归因:目前只有 anthropic 的 live entitlement 证据依赖这条通道。- // 即使 Registry presence 仍能展示目录,UI 也要说明当前账号验证失败,而不是一直- // 说「正在发现」。- //- // 连接态直接沿用本次快照已经算好的那个:它内部要读凭证库,macOS 上每读一次就是一个- // 同步的 `security` 子进程,同一次 listProviders 不该为此阻塞主线程两回(PR #548 review)。- modelDiscoveryFailure: (providerId, connected) =>- providerId === 'anthropic' ? getAnthropicModelDiscoveryFailure(connected) : null,// 「模型 / 供应商停用」override:main 侧持久化真源,烘焙进 ProviderView 后// renderer / IM / Orca / device-link 全部消费同一份准入事实。getModelAccess: readModelDisableOverrides,diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.tsindex 39e5f93d3d..15cf22b056 100644--- a/apps/desktop/src/main/maker-host/index.ts+++ b/apps/desktop/src/main/maker-host/index.ts@@ -190,10 +190,7 @@ import {refreshDiscoveredCodexModels,setNativeProviderClaimListener,} from './createDesktopProviderService.js';-import {- clearAnthropicDiscoveredModels,- setAnthropicDiscoveryFailureListener,-} from './model-discovery/anthropic.js';+import { clearAnthropicDiscoveredModels } from './model-discovery/anthropic.js';import {buildDesktopClaudeRuntimeConfig,desktopCodexRuntimeConfig,@@ -202,7 +199,6 @@ import {import {getClaudeEndpoint,setClaudeProxyGatewayKeyReader,- setClaudeProxyOAuthSpawnChecker,} from './anthropic-compat-proxy-host.js';import { resolveRemoteClaudeRoute } from './remote-claude-route.js';import { resolveDesktopClaudeSubagentModelAccess } from './subagent-model-access.js';@@ -214,7 +210,6 @@ import {} from './auto-review-model-router.js';import { ensureCurrentAccountProviderReadiness } from './account-provider-readiness-ensure.js';import { ACCOUNT_PROVIDER_NOT_READY_CODE } from '../../shared/accountProviderReadiness.js';-import { hasClaudeAiOAuth } from './claude-credentials-store.js';import {armCodexHttpRecovery,clearCodexProxyAuthInjection,@@ -450,25 +445,6 @@ setActiveCatalogChangedListener((revision) => {}});-/**- * anthropic 清单发现的失败态变化 → 广播 PROVIDER_CHANGED。- *- * 归因不进 active catalog(清单没变,没有 revision 可言),但 renderer 往往在拉取失败- * **之前**就取走了 provider 快照(15s 超时那条路径尤其明显)。不主动通知,设置页会一直- * 停在「正在发现」而不是讲明失败理由(PR #548 review)。- */-setAnthropicDiscoveryFailureListener(() => {- try {- // 复用既有的「刷 capabilities + 广播」收口:清单确实没变,这一步只是把 provider- // 快照重新推给 renderer,让它重取带上失败归因的 listProviders。- refreshSelectableModelsAndBroadcast({});- } catch (error) {- desktopMakerLogger.warn('anthropic discovery failure broadcast failed', {- error: error instanceof Error ? error.message : String(error),- });- }-});-/*** 本机凭证绑定自愈成功 → 广播 PROVIDER_CHANGED。*@@ -1145,9 +1121,8 @@ export function getMaker(): Maker {// 再转 gateway —— 这把 key 不进子进程 env(R4),由本地 proxy 旁路读取。注入 reader,// 与 codex setCodexProxyGatewayKeyReader 同源(都用 readClaudeApiKey 读那把 XD gateway key)。setClaudeProxyGatewayKeyReader(readClaudeApiKey);- // cc spawn 凭证形态(oauth-spawn vs gateway-spawn)由「是否连了 Claude.ai 订阅」决定;- // proxy 的默认路由据此分流(oauth-spawn 默认换网关 key、gateway-spawn passthrough)。live 读。- setClaudeProxyOAuthSpawnChecker(hasClaudeAiOAuth);+ // 不再接 setClaudeProxyOAuthSpawnChecker:Claude 订阅会话由 CLI 直连 Anthropic、不经本+ // proxy,经 proxy 的 cc 进程一律带网关 key / 占位 key,默认路由恒按 gateway-spawn 分流。// 两个 agent 各自持有一份 mcpProviders 数组(内置 lizi + orca bridge)。用户自定义 MCP// 由 custom-mcp-registry 在启动 + 每次 CRUD 后**原地追加/刷新**到这两个数组末尾,// 因此这里必须用具名 const 保住引用(不能内联 spread 出临时数组)。diff --git a/apps/desktop/src/main/maker-host/model-context-settings.ts b/apps/desktop/src/main/maker-host/model-context-settings.tsindex e7aa1eac7f..48768b31d6 100644--- a/apps/desktop/src/main/maker-host/model-context-settings.ts+++ b/apps/desktop/src/main/maker-host/model-context-settings.ts@@ -1,7 +1,7 @@import type { AgentKind, Catalog } from '@cindy/model-providers';import { desktopCodexAuthAdapter, readClaudeApiKey } from './auth-adapters.js';-import { hasClaudeAiOAuth } from './claude-credentials-store.js';+import { hasClaudeNativeLogin } from './claude-native-auth.js';import { gatewayDefaultRouteDecision } from './provider-route.js';import { resolveModelContextProviderId, resolveVerifiedContextWindow } from './catalog-to-descriptors.js';import { readModelContextLimit } from './model-context-limit-store.js';@@ -15,11 +15,12 @@ export function resolveDesktopModelContextProviderId(): string | null {const source = resolveModelContextProviderId(catalog, agent, providerId, modelId);if (source || providerId) return source;- // Claude's OAuth spawn may still route through XD; login alone is not its destination.+ // Implicit Claude sessions use the gateway whenever a gateway key exists; only without one+ // do they fall back to the local Claude Code login (same order as the Claude auth adapter).// Codex's ordinary implicit models instead inherit subscription-first spawn credentials.const defaultSource = agent === 'claude-code'? gatewayDefaultRouteDecision(agent, readClaudeApiKey()) ? 'xd'- : hasClaudeAiOAuth() ? 'anthropic' : null+ : hasClaudeNativeLogin() ? 'anthropic' : null: agent === 'codex'? modelId.startsWith('codex/') ? 'xd': desktopCodexAuthAdapter.hasCodexOAuthLoginReadOnly() ? 'openai' : 'xd'diff --git a/apps/desktop/src/main/maker-host/model-discovery/anthropic.ts b/apps/desktop/src/main/maker-host/model-discovery/anthropic.tsindex 253b2fed94..3535dc5c42 100644--- a/apps/desktop/src/main/maker-host/model-discovery/anthropic.ts+++ b/apps/desktop/src/main/maker-host/model-discovery/anthropic.ts@@ -3,37 +3,35 @@ import { pickModelMetadata } from '@cindy/model-providers';* model-discovery/anthropic —— Anthropic(Claude.ai 订阅)模型清单的动态发现。* ---------------------------------------------------------------------------* 2026-07-19 模型列表统一重构:anthropic 供应商的清单**唯一来源是动态发现**,- * 产品目录静态段已退役(bundled 恒为空)。两条互补通道,汇入同一个 apply:+ * 产品目录静态段已退役(bundled 恒为空;Registry presence 仍会实体化已知型号)。*- * 1. **HTTP `/v1/models`**(启动时 / 登录成功 / 本机凭证被认领给当前 owner /- * 暂时性失败的有限次重试 / 用户在设置页手动重试):订阅 OAuth Bearer +- * `anthropic-beta: oauth-2025-04-20`(与 provider-one-shot 同一套已验证的头)。- * 即时出清单;响应可能不带 effort/fast 能力信息,此时按确定性默认合成- * (见 mapAnthropicHttpModels),等 SDK 通道精化。- * 2. **SDK `supportedModels()`**(每次 claude-code 会话 init 后捕获,经- * maker-core setClaudeSupportedModelsListener):效力最高——effort 档 /- * fastMode 是 SDK 明说的,逐字段可信。+ * **SDK `supportedModels()`**(每次 claude-code 会话 init 后捕获,经+ * maker-core setClaudeSupportedModelsListener):effort 档 / fastMode 是 SDK 明说的,+ * 逐字段可信。上一次成功结果持久化为磁盘缓存,启动即恢复。+ *+ * Claude 订阅凭证只在内置 Claude Code CLI 里(claude-native-cli),Cindy 不带它+ * 直接请求 Anthropic,所以没有 HTTP `/v1/models` 通道。旧版缓存里 HTTP 记下的+ * 精确窗口(explicitWindows)仍会被恢复并沿用。** 合并纪律(确定性,无隐藏兜底):- * - 两条通道都按 id、按字段合并:effort / fastMode 哪项明确返回就只覆盖并记录哪项;+ * - 按 id、按字段合并:effort / fastMode 哪项明确返回就只覆盖并记录哪项;* 缺席字段只保留**明确探测过**的旧值,旧版缓存 / 合成默认会用当前产品目录基线刷新* (防止历史 low/medium/high 永久盖住新模型的 xhigh/max,也防止 fast-only 响应清空档位);- * - HTTP 明说的 max_input_tokens 单独记账(explicitWindows,随缓存持久化),SDK+ * - 旧版 HTTP 明说的 max_input_tokens 单独记账(explicitWindows,随缓存持久化),SDK* 通道覆盖时不许把精确窗口打回 1M/200k 猜测值;* - 同一授权世代内失败不清列表(上一次成功结果 + 磁盘缓存是「陈旧的真数据」,* 可溯源);登出 / 直接换号都会先清空并删缓存,旧账号结果不得跨世代继承;* - 成功但**骤减**的快照同样不生效(isDegenerateModelListShrink,质量下限护栏):* 清单无静态兜底,一次退化响应不允许把整个供应商清单打塌。*- * 登录态门控(2026-07-19 对抗性 review P1):两条通道的 apply 都必须以「当前确有- * Claude.ai OAuth」为前提——SDK 捕获来自本地 CLI 注册表,不需要 Anthropic 凭证也能- * 应答,不设门会让未登录 / 已登出用户长出 anthropic 清单并重建刚删掉的缓存;HTTP- * 在途请求跨越授权边界完成时同理。世代计数(authGeneration)在登出 / 换号时自增,- * 作废一切在途写回,并让新账号拉取不被旧 single-flight 吞掉。磁盘缓存写删经同一- * 串行队列 + 原子 rename,保证登出删缓存不会被较早的 SDK 持久化反向覆盖。+ * 登录态门控(2026-07-19 对抗性 review P1):apply 必须以「Cindy 已连接本机 Claude Code+ * 登录」为前提——SDK 捕获来自本地 CLI 注册表,任何 provider 的 cc 会话都会应答,不设门+ * 会让未登录 / 已登出用户长出 anthropic 清单并重建刚删掉的缓存。世代计数(authGeneration)+ * 在登出 / 换号时自增,作废一切在途写回。磁盘缓存写删经同一串行队列 + 原子 rename,+ * 保证登出删缓存不会被较早的 SDK 持久化反向覆盖。** contextWindow 规则:- * HTTP 响应带 max_input_tokens 用之;否则读取当前 modelRegistry 的已知窗口;+ * 旧缓存恢复的精确窗口用之;否则读取当前 modelRegistry 的已知窗口;* 目录未知时默认 1M,仅 id 含 "haiku" 例外 200k。这样已知旧模型不会被错误提升到* 1M,未来新模型仍可在目录更新前按当代默认工作。*@@ -46,7 +44,7 @@ import { app } from 'electron';import fsp from 'node:fs/promises';import path from 'node:path';-import type { CatalogModel, Effort, ProviderModelDiscoveryFailure } from '@cindy/model-providers';+import type { CatalogModel, Effort } from '@cindy/model-providers';import { createLogger } from '../../logger.js';import {@@ -55,9 +53,7 @@ import {getCindyModelEffortBaseline,setAnthropicDiscoveredModels,} from '../active-catalog.js';-import { hasClaudeAiOAuth, readClaudeAiOAuth } from '../claude-credentials-store.js';-import { getValidClaudeAiOAuth } from '../claude-oauth-refresh.js';-import { outboundFetch } from '../outbound-fetch.js';+import { hasClaudeNativeLogin } from '../claude-native-auth.js';const log = createLogger('model-discovery:anthropic');@@ -69,50 +65,19 @@ const VALID_EFFORTS: ReadonlySet<string> = new Set(['xhigh','max',]);-const HTTP_TIMEOUT_MS = 15_000;-/** /v1/models 游标分页的最大页数(现实模型数远小于单页 1000,纯防御)。 */-const MAX_MODEL_PAGES = 5;-/** 最近一次生效的发现结果(含缓存加载),合并时的能力字段保留源。 */let lastApplied: CatalogModel[] = [];/**- * 能力字段由 HTTP / SDK 明确声明过的模型 id。effort / fastMode 必须分开记账,因为上游+ * 能力字段由 SDK(或旧版 HTTP)明确声明过的模型 id。effort / fastMode 必须分开记账,因为上游* 可能只返回其中一项;旧版缓存里的 low/medium/high 既可能是合成默认,也可能是上游实值,* 只看模型值无法安全判断。旧缓存没有来源字段时一律按非明确处理。*/const explicitEffortModelIds = new Set<string>();const explicitFastModeModelIds = new Set<string>();-/** HTTP 明说过 max_input_tokens 的模型窗口(id → tokens);SDK 覆盖时优先于启发式规则。 */+/** 旧版 HTTP 明说过 max_input_tokens 的模型窗口(id → tokens,从缓存恢复);优先于启发式规则。 */const explicitWindows = new Map<string, number>();/** 授权边界(登出 / 换号)自增:在途发现若世代已变,结果作废不写回。 */let authGeneration = 0;-let httpRefreshInflight: Promise<boolean> | null = null;-/** 在途拉取所属的世代;世代已变时新调用不复用旧 promise(换号补拉不被吞)。 */-let httpRefreshInflightGen = -1;-/**- * 最近一次发现失败的归因;成功即清空。- *- * 本供应商的清单没有静态兜底,拉不到就是零模型,所以失败必须如实记账、由 UI 讲明理由,- * 而不是一直说「正在发现」。是否自动重试按归因分流(见 isRetryableFailure):暂时性故障- * 悄悄重试几次,确定性拒绝(地域 / 凭证 / 请求被拒)一次都不重试 —— 那种情况重试只会- * 把真正的原因藏起来。- */-let lastFailure: ProviderModelDiscoveryFailure | null = null;-/**- * 暂时性失败的重试节奏(ms)。刻意保持「简单、短」:目的是扛过链路抖动 / 上游瞬时 5xx,- * 不是替代用户的判断 —— 一分钟内收敛不了就停手,把失败理由和重试入口交还给用户。- */-const HTTP_RETRY_DELAYS_MS = [2_000, 8_000, 30_000] as const;-let httpRetryTimer: NodeJS.Timeout | null = null;-let httpRetryAttempt = 0;-/**- * 失败态变化的收口(desktop host 注入 = 广播 PROVIDER_CHANGED)。- *- * 归因只活在本模块的内存里,不进 active-catalog —— 清单没变,catalog 也就没有 revision- * 变化可言。但 renderer 早在拉取失败**之前**就取走了 provider 快照(15s 超时那条路径- * 尤其明显),不主动通知的话它会一直显示「正在发现」,直到用户手动切页重取。- */-let failureChangedListener: (() => void) | null = null;/** 缓存写入 / 删除严格串行,保证授权边界后的删除一定排在旧世代写入之后。 */let cacheMutationQueue: Promise<void> = Promise.resolve();let cacheTempSequence = 0;@@ -130,7 +95,7 @@ function enqueueCacheMutation(task: () => Promise<void>): Promise<void> {}function generationCanApply(generation: number, models: CatalogModel[]): boolean {- return generation === authGeneration && (models.length === 0 || hasClaudeAiOAuth());+ return generation === authGeneration && (models.length === 0 || hasClaudeNativeLogin());}/**@@ -145,7 +110,7 @@ function normalizeModelId(raw: string): string {}/**- * contextWindow 规则:HTTP 明示 > 目录已知值 > 未知模型启发式(默认 1M,Haiku 200k)。+ * contextWindow 规则:缓存恢复的精确值 > 目录已知值 > 未知模型启发式(默认 1M,Haiku 200k)。** 前两档是**显式声明**的真实上限,一并标记 contextWindowVerified 让下游可以拿它收敛* 运行期上报的窗口;最后一档是猜的,不标记 —— 否则未知模型会被一个启发式常量当成硬@@ -190,91 +155,6 @@ export function isDegenerateModelListShrink(prevCount: number, nextCount: numberreturn nextCount < Math.max(2, Math.ceil(prevCount / 2));}-/** 连续多少次相同的 HTTP 骤减快照 = 确认为真实下架(收敛放行,防护栏永久卡死)。 */-const CONFIRMED_SHRINK_STREAK = 3;-/** 待确认骤减快照的签名(排序 id 集)与连续命中次数。 */-let httpShrinkSignature: string | null = null;-let httpShrinkStreak = 0;--function resetHttpShrinkStreak(): void {- httpShrinkSignature = null;- httpShrinkStreak = 0;-}--/**- * 待确认骤减记账落盘(review P2 二轮:HTTP 刷新只在启动 / OAuth 登录各跑一次,- * 记账若只在内存,用户每次重启 streak 都归零,3 次确认永远凑不齐)。写进现有磁盘- * 缓存文件的 `pendingShrink` 字段(read-modify-write + 原子 rename,与其它缓存- * 写删同队列串行);缓存文件不存在 = 无已确认清单,重启后护栏本就不触发,无需记账。- */-function persistPendingShrink(): void {- const state =- httpShrinkSignature !== null- ? { signature: httpShrinkSignature, streak: httpShrinkStreak }- : null;- const generation = authGeneration;- void enqueueCacheMutation(async () => {- if (generation !== authGeneration || !hasClaudeAiOAuth()) return;- const file = cacheFilePath();- let raw: Record<string, unknown> | null = null;- try {- const parsed: unknown = JSON.parse(await fsp.readFile(file, 'utf-8'));- if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {- raw = parsed as Record<string, unknown>;- }- } catch {- /* 缓存缺失 / 损坏:不为记账凭空造缓存 */- }- if (!raw) return;- if (state) raw.pendingShrink = state;- else if (raw.pendingShrink === undefined)- return; // 无变化不写盘- else delete raw.pendingShrink;- const temp = `${file}.${process.pid}.${(cacheTempSequence += 1)}.tmp`;- try {- await fsp.writeFile(temp, JSON.stringify(raw, null, 2), 'utf-8');- if (generation !== authGeneration || !hasClaudeAiOAuth()) return;- await fsp.rename(temp, file);- } finally {- await fsp.rm(temp, { force: true }).catch(() => undefined);- }- });-}--/**- * HTTP `/v1/models` 快照的骤减收敛记账(review P2:护栏不能把真实批量下架永久拦死):- * - 非骤减 → 直接放行并清零 streak;- * - 骤减 → 记签名(排序 id 集);**连续 CONFIRMED_SHRINK_STREAK 次相同**的骤减快照- * 视为上游真实下架,放行收敛;签名变化(上游还在抖)则重新计数。- * 记账随磁盘缓存持久化(persistPendingShrink):HTTP 刷新的触发点稀疏(启动 / 登录 /- * 绑定认领 / 手动重试,失败只在暂时性归因下自动重试有限次),跨重启不累计的话收敛永远- * 不会发生——重启后由 loadAnthropicModelsFromDiskCache 恢复,登出 / 换号随缓存文件一起清除。- * 只有 HTTP 通道参与收敛:它是 Anthropic 官方列模型端点,连续一致可作可用性证据;- * SDK 捕获(本地 CLI 注册表,正是打塌事故的退化来源)永不收敛,等 HTTP 纠正。- */-export function evaluateHttpShrink(- prevCount: number,- nextIds: readonly string[],-): 'accept' | 'reject' {- let verdict: 'accept' | 'reject';- if (!isDegenerateModelListShrink(prevCount, nextIds.length)) {- resetHttpShrinkStreak();- verdict = 'accept';- } else {- const signature = [...nextIds].sort().join('\n');- httpShrinkStreak = signature === httpShrinkSignature ? httpShrinkStreak + 1 : 1;- httpShrinkSignature = signature;- if (httpShrinkStreak >= CONFIRMED_SHRINK_STREAK) {- resetHttpShrinkStreak();- verdict = 'accept';- } else {- verdict = 'reject';- }- }- persistPendingShrink();- return verdict;-}-/** SDK 映射结果:每项能力是条目明说的还是合成默认的(决定逐字段合并与来源记账)。 */export interface SdkMappedModel {model: CatalogModel;@@ -374,15 +254,6 @@ export function mapAnthropicSdkModels(raw: unknown): SdkMappedModel[] {return out;}-/** HTTP 映射结果:每项能力是响应明说的还是合成默认的(决定逐字段合并与来源记账)。 */-export interface HttpMappedModel {- model: CatalogModel;- hasEffortInfo: boolean;- hasFastModeInfo: boolean;- /** 响应明说的 max_input_tokens(null = 未下发,窗口来自启发式规则)。 */- explicitContextWindow: number | null;-}-interface CapabilityMappedModel {model: CatalogModel;hasEffortInfo: boolean;@@ -443,71 +314,6 @@ function mergeCapabilitiesWithPrevious(mapped: readonly CapabilityMappedModel[])};}-/**- * HTTP `GET /v1/models` 单页条目数组 → 映射结果。纯函数,对响应形状容错:- * 能力字段(capabilities.efforts / fast_mode)是 Anthropic 侧未固化的扩展,逐字段识别;- * effort 认不出时按 modelRegistry 能力基线合成,目录也没有才回落当代旗舰 5 档- * (low/medium/high/xhigh/max,默认 high),haiku 系例外 0 档。fastMode 未知时先为 false,- * 合并阶段会保留已明确探测过的旧值。- */-export function mapAnthropicHttpModels(raw: unknown): HttpMappedModel[] {- if (!Array.isArray(raw)) return [];- const out: HttpMappedModel[] = [];- const seen = new Set<string>();- for (const entry of raw) {- if (!entry || typeof entry !== 'object') continue;- const e = entry as {- id?: unknown;- type?: unknown;- display_name?: unknown;- max_input_tokens?: unknown;- capabilities?: unknown;- };- if (e.type !== undefined && e.type !== 'model') continue;- if (typeof e.id !== 'string' || e.id.length === 0) continue;- const id = normalizeModelId(e.id);- // /v1/models 新发布在前;dated 变体剥后缀去重 first-wins = 保留最新。- if (!id.startsWith('claude') || seen.has(id)) continue;- seen.add(id);- const caps =- e.capabilities && typeof e.capabilities === 'object'- ? (e.capabilities as { efforts?: unknown; effort_levels?: unknown; fast_mode?: unknown })- : null;- const capEfforts = caps ? (toEfforts(caps.efforts) ?? toEfforts(caps.effort_levels)) : null;- const hasEffortInfo = capEfforts !== null;- const hasFastModeInfo = typeof caps?.fast_mode === 'boolean';- const fallback = fallbackEffortBaseline(id);- const efforts: Effort[] = capEfforts ?? fallback.efforts;- const defaultEffort = capEfforts !== null ? pickDefaultEffort(efforts) : fallback.defaultEffort;- const maxInput =- typeof e.max_input_tokens === 'number' && e.max_input_tokens > 0 ? e.max_input_tokens : null;- out.push({- hasEffortInfo,- hasFastModeInfo,- explicitContextWindow: maxInput,- model: {- id,- discoveredMetadata: pickModelMetadata({- name: e.display_name,- contextWindow: maxInput,- efforts: capEfforts ?? undefined,- supportsFastMode: caps?.fast_mode,- }),- name: typeof e.display_name === 'string' && e.display_name.length > 0 ? e.display_name : id,- group: 'anthropic',- sortOrder: out.length,- ...contextWindowFor(id, maxInput ?? undefined),- efforts,- defaultEffort,- supportsFastMode: caps?.fast_mode === true,- status: 'active',- ...(/haiku/.test(id) ? { defaultEnabled: false } : {}),- },- });- }- return out;-}-/*** 生效 + 可选持久化。setAnthropicDiscoveredModels 统一经 active-catalog 的* markChanged 收口能力刷新、revision 递增与 PROVIDER_CHANGED 广播。@@ -556,10 +362,6 @@ async function applyModels(explicitFastModeModelIds: models.map((model) => model.id).filter((id) => explicitFastModeModelIds.has(id)),- // 整份重写不得抹掉跨重启的待确认骤减记账(SDK 每会话都会持久化一次)。- ...(httpShrinkSignature !== null- ? { pendingShrink: { signature: httpShrinkSignature, streak: httpShrinkStreak } }- : {}),},null,2,@@ -585,14 +387,14 @@ async function applyModels(/*** 启动时加载磁盘缓存(上一次动态获取的成功结果)。未登录不加载(登出即清,- * 残留缓存也不能代表可用性);缓存缺失 / 坏 JSON 静默跳过(等 HTTP / SDK 通道)。+ * 残留缓存也不能代表可用性);缓存缺失 / 坏 JSON 静默跳过(等 SDK 通道)。*/export async function loadAnthropicModelsFromDiskCache(): Promise<void> {- if (!hasClaudeAiOAuth()) return;+ if (!hasClaudeNativeLogin()) return;const generation = authGeneration;try {const raw: unknown = JSON.parse(await fsp.readFile(cacheFilePath(), 'utf-8'));- if (generation !== authGeneration || !hasClaudeAiOAuth()) return;+ if (generation !== authGeneration || !hasClaudeNativeLogin()) return;const models = (raw as { models?: unknown } | null)?.models;if (!Array.isArray(models) || models.length === 0) return;// 恢复「窗口来自 HTTP 明说」的记账,否则重启后首个 SDK 捕获会把精确窗口打回猜测值。@@ -606,25 +408,6 @@ export async function loadAnthropicModelsFromDiskCache(): Promise<void> {if (!explicitWindows.has(normalizedId)) explicitWindows.set(normalizedId, win);}}- // 恢复待确认骤减记账(跨重启累计,见 persistPendingShrink;坏字段静默忽略)。- const pending = (raw as { pendingShrink?: unknown }).pendingShrink;- if (pending && typeof pending === 'object' && !Array.isArray(pending)) {- const p = pending as { signature?: unknown; streak?: unknown };- if (- typeof p.signature === 'string' &&- p.signature.length > 0 &&- typeof p.streak === 'number' &&- Number.isInteger(p.streak) &&- p.streak > 0- ) {- // 签名按当前归一化口径重算(排序 id 集):历史签名可能含脏 id,口径漂移会让- // 跨重启的骤减确认计数被无声重置。- httpShrinkSignature = [...new Set(p.signature.split('\n').map(normalizeModelId))]- .sort()- .join('\n');- httpShrinkStreak = Math.min(p.streak, CONFIRMED_SHRINK_STREAK);- }- }// 缓存内容出自本模块 mapper,仍做最小结构校验防手改坏文件。const valid = models.filter((m): m is CatalogModel =>@@ -663,7 +446,7 @@ export async function loadAnthropicModelsFromDiskCache(): Promise<void> {return restored;};// 旧的 explicitCapabilityModelIds 无法区分 effort / fastMode,刻意不恢复;- // 把有歧义的整模型来源当作非明确,下一次 HTTP / SDK 会按逐字段证据重新记账。+ // 把有歧义的整模型来源当作非明确,下一次 SDK 捕获会按逐字段证据重新记账。const restoredExplicitEffortIds = restoreIds((raw as { explicitEffortModelIds?: unknown }).explicitEffortModelIds,);@@ -716,16 +499,16 @@ export async function loadAnthropicModelsFromDiskCache(): Promise<void> {* SDK 会话 init 捕获入口(maker-core setClaudeSupportedModelsListener 接线)。* 登录态门控:SDK 应答来自本地 CLI 注册表,任何 provider 的 cc 会话都会触发,* 未登录 Claude.ai 时不得注入(否则登出被击穿 / 纯网关用户长出 anthropic 清单)。- * 按 id 合并:条目带能力信息则覆盖,否则保留已精化条目;HTTP 明说过的窗口不回退。+ * 按 id 合并:条目带能力信息则覆盖,否则保留已精化条目;缓存恢复的精确窗口不回退。*/export function noteAnthropicSdkSupportedModels(raw: unknown): void {- if (!hasClaudeAiOAuth()) return;+ if (!hasClaudeNativeLogin()) return;const generation = authGeneration;const mapped = mapAnthropicSdkModels(raw);if (mapped.length === 0) return;const mappedWithWindows = mapped.map(({ model, hasEffortInfo, hasFastModeInfo }) => {const explicit = explicitWindows.get(model.id);- // explicitWindows 存的是 HTTP 明说过的 max_input_tokens —— 恢复它时必须连+ // explicitWindows 存的是(旧版)HTTP 明说过的 max_input_tokens —— 恢复它时必须连// contextWindowVerified 一起恢复。SDK 通道重新映射同一模型时走的是「无 explicit」// 分支(目录里没有该模型就落到启发式、不带标记), 只覆盖 contextWindow 会把这份// provenance 静默擦掉, 之后就不再拿这个真实上限去收敛虚高的上报值了。@@ -742,16 +525,11 @@ export function noteAnthropicSdkSupportedModels(raw: unknown): void {});const { models, explicitEffortIds, explicitFastModeIds } =mergeCapabilitiesWithPrevious(mappedWithWindows);- // SDK 通道骤减恒拒绝其**存在性快照**、**不参与收敛**:持续一致的退化 SDK 快照正是- // 打塌事故的形态,给 SDK 开 streak 收敛等于把事故门重新打开(真退化会一直一致,- // streak 必然凑齐)。但 cc 当前可能只返回本会话模型这一条,其中明确携带的 capability- // 仍是该模型的权威信息:保留完整清单,只把同 id 的 effort / fast 字段增量合入。- // 否则 HTTP `/v1/models` 不带 capabilities 时会永久停在合成的 low/medium/high,- // Fable / Opus 的 xhigh 永远无法进入 UI。- // 真实批量下架的收敛只认 HTTP 权威通道(evaluateHttpShrink);为了不依赖「下次重启 /- // 登录」才仲裁,这里在拒绝的同时主动触发一次 HTTP 刷新(单飞防抖):HTTP 可达时要么- // 纠正要么推进收敛 streak;HTTP 持续不可达时保留陈旧超集(fail-visible:多出的条目- // 发请求时报错,不会静默丢模型)——两难下的取舍,review P1 讨论定案。+ // SDK 通道骤减恒拒绝其**存在性快照**:持续一致的退化 SDK 快照正是打塌事故的形态。+ // 但 cc 当前可能只返回本会话模型这一条,其中明确携带的 capability 仍是该模型的权威+ // 信息:保留完整清单,只把同 id 的 effort / fast 字段增量合入,否则 Fable / Opus 的+ // xhigh 永远无法进入 UI。拒绝时保留陈旧超集(fail-visible:多出的条目发请求时报错,+ // 不会静默丢模型);清单随登出 / 换号清空重建。if (isDegenerateModelListShrink(lastApplied.length, models.length)) {const capabilityPatches = new Map(mapped@@ -797,7 +575,7 @@ export function noteAnthropicSdkSupportedModels(raw: unknown): void {if (patch.hasFastModeInfo) mergedExplicitFastModeIds.add(id);}log.warn(- `anthropic SDK capture looks degenerate (${lastApplied.length} -> ${models.length}); keeping current list, merging ${capabilityPatches.size} capability patch(es), and consulting HTTP`,+ `anthropic SDK capture looks degenerate (${lastApplied.length} -> ${models.length}); keeping current list, merging ${capabilityPatches.size} capability patch(es)`,);void applyModels(merged,@@ -808,7 +586,6 @@ export function noteAnthropicSdkSupportedModels(raw: unknown): void {).catch((err) => {log.warn('apply partial anthropic SDK capabilities failed', { error: String(err) });});- void refreshAnthropicModelsFromHttp().catch(() => undefined);return;}log.info(`anthropic models captured from SDK init: ${models.length}`);@@ -819,419 +596,6 @@ export function noteAnthropicSdkSupportedModels(raw: unknown): void {);}-/** 非 2xx 响应:带上状态码与响应体片段抛出 —— 地域拒绝只能从响应体认出来。 */-class DiscoveryHttpError extends Error {- constructor(- readonly status: number,- readonly body: string,- ) {- super(`HTTP ${status}`);- this.name = 'DiscoveryHttpError';- }-}--/** 响应体只留够判定与诊断的前缀,避免把上游的大 HTML 错误页整个搬进日志。 */-const ERROR_BODY_SNIPPET_LIMIT = 2_000;--/**- * HTTP 200 但正文不可用 —— 解析不了,或解析出来根本不是 /v1/models 的形状。- * 都是上游 / 中间层的问题,与链路不通要分开归因(且属于可重试类)。- */-class DiscoveryResponseError extends Error {- constructor(detail: string) {- super(`malformed response body: ${detail}`);- this.name = 'DiscoveryResponseError';- }-}--/**- * 地域拒绝的识别标记。Anthropic 对不支持的国家 / 地区返回- * `unsupported_country_region_territory`,**400 与 403 都出现过**(取决于是否经中间层),- * 所以只看状态码不够 —— 必须认响应体。同为 403 的- * `{"error":{"type":"forbidden","message":"Request not allowed"}}` 是另一回事- * (Cloudflare 对代理 / VPN 出口的拦截),两者对用户的下一步完全不同。- */-const REGION_BLOCK_MARKERS = [- 'unsupported_country_region_territory',- 'unsupported countries, regions, or territories',-] as const;--function looksRegionBlocked(status: number, body: string): boolean {- if (status !== 400 && status !== 403) return false;- const lower = body.toLowerCase();- return REGION_BLOCK_MARKERS.some((marker) => lower.includes(marker));-}--/**- * fetch / HTTP 错误 → 用户能理解的归因。- *- * undici 在 DNS 失败、连接被拒、TLS 失败时统一抛 `TypeError: fetch failed`,真正的- * errno 藏在 `cause.code` —— 链路不通时最常见的形态,必须挖出来才能区分「连不上」- * 和「连上了但超时」。detail 只进日志与诊断,不直接展示给用户。- */-function classifyDiscoveryError(err: unknown): {- kind: ProviderModelDiscoveryFailure['kind'];- detail: string;-} {- // 200 + 坏正文:上游侧问题,归 upstream(可重试),不是「连不上」。- if (err instanceof DiscoveryResponseError) return { kind: 'upstream', detail: err.message };- if (err instanceof DiscoveryHttpError) {- const detail = err.body ? `HTTP ${err.status}: ${err.body}` : `HTTP ${err.status}`;- if (looksRegionBlocked(err.status, err.body)) return { kind: 'regionBlocked', detail };- if (err.status === 401) return { kind: 'unauthorized', detail };- if (err.status === 403) return { kind: 'forbidden', detail };- // 408 Request Timeout 是上游 / 中间代理说「这次超时了」—— 与本地超时同源的一过性状况,- // 归 timeout 走重试;落到 rejected 会让空清单的用户被迫手动重试(PR #548 review)。- if (err.status === 408) return { kind: 'timeout', detail };- // 5xx / 429 是服务端侧故障,可能几秒后就好;其它 4xx 是我们这边请求本身被拒。- if (err.status >= 500 || err.status === 429) return { kind: 'upstream', detail };- return { kind: 'rejected', detail };- }- const base = err instanceof Error ? `${err.name}: ${err.message}` : String(err);- if (err instanceof Error && (err.name === 'TimeoutError' || err.name === 'AbortError')) {- return { kind: 'timeout', detail: base };- }- const cause = err instanceof Error ? (err.cause as { code?: unknown } | undefined) : undefined;- const code = typeof cause?.code === 'string' ? cause.code : undefined;- const detail = code ? `${base} (${code})` : base;- if (code === 'ETIMEDOUT' || code === 'UND_ERR_CONNECT_TIMEOUT') {- return { kind: 'timeout', detail };- }- return { kind: 'network', detail };-}--/**- * 该归因值不值得自动重试。- *- * 分界是「这次失败是否可能只是暂时的」:链路不通 / 超时 / 上游 5xx 有可能几秒后自愈,- * 值得替用户悄悄再试几次;而地域拒绝、凭证被拒、请求被拒、空清单都是**确定性**答复- * —— 同一个请求再发一百次也是同一个结果,重试只会把「被拒绝」拖成「一直在发现中」,- * 把真正的原因藏起来。- */-function isRetryableFailure(kind: ProviderModelDiscoveryFailure['kind']): boolean {- return kind === 'network' || kind === 'timeout' || kind === 'upstream';-}--/** 取消待执行的重试并清零退避计数(成功 / 授权边界 / 确定性失败 / 测试重置)。 */-function cancelHttpRetry(): void {- if (httpRetryTimer) {- clearTimeout(httpRetryTimer);- httpRetryTimer = null;- }- httpRetryAttempt = 0;-}--/**- * 安排下一次重试。已有待执行的重试不重复排;退避次数用尽就停手(等下一次启动、显式- * 登录、绑定认领或用户手动重试)。世代变化后回调直接放弃 —— 登出 / 换号的在途结果本就- * 作废。timer 不持有事件循环(unref),不拖慢退出。- */-function scheduleHttpRetry(generation: number): void {- if (httpRetryTimer) return;- if (generation !== authGeneration) return;- const delay = HTTP_RETRY_DELAYS_MS[httpRetryAttempt];- if (delay === undefined) return;- httpRetryAttempt += 1;- const attempt = httpRetryAttempt;- const timer = setTimeout(() => {- httpRetryTimer = null;- if (generation !== authGeneration || !hasClaudeAiOAuth()) return;- // fromRetry:这是退避链自身的下一档,不是新一轮 —— 不能重置计数,否则会无限轮询。- void refreshAnthropicModelsFromHttp({ fromRetry: true }).catch(() => undefined);- }, delay);- timer.unref?.();- httpRetryTimer = timer;- log.info(- `anthropic /v1/models retry scheduled in ${delay}ms (attempt ${attempt}/${HTTP_RETRY_DELAYS_MS.length})`,- );-}--/**- * 记一次发现失败并按归因决定要不要自动重试;世代已变(登出 / 换号)的结果不写回。- *- * 确定性拒绝会**主动取消**待执行的重试并清零退避:上一轮可能因为链路抖动排了重试,- * 这一轮上游明确答了「不允许」—— 继续按旧节奏重试既无意义,也会让失败理由在- * 「发现中」和「被拒绝」之间来回跳。- */-function noteDiscoveryFailure(- generation: number,- kind: ProviderModelDiscoveryFailure['kind'],- detail?: string,-): void {- if (generation !== authGeneration) return;- lastFailure = {- kind,- at: new Date().toISOString(),- ...(detail ? { detail } : {}),- };- log.warn(`anthropic model discovery failed (${kind})`, { detail });- notifyFailureChanged();- if (isRetryableFailure(kind)) {- scheduleHttpRetry(generation);- return;- }- cancelHttpRetry();-}--/**- * 清掉失败态与待执行的重试 —— 用于「上游已经答了、且用户手里确有可用清单」的所有出口,- * 不只是清单被成功替换的那一条。- *- * 失败态**由有变无也要通知**:applyModels 只在清单真的变了时才 markChanged 广播,而- * 「上次失败、这次成功且清单与上次一致」正好落在它的 early return 里;快照被 shrink 守卫- * 拒绝时更是连 applyModels 都不会走到。不在这里通知,UI 会继续显示已经不成立的失败理由。- */-function clearDiscoveryFailure(): void {- const hadFailure = lastFailure !== null;- lastFailure = null;- cancelHttpRetry();- if (hadFailure) notifyFailureChanged();-}--/**- * 注册失败态变化的收口(desktop host 装配时接广播;传 null 解绑)。监听器不可抛 ——- * 广播失败不该反过来打断发现流程。- */-export function setAnthropicDiscoveryFailureListener(listener: (() => void) | null): void {- failureChangedListener = listener;-}--function notifyFailureChanged(): void {- try {- failureChangedListener?.();- } catch (err) {- log.warn('anthropic discovery failure broadcast failed', { error: String(err) });- }-}--/**- * 最近一次清单发现失败(供 listProviders 合成 ProviderView)。- *- * 未登录时一律返回 null:没有授权就谈不上「发现失败」,那种状态下 UI 该讲的是「去连接」,- * 而不是把上一个账号留下的失败理由摆给新用户看。- *- * `knownConnected` 让调用方交出同一次快照里**已经算好**的连接态。macOS 上 hasClaudeAiOAuth()- * 会同步 `execFileSync('security', ...)` 读一次 Keychain —— listProviders 先在 connection 回调- * 里读过一遍,这里再读一遍就是白白让 Electron 主线程多阻塞一个子进程,而供应商列表还会随- * PROVIDER_CHANGED 反复重取(PR #548 review)。- */-export function getAnthropicModelDiscoveryFailure(- knownConnected?: boolean,-): ProviderModelDiscoveryFailure | null {- const connected = knownConnected ?? hasClaudeAiOAuth();- if (!connected) return null;- return lastFailure;-}--/**- * HTTP `/v1/models` 拉取(启动时 / 登录成功 / 绑定认领成功 / 用户手动重试 / 自动重试)。- * single-flight;失败记日志 + 记账归因、保留现值(缓存是上次成功的真数据),并按归因决定- * 要不要自动重试(暂时性故障重试有限次,确定性拒绝一次都不重试,见 isRetryableFailure);- * 成功按合并纪律生效并持久化。- *- * `fromRetry` 仅由退避回调传入。**外部触发一律开启新一轮退避**:否则上一轮把三档用尽后- * `httpRetryAttempt` 停在上限,此后用户手动点「重试」或新的凭证认领再次触发发现时,这次- * 若又遇到暂时性失败就再也排不出自动重试 —— 链路稍后恢复也只能靠用户反复手点(PR #548- * review)。- */-export function refreshAnthropicModelsFromHttp(options?: {- fromRetry?: boolean;- /** 内部用:本次已经是「401 → 强制换 token」后的那一次,不再递归换第二次。 */- afterForcedRefresh?: boolean;-}): Promise<boolean> {- if (!options?.fromRetry) cancelHttpRetry();- // 只复用**同世代**的在途拉取:登出后世代已变,旧 promise 的结果注定作废,- // 复用会吞掉换号后新账号的补拉。- if (httpRefreshInflight && httpRefreshInflightGen === authGeneration) return httpRefreshInflight;- const gen = authGeneration;- const flight = (async () => {- const oauth = await getValidClaudeAiOAuth();- if (!oauth?.accessToken) return false;- if (gen !== authGeneration || !hasClaudeAiOAuth()) return false;- const provider = getActiveCatalog().providers.find((p) => p.id === 'anthropic');- const upstream = provider?.routing['claude-code']?.upstream ?? 'https://api.anthropic.com';- const entries: unknown[] = [];- let url: string | null = `${upstream.replace(/\/+$/, '')}/v1/models?limit=1000`;- try {- for (let page = 0; url && page < MAX_MODEL_PAGES; page += 1) {- const res: Response = await outboundFetch(url, {- headers: {- authorization: `Bearer ${oauth.accessToken}`,- 'anthropic-version': '2023-06-01',- 'anthropic-beta': 'oauth-2025-04-20',- },- signal: AbortSignal.timeout(HTTP_TIMEOUT_MS),- });- if (!res.ok) {- // 读响应体:地域拒绝与 Cloudflare 拦截同为 403,只有正文能把两者分开。- const body = await res.text().catch(() => '');- throw new DiscoveryHttpError(res.status, body.slice(0, ERROR_BODY_SNIPPET_LIMIT));- }- // 200 但正文坏掉(破损代理 / CDN 截断)是**上游**的问题,不是链路不通 —— 单独标记,- // 否则会归到 network,让用户白查网络和 Proxy(PR #548 review)。- let raw: unknown;- try {- raw = await res.json();- } catch (parseErr) {- throw new DiscoveryResponseError(- parseErr instanceof Error ? parseErr.message : String(parseErr),- );- }- // 先确认根是对象:JSON `null` / 标量 / 数组都是合法 JSON,直接取 .data 要么抛- // TypeError(落到兜底被当成 network,让用户白查网络)、要么静默拿到 undefined。- if (typeof raw !== 'object' || raw === null || Array.isArray(raw)) {- throw new DiscoveryResponseError(- `unexpected payload root (${raw === null ? 'null' : Array.isArray(raw) ? 'array' : typeof raw})`,- );- }- // 再确认 data 是数组 = 拿到的确实是 /v1/models 的形状(典型反例:代理生成的- // {"error":...} 却带 200)。静默跳过会一路走到「empty」——确定性归因、不重试,- // 还会把上游故障说成用户的权限问题。- const body = raw as { data?: unknown; has_more?: unknown; last_id?: unknown };- if (!Array.isArray(body.data)) {- throw new DiscoveryResponseError(- `unexpected payload shape (data=${body.data === undefined ? 'missing' : typeof body.data})`,- );- }- entries.push(...body.data);- // has_more=true 却没给可用游标 —— 静默收尾会把「只翻了一页的前缀」当成完整清单交出去,- // 而它完全可能小到刚好落进 shrink 守卫的放行区间,于是真清单被截断替换、失败态被清、- // 也不排重试,用户从此少一半模型且毫无提示(PR #548 review)。这是响应本身不完整,归- // upstream 让它重试。- if (body.has_more === true) {- if (typeof body.last_id !== 'string' || body.last_id.length === 0) {- throw new DiscoveryResponseError(- `has_more=true without a usable last_id cursor (got ${- body.last_id === undefined ? 'missing' : typeof body.last_id- })`,- );- }- url = `${upstream.replace(/\/+$/, '')}/v1/models?limit=1000&after_id=${encodeURIComponent(body.last_id)}`;- } else {- url = null;- }- }- } catch (err) {- // 失败不清列表:现值(含磁盘缓存)是上次成功的真数据;SDK 通道随后仍会精化。- const { kind, detail } = classifyDiscoveryError(err);- // 401 先别急着判「确定性拒绝」:本地 expiresAt 未到时 getValidClaudeAiOAuth 会原样- // 返回旧 token,而服务端可能已经拒绝它。refresh token 还有效的话,强制换一枚再试- // 一次就能恢复 —— 否则用户明明只需静默续期,却被告知要断开重连,而且清单为空时他- // 连个能用的模型都挑不出来(PR #548 review;运行时 401 回调走的也是这条路)。- if (kind === 'unauthorized' && !options?.afterForcedRefresh) {- let refreshError: unknown = null;- const refreshed = await getValidClaudeAiOAuth({- forceRefresh: true,- staleToken: oauth.accessToken,- }).catch((err: unknown) => {- refreshError = err;- return null;- });- if (- refreshed?.accessToken &&- refreshed.accessToken !== oauth.accessToken &&- gen === authGeneration &&- hasClaudeAiOAuth()- ) {- httpRefreshInflight = null;- log.info('anthropic /v1/models got 401; retrying once with a force-refreshed token');- return refreshAnthropicModelsFromHttp({- fromRetry: options?.fromRetry ?? false,- afterForcedRefresh: true,- });- }- // 走到这里 = 没换到新 token,但原因有两种,归因不同:- //- // · 刷新**交出了** token,只是和旧的那枚一样 —— 刷新链路本身是通的,服务端认为- // 当前 token 就是最新的,而它确实被 401 了。这是真的授权问题。- // · 刷新**一枚都没交出**(返回 null 或抛错)—— 是这一步自己没成:token 端点超时 /- // 5xx / 没抢到刷新锁。归 unauthorized 会取消全部重试、还叫用户去断开重连,可- // refresh token 很可能完全有效,过一会儿再刷就成了(PR #548 review)。- //- // 第二种还要再确认凭证现状才算数:真的授权失效时,invalid_grant 收尾已经把凭证清了- // (setClaudeOAuthInvalidGrantHandler → invalidate),或者它本来就没有 refresh token- // 可用 —— 那两种同样是 unauthorized。凭证还在、也还能刷,才是暂时性故障。- if (refreshed == null) {- const credential = readClaudeAiOAuth();- const stillRefreshable =- typeof credential?.refreshToken === 'string' && credential.refreshToken.length > 0;- if (refreshError !== null || stillRefreshable) {- noteDiscoveryFailure(- gen,- 'upstream',- `401 then forced token refresh yielded nothing${- refreshError instanceof Error ? `: ${refreshError.message}` : ' (transient)'- }`,- );- return false;- }- }- }- noteDiscoveryFailure(gen, kind, detail);- return false;- }- // 在途期间登出 / 换号:结果作废,不写回、不重建缓存(review P1 竞态豁口)。- if (gen !== authGeneration || !hasClaudeAiOAuth()) {- log.info('anthropic /v1/models result discarded: auth changed mid-flight');- return false;- }- const mapped = mapAnthropicHttpModels(entries);- if (mapped.length === 0) {- // 上游答了但一个可用模型都没有 —— 清单没有静态兜底,停在空清单等于供应商不可用,- // 同样记账为失败,不让 UI 停在「正在发现」。- //- // 但要分清是哪一种「没有」:data 本来就是空数组 = 这个账号确实没有可用模型,是确定性- // 事实,该按 empty 停下不重试;data 非空却一条都映射不出来 = 响应字段缺失或上游改版,- // 那是上游故障,归 empty 会既取消重试、又叫用户去查账号权限(PR #548 review)。- if (entries.length > 0) {- noteDiscoveryFailure(- gen,- 'upstream',- `payload listed ${entries.length} entries but none mapped to a usable model`,- );- return false;- }- noteDiscoveryFailure(gen, 'empty');- return false;- }- // 退化判定必须先于任何状态写入:被拒快照连 explicitWindows 也不许污染,- // 否则后续 SDK 捕获会把退化响应带来的窗口值用作精确记账(review P2)。- // 连续多次相同的骤减快照经 evaluateHttpShrink 收敛放行(真实批量下架自愈)。- if (- evaluateHttpShrink(- lastApplied.length,- mapped.map((m) => m.model.id),- ) === 'reject'- ) {- log.warn(- `anthropic /v1/models response looks degenerate (${lastApplied.length} -> ${mapped.length}); keeping current list (streak ${httpShrinkStreak}/${CONFIRMED_SHRINK_STREAK})`,- );- // 快照被拒 ≠ 发现失败:上游确确实实答了,而且旧清单原样留用 —— 此刻供应商对用户是可用的。- // 若还挂着上一次的 network / timeout 理由,UI 就会对着一个有模型可选的供应商说「连不上」;- // 而这条早退路径既不记新失败也不排重试,那个过期理由会一直挂到下次成功发现(PR #548 review)。- clearDiscoveryFailure();- return false;- }- for (const { model, explicitContextWindow } of mapped) {- if (explicitContextWindow != null) explicitWindows.set(model.id, explicitContextWindow);- }- // HTTP 不带能力时只保留明确探测过的旧能力;旧版缓存 / 合成默认用当前目录基线刷新。- const { models, explicitEffortIds, explicitFastModeIds } =- mergeCapabilitiesWithPrevious(mapped);- log.info(`anthropic models refreshed via HTTP: ${models.length}`);- // 拿到有效清单 = 发现已恢复,清掉失败态与待执行的重试(放在 apply 之前:apply 只负责- // 生效,它因世代变化被 gate 掉时新世代会带着自己的触发重来)。- clearDiscoveryFailure();- return applyModels(models, true, gen, explicitEffortIds, explicitFastModeIds);- })().finally(() => {- // 只清自己的登记:世代变化后可能已有新 flight 顶替,不能误清。- if (httpRefreshInflight === flight) httpRefreshInflight = null;- });- httpRefreshInflight = flight;- httpRefreshInflightGen = gen;- return flight;-}-/*** 授权边界收口(登出 / 直接换号共用):清空清单 + 删磁盘缓存 + 作废在途发现。* 删除与持久化走同一队列,所以函数 resolve 后旧世代缓存不可能重新出现。@@ -1239,20 +603,10 @@ export function refreshAnthropicModelsFromHttp(options?: {export async function clearAnthropicDiscoveredModels(): Promise<void> {const generation = authGeneration + 1;authGeneration = generation;- // 失败态与待执行的重试都属于旧世代的账:登出 / 换号后既不能把上一个账号的失败理由- // 摆给新账号看,也不该让旧世代排的重试继续跑(回调自带世代校验,这里再显式取消)。- const hadFailure = lastFailure !== null;- lastFailure = null;- cancelHttpRetry();explicitWindows.clear();explicitEffortModelIds.clear();explicitFastModeModelIds.clear();- resetHttpShrinkStreak();await applyModels([], false, generation);- // 首次发现就失败时 lastApplied 本来就是空,applyModels([]) 会走「清单没变」早退、不广播。- // 本地窗口碰巧还能靠 auth 事件刷新,但那个事件不过 device-link —— 配对的手机 / 控制端会- // 一直留着旧的失败理由。失败态由有变无时补一次通知,让两边都收敛(PR #548 review)。- if (hadFailure) notifyFailureChanged();await enqueueCacheMutation(async () => {await fsp.rm(cacheFilePath(), { force: true });});@@ -1269,11 +623,6 @@ export function resetAnthropicDiscoveryForTest(): void {explicitWindows.clear();explicitEffortModelIds.clear();explicitFastModeModelIds.clear();- resetHttpShrinkStreak();- lastFailure = null;- cancelHttpRetry();// 不回拨世代:即便测试误留异步任务,旧任务也不会重新获得生效资格。authGeneration += 1;- httpRefreshInflight = null;- httpRefreshInflightGen = -1;}diff --git a/apps/desktop/src/main/maker-host/pi-host.ts b/apps/desktop/src/main/maker-host/pi-host.tsindex 7250f71cc7..6eff3a48ae 100644--- a/apps/desktop/src/main/maker-host/pi-host.ts+++ b/apps/desktop/src/main/maker-host/pi-host.ts@@ -89,7 +89,6 @@ import {isAnthropicCompatProxyHandleReady,} from './anthropic-compat-proxy-host.js';import { hostCredentialEndpointAllowed } from './pi-provider-transport.js';-import { hasClaudeAiOAuth } from './claude-credentials-store.js';import { hasGrokOAuthLogin } from './grok-oauth-login.js';import { isOpenAiSubscriptionProviderId } from './codex-account-auth.js';import hostSystemPrompt from './host-system-prompt.md?raw';@@ -130,22 +129,6 @@ const PI_SESSION_ID_ENV = 'CINDY_PI_SESSION_ID';const PI_SESSION_TOKEN_ENV = 'CINDY_PI_SESSION_TOKEN';const PI_PROVIDER_AUTH_PLACEHOLDER_KEY = 'cindy-pi-provider-auth-placeholder';const PI_OPENAI_PROXY_KEY_ENV = 'CINDY_PI_OPENAI_PROXY_KEY';-const PI_ANTHROPIC_PROXY_KEY_ENV = 'CINDY_PI_ANTHROPIC_PROXY_KEY';-/**- * Claude 订阅占位 token。Pi 的 anthropic 适配器按 `apiKey.includes('sk-ant-oat')` 判定- * OAuth 形态,命中后才走原生订阅请求构造:Bearer 鉴权、`claude-code-20250219,oauth-2025-04-20`- * 加各 beta(fine-grained tool streaming / server-side fallback 等)、Claude Code 身份 system- * 段与 `claude-cli` UA。占位值本身不含授权能力;真 token 由 loopback proxy 在解析出- * anthropic provider 路由时覆盖 `authorization`,故该路由是占位值被换掉的唯一保证 ——- * 请求带 provider 头就必须钉在该路由上,不能落回默认上游(见- * anthropic-compat-proxy-host 的 piProviderId 钉住分支)。- * 用普通字串会让 Pi 按 x-api-key 形态发请求,proxy 再补 beta 头就会- * 与 body 里 Pi 已注入的 `fallbacks` 等字段脱节(400 `fallbacks: Extra inputs are not permitted`)。- *- * 取值即探针要求的最短形态(二进制里只有 `sk-ant-oat` 这一个字面量,版本段不参与判定),- * 与仓内既有 OAuth 形态夹具同值 —— 不额外造一个更长、更像真 token 的字串去撞密钥扫描。- */-const PI_ANTHROPIC_PROXY_PLACEHOLDER_TOKEN = 'sk-ant-oat01';const PI_PROVIDER_HEADER = 'x-cindy-pi-provider-id';export interface PiBundledModelInfo {@@ -573,10 +556,9 @@ export function buildPiSubscriptionNativeProviders(const env: Record<string, string> = {[PI_OPENAI_PROXY_KEY_ENV]: piOpenaiProxyPlaceholderJwt(),[PI_XAI_PROXY_API_KEY_ENV]: PI_PROVIDER_AUTH_PLACEHOLDER_KEY,- [PI_ANTHROPIC_PROXY_KEY_ENV]: PI_ANTHROPIC_PROXY_PLACEHOLDER_TOKEN,};const add = (- sourceProviderId: 'anthropic' | 'openai' | 'xai',+ sourceProviderId: 'openai' | 'xai',piProviderId: string,name: string,baseUrl: string,@@ -637,7 +619,6 @@ export function buildPiSubscriptionNativeProviders(name,baseUrl,inheritModels: true,- ...(sourceProviderId === 'anthropic' ? { apiKeyEnvVar: PI_ANTHROPIC_PROXY_KEY_ENV } : {}),...(sourceProviderId === 'openai' ? { apiKeyEnvVar: PI_OPENAI_PROXY_KEY_ENV } : {}),...(sourceProviderId === 'xai' ? { apiKeyEnvVar: PI_XAI_PROXY_API_KEY_ENV } : {}),modelIdAliases,@@ -661,8 +642,7 @@ export function buildPiSubscriptionNativeProviders(: sourceProviderId === 'xai' ? officialXaiById.get(wireId) : undefined;const api = sourceProviderId === 'openai'? 'openai-codex-responses' as const- : model.piApi ?? bundledModel?.api ?? officialModel?.api- ?? (sourceProviderId === 'anthropic' ? 'anthropic-messages' as const : undefined);+ : model.piApi ?? bundledModel?.api ?? officialModel?.api;const template = [bundledModel, contextProfileTemplate, officialModel].find((candidate) => candidate?.api === api);const correction = sourceProviderId === 'xai'@@ -673,9 +653,7 @@ export function buildPiSubscriptionNativeProviders(const compatibleCorrection = correction?.api === api ? correction : null;const thinking = compatibleCorrection?.thinkingLevelMap?? officialThinking?.thinkingLevelMap ?? template?.thinkingLevelMap;- const compat = sourceProviderId === 'anthropic'- ? pruneAnthropicCompatForLink(template?.compat, 'subscription')- : compatibleCorrection?.compat ?? officialThinking?.compat ?? template?.compat;+ const compat = compatibleCorrection?.compat ?? officialThinking?.compat ?? template?.compat;const cost = catalogCostForPiNative(model.cost) ?? template?.cost;const listedIds = listedModelIdsByProvider?.get(piProviderId)?? listedPiModelIds(bundledModelsByProvider)?.get(piProviderId);@@ -709,14 +687,15 @@ export function buildPiSubscriptionNativeProviders(}),});};- add('anthropic', 'anthropic', 'Anthropic', endpoint);+ // Claude 订阅不给 Pi:它只供内置 Claude Code CLI 用自己的登录使用(Pi 原生 /login 不受影响)。add('openai', 'openai-codex', 'OpenAI (ChatGPT)', endpoint, 'chatgpt/');add('xai', 'xai', 'xAI (SuperGrok)', appendEndpointPath(endpoint, 'v1'), 'xai/');- for (const account of catalog.providers.filter((provider) => provider.auth.native)) {+ // Independent Claude accounts are retired and never projected into Pi.+ for (const account of catalog.providers.filter((provider) => provider.auth.native && provider.auth.native !== 'claude')) {// Reuse the native subscription projection with this account's catalog. Unique provider IDs// have no bundled registry entry, so materialize native model metadata instead of inheriting it.- const brand = account.auth.native === 'claude' ? 'anthropic' : account.auth.native === 'xai' ? 'xai' : 'openai';- const api = brand === 'anthropic' ? 'anthropic-messages' as const : brand === 'xai' ? 'openai-responses' as const : 'openai-codex-responses' as const;+ const brand = account.auth.native === 'xai' ? 'xai' : 'openai';+ const api = brand === 'xai' ? 'openai-responses' as const : 'openai-codex-responses' as const;const accountCatalog = {...catalog,providers: [{ ...account, id: brand, auth: { method: 'oauth' as const } }],@@ -752,7 +731,7 @@ export const PI_XAI_COMPAT_FORWARD_PORT = 47989;* xAI/BYOM provider **不在此列** —— 它们走各自原生块 + 独立 key,而网关块仍需真网关 key* 以便会话中途切回网关模型可用,故原生 provider 会话不能写占位符毒化网关块。*/-const PI_OAUTH_SUBSCRIPTION_PROVIDERS = new Set(['anthropic', 'openai']);+const PI_OAUTH_SUBSCRIPTION_PROVIDERS = new Set(['openai']);const PI_BUNDLED_RESERVED_PROVIDER_IDS = ['anthropic', 'openai-codex', 'xai'] as const;/**@@ -771,10 +750,9 @@ class DesktopPiAuthAdapter implements AuthAdapter {async getState(options?: AuthAdapterOptions): Promise<AuthState> {const providerId = options?.providerId?.trim() || null;if (providerId && subscriptionAccountKind(providerId)) return subscriptionAccountState(providerId);+ // Claude 订阅只供内置 Claude Code CLI 使用,Pi 会话不能选它(旧会话在此明确拒绝)。if (providerId === 'anthropic') {- return hasClaudeAiOAuth()- ? { authenticated: true, identity: 'Claude.ai', authSource: 'oauth' }- : { authenticated: false, errorReason: 'anthropic_oauth_unavailable' };+ return { authenticated: false, errorReason: 'anthropic_oauth_unavailable' };}if (providerId && isOpenAiSubscriptionProviderId(providerId)) {return desktopCodexAuthAdapter.getState({ credentialMode: 'oauth-bearer', providerId });@@ -1095,36 +1073,27 @@ function xaiOfficialCapabilityCorrection(}/**- * 按链路裁剪 Anthropic Messages 的 Pi compat 能力位(#4982 / #4983)。+ * 裁剪网关链路 Anthropic Messages 的 Pi compat 能力位(#4982)。* Pi 目录探测把 Anthropic 直连的新格式能力位(tool `strict`、消息内 `tool_removal` 块、- * 逐轮 effort)原样带进每条链路的 models.json:- * - xd 网关的 Anthropic-Messages schema 尚不接受 `tools[].strict` 与 `tool_removal`,- * Opus 5 / 5.5 每条消息 400;- * - Anthropic 订阅直连接受 `strict`,但 Pi 发出的 mid-conversation beta 名与 Anthropic- * 现要求的 `inline-tools-2026-09-15` 不符,第二轮起 400。- * `supportsMidConvoSystemMessages` 两条链路都被接受,保留。- * 恢复条件:网关 schema 补齐 `strict` / `tool_removal` 后去掉网关侧 `supportsStrictTools`- * 裁剪;Pi 上游补发正确 beta(或对不支持端点降级)并随内核更新进入 Cindy 后去掉两个- * MidConvo 裁剪。只改客户端生成的 models.json,不改代理与上游。+ * 逐轮 effort)原样带进网关链路的 models.json,而 xd 网关的 Anthropic-Messages schema+ * 尚不接受 `tools[].strict` 与 `tool_removal`,Opus 5 / 5.5 每条消息 400。+ * `supportsMidConvoSystemMessages` 网关接受,保留。+ * Cindy 不再给 Pi 投影 Claude 订阅链路(订阅只归内置 Claude Code CLI);Pi 原生 /login 的+ * Anthropic 由 Pi 自己的目录决定,不经这里。+ * 恢复条件:网关 schema 补齐 `strict` / `tool_removal` 后去掉本裁剪。只改客户端生成的+ * models.json,不改代理与上游。*/const GATEWAY_UNSUPPORTED_ANTHROPIC_COMPAT: readonly string[] = ['supportsStrictTools','supportsMidConvoToolChanges','supportsMidConvoEffort',];-const SUBSCRIPTION_UNSUPPORTED_ANTHROPIC_COMPAT: readonly string[] = [- 'supportsMidConvoToolChanges',- 'supportsMidConvoEffort',-];-export function pruneAnthropicCompatForLink(+export function pruneAnthropicCompatForGateway(compat: Record<string, unknown> | undefined,- link: 'gateway' | 'subscription',): Record<string, unknown> | undefined {if (!compat) return compat;- const unsupported = link === 'gateway'- ? GATEWAY_UNSUPPORTED_ANTHROPIC_COMPAT- : SUBSCRIPTION_UNSUPPORTED_ANTHROPIC_COMPAT;+ const unsupported = GATEWAY_UNSUPPORTED_ANTHROPIC_COMPAT;if (!unsupported.some((key) => key in compat)) return compat;const next = { ...compat };for (const key of unsupported) delete next[key];@@ -1682,7 +1651,7 @@ export function resolvePiCindyGatewayModelSpec(const compatibleBundled = bundled?.api === api ? bundled : undefined;const compatibleProbed = probed?.api === api ? probed : undefined;let compat = compatibleProbed?.compat ?? compatibleBundled?.compat;- if (api === 'anthropic-messages') compat = pruneAnthropicCompatForLink(compat, 'gateway');+ if (api === 'anthropic-messages') compat = pruneAnthropicCompatForGateway(compat);// Gateway routing needs Pi's native session identity on every Chat/Messages request.// This is a Gateway transport policy, not a change to direct BYOM/subscription providers.if (api === 'openai-completions' || api === 'anthropic-messages') {diff --git a/apps/desktop/src/main/maker-host/provider-service.ts b/apps/desktop/src/main/maker-host/provider-service.tsindex e4d9cd9565..a9f2508a33 100644--- a/apps/desktop/src/main/maker-host/provider-service.ts+++ b/apps/desktop/src/main/maker-host/provider-service.ts@@ -64,7 +64,7 @@ export interface ProviderListOptions extends ConnectionReadOptions {export interface ProviderConnectionReaders {/** XD 网关:托管 api_key 是否存在。 */xd: (opts: ConnectionReadOptions) => boolean | Promise<boolean>;- /** Anthropic:系统 Claude.ai OAuth 是否登录。 */+ /** Anthropic:内置 Claude Code CLI 是否已登录且 Cindy 获准使用。 */anthropic: (opts: ConnectionReadOptions) => boolean | Promise<boolean>;/** OpenAI:Codex 是否 OAuth 登录。 */openai: (opts: ConnectionReadOptions) => boolean | Promise<boolean>;diff --git a/apps/desktop/src/main/maker-host/remote-claude-route.ts b/apps/desktop/src/main/maker-host/remote-claude-route.tsindex 0cc3e0eb84..3df4c88bbf 100644--- a/apps/desktop/src/main/maker-host/remote-claude-route.ts+++ b/apps/desktop/src/main/maker-host/remote-claude-route.ts@@ -1,4 +1,4 @@-import { isClaudeSubscriptionProviderId, readClaudeAccountOAuth } from './subscription-account-auth.js';+import { isClaudeSubscriptionProviderId } from './subscription-account-auth.js';/*** remote-claude-route —— 远端 Claude Code 会话的「路由 materialization」(host 侧)。*@@ -6,10 +6,13 @@ import { isClaudeSubscriptionProviderId, readClaudeAccountOAuth } from './subscr* loopback compat-proxy 里(anthropic-compat-proxy-host.ts 的 routingTransform 按请求覆盖* upstream + 鉴权头)。远端 cc-mgr 会话够不到这个 proxy,所以必须在 spawn 前把「该会话应走* 的真上游 + 鉴权 + 定制请求头」解析好,直接烤进远端 cc 子进程的 env(ANTHROPIC_BASE_URL /- * ANTHROPIC_API_KEY | ANTHROPIC_AUTH_TOKEN / ANTHROPIC_CUSTOM_HEADERS / CLAUDE_CODE_OAUTH_TOKEN)。+ * ANTHROPIC_API_KEY | ANTHROPIC_AUTH_TOKEN / ANTHROPIC_CUSTOM_HEADERS)。+ *+ * Claude 订阅不下发到远端:订阅凭证只在本机内置 Claude Code CLI 的登录里,Cindy 不读取、+ * 不转发(见 claude-native-cli)。远端会话选 Claude 订阅一律明确报错。** 注入进 maker-core 的 AgentDeps.resolveRemoteClaudeRoute。返回语义见该字段文档:- * - RemoteClaudeRoute:native OAuth 订阅 / 自定义 Claude Code 供应商 —— 覆盖 endpoint + 鉴权;+ * - RemoteClaudeRoute:自定义 Claude Code 供应商 —— 覆盖 endpoint + 鉴权;* - null:有效路由是 XD 网关(或默认回落网关)—— maker-core 将远端凭证形态回落* 'gateway-key'(网关 key + 网关 endpoint),与升级前远端行为一致;* - throw:供应商在远端无法用 cc env 表达(自定义 requestPath / modelIdRewrite / oauth-passthrough),@@ -30,17 +33,7 @@ import type { RemoteClaudeRoute } from '@cindy/maker-core';import type { RoutingDecision } from '@cindy/anthropic-compat-proxy';import { readClaudeApiKey } from './auth-adapters.js';-import { claudeOAuthSpawnEnv } from './claude-oauth-spawn-env.js';-import { getClaudeAiOAuthForSpawn } from './claude-oauth-refresh.js';-import { hasClaudeAiOAuth } from './claude-credentials-store.js';-import { getActiveCatalog } from './active-catalog.js';-import {- ANTHROPIC_DIRECT_UPSTREAM,- anthropicCatalogModelIds,- isAnthropicWireModel,-} from './claude-gateway-config.js';import {- gatewayDefaultRouteDecision,isProviderRouteMutationInProgress,resolveProviderRouteDecision,type ResolvedProviderRouteDecision,@@ -57,9 +50,12 @@ export async function resolveRemoteClaudeRoute(opts: {}): Promise<RemoteClaudeRoute | null> {const providerId = opts.providerId?.trim() || null;- // 内置 Anthropic 的 catalog route 是 oauth-passthrough(本地 cc 子进程自己带订阅 bearer);- // 远端没有这个 bearer 来源,必须由 host 读取 native OAuth token 后显式 materialize。- if (providerId && isClaudeSubscriptionProviderId(providerId)) return nativeAnthropicRoute(providerId);+ // Claude 订阅只能在本机经 CLI 自己的登录使用,远端会话不提供。+ if (providerId && isClaudeSubscriptionProviderId(providerId)) {+ throw new Error(+ '[REMOTE_NATIVE_OAUTH_UNAVAILABLE] Claude subscriptions only run through this desktop\'s own Claude Code login; pick a gateway or API-key model for the remote session.',+ );+ }// 显式选定供应商(非网关)→ 按其 RoutingDescriptor materialize。if (providerId && providerId !== 'xd') {@@ -88,42 +84,11 @@ export async function resolveRemoteClaudeRoute(opts: {// 显式 XD 网关 → 走既有网关远端路径(maker-core 侧 null 回落)。if (providerId === 'xd') return null;- // 未显式选供应商(默认):镜像本地 proxy 的默认路由(anthropic-compat-proxy-host ②段)。- // 没连订阅 = gateway-spawn,本地 passthrough 网关 → 远端网关(null)。- if (!hasClaudeAiOAuth()) return null;- // oauth-spawn + 有网关 key(且网关可用):本地「全量换网关 key」防订阅 token 泄漏到网关,- // 远端同样走网关(null)——计费归属与实际上游必须与本地一致,不能因为是远端就升级成直连。- if (gatewayDefaultRouteDecision(REMOTE_AGENT, readClaudeApiKey())) return null;- // oauth-spawn、没网关 key:Anthropic 模型唯一出路是订阅直连(与本地一致)。- if (isAnthropicWireModel(opts.model, anthropicCatalogModelIds(getActiveCatalog()))) {- return nativeAnthropicRoute();- }- // 没网关 key 的非 Anthropic 模型:本地 passthrough 必 401;远端回网关路径,由 maker-core- // 的 remoteEndpoint guard / gateway-key auth gate 报「缺网关凭据」的真实原因。+ // 未显式选供应商(默认):远端恒走网关(null)。没有网关 key 时由 maker-core 的+ // gateway-key auth gate 报「缺网关凭据」的真实原因 —— 远端不会回落到 Claude 订阅。return null;}-/** 内置 Anthropic 订阅直连:endpoint 取运行时目录 anthropic 描述符 upstream,缺省隐式直连上游。 */-function nativeAnthropicRoute(providerId = 'anthropic'): RemoteClaudeRoute {- const oauth = providerId === 'anthropic' ? getClaudeAiOAuthForSpawn() : readClaudeAccountOAuth(providerId);- if (!oauth?.accessToken) {- throw new Error(- '[REMOTE_NATIVE_OAUTH_UNAVAILABLE] Anthropic subscription is not connected on this desktop; connect Claude.ai or pick a gateway model for the remote session.',- );- }- const descriptor = getActiveCatalog().providers.find((p) => p.id === providerId)?.routing[- REMOTE_AGENT- ];- const endpoint = descriptor?.upstream?.trim() || ANTHROPIC_DIRECT_UPSTREAM;- const env = claudeOAuthSpawnEnv(oauth);- if (providerId !== 'anthropic') env.CINDY_CLAUDE_ACCOUNT_PROVIDER_ID = providerId;- const customHeaders = descriptor?.headerOverride;- if (customHeaders && Object.keys(customHeaders).length > 0) {- env.ANTHROPIC_CUSTOM_HEADERS = serializeCustomHeaders(customHeaders);- }- return { endpoint, env };-}-/** 自定义 / 通用 OAuth Claude Code 供应商:把 buildRouteDecision 结论翻成 cc env。 */function materializeRoutedProvider(routed: ResolvedProviderRouteDecision): RemoteClaudeRoute {const { providerId, routing, decision } = routed;diff --git a/apps/desktop/src/main/maker-host/runtime-configs.ts b/apps/desktop/src/main/maker-host/runtime-configs.tsindex c388a08233..5c7f880093 100644--- a/apps/desktop/src/main/maker-host/runtime-configs.ts+++ b/apps/desktop/src/main/maker-host/runtime-configs.ts@@ -18,8 +18,8 @@ import { effectiveXdGatewayBaseUrl } from '../model-access/effectiveEndpoint.js'import { getActiveCatalog } from './active-catalog.js';import { readModelDisableOverrides } from './model-disable-store.js';import { claudeBehaviorFlagsForSpawn } from './claude-behavior-flags.js';-import { hasClaudeAiOAuth } from './claude-credentials-store.js';-import { readClaudeAccountOAuth } from './subscription-account-auth.js';+import { isAnthropicWireModel } from './claude-gateway-config.js';+import { hasClaudeNativeLogin } from './claude-native-auth.js';import claudeSystemPrompt from './claude-system-prompt.md?raw';import codexSystemPrompt from './codex-system-prompt.md?raw';import hostSystemPrompt from './host-system-prompt.md?raw';@@ -172,8 +172,9 @@ export function buildDesktopClaudeRuntimeConfig(endpointFn: () => string): AgentcredentialMode: ctx.credentialMode,providerId: ctx.sessionProviderId,nativeAuth: getActiveCatalog().providers.find(p => p.id === ctx.sessionProviderId)?.auth.native,+ // 独立 Claude 账号已停用,只有本机 Claude Code 登录算「连了订阅」。oauthConnected: () => getActiveCatalog().providers.find(p => p.id === ctx.sessionProviderId)?.auth.native === 'claude'- ? Boolean(readClaudeAccountOAuth(ctx.sessionProviderId!)?.accessToken) : hasClaudeAiOAuth(),+ ? false : hasClaudeNativeLogin(),}),// 工具链限核 env(agent 资源占用治理):只对本机 spawn 注入 —— 值按本机// 核数算,远端机器的资源不归本设置管。设置关闭时为空对象,零影响。@@ -251,6 +252,9 @@ function resolveSubagentModelForRoute(): string | undefined {const saved = readSubagentModelSettings().claudeCode ?? undefined;if (!saved) return undefined;+ // Claude 订阅会话由 CLI 用本机登录直连 Anthropic,子代理请求不经 proxy 按模型路由:+ // 只有 Anthropic 一方模型能用,其它覆写(chatgpt/ / xai/ / 用户来源的裸 id)不注入。+ if (credentialMode === 'oauth-bearer' && !isAnthropicWireModel(saved)) return undefined;const overrides = readModelDisableOverrides();const offering = getActiveCatalog().providers.filter((p) =>(p.models['claude-code'] ?? []).some((m) => m.id === saved),diff --git a/apps/desktop/src/main/maker-host/subscription-account-auth.ts b/apps/desktop/src/main/maker-host/subscription-account-auth.tsindex 142e7558ba..60327b34cb 100644--- a/apps/desktop/src/main/maker-host/subscription-account-auth.ts+++ b/apps/desktop/src/main/maker-host/subscription-account-auth.ts@@ -1,13 +1,7 @@-import { app } from 'electron';-import path from 'node:path';-import { createHash } from 'node:crypto';import { activeOwnerScopeKey, isAppSessionBoundaryPending, ownerScopedUserDataPath } from '../appSessionState.js';import { genericOAuthSecretIo } from '../secrets/providerSecretStore.js';import { getActiveCatalog, setDiscoveredProviderModels, setXaiDiscoveredModels } from './active-catalog.js';import { discardXaiModelsDiskCache } from './model-discovery/xai.js';-import { createClaudeOAuthRefresher, type GetValidOAuthOptions } from './claude-oauth-refresh.js';-import { type ClaudeAiOAuth, readClaudeAiOAuth } from './claude-credentials-store.js';-import { runClaudeOAuthLogin, cancelClaudeOAuthLogin } from './claude-oauth-login.js';import {runGrokOAuthLogin,cancelGrokOAuthLogin,@@ -16,7 +10,6 @@ import {logoutGrok,resetGrokOAuthMemoryCache,} from './grok-oauth-login.js';-import { outboundFetch } from './outbound-fetch.js';import { createLogger } from '../logger.js';const log = createLogger('subscription-account-auth');@@ -24,14 +17,12 @@ let onInvalidated: (providerId: string) => void = () => {};export function setSubscriptionAccountInvalidatedHandler(handler: typeof onInvalidated): void {onInvalidated = handler;}-type AccountRefreshState = {- refresher: ReturnType<typeof createClaudeOAuthRefresher>;- invalidatedCredential?: string;-};-const refreshers = new Map<string, AccountRefreshState>();-function credentialFingerprint(raw: string): string {- return createHash('sha256').update(raw).digest('hex');-}+/**+ * 独立 Claude 账号已停用的归因。它的凭证是 Cindy 自己跑 OAuth 登录后保存的,而 Claude 订阅+ * 只允许经官方 Claude Code CLI 自己的登录使用(见 claude-native-cli);已有条目保留在设置里+ * 供用户查看 / 删除,不再参与任何会话。+ */+export const CLAUDE_ACCOUNT_RETIRED_REASON = 'claude_account_retired';export function subscriptionAccountKind(providerId?: string | null): 'claude' | 'xai' | null {const native = getActiveCatalog().providers.find((p) => p.id === providerId)?.auth.native;@@ -56,84 +47,20 @@ export function isClaudeSubscriptionProviderId(providerId?: string | null): boolexport function isXaiSubscriptionProviderId(providerId?: string | null): boolean {return providerId === 'xai' || subscriptionAccountKind(providerId) === 'xai';}-export function readClaudeAccountOAuth(providerId = 'anthropic'): ClaudeAiOAuth | null {- if (providerId === 'anthropic') return readClaudeAiOAuth();- if (subscriptionAccountKind(providerId) !== 'claude' || isAppSessionBoundaryPending())- return null;- try {- const raw = genericOAuthSecretIo.read(providerId) ?? 'null';- if (refreshers.get(`${activeOwnerScopeKey()}:${providerId}`)?.invalidatedCredential === credentialFingerprint(raw)) return null;- const blob = JSON.parse(raw);- return typeof blob?.accessToken === 'string' && blob.accessToken ? blob : null;- } catch {- return null;- }-}-function claudeAccount(providerId: string) {- const scope = activeOwnerScopeKey();- const key = `${scope}:${providerId}`;- let account = refreshers.get(key);- if (!account) {- const current = () => activeOwnerScopeKey() === scope && !isAppSessionBoundaryPending();- const directory = path.join(- app.getPath('userData'),- 'subscription-accounts',- createHash('sha256').update(key).digest('hex'),- );- const refresher = createClaudeOAuthRefresher({- readOAuth: () => (current() ? readClaudeAccountOAuth(providerId) : null),- writeOAuth: (oauth) => {- if (!current() || !genericOAuthSecretIo.write(providerId, JSON.stringify(oauth)))- throw new Error('Failed to save account credentials');- },- fetchFn: outboundFetch,- now: Date.now,- lockDir: () => directory,- onInvalidGrant: () => {- if (!current()) return;- const raw = genericOAuthSecretIo.readStrict(providerId);- if (raw) account!.invalidatedCredential = credentialFingerprint(raw);- account!.refresher.invalidate();- if (!genericOAuthSecretIo.remove(providerId)) {- log.warn('revoked account credential could not be removed; suppressing retained credential', { providerId });- }- void clearSubscriptionAccountDiscoveredModels(providerId);- onInvalidated(providerId);- },- });- account = { refresher };- refreshers.set(key, account);- }- return account.refresher;-}-export async function getValidClaudeAccountOAuth(providerId: string, options?: GetValidOAuthOptions) {- const scope = activeOwnerScopeKey();- const result = await claudeAccount(providerId).getValidOAuth(options);- // The native refresher may return its pre-refresh credential on a failed refresh.- // Re-read after invalidation/login so that captured revoked credentials cannot escape.- return result && activeOwnerScopeKey() === scope && !isAppSessionBoundaryPending()- ? readClaudeAccountOAuth(providerId) : null;-}-export async function prepareClaudeAccountUsage(providerId: string): Promise<ClaudeAiOAuth | null> {- const scope = activeOwnerScopeKey();- const refresher = claudeAccount(providerId);- const oauth = await getValidClaudeAccountOAuth(providerId);- if (!oauth || activeOwnerScopeKey() !== scope) return null;- if (!oauth.subscriptionType) await refresher.backfillSubscriptionProfile(oauth.accessToken);- return activeOwnerScopeKey() === scope ? readClaudeAccountOAuth(providerId) : null;-}-export function subscriptionAccountState(providerId: string) {+export function subscriptionAccountState(providerId: string): {+ authenticated: boolean;+ identity?: string;+ errorReason?: string;+ authSource: 'oauth';+} {const kind = subscriptionAccountKind(providerId);- const oauth = kind === 'claude' ? readClaudeAccountOAuth(providerId) : null;+ if (kind === 'claude') {+ return { authenticated: false, errorReason: CLAUDE_ACCOUNT_RETIRED_REASON, authSource: 'oauth' };+ }return {- authenticated: kind === 'xai' ? hasGrokOAuthLogin(providerId) : !!oauth,- identity:- kind === 'xai'- ? grokAccountIdentity(providerId)- : typeof oauth?.identity === 'string'- ? oauth.identity- : undefined,- authSource: 'oauth' as const,+ authenticated: kind === 'xai' ? hasGrokOAuthLogin(providerId) : false,+ identity: kind === 'xai' ? grokAccountIdentity(providerId) : undefined,+ authSource: 'oauth',};}const logins = new Map<string, { cancel: () => void }>();@@ -142,8 +69,6 @@ export function cancelSubscriptionAccountLogin(providerId: string): void {}export function resetSubscriptionAccountCaches(): void {for (const operation of logins.values()) operation.cancel();- for (const account of refreshers.values()) account.refresher.invalidate();- refreshers.clear();}export async function loginSubscriptionAccount(providerId: string,@@ -160,6 +85,7 @@ export async function loginSubscriptionAccount(}> {const kind = subscriptionAccountKind(providerId);if (!kind) throw new Error('Unknown subscription account');+ if (kind === 'claude') return { ok: false, reason: CLAUDE_ACCOUNT_RETIRED_REASON };if (kind !== 'xai' && options?.method === 'device') throw new Error('Device login is only available for Grok');const scope = activeOwnerScopeKey();const key = `${scope}:${providerId}`;@@ -172,8 +98,7 @@ export async function loginSubscriptionAccount(const operation = {cancel: () => {cancelled = true;- if (kind === 'claude') cancelClaudeOAuthLogin(key);- else cancelGrokOAuthLogin(providerId);+ cancelGrokOAuthLogin(providerId);},};logins.set(key, operation);@@ -184,7 +109,6 @@ export async function loginSubscriptionAccount(genericOAuthSecretIo.readStrict(providerId) !== written)return false;- if (kind === 'claude') claudeAccount(providerId).invalidate();const restored =before === null? genericOAuthSecretIo.remove(providerId)@@ -201,26 +125,17 @@ export async function loginSubscriptionAccount(try {const persist = (blob: unknown) => {if (!current()) throw new Error('login_cancelled');- if (kind === 'claude') claudeAccount(providerId).invalidate();const raw = JSON.stringify(blob);if (!genericOAuthSecretIo.write(providerId, raw))throw new Error('Failed to save account credentials');written = raw;};- const result =- kind === 'claude'- ? await runClaudeOAuthLogin({- loginKey: key,- isCurrent: current,- persist,- backfill: async () => {},- })- : await runGrokOAuthLogin({- isCurrent: current,- persist,- method: options?.method,- onDeviceCode: options?.onDeviceCode,- }, providerId);+ const result = await runGrokOAuthLogin({+ isCurrent: current,+ persist,+ method: options?.method,+ onDeviceCode: options?.onDeviceCode,+ }, providerId);if (!current()) {restoreWrittenCredentials();return { ok: false, reason: 'login_cancelled' };@@ -248,7 +163,6 @@ export function removeSubscriptionAccountCredentialsReversibly(providerId: strincancelSubscriptionAccountLogin(providerId);const scope = activeOwnerScopeKey();const previous = genericOAuthSecretIo.readStrict(providerId);- if (subscriptionAccountKind(providerId) === 'claude') claudeAccount(providerId).invalidate();if (subscriptionAccountKind(providerId) === 'xai') logoutGrok(providerId);else if (!genericOAuthSecretIo.remove(providerId))throw new Error('Failed to remove account credentials');diff --git a/apps/desktop/src/main/maker-host/subscription-account-models.ts b/apps/desktop/src/main/maker-host/subscription-account-models.tsindex 90a3116bcc..3e3eae2447 100644--- a/apps/desktop/src/main/maker-host/subscription-account-models.ts+++ b/apps/desktop/src/main/maker-host/subscription-account-models.ts@@ -1,16 +1,11 @@import { activeOwnerScopeKey, ownerScopedUserDataPath } from '../appSessionState.js';-import {- subscriptionAccountKind,- getValidClaudeAccountOAuth,- readClaudeAccountOAuth,-} from './subscription-account-auth.js';+import { subscriptionAccountKind } from './subscription-account-auth.js';import { getGrokAccessToken, peekGrokAccessToken, hasGrokOAuthLogin } from './grok-oauth-login.js';import { refreshXaiModelsFromHttp } from './model-discovery/xai.js';-import { mapAnthropicHttpModels } from './model-discovery/anthropic.js';-import { setXaiDiscoveredModels, setDiscoveredProviderModels } from './active-catalog.js';+import { setXaiDiscoveredModels } from './active-catalog.js';import { invalidateXaiBridgeAuth } from './xai-auth-invalidation-host.js';-import { outboundFetch } from './outbound-fetch.js';+/** 独立订阅账号的模型清单刷新。独立 Claude 账号已停用,不拉清单(返回 false)。 */export async function refreshSubscriptionAccountModels(providerId: string): Promise<boolean> {const kind = subscriptionAccountKind(providerId);if (kind === 'xai')@@ -25,43 +20,5 @@ export async function refreshSubscriptionAccountModels(providerId: string): PromapplySnapshot: (models) => setXaiDiscoveredModels(models, providerId),invalidateAuth: (failure) => invalidateXaiBridgeAuth(failure, providerId),});- if (kind !== 'claude') return false;- const scope = activeOwnerScopeKey();- const oauth = await getValidClaudeAccountOAuth(providerId);- if (!oauth || scope !== activeOwnerScopeKey()) return false;- const current = () =>- scope === activeOwnerScopeKey() &&- readClaudeAccountOAuth(providerId)?.accessToken === oauth.accessToken;- const entries: unknown[] = [];- let after: string | undefined;- for (let page = 0; page < 5; page++) {- const url = new URL('https://api.anthropic.com/v1/models');- url.searchParams.set('limit', '1000');- if (after) url.searchParams.set('after_id', after);- const response = await outboundFetch(url.toString(), {- headers: {- authorization: `Bearer ${oauth.accessToken}`,- 'anthropic-version': '2023-06-01',- 'anthropic-beta': 'oauth-2025-04-20',- },- signal: AbortSignal.timeout(15_000),- });- if (!response.ok || !current()) return false;- const raw = (await response.json()) as {- data?: unknown[];- has_more?: boolean;- last_id?: string;- };- if (!Array.isArray(raw?.data)) return false;- entries.push(...raw.data);- if (!raw.has_more) {- const models = mapAnthropicHttpModels(entries).map((entry) => entry.model);- if (!models.length || !current()) return false;- setDiscoveredProviderModels(providerId, 'claude-code', models);- return true;- }- if (typeof raw.last_id !== 'string' || raw.last_id === after) return false;- after = raw.last_id;- }return false;}diff --git a/apps/desktop/src/main/maker-host/title-one-shot.ts b/apps/desktop/src/main/maker-host/title-one-shot.tsindex 25f7256556..de43578b35 100644--- a/apps/desktop/src/main/maker-host/title-one-shot.ts+++ b/apps/desktop/src/main/maker-host/title-one-shot.ts@@ -1,5 +1,5 @@import { isOpenAiSubscriptionProvider } from '@cindy/model-providers';-import { getValidClaudeAccountOAuth, isClaudeSubscriptionProviderId } from './subscription-account-auth.js';+import { isClaudeSubscriptionProviderId } from './subscription-account-auth.js';/*** title-one-shot —— 会话标题的「单次 HTTP」生成器。*@@ -54,7 +54,6 @@ import { getActiveCatalog } from './active-catalog.js';import { isModelDisabled, isProviderDisabled } from '@cindy/model-providers';import { readModelDisableOverrides } from './model-disable-store.js';import { readClaudeApiKey, readCodexOneShotCreds } from './auth-adapters.js';-import { getValidClaudeAiOAuth } from './claude-oauth-refresh.js';import { outboundUndiciFetch } from './outbound-fetch.js';import { effectiveXdGatewayBaseUrl } from '../model-access/effectiveEndpoint.js';import { validateTitleOutput } from './title-output-validation.js';@@ -493,11 +492,9 @@ export async function generateTitleViaProviderResult(const readSessionProviderId = deps.readSessionProviderId ?? (async () => null);const listConnectedProviders = deps.listConnectedProviders ?? (async () => []);const readCodexCreds = deps.readCodexCreds ?? ((providerId?: string) => readCodexOneShotCreds(undefined, providerId));- // 走刷新模块而非直读凭证库:cc >= 2.1.198 后凭证库的新鲜度取决于 host 刷新节奏,- // 直读会在 token 过期后长期拿死值 → 静默 401 回落启发式标题。getValidClaudeAiOAuth- // 临期自动续(非强制语义,失败退回现值,行为不劣于直读)。- const readAnthropicOAuth = deps.readAnthropicOAuth ?? ((providerId?: string) =>- providerId && providerId !== 'anthropic' ? getValidClaudeAccountOAuth(providerId) : getValidClaudeAiOAuth());+ // Claude 订阅凭证只在内置 Claude Code CLI 里,Cindy 不持有:缺省没有 anthropic 凭证,+ // 该 wire 的标题请求一律跳过(回落启发式标题)。+ const readAnthropicOAuth = deps.readAnthropicOAuth ?? (async () => null);const readGatewayKey = deps.readGatewayKey ?? readClaudeApiKey;// Provider 解析:WYSIWYG,与模型选择器高亮同口径。diff --git a/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.tsindex 40758764a4..af58ef211a 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaProviderRoutingSnapshotWiring.test.ts@@ -61,7 +61,7 @@ describe('Orca provider routing snapshot wiring', () => {expect(worktreeAllocation).toBeGreaterThan(validation);});- it.each([['openai', 'codex'], ['anthropic', 'claude']] as const)('marks %s accounts local-only for Pi before SSH worker creation', async (brand, native) => {+ it.each([['openai', 'codex']] as const)('marks %s accounts local-only for Pi before SSH worker creation', async (brand, native) => {const builtin = BUNDLED_CATALOG.providers.find((provider) => provider.id === brand)!;const account = { ...builtin, id: 'user-account', auth: { method: 'oauth' as const, native } };const catalog = { ...BUNDLED_CATALOG, providers: [account, builtin] };@@ -76,6 +76,23 @@ describe('Orca provider routing snapshot wiring', () => {expect(routing.availability[nativeAgent].find((provider) => provider.id === brand)?.localOnlyForSsh).toBe(false);});+ it('never offers the Claude subscription (builtin or retired account) to Pi Orca workers', async () => {+ const builtin = BUNDLED_CATALOG.providers.find((provider) => provider.id === 'anthropic')!;+ const account = { ...builtin, id: 'user-account', agents: [], auth: { method: 'oauth' as const, native: 'claude' as const } };+ const catalog = { ...BUNDLED_CATALOG, providers: [account, builtin] };+ const routing = await readOrcaWorkerProviderRoutingContext({+ providerService: {+ listProviders: vi.fn(async () => buildRegistry(catalog, { [account.id]: true, anthropic: true })),+ },+ getCatalog: () => catalog,+ });+ for (const agent of ['pi', 'codex'] as const) {+ expect(routing.availability[agent].some((provider) => provider.id === 'anthropic' || provider.id === account.id)).toBe(false);+ }+ // 远端任务不能用 Claude 订阅(它只在本机 Claude Code 的登录里),SSH worker 不选它。+ expect(routing.availability['claude-code'].find((provider) => provider.id === 'anthropic')?.localOnlyForSsh).toBe(true);+ });+it('rejects SSH account switching before deferring or replacing the running route', () => {const guard = registerSource.indexOf("throwIpcError('INVALID_PARAMS', 'This provider requires local execution')");expect(guard).toBeGreaterThan(-1);diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionCreateHandler.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionCreateHandler.test.tsindex 87af0a26ab..81145fcc4c 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionCreateHandler.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionCreateHandler.test.ts@@ -155,6 +155,7 @@ describe('maker session CREATE_SESSION IPC handler', () => {['[REMOTE_PROVIDER_UPDATING] provider "p" credentials are being updated; retry in a moment', 'REMOTE_PROVIDER_UPDATING'],['[REMOTE_PROVIDER_UNSUPPORTED] provider "p" has no claude-code route on this desktop', 'REMOTE_PROVIDER_UNSUPPORTED'],['[REMOTE_NATIVE_OAUTH_UNAVAILABLE] Anthropic subscription is not connected on this desktop', 'REMOTE_NATIVE_OAUTH_UNAVAILABLE'],+ ['[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE] /repo/.claude/settings.json sets ANTHROPIC_BASE_URL', 'CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE'],// 轮 40-w4-t3 HIGH:远端 Pi 会话启动时 Cindy AI gateway 未就绪 —— 必须映射// 到 IPC code, renderer 走 5 语言可行动文案, 不显示 raw 英文。['[REMOTE_GATEWAY_ENDPOINT_UNAVAILABLE] Remote Pi sessions need the XD gateway endpoint issued after sign-in (runtimeConfig.remoteEndpoint is empty)', 'REMOTE_GATEWAY_ENDPOINT_UNAVAILABLE'],diff --git a/apps/desktop/src/main/maker-ipc/channels.ts b/apps/desktop/src/main/maker-ipc/channels.tsindex 6a4fad2a7c..d1af108e12 100644--- a/apps/desktop/src/main/maker-ipc/channels.ts+++ b/apps/desktop/src/main/maker-ipc/channels.ts@@ -477,13 +477,12 @@ export const MAKER_INVOKE = {*/CLAUDE_SESSION_ROUTE_GET: 'maker:claude-session-route:get',/**- * Claude.ai 订阅 OAuth 登录 —— 浏览器 OAuth(移植自 cc),凭证落系统 ~/.claude 凭证库- * (mac Keychain `Claude Code-credentials` / 其它 .credentials.json),与本地 claude 共用、- * 自动兼容已登录态。与鉴权模式开关正交(像 Codex 的 OAuth 登录独立于 API 模式)。- * - STATUS: 返回 { authorized }(系统凭证库是否有 Claude.ai OAuth 登录)- * - LOGIN: 拉起浏览器 OAuth,成功后写凭证 + 广播;返回 { authorized }- * - LOGOUT: 清凭证(⚠️ 同时登出本地 claude)+ 广播- * - CANCEL: 取消进行中的浏览器登录流+ * Claude.ai 订阅 —— 登录由内置 Claude Code CLI 自己完成(`claude auth login`),凭证落在+ * CLI 的默认凭证库(与终端里的 claude 共用);Cindy 不读取、不保存凭证,只记使用许可。+ * - STATUS: 返回 { authorized }(CLI 已登录且 Cindy 获准使用)+ * - LOGIN: CLI 已登录则直接授权;否则拉起 CLI 登录,完成后授权 + 广播;返回 { ok, reason?, authorized }+ * - LOGOUT: 撤销 Cindy 的使用许可 + 广播(不登出 CLI)+ * - CANCEL: 取消进行中的 CLI 登录*/CLAUDE_OAUTH_STATUS: 'maker:claude-oauth:status',CLAUDE_OAUTH_LOGIN: 'maker:claude-oauth:login',@@ -496,7 +495,7 @@ export const MAKER_INVOKE = {XAI_OAUTH_CANCEL: 'maker:xai-oauth:cancel',/*** 模型供应商目录(@cindy/model-providers)—— 只读聚合:内置目录元数据 + 各供应商- * 实时连接状态(XD=gateway key / Anthropic=Claude.ai OAuth / OpenAI=Codex OAuth)。+ * 实时连接状态(XD=gateway key / Anthropic=本机 Claude Code 登录 / OpenAI=Codex OAuth)。* 供应商的「连接 / 断开」复用各 agent 已有的鉴权通道(CLAUDE_OAUTH_* / AUTH_* / 登录托管),* 不另立重复通道。*/diff --git a/apps/desktop/src/main/maker-ipc/localCliDetect.ts b/apps/desktop/src/main/maker-ipc/localCliDetect.tsindex 9d839d9fc6..3956770969 100644--- a/apps/desktop/src/main/maker-ipc/localCliDetect.ts+++ b/apps/desktop/src/main/maker-ipc/localCliDetect.ts@@ -11,7 +11,7 @@ import { homedir } from 'node:os';import { join } from 'node:path';import { stat } from 'node:fs/promises';-import { hasClaudeAiOAuth } from '../maker-host/claude-credentials-store.js';+import { hasClaudeNativeLogin } from '../maker-host/claude-native-auth.js';import { isCodexAuthInheritedFromSystemCli } from '../maker-host/auth-adapters.js';import { isNativeProviderAuthSelfAuthorized } from '../maker-host/nativeProviderAuthBinding.js';import {@@ -27,8 +27,8 @@ export interface LocalCliScanDeps {/** 路径存在且是普通文件。 */isFile(path: string): Promise<boolean>;/**- * Claude Code 是否已登录 claude.ai(跨平台:macOS Keychain / 其它平台文件)。- * 生产 = hasClaudeAiOAuth();只返 boolean,不暴露凭证内容(规则 23)。+ * Claude Code 是否已登录 claude.ai(内置 CLI 的 `auth status` 结果,Cindy 不读凭证)。+ * 生产 = hasClaudeNativeLogin();只返 boolean,不暴露凭证内容(规则 23)。*/hasClaudeLogin(): boolean;/**@@ -58,7 +58,7 @@ export function createLocalCliScanDeps(): LocalCliScanDeps {},hasClaudeLogin: () => {try {- return hasClaudeAiOAuth();+ return hasClaudeNativeLogin();} catch {return false;}@@ -71,10 +71,9 @@ export function createLocalCliScanDeps(): LocalCliScanDeps {// 「已沿用本机登录、无需额外授权」,而那次授权正是他自己刚做的// (PR #1076 review 第三轮)。共用存储只证明账号相同,证不出凭证的来路。if (isNativeProviderAuthSelfAuthorized(providerId)) return false;- // claude:Cindy 与本机 Claude Code **共用同一处凭证存储**(macOS Keychain 的- // `Claude Code-credentials` / 其它平台 ~/.claude/.credentials.json,见- // claude-credentials-store 顶注)。物理上就是同一份,不存在「各自登录不同账号」- // 这种分歧,所以排除掉自己授权的那种情况后,已登录即是继承。+ // claude:Cindy 用的就是内置 Claude Code CLI 自己的登录(CLI 默认凭证库,与终端里的+ // claude 同一份,见 claude-native-cli 顶注)。不存在「各自登录不同账号」这种分歧,+ // 所以排除掉自己授权的那种情况后,已登录即是继承。if (cli === 'claude-cli') return true;// codex:Cindy 有自己的 codex-home,只有账号一致时 reconcile 才建硬链 ——// 必须实证 inode 同一性,不能由「两边都登录了」推出来。diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex ffe8f120ae..9c55869bd2 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -885,10 +885,6 @@ import {beginProviderRouteMutation,setPendingCredentialSwitchReader,} from '../maker-host/provider-route.js';-import {- getAnthropicModelDiscoveryFailure,- refreshAnthropicModelsFromHttp,-} from '../maker-host/model-discovery/anthropic.js';import { refreshXaiModelsFromHttp } from '../maker-host/model-discovery/xai.js';import { refreshBuiltinProviderModels, refreshModelsWithCatalog } from '../maker-host/provider-model-refresh.js';import {@@ -5591,7 +5587,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)refreshProvider: (providerId) =>refreshBuiltinProviderModels(providerId, {refreshXd: options.refreshXdGatewayModels,- refreshAnthropic: refreshAnthropicModelsFromHttp,+ // Claude 订阅清单只由 Claude Code 会话 init 的 SDK 捕获刷新(Cindy 不带订阅凭证+ // 请求 Anthropic),这里没有可主动拉取的通道。+ refreshAnthropic: async () => true,refreshOpenAi: () =>maker.refreshAgentLocalModels('codex', { credentialMode: 'oauth-bearer' }),refreshOpenAiMedia: refreshOpenAiMediaModels,@@ -5689,13 +5687,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)// 改用不抛的判定决定「这次读取要不要放行本机绑定自愈 + 清单拉取」。isTrustedSender: (event) =>isTrustedAppRendererEvent(event as Parameters<typeof isTrustedAppRendererEvent>[0]),- // 动态清单重新发现:目前只有 anthropic 订阅是「清单唯一来源是动态发现」的供应商。- // 拉取内部只记账不抛,完成后现读一次失败归因回给 renderer。- rediscoverModels: async (providerId) => {- if (providerId !== 'anthropic') return null;- await refreshAnthropicModelsFromHttp();- return getAnthropicModelDiscoveryFailure();- },+ // 动态清单重新发现:目前没有需要主动重拉的供应商(anthropic 清单来自 Claude Code+ // 会话 init 的 SDK 捕获,没有 HTTP 发现通道,也就没有失败态)。+ rediscoverModels: async () => null,refreshBuiltinModels: refreshProviderModelsManually,requestModelsAutoRefresh: requestProviderModelAutoRefresh,scanLocalCli: () => scanLocalCliAuth(createLocalCliScanDeps()),diff --git a/apps/desktop/src/main/maker-ipc/sessionCreateHandler.ts b/apps/desktop/src/main/maker-ipc/sessionCreateHandler.tsindex a4127d6cfa..c93e4923ec 100644--- a/apps/desktop/src/main/maker-ipc/sessionCreateHandler.ts+++ b/apps/desktop/src/main/maker-ipc/sessionCreateHandler.ts@@ -20,6 +20,8 @@ function remoteRouteErrorCode(err: unknown): IpcErrorCode | null {if (msg.includes('[REMOTE_PROVIDER_UPDATING]')) return 'REMOTE_PROVIDER_UPDATING';if (msg.includes('[REMOTE_PROVIDER_UNSUPPORTED]')) return 'REMOTE_PROVIDER_UNSUPPORTED';if (msg.includes('[REMOTE_NATIVE_OAUTH_UNAVAILABLE]')) return 'REMOTE_NATIVE_OAUTH_UNAVAILABLE';+ // maker-core workspace-settings-guard:工作区设置会改写 Claude 订阅会话的上游 / 鉴权。+ if (msg.includes('[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE]')) return 'CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE';// 轮 40-w4-t3 HIGH:远端 Pi 会话启动时 Cindy AI gateway endpoint 未就绪 ——// maker-core 抛 [REMOTE_GATEWAY_ENDPOINT_UNAVAILABLE](含 raw 实现细节// runtimeConfig.remoteEndpoint is empty)。不映射会让用户看到不可操作的英文diff --git a/apps/desktop/src/main/maker-ipc/usage.ts b/apps/desktop/src/main/maker-ipc/usage.tsindex 33fe45f3d3..5a3b08eed8 100644--- a/apps/desktop/src/main/maker-ipc/usage.ts+++ b/apps/desktop/src/main/maker-ipc/usage.ts@@ -7,26 +7,21 @@*/import type { XaiSubscriptionUsageSnapshot } from '../../shared/xaiSubscriptionUsage.js';-import { scryptSync } from 'node:crypto';+import { createHash } from 'node:crypto';import { readSubscriptionAccountUsage, triggerSubscriptionAccountUsage, syncSubscriptionAccountUsage, setSubscriptionAccountUsageBroadcaster } from '../usage/subscriptionAccountUsage.js';import { broadcastSubscriptionAccountUsage, clearXaiRateLimitSnapshot } from '../usageBroadcaster.js';import { subscriptionAccountKind } from '../maker-host/subscription-account-auth.js';-import path from 'node:path';--import type { Maker } from '@cindy/maker-core';+import { setClaudeRateLimitInfoListener, type Maker } from '@cindy/maker-core';import { createLogger } from '../logger.js';import { assertTrustedAppRendererEvent } from '../security/trustedAppRenderer.js';-import { getCachedBinaryStatus } from '../agent-binaries/index.js';import {readClaudeAccountUsageSnapshot,triggerClaudeAccountUsageRefresh,} from '../usage/claudeAccountUsage.js';import {- ClaudeSubscriptionUsageRateLimitedError,- ClaudeSubscriptionUsageUnauthorizedError,- fetchClaudeSubscriptionUsageSnapshot,-} from '../usage/claudeSubscriptionUsage.js';-import { createClaudeSubscriptionUsageReader } from '../usage/claudeSubscriptionUsageRefresh.js';+ parseClaudeSdkRateLimitInfo,+ type ClaudeSubscriptionUsageSnapshot,+} from '../../shared/claudeSubscriptionUsage.js';import {XaiSubscriptionUsageRateLimitedError,XaiSubscriptionUsageUnauthorizedError,@@ -56,10 +51,10 @@ import {import { activeOwnerScopeKey, isAppSessionBoundaryPending } from '../appSessionState.js';import { isOpenAiSubscriptionProviderId } from '../maker-host/codex-account-auth.js';import { desktopCodexAuthAdapter } from '../maker-host/auth-adapters.js';-import { readClaudeAiOAuth } from '../maker-host/claude-credentials-store.js';+import { hasClaudeNativeLogin } from '../maker-host/claude-native-auth.js';+import { peekClaudeCliLoginStatus } from '../maker-host/claude-native-cli-status.js';import { getGrokAccessToken, hasGrokOAuthLogin } from '../maker-host/grok-oauth-login.js';import { outboundFetch } from '../maker-host/outbound-fetch.js';-import { setClaudeRateLimitHeadersListener } from '../maker-host/claude-rate-limit-headers-observer.js';import { createCodexRateLimitResetService } from '../usage/codexRateLimitReset.js';import { createElectronIpcHandlerRegistry } from './electronIpcRegistry.js';@@ -68,98 +63,50 @@ import { registerMakerUsageHandlers } from './usageHandlers.js';const log = createLogger('maker-ipc:usage');/**- * best-effort 提取应用分发的 claude 二进制版本 (oauth/usage 的 User-Agent 用) ——- * prod 安装路径形如 userData/<installSubdir>/<version>/<binary>, 父目录名即版本;- * dev LFS bundle 路径提不出来时返回 null, fetch 层用 pin 常量兜底。+ * 当前 Claude 账号的快照归属指纹(CLI 登录邮箱的 sha256 截断,不含邮箱原文)。同机在+ * CLI 里换号时据此丢弃上一个账号的持久化快照。未登录 / CLI 没报邮箱时为 null。*/-function readClaudeCodeVersionBestEffort(): string | null {- try {- const status = getCachedBinaryStatus('claude-code');- if (!status.binaryPath) return null;- const versionDir = path.basename(path.dirname(status.binaryPath));- return /^\d+\.\d+/.test(versionDir) ? versionDir : null;- } catch {- return null;- }+function currentClaudeAccountFingerprint(): string | null {+ const email = peekClaudeCliLoginStatus()?.email;+ return email ? createHash('sha256').update(`claude-usage:${email}`).digest('hex').slice(0, 16) : null;}-/** scrypt 应用盐 —— 指纹只用于同机快照归属比对, 盐固定即可(不跨机、不防离线爆破)。 */-const CLAUDE_TOKEN_FINGERPRINT_SALT = 'xdt-claude-subscription-usage-fp-v1';--// token → 指纹的单值缓存: scrypt 是有意的高成本哈希(CodeQL js/insufficient-password-hash-// 对 token 素材要求 computationally expensive), 缓存后仅换号时重算一次, 常规刷新零开销。-let _lastFingerprintToken: string | null = null;-let _lastFingerprint: string | null = null;--// 「当前凭证」内存缓存 —— 给 headers listener 用(它在 proxy 响应热路径的-// fire-and-forget 回调里, 不允许任何同步 keychain 读 / scrypt 计算)。由-// readClaudeCredentialsInfo(reader 的后台流程 / IPC 读, 本来就要读凭证库)顺手-// 刷新; listener 只做内存字符串比较。token 原文用于把 headers 快照绑定到发出-// 请求的账号: 换号 / 登出瞬间的 in-flight 尾巴响应(请求 token ≠ 当前凭证)直接-// 丢弃, 不会被错误打上最新账号的指纹落库。-let _currentClaudeToken: string | null = null;-let _currentClaudeFingerprint: string | null = null;-// 是否已读过凭证库 —— 区分「冷启动缓存未就位」(允许落无指纹快照)与「明确登出」-// (token 缓存为 null 是事实, 登出后的 in-flight 尾巴响应必须丢弃)。-let _claudeCredentialsKnown = false;-/**- * OAuth token → 快照归属指纹(scrypt 截 16 hex, 不含 token 原文)——- * 端点刷新 record 时由 reader 附到快照上, read 换号时据此判定持久化快照过期- * (同机换账号防串号)。只在 reader 的后台刷新流程调用, 不在任何请求热路径上。+ * 内置 Claude 订阅的余量 reader。订阅会话由内置 CLI 用自己的登录直连 Anthropic,Cindy+ * 不持有订阅 token,也不去查用量端点;快照只来自 CLI 在会话里上报的 SDK+ * `rate_limit_event`(见 registerMakerUsageIpc 的 setClaudeRateLimitInfoListener),+ * 按 headers 源同口径增量合并、持久化。这里只负责读缓存与凭证变化后的清理。*/-function fingerprintClaudeToken(token: string): string {- if (token === _lastFingerprintToken && _lastFingerprint) return _lastFingerprint;- const fingerprint = scryptSync(token, CLAUDE_TOKEN_FINGERPRINT_SALT, 32)- .toString('hex')- .slice(0, 16);- _lastFingerprintToken = token;- _lastFingerprint = fingerprint;- return fingerprint;-}--/** 读订阅凭证 + 顺手刷新「当前凭证」内存缓存(headers listener 消费)。 */-function readClaudeCredentialsInfo(): {- accessToken: string;- subscriptionType: string | null;-} | null {- const oauth = readClaudeAiOAuth();- _claudeCredentialsKnown = true;- if (!oauth) {- _currentClaudeToken = null;- _currentClaudeFingerprint = null;- return null;- }- _currentClaudeToken = oauth.accessToken;- _currentClaudeFingerprint = fingerprintClaudeToken(oauth.accessToken);- return {- accessToken: oauth.accessToken,- subscriptionType: oauth.subscriptionType ?? null,- };+interface ClaudeSubscriptionUsageReader {+ /** IPC / device-link 读:缓存快照(未连接时 null)。 */+ read(): Promise<ClaudeSubscriptionUsageSnapshot | null>;+ /** turn-done 钩子:没有可主动拉取的端点,保留接口形状。 */+ triggerRefresh(): void;+ /** 登录态变化后的强制同步:未连接时无条件清快照并广播。 */+ syncForCredentialChange(): Promise<void>;}-const claudeSubscriptionUsageReader = createClaudeSubscriptionUsageReader({- readCredentials: readClaudeCredentialsInfo,- fetchSnapshot: (credentials) =>- fetchClaudeSubscriptionUsageSnapshot({- accessToken: credentials.accessToken,- subscriptionType: credentials.subscriptionType,- claudeCodeVersion: readClaudeCodeVersionBestEffort(),- }),- recordSnapshot: recordClaudeSubscriptionUsageSnapshot,- clearSnapshot: clearClaudeSubscriptionUsageSnapshot,- readCachedSnapshot: readClaudeSubscriptionUsageSnapshot,- fingerprintToken: fingerprintClaudeToken,- now: () => Date.now(),- isUnauthorizedError: (err) => err instanceof ClaudeSubscriptionUsageUnauthorizedError,- isRateLimitedError: (err) => err instanceof ClaudeSubscriptionUsageRateLimitedError,- onRefreshError: (err) => {- log.warn(- 'claude subscription usage refresh failed:',- err instanceof Error ? err.message : String(err),- );+const claudeSubscriptionUsageReader: ClaudeSubscriptionUsageReader = {+ async read(): Promise<ClaudeSubscriptionUsageSnapshot | null> {+ if (!hasClaudeNativeLogin()) return null;+ const snapshot = await readClaudeSubscriptionUsageSnapshot();+ const fingerprint = currentClaudeAccountFingerprint();+ if (snapshot?.accountFingerprint && fingerprint && snapshot.accountFingerprint !== fingerprint) {+ await clearClaudeSubscriptionUsageSnapshot();+ return null;+ }+ return snapshot;},-});+ // 没有可主动拉取的余量端点:余量随会话里的 rate_limit_event 更新。+ triggerRefresh(): void {},+ async syncForCredentialChange(): Promise<void> {+ if (!hasClaudeNativeLogin()) {+ await clearClaudeSubscriptionUsageSnapshot();+ return;+ }+ await claudeSubscriptionUsageReader.read();+ },+};/*** Claude turn done 后的订阅余量刷新钩子 (register.ts 消费) —— fire-and-forget,@@ -171,11 +118,10 @@ export function triggerClaudeSubscriptionUsageRefresh(providerId?: string): void}/**- * Claude 订阅凭证变化(OAuth 登录 / 登出 / 换号)后的余量同步钩子(bootstrap 的- * CLAUDE_OAUTH_LOGIN / LOGOUT handler 消费)。复用 read() 的完整语义:- * - 登出 → 凭证消失, 清快照并广播 null(chip 立即回占位态);- * - 换号 → 指纹校验清掉旧账号快照 + 触发新账号端点刷新;- * - 登录 → 刷新指纹缓存 + 触发端点刷新。+ * Claude 订阅登录态变化(CLI 登录 / 登出 / 换号 / Cindy 断开)后的余量同步钩子(bootstrap+ * 的 CLAUDE_OAUTH_LOGIN / LOGOUT handler 与 CLI 登录态监听消费):+ * - 未连接 → 清快照并广播 null(chip 立即回占位态);+ * - 换号 → 指纹校验清掉旧账号快照,新余量等下一次会话上报。* renderer 不需要感知 auth 事件, 全靠既有 usage:claude-subscription-changed push。*/export function syncClaudeSubscriptionUsageForAuthChange(providerId?: string): void {@@ -365,35 +311,19 @@ export function registerMakerUsageIpc(maker: Maker): void {emptyUsageHistory: emptyUsageHistoryPayload,});- // proxy 旁路读到订阅直连响应的 unified rate limit headers → 落库 + 广播。- // ⚠️ 这条回调由 observer 在响应开始时同步发起, 处于 proxy 热路径 —— 首个 await- // 之前的主路径不得有任何同步 IO / scrypt(规则 10), 只做内存读与字符串比较。- // 例外:请求 bearer 与缓存 token 不一致时,可能是 Claude Code 刚刷新 OAuth access token- // 而缓存尚未更新;这个 rare mismatch 分支允许同步刷新一次凭证缓存,避免把新 token 的- // headers 快照持续误丢到下一次 IPC read / throttle 过期。- // 快照绑定到发出请求的 token: 请求 bearer 与「当前凭证」缓存不符(换号 / 登出- // 瞬间的 in-flight 尾巴, 或登出后缓存已清)→ 丢弃, 不落库不广播; 缓存尚未就位- // (冷启动首响应早于任何 read)时保守落一笔无指纹快照, 由随后端点刷新补齐归属。- setClaudeRateLimitHeadersListener((snapshot, requestBearerToken) => {- let currentToken = _currentClaudeToken;- // Cold responses must prove builtin ownership too; an independent account- // must never populate the builtin account's cache before its first read.- if (!_claudeCredentialsKnown) currentToken = readClaudeCredentialsInfo()?.accessToken ?? null;- if (currentToken) {- if (requestBearerToken !== currentToken) {- currentToken = readClaudeCredentialsInfo()?.accessToken ?? null;- if (requestBearerToken !== currentToken) return false; // 归属不符 (换号尾巴), 丢弃- }- const fingerprint = _currentClaudeFingerprint;- void recordClaudeSubscriptionUsageSnapshot(- fingerprint ? { ...snapshot, accountFingerprint: fingerprint } : snapshot,- );- return true;- }- // token 缓存为 null 且已读过凭证库 = 明确登出 —— 登出后的 in-flight 尾巴响应- // 丢弃(auth 钩子已清快照, 落库会残留旧账号数据)。只有冷启动(从未读过凭证,- // 首响应早于任何 read)才保守落一笔无指纹快照, 由随后端点刷新补齐归属。- return false;+ // 订阅会话的 CLI 在会话里上报 SDK rate_limit_event → 落库 + 广播(maker-core 只对本机+ // Claude 订阅会话转发)。事件晚于登出 / 断开到达时丢弃,不复活刚清掉的快照。+ setClaudeRateLimitInfoListener((info) => {+ if (!hasClaudeNativeLogin()) return;+ const snapshot = parseClaudeSdkRateLimitInfo(info, Date.now());+ if (!snapshot) return;+ const fingerprint = currentClaudeAccountFingerprint();+ const subscriptionType = peekClaudeCliLoginStatus()?.subscriptionType;+ void recordClaudeSubscriptionUsageSnapshot({+ ...snapshot,+ ...(fingerprint ? { accountFingerprint: fingerprint } : {}),+ ...(subscriptionType ? { subscriptionType } : {}),+ });});log.info('maker usage IPC handlers registered');diff --git a/apps/desktop/src/main/oauthResultPage.ts b/apps/desktop/src/main/oauthResultPage.tsindex 794e423e4c..e723dac63a 100644--- a/apps/desktop/src/main/oauthResultPage.ts+++ b/apps/desktop/src/main/oauthResultPage.ts@@ -24,7 +24,7 @@ export type OAuthResultPageTheme = 'light' | 'dark';/** 业务来源(三层 adapter 之一,PR3)。目前仅 desktop-login 切换到 wave4 新品牌卡。 */export type OAuthResultPageKind =- 'desktop-login' | 'ghost-oauth' | 'claude-oauth' | 'xai-oauth' | 'generic-oauth';+ 'desktop-login' | 'ghost-oauth' | 'xai-oauth' | 'generic-oauth';/** 视觉三分类(三层 adapter 之三,callback-pages-classification.md 页壳改造点 1)。 */export type OAuthResultVisualKind = 'success' | 'failure' | 'neutral';diff --git a/apps/desktop/src/main/remote-ssh/claude-env.ts b/apps/desktop/src/main/remote-ssh/claude-env.tsindex 9891a9c42d..181a983d57 100644--- a/apps/desktop/src/main/remote-ssh/claude-env.ts+++ b/apps/desktop/src/main/remote-ssh/claude-env.ts@@ -44,11 +44,11 @@ import { claudeUpstreamEndpoint } from '../maker-host/runtime-configs.js';* Claude 'oauth' (subscription) mode is intentionally NOT honored on remote:* the per-model OAuth↔gateway split lives in the LOCAL loopback proxy, which a* remote machine can't reach. So remote Claude always uses the gateway key +- * gateway endpoint regardless of the local auth-mode toggle, and the user's- * Claude.ai subscription token is NEVER ferried to a remote host. (Mirrors the- * existing remote + compat-mode restriction.) Reads the gateway key directly,- * not desktopClaudeAuthAdapter.getAuthEnv() — the latter returns the OAuth token- * (no ANTHROPIC_API_KEY) in oauth mode, which would be wrong here.+ * gateway endpoint regardless of the local auth-mode toggle. The Claude.ai+ * subscription lives only inside the local Claude Code CLI login and is never+ * ferried to a remote host. Reads the gateway key directly, not+ * desktopClaudeAuthAdapter.getAuthEnv() — that carries no API key for+ * subscription sessions.*/export function getRemoteClaudeEnv(): Record<string, string> | null {const apiKey = readClaudeApiKey();diff --git a/apps/desktop/src/main/usage/__tests__/claudeSubscriptionUsage.test.ts b/apps/desktop/src/main/usage/__tests__/claudeSubscriptionUsage.test.tsdeleted file mode 100644index b704f05925..0000000000--- a/apps/desktop/src/main/usage/__tests__/claudeSubscriptionUsage.test.ts+++ /dev/null@@ -1,528 +0,0 @@-/**- * claudeSubscriptionUsage.test.ts- * ---------------------------------------------------------------------------- * Claude 订阅余量的解析 / 合并 / 模型匹配纯函数 + oauth/usage fetch 层单测:- * - parseClaudeOAuthUsageResponse: 新 schema limits[](实测样本)优先,legacy 顶层键兜底- * - parseClaudeUnifiedRateLimitHeaders: headers 0.0-1.0 分数 ×100 归一化- * - mergeClaudeSubscriptionUsageSnapshot: headers 增量 / endpoint 全量的双源语义- * - claudeModelFamily / matchScopedWindowForModel: 方案 B 的模型 → scoped 窗口匹配- * - isClaudeSubscriptionAlerting: chip 变红口径(只看影响当前会话的窗口 + rejected)- * - fetchClaudeSubscriptionUsageSnapshot: UA / beta 头、401→Unauthorized、429→RateLimited- */--import { describe, expect, it, vi } from 'vitest';--import {- claudeModelFamily,- hasAlertingClaudeSessionWindow,- isClaudeSubscriptionAlerting,- isClaudeUsageWindowAlerting,- matchScopedWindowForModel,- mergeClaudeSubscriptionUsageSnapshot,- parseClaudeOAuthUsageResponse,- parseClaudeUnifiedRateLimitHeaders,- type ClaudeSubscriptionUsageSnapshot,-} from '../../../shared/claudeSubscriptionUsage';-import {- ClaudeSubscriptionUsageRateLimitedError,- ClaudeSubscriptionUsageUnauthorizedError,- fetchClaudeSubscriptionUsageSnapshot,-} from '../claudeSubscriptionUsage';--const NOW = 1_800_000_000_000;--/** 2026-07 实测 oauth/usage 响应形态(新 schema:limits[] + 顶层 legacy 键均在)。 */-const LIVE_RESPONSE = {- five_hour: { utilization: 55.0, resets_at: '2026-07-02T13:00:00.539734+00:00' },- seven_day: { utilization: 11.0, resets_at: '2026-07-09T08:00:00.539755+00:00' },- seven_day_opus: null,- seven_day_sonnet: null,- tangelo: null,- extra_usage: {- is_enabled: false, monthly_limit: null, used_credits: null, utilization: null,- },- limits: [- {- kind: 'session', group: 'session', percent: 55, severity: 'normal',- resets_at: '2026-07-02T13:00:00.539734+00:00', scope: null, is_active: true,- },- {- kind: 'weekly_all', group: 'weekly', percent: 11, severity: 'normal',- resets_at: '2026-07-09T08:00:00.539755+00:00', scope: null, is_active: false,- },- {- kind: 'weekly_scoped', group: 'weekly', percent: 22, severity: 'normal',- resets_at: '2026-07-09T08:00:00.540080+00:00',- scope: { model: { id: null, display_name: 'Fable' }, surface: null },- is_active: false,- },- ],-};--describe('parseClaudeOAuthUsageResponse', () => {- it('parses the live limits[] schema (session / weekly_all / weekly_scoped)', () => {- const snapshot = parseClaudeOAuthUsageResponse(LIVE_RESPONSE, NOW);- expect(snapshot).not.toBeNull();- expect(snapshot?.fiveHour?.utilization).toBe(55);- expect(snapshot?.fiveHour?.severity).toBe('normal');- expect(snapshot?.fiveHour?.resetsAt).toBe(Math.floor(Date.parse('2026-07-02T13:00:00.539734+00:00') / 1000));- expect(snapshot?.sevenDay?.utilization).toBe(11);- expect(snapshot?.scoped).toHaveLength(1);- expect(snapshot?.scoped?.[0]).toMatchObject({ modelDisplayName: 'Fable', utilization: 22 });- expect(snapshot?.source).toBe('oauth-endpoint');- expect(snapshot?.updatedAt).toBe(NOW);- // extra_usage 未启用且无数值 → null- expect(snapshot?.extraUsage).toBeNull();- });-- it('falls back to legacy top-level keys when limits[] is absent', () => {- const snapshot = parseClaudeOAuthUsageResponse({- five_hour: { utilization: 33.5, resets_at: '2026-04-11T07:00:00Z' },- seven_day: { utilization: 13.0, resets_at: '2026-04-14T07:00:00Z' },- seven_day_opus: null,- seven_day_sonnet: { utilization: 1.0, resets_at: '2026-04-14T07:00:00Z' },- }, NOW);- expect(snapshot?.fiveHour?.utilization).toBe(33.5);- expect(snapshot?.sevenDay?.utilization).toBe(13);- expect(snapshot?.scoped).toEqual([- expect.objectContaining({ modelDisplayName: 'Sonnet', utilization: 1 }),- ]);- });-- it('parses legacy seven_day_fable top-level key into a Fable scoped window (#3244)', () => {- // 旧 schema 兜底原先只列了 Opus/Sonnet,漏了 Fable,导致走旧端点或降级- // 快照时 Fable 周限不显示(同环境 Opus/Sonnet 正常)。- const snapshot = parseClaudeOAuthUsageResponse({- five_hour: { utilization: 10, resets_at: '2026-04-11T07:00:00Z' },- seven_day: { utilization: 13, resets_at: '2026-04-14T07:00:00Z' },- seven_day_opus: { utilization: 5, resets_at: '2026-04-14T07:00:00Z' },- seven_day_sonnet: { utilization: 1, resets_at: '2026-04-14T07:00:00Z' },- seven_day_fable: { utilization: 87, resets_at: '2026-04-14T07:00:00Z' },- }, NOW);- expect(snapshot?.scoped).toEqual([- expect.objectContaining({ modelDisplayName: 'Opus', utilization: 5 }),- expect.objectContaining({ modelDisplayName: 'Sonnet', utilization: 1 }),- expect.objectContaining({ modelDisplayName: 'Fable', utilization: 87 }),- ]);- // 匹配器也能命中这个 legacy Fable 窗口- expect(- matchScopedWindowForModel(snapshot?.scoped, 'claude-fable-5')?.utilization,- ).toBe(87);- });-- it('merges legacy per-family fallback when limits[] only covers some families (#3244 Codex P1)', () => {- // 混合/降级响应:limits[] 的 weekly_scoped 只给了 Opus,Fable 仅通过顶层- // seven_day_fable 下发。旧逻辑用 `scoped.length === 0` 整体门控,有 Opus 时整个- // legacy 兜底被跳过,Fable 周限丢失。修复后按家族补(归属判定走共享 helper):- // Opus 以 limits[] 为准(utilization 5、保留 severity),缺失的 Fable 从顶层键补入。- const snapshot = parseClaudeOAuthUsageResponse({- five_hour: { utilization: 10, resets_at: '2026-04-11T07:00:00Z' },- seven_day: { utilization: 13, resets_at: '2026-04-14T07:00:00Z' },- seven_day_fable: { utilization: 87, resets_at: '2026-04-14T07:00:00Z' },- seven_day_opus: { utilization: 5, resets_at: '2026-04-14T07:00:00Z' },- limits: [- {- kind: 'weekly_scoped', percent: 5, severity: 'normal',- resets_at: '2026-04-14T07:00:00Z',- scope: { model: { id: null, display_name: 'Opus' } },- },- ],- }, NOW);- expect(snapshot?.scoped).toEqual([- expect.objectContaining({ modelDisplayName: 'Opus', utilization: 5, severity: 'normal' }),- expect.objectContaining({ modelDisplayName: 'Fable', utilization: 87 }),- ]);- expect(- matchScopedWindowForModel(snapshot?.scoped, 'claude-fable-5')?.utilization,- ).toBe(87);- });-- it('does not let a same-family legacy window override the limits[] scoped window', () => {- // 去重以家族为单位:limits[] 已给 Fable(带 severity)时,顶层 seven_day_fable- // 即使存在也不覆盖——limits[] 是权威全集。这里 Fable 的 limits[] 值 22、legacy 87,- // 解析后必须保留 22 且只有一个 Fable 窗口。- const snapshot = parseClaudeOAuthUsageResponse({- five_hour: { utilization: 10, resets_at: '2026-04-11T07:00:00Z' },- seven_day_fable: { utilization: 87, resets_at: '2026-04-14T07:00:00Z' },- limits: [- {- kind: 'weekly_scoped', percent: 22, severity: 'warning',- resets_at: '2026-04-14T07:00:00Z',- scope: { model: { id: null, display_name: 'Claude Fable' } },- },- ],- }, NOW);- expect(snapshot?.scoped).toEqual([- expect.objectContaining({ modelDisplayName: 'Claude Fable', utilization: 22, severity: 'warning' }),- ]);- });-- it('parses enabled extra usage', () => {- const snapshot = parseClaudeOAuthUsageResponse({- five_hour: { utilization: 10 },- extra_usage: { is_enabled: true, monthly_limit: 5000, used_credits: 1234, utilization: 24.7 },- }, NOW);- expect(snapshot?.extraUsage).toEqual({- isEnabled: true, utilization: 24.7, usedCredits: 1234, monthlyLimit: 5000,- });- });-- it('returns null for unparsable / windowless payloads', () => {- expect(parseClaudeOAuthUsageResponse(null, NOW)).toBeNull();- expect(parseClaudeOAuthUsageResponse('nope', NOW)).toBeNull();- expect(parseClaudeOAuthUsageResponse({}, NOW)).toBeNull();- // 教育版 / 组织托管订阅可能只有订阅通知、无数字配额 → 无窗口按无数据处理- expect(parseClaudeOAuthUsageResponse({ five_hour: null, seven_day: null, limits: [] }, NOW)).toBeNull();- });-- it('clamps out-of-range percent and skips malformed limit entries', () => {- const snapshot = parseClaudeOAuthUsageResponse({- limits: [- { kind: 'session', percent: 250 },- { kind: 'weekly_all', percent: 'not-a-number' },- { kind: 'weekly_scoped', percent: 10, scope: { model: {} } }, // 无 display_name → 跳过- 'garbage',- ],- }, NOW);- expect(snapshot?.fiveHour?.utilization).toBe(100);- expect(snapshot?.sevenDay).toBeNull();- expect(snapshot?.scoped).toEqual([]);- });-});--describe('parseClaudeUnifiedRateLimitHeaders', () => {- it('normalizes 0.0-1.0 fractional utilization to 0-100 percent', () => {- const snapshot = parseClaudeUnifiedRateLimitHeaders({- 'anthropic-ratelimit-unified-status': 'allowed',- 'anthropic-ratelimit-unified-5h-utilization': '0.018416969696969696',- 'anthropic-ratelimit-unified-5h-reset': '1764554400',- 'anthropic-ratelimit-unified-7d-utilization': '0.7370692663445869',- 'anthropic-ratelimit-unified-7d-reset': '1764986400',- 'anthropic-ratelimit-unified-representative-claim': 'five_hour',- }, NOW);- expect(snapshot?.fiveHour?.utilization).toBeCloseTo(1.8417, 3);- expect(snapshot?.fiveHour?.resetsAt).toBe(1764554400);- expect(snapshot?.sevenDay?.utilization).toBeCloseTo(73.7069, 3);- expect(snapshot?.rateLimitStatus).toBe('allowed');- expect(snapshot?.representativeClaim).toBe('five_hour');- expect(snapshot?.source).toBe('unified-headers');- });-- it('returns null when no unified headers are present (gateway responses)', () => {- expect(parseClaudeUnifiedRateLimitHeaders({ 'content-type': 'application/json' }, NOW)).toBeNull();- });-});--describe('mergeClaudeSubscriptionUsageSnapshot', () => {- const endpointSnapshot: ClaudeSubscriptionUsageSnapshot = {- fiveHour: { utilization: 55, resetsAt: 1, severity: 'normal' },- sevenDay: { utilization: 11, resetsAt: 2, severity: 'normal' },- scoped: [{ utilization: 22, modelDisplayName: 'Fable', resetsAt: 2 }],- subscriptionType: 'max',- extraUsage: { isEnabled: false },- source: 'oauth-endpoint',- updatedAt: 100,- };-- it('headers merge keeps endpoint-only fields (scoped / plan / extraUsage)', () => {- const merged = mergeClaudeSubscriptionUsageSnapshot(endpointSnapshot, {- fiveHour: { utilization: 60, resetsAt: 3 },- sevenDay: null,- rateLimitStatus: 'allowed_warning',- source: 'unified-headers',- updatedAt: 200,- });- expect(merged.fiveHour?.utilization).toBe(60);- // headers 没给 7d → 保留 endpoint 的- expect(merged.sevenDay?.utilization).toBe(11);- expect(merged.scoped).toHaveLength(1);- expect(merged.subscriptionType).toBe('max');- expect(merged.extraUsage).toEqual({ isEnabled: false });- expect(merged.rateLimitStatus).toBe('allowed_warning');- expect(merged.updatedAt).toBe(200);- });-- it('endpoint refresh replaces windows and drops stale headers-only status', () => {- const withHeaders = mergeClaudeSubscriptionUsageSnapshot(endpointSnapshot, {- fiveHour: { utilization: 99.99 },- rateLimitStatus: 'rejected',- source: 'unified-headers',- updatedAt: 200,- });- const refreshed = mergeClaudeSubscriptionUsageSnapshot(withHeaders, {- fiveHour: { utilization: 70, severity: 'warning' },- sevenDay: { utilization: 15 },- scoped: [],- source: 'oauth-endpoint',- updatedAt: 300,- });- expect(refreshed.fiveHour).toEqual({ utilization: 70, severity: 'warning' });- expect(refreshed.scoped).toEqual([]);- expect(refreshed.subscriptionType).toBe('max');- // headers 的 rejected 是瞬时信号 —— 限额重置后无新直连响应时不得永久挂警示;- // 真实限流会由下一次直连响应的 headers 重新带回。- expect(refreshed.rateLimitStatus).toBeUndefined();- expect(refreshed.updatedAt).toBe(300);- });-- it('returns incoming as-is when there is no previous snapshot', () => {- expect(mergeClaudeSubscriptionUsageSnapshot(null, endpointSnapshot)).toBe(endpointSnapshot);- });-- it('discards all previous fields when account fingerprints conflict (account switch)', () => {- // 换号窗口: prev 是账号 A 的全量快照, headers incoming 带账号 B 指纹 —— 不得把- // A 的 scoped / subscriptionType / extraUsage 串给 B, incoming 即新起点。- const prevA = { ...endpointSnapshot, accountFingerprint: 'fp-a' };- const headersB: ClaudeSubscriptionUsageSnapshot = {- fiveHour: { utilization: 5 },- rateLimitStatus: 'allowed',- source: 'unified-headers',- accountFingerprint: 'fp-b',- updatedAt: 500,- };- expect(mergeClaudeSubscriptionUsageSnapshot(prevA, headersB)).toBe(headersB);-- // endpoint incoming 指纹冲突同理: 不沿用 prev 的 subscriptionType 等兜底字段。- const endpointB: ClaudeSubscriptionUsageSnapshot = {- fiveHour: { utilization: 1 },- scoped: [],- source: 'oauth-endpoint',- accountFingerprint: 'fp-b',- updatedAt: 600,- };- const merged = mergeClaudeSubscriptionUsageSnapshot(prevA, endpointB);- expect(merged).toBe(endpointB);- expect(merged.subscriptionType).toBeUndefined();- });-});--describe('claudeModelFamily / matchScopedWindowForModel', () => {- it('extracts the family from model ids with routing suffixes', () => {- expect(claudeModelFamily('claude-fable-5[1m]')).toBe('fable');- expect(claudeModelFamily('claude-opus-4-8')).toBe('opus');- expect(claudeModelFamily('sonnet')).toBe('sonnet');- expect(claudeModelFamily('claude-haiku-4-5-20251001')).toBe('haiku');- expect(claudeModelFamily('gpt-5.5')).toBeNull();- expect(claudeModelFamily(null)).toBeNull();- });-- it('matches the scoped window for the current model and falls back to null', () => {- const scoped = [- { utilization: 22, modelDisplayName: 'Fable' },- { utilization: 5, modelDisplayName: 'Opus' },- ];- expect(matchScopedWindowForModel(scoped, 'claude-fable-5[1m]')?.utilization).toBe(22);- expect(matchScopedWindowForModel(scoped, 'claude-opus-4-8')?.utilization).toBe(5);- expect(matchScopedWindowForModel(scoped, 'claude-sonnet-4-6')).toBeNull();- expect(matchScopedWindowForModel(undefined, 'claude-fable-5')).toBeNull();- });-- it('matches Fable scoped window across display_name variants (#3244)', () => {- // 端点对 display_name 的口径历史上有 "Fable" / "Claude Fable" / "Fable 5"- // 等形态;精确等于会把变体漏掉,导致 Fable 周限不显示而 Opus/Sonnet 正常。- const scoped = [- { utilization: 30, modelDisplayName: 'Claude Fable' },- { utilization: 5, modelDisplayName: 'Opus' },- ];- expect(matchScopedWindowForModel(scoped, 'claude-fable-5')?.utilization).toBe(30);- const scoped2 = [- { utilization: 41, modelDisplayName: 'Fable 5' },- ];- expect(matchScopedWindowForModel(scoped2, 'claude-fable-5-20250101')?.utilization).toBe(41);- });-- it('classifies a scoped window by its modelId when present (authoritative over displayName)', () => {- // window.modelId 能经 claudeModelFamily 归类时优先用它:即使 displayName 不含家族名- // 也能命中。- const scoped = [- { utilization: 30, modelDisplayName: 'Internal Label', modelId: 'claude-fable-5-20250101' },- ];- expect(matchScopedWindowForModel(scoped, 'claude-fable-5')?.utilization).toBe(30);- // modelId 指向另一家族时以 modelId 为准,不回退 displayName(即使后者含子串也不跨家族误命中)- const cross = [- { utilization: 99, modelDisplayName: 'Fable-ish', modelId: 'claude-opus-4-8' },- ];- expect(matchScopedWindowForModel(cross, 'claude-fable-5')).toBeNull();- });-- it('falls back to displayName variant matching when modelId is null or unrecognized', () => {- // modelId 为 null → 回退 displayName 变体包含- const noId = [- { utilization: 30, modelDisplayName: 'Claude Fable', modelId: null },- ];- expect(matchScopedWindowForModel(noId, 'claude-fable-5')?.utilization).toBe(30);- // modelId 存在但无法归类(不在已知家族表)→ 同样回退 displayName 变体- const unknownId = [- { utilization: 41, modelDisplayName: 'Fable 5', modelId: 'internal-fable-foo' },- ];- expect(matchScopedWindowForModel(unknownId, 'claude-fable-5')?.utilization).toBe(41);- });-});--describe('isClaudeSubscriptionAlerting', () => {- /**- * 2026-07-25 实测快照:5h / 总周限都很宽裕,只有 Fable 的分模型周限 87% 且服务端- * 给了 severity=warning。chip 上只显示 5h + 周限两段,所以这份数据只该让 Fable- * 会话变红。- */- const SNAPSHOT: ClaudeSubscriptionUsageSnapshot = {- fiveHour: { utilization: 10 },- sevenDay: { utilization: 44 },- scoped: [{ utilization: 87, severity: 'warning', modelDisplayName: 'Fable' }],- rateLimitStatus: 'allowed',- subscriptionType: 'max',- };-- it('only alerts the model whose scoped weekly window is warning', () => {- expect(isClaudeSubscriptionAlerting(SNAPSHOT, 'claude-fable-5[1m]')).toBe(true);- // 跑 Opus / Sonnet 的会话不受 Fable 周限影响 —— chip 上也没有那一段, 不能染红- expect(isClaudeSubscriptionAlerting(SNAPSHOT, 'claude-opus-5[1m]')).toBe(false);- expect(isClaudeSubscriptionAlerting(SNAPSHOT, 'claude-sonnet-5')).toBe(false);- // 家族识别不出来时回退总周限(44%,不告警)- expect(isClaudeSubscriptionAlerting(SNAPSHOT, null)).toBe(false);- expect(isClaudeSubscriptionAlerting(null, 'claude-fable-5')).toBe(false);- });-- it('ignores allowed_warning but honors rejected', () => {- // allowed_warning 是服务端综合全部窗口(含其它模型周限)的模糊信号:chip 只显示- // 5h + 周限, 拿它染红会出现「剩余 91% / 56% 却是红的」- expect(isClaudeSubscriptionAlerting(- { ...SNAPSHOT, rateLimitStatus: 'allowed_warning' },- 'claude-opus-5[1m]',- )).toBe(false);- // 真限流(请求已被拒)与当前模型无关, 一律告警- expect(isClaudeSubscriptionAlerting(- { ...SNAPSHOT, rateLimitStatus: 'rejected' },- 'claude-opus-5[1m]',- )).toBe(true);- expect(isClaudeSubscriptionAlerting(- { ...SNAPSHOT, rateLimitStatus: 'REJECTED ' },- 'claude-opus-5[1m]',- )).toBe(true);- });-- it('alerts on exhausted or non-normal session-scope windows', () => {- // 打满(headers 源不带 severity, 只能靠 utilization)- expect(isClaudeSubscriptionAlerting(- { fiveHour: { utilization: 100 } },- 'claude-opus-5',- )).toBe(true);- // 总周限 severity 非 normal —— 所有模型共用, 与当前模型无关- expect(isClaudeSubscriptionAlerting(- { sevenDay: { utilization: 80, severity: 'warning' } },- 'claude-opus-5',- )).toBe(true);- // 水位远未见底且 severity=normal → 不告警- expect(isClaudeSubscriptionAlerting(- { fiveHour: { utilization: 60, severity: 'normal' }, sevenDay: { utilization: 44 } },- 'claude-opus-5',- )).toBe(false);- });-- it('alerts when a displayed window runs down to the last 10%', () => {- // unified-headers 源不带 per-window severity, 只有 utilization: 光靠「打满」会让- // chip 一直到 99.95% 才变红。剩余 ≤10% 即告警, 判据是 chip 上正在显示的那个数字。- expect(isClaudeSubscriptionAlerting({ fiveHour: { utilization: 90 } }, 'claude-opus-5'))- .toBe(true);- expect(isClaudeSubscriptionAlerting({ sevenDay: { utilization: 92 } }, 'claude-opus-5'))- .toBe(true);- // 水位判定优先于服务端 severity: 只剩 5% 时说 normal 也照样提醒- expect(isClaudeSubscriptionAlerting(- { fiveHour: { utilization: 95, severity: 'normal' } },- 'claude-opus-5',- )).toBe(true);- // 阈值下方不告警(89% 已用 = 剩余 11%)- expect(isClaudeSubscriptionAlerting({ fiveHour: { utilization: 89 } }, 'claude-opus-5'))- .toBe(false);- // 其它模型的 scoped 窗口即使见底也不染红当前会话 —— 与阈值无关- expect(isClaudeSubscriptionAlerting(- { fiveHour: { utilization: 10 }, scoped: [{ utilization: 99, modelDisplayName: 'Fable' }] },- 'claude-opus-5',- )).toBe(false);- });-- it('hasAlertingClaudeSessionWindow excludes the overall status signal', () => {- // tooltip 用它 + status 分流, chip 用 isClaudeSubscriptionAlerting; 窗口维度本身- // 不看 status(rejected 也不例外)- expect(hasAlertingClaudeSessionWindow(- { ...SNAPSHOT, rateLimitStatus: 'rejected' },- 'claude-opus-5[1m]',- )).toBe(false);- expect(hasAlertingClaudeSessionWindow(SNAPSHOT, 'claude-fable-5[1m]')).toBe(true);- expect(isClaudeUsageWindowAlerting(undefined)).toBe(false);- expect(isClaudeUsageWindowAlerting({ utilization: 87, severity: 'warning' })).toBe(true);- });-- it('ignores non-finite utilization instead of treating it as exhausted', () => {- // 持久化快照是 JSON.parse 后直接断言的, 不重新校验字段: 脏值不能被 clampPercent- // 夹成 100 而误判额度耗尽。severity 缺失时一律不告警。- expect(isClaudeUsageWindowAlerting({ utilization: Number.POSITIVE_INFINITY })).toBe(false);- expect(isClaudeUsageWindowAlerting({ utilization: Number.NaN })).toBe(false);- expect(isClaudeSubscriptionAlerting(- { fiveHour: { utilization: Number.POSITIVE_INFINITY } },- 'claude-opus-5',- )).toBe(false);- // 脏 utilization 不影响 severity 这条独立判据- expect(isClaudeUsageWindowAlerting({ utilization: Number.NaN, severity: 'warning' }))- .toBe(true);- });-});--describe('fetchClaudeSubscriptionUsageSnapshot', () => {- function jsonResponse(status: number, body: unknown): Response {- return {- ok: status >= 200 && status < 300,- status,- json: async () => body,- } as unknown as Response;- }-- it('sends bearer + oauth beta + claude-code UA and returns a parsed snapshot', async () => {- const fetchFn = vi.fn().mockResolvedValue(jsonResponse(200, LIVE_RESPONSE));- const result = await fetchClaudeSubscriptionUsageSnapshot({- accessToken: 'sk-ant-oat01-test',- subscriptionType: 'max',- claudeCodeVersion: '2.1.186',- fetchFn,- now: NOW,- });- const snapshot = typeof result === 'object' ? result : null;- expect(snapshot).not.toBeNull();- expect(fetchFn).toHaveBeenCalledWith(- 'https://api.anthropic.com/api/oauth/usage',- expect.objectContaining({- method: 'GET',- headers: expect.objectContaining({- Authorization: 'Bearer sk-ant-oat01-test',- 'anthropic-beta': 'oauth-2025-04-20',- 'User-Agent': 'claude-code/2.1.186',- }),- }),- );- expect(snapshot?.fiveHour?.utilization).toBe(55);- expect(snapshot?.subscriptionType).toBe('max');- });-- it('throws Unauthorized on 401 and RateLimited on 429', async () => {- await expect(fetchClaudeSubscriptionUsageSnapshot({- accessToken: 't', fetchFn: vi.fn().mockResolvedValue(jsonResponse(401, {})),- })).rejects.toBeInstanceOf(ClaudeSubscriptionUsageUnauthorizedError);- await expect(fetchClaudeSubscriptionUsageSnapshot({- accessToken: 't', fetchFn: vi.fn().mockResolvedValue(jsonResponse(429, {})),- })).rejects.toBeInstanceOf(ClaudeSubscriptionUsageRateLimitedError);- });-- it('returns null on transport failures but explicit empty on parsable-window-less 2xx', async () => {- // 网络失败 → null (保留缓存下轮再试)- await expect(fetchClaudeSubscriptionUsageSnapshot({- accessToken: 't', fetchFn: vi.fn().mockResolvedValue(jsonResponse(500, {})),- })).resolves.toBeNull();- await expect(fetchClaudeSubscriptionUsageSnapshot({- accessToken: 't', fetchFn: vi.fn().mockRejectedValue(new Error('offline')),- })).resolves.toBeNull();- // 端点成功但无可解析窗口 (教育版 / schema 变化) → 'empty' (调用方清缓存降级)- await expect(fetchClaudeSubscriptionUsageSnapshot({- accessToken: 't', fetchFn: vi.fn().mockResolvedValue(jsonResponse(200, { limits: [] })),- })).resolves.toBe('empty');- });-});diff --git a/apps/desktop/src/main/usage/__tests__/claudeSubscriptionUsageRefresh.test.ts b/apps/desktop/src/main/usage/__tests__/claudeSubscriptionUsageRefresh.test.tsdeleted file mode 100644index 59c07e023e..0000000000--- a/apps/desktop/src/main/usage/__tests__/claudeSubscriptionUsageRefresh.test.ts+++ /dev/null@@ -1,388 +0,0 @@-/**- * claudeSubscriptionUsageRefresh.test.ts- * ---------------------------------------------------------------------------- * cached-first reader 的行为单测:- * - read(): 缓存立即返回 + 后台刷新;无凭证时清一次缓存(且只清一次)- * - 节流: throttleMs 内重复触发不再 fetch; token 变化重置节流- * - 401 → 清缓存快照; 429 → 指数退避(初始 → ×2 → 封顶), 成功后重置- */--import { describe, expect, it, vi } from 'vitest';--import type { ClaudeSubscriptionUsageSnapshot } from '../../../shared/claudeSubscriptionUsage';-import {- createClaudeSubscriptionUsageReader,- type ClaudeSubscriptionCredentialInfo,-} from '../claudeSubscriptionUsageRefresh';--class UnauthorizedError extends Error {}-class RateLimitedError extends Error {}--function makeSnapshot(updatedAt: number): ClaudeSubscriptionUsageSnapshot {- return { fiveHour: { utilization: 10 }, source: 'oauth-endpoint', updatedAt };-}--function makeDeps(overrides: Partial<{- credentials: ClaudeSubscriptionCredentialInfo | null;- cached: ClaudeSubscriptionUsageSnapshot | null;- now: () => number;- fetchSnapshot: ReturnType<typeof vi.fn>;-}> = {}) {- const recordSnapshot = vi.fn().mockResolvedValue(undefined);- const clearSnapshot = vi.fn().mockResolvedValue(undefined);- const fetchSnapshot = overrides.fetchSnapshot- ?? vi.fn().mockResolvedValue(makeSnapshot(1));- const deps = {- readCredentials: vi.fn(() => overrides.credentials === undefined- ? { accessToken: 'token-a', subscriptionType: 'max' }- : overrides.credentials),- fetchSnapshot,- recordSnapshot,- clearSnapshot,- readCachedSnapshot: vi.fn().mockResolvedValue(overrides.cached ?? null),- fingerprintToken: (token: string) => `fp:${token}`,- now: overrides.now ?? (() => 1_000_000),- isUnauthorizedError: (err: unknown) => err instanceof UnauthorizedError,- isRateLimitedError: (err: unknown) => err instanceof RateLimitedError,- onRefreshError: vi.fn(),- };- return { deps, recordSnapshot, clearSnapshot, fetchSnapshot };-}--async function settle(): Promise<void> {- await new Promise((resolve) => setTimeout(resolve, 0));-}--describe('createClaudeSubscriptionUsageReader', () => {- it('returns the cached snapshot immediately and refreshes in the background', async () => {- const cached = makeSnapshot(0);- const fresh = makeSnapshot(2);- const { deps, recordSnapshot } = makeDeps({- cached,- fetchSnapshot: vi.fn().mockResolvedValue(fresh),- });- const reader = createClaudeSubscriptionUsageReader(deps);-- await expect(reader.read()).resolves.toBe(cached);- await settle();- // 归属指纹由 reader 在 record 前附加(fetch 时 token 已在手, 不再读凭证库)。- expect(recordSnapshot).toHaveBeenCalledWith({ ...fresh, accountFingerprint: 'fp:token-a' });- });-- it('clears the snapshot once when credentials disappear', async () => {- let credentials: ClaudeSubscriptionCredentialInfo | null = { accessToken: 'token-a' };- const { deps, clearSnapshot } = makeDeps();- deps.readCredentials = vi.fn(() => credentials);- const reader = createClaudeSubscriptionUsageReader(deps);-- await reader.read();- credentials = null;- await expect(reader.read()).resolves.toBeNull();- await expect(reader.read()).resolves.toBeNull();- expect(clearSnapshot).toHaveBeenCalledTimes(1);- // 未登录用户的常规读不触发清库- const freshDeps = makeDeps({ credentials: null });- const freshReader = createClaudeSubscriptionUsageReader(freshDeps.deps);- await expect(freshReader.read()).resolves.toBeNull();- expect(freshDeps.clearSnapshot).not.toHaveBeenCalled();- });-- it('throttles refreshes within throttleMs and resets on token change', async () => {- let nowMs = 1_000_000;- let token = 'token-a';- const { deps, fetchSnapshot } = makeDeps({ now: () => nowMs });- deps.readCredentials = vi.fn(() => ({ accessToken: token }));- const reader = createClaudeSubscriptionUsageReader(deps, { throttleMs: 180_000 });-- await reader.read();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);-- nowMs += 10_000;- await reader.read();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1); // 节流内不再 fetch-- nowMs += 180_001;- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(2); // 节流过期后触发-- token = 'token-b';- nowMs += 1_000;- await reader.read();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(3); // token 变化重置节流- });-- it('clears the cached snapshot on unauthorized errors but keeps the throttle', async () => {- let nowMs = 1_000_000;- const fetchSnapshot = vi.fn().mockRejectedValue(new UnauthorizedError('401'));- const { deps, clearSnapshot, recordSnapshot } = makeDeps({ now: () => nowMs, fetchSnapshot });- const reader = createClaudeSubscriptionUsageReader(deps, { throttleMs: 180_000 });- await reader.read();- await settle();- expect(clearSnapshot).toHaveBeenCalledTimes(1);- expect(recordSnapshot).not.toHaveBeenCalled();- expect(deps.onRefreshError).not.toHaveBeenCalled();-- // token 过期但仍在凭证库的窗口: 节流必须保留, 每个 turn-done 不得对敏感端点- // 无节流重试 401。- nowMs += 10_000;- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);-- nowMs += 180_001; // 节流过期后允许再试- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(2);- });-- it('backs off exponentially on 429 and recovers after a success', async () => {- let nowMs = 1_000_000;- const fetchSnapshot = vi.fn()- .mockRejectedValueOnce(new RateLimitedError('429'))- .mockRejectedValueOnce(new RateLimitedError('429'))- .mockResolvedValue(makeSnapshot(9));- const { deps, recordSnapshot } = makeDeps({ now: () => nowMs, fetchSnapshot });- const reader = createClaudeSubscriptionUsageReader(deps, {- throttleMs: 1_000,- rateLimitBackoffInitialMs: 300_000,- rateLimitBackoffMaxMs: 1_800_000,- });-- reader.triggerRefresh(); // 第一次 → 429, 退避 300s- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);-- nowMs += 200_000; // 退避未过- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);-- nowMs += 200_000; // 退避已过 → 第二次 → 429, 退避 ×2 = 600s- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(2);-- nowMs += 500_000; // 600s 未过- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(2);-- nowMs += 200_000; // 已过 → 第三次成功, 退避清零- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(3);- expect(recordSnapshot).toHaveBeenCalledWith({ ...makeSnapshot(9), accountFingerprint: 'fp:token-a' });-- nowMs += 1_001; // 常规节流恢复生效- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(4);- });-- it('invalidates the persisted snapshot when its fingerprint belongs to another token', async () => {- // 同机换号:持久化快照归属 token-b, 当前凭证是 token-a → read 不得把上一个- // 账号的余量顶给新账号, 应清缓存 + 返回 null + 触发后台刷新。- const staleSnapshot = { ...makeSnapshot(1), accountFingerprint: 'fp:token-b' };- const { deps, clearSnapshot, fetchSnapshot } = makeDeps({ cached: staleSnapshot });- const reader = createClaudeSubscriptionUsageReader(deps);-- await expect(reader.read()).resolves.toBeNull();- expect(clearSnapshot).toHaveBeenCalledTimes(1);- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- });-- it('keeps serving fingerprint-less legacy snapshots (unknown ownership, do not over-clear)', async () => {- const legacy = makeSnapshot(1); // 无 accountFingerprint- const { deps, clearSnapshot } = makeDeps({ cached: legacy });- const reader = createClaudeSubscriptionUsageReader(deps);-- await expect(reader.read()).resolves.toBe(legacy);- expect(clearSnapshot).not.toHaveBeenCalled();- });-- it('skips the credential read entirely when triggerRefresh hits throttle / backoff / in-flight', async () => {- // turn-done 每轮无条件触发, 预检必须在读凭证之前 —— macOS 的凭证读是同步- // keychain 子进程 spawn, 节流窗口内不允许为"短路判断"付这笔成本。- let nowMs = 1_000_000;- const { deps, fetchSnapshot } = makeDeps({ now: () => nowMs });- const reader = createClaudeSubscriptionUsageReader(deps, { throttleMs: 180_000 });-- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- // 首次触发 2 次读: trigger 入口 1 次 + fetch 成功后的 isRefreshStillCurrent 校验- // (后者在后台 async 流程里, 不在 turn-done 同步路径上)。- const baseline = deps.readCredentials.mock.calls.length;-- nowMs += 10_000; // 节流窗口内- reader.triggerRefresh();- reader.triggerRefresh();- await settle();- expect(deps.readCredentials).toHaveBeenCalledTimes(baseline); // 预检短路, 零凭证读- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- });-- it('cools down credential probing after a no-credentials result (gateway-only users)', async () => {- // 未连订阅用户: turn-done 每轮无条件触发, 读到 null 后 throttleMs 内不得再付- // 同步 keychain 读; 冷却过期后恢复探测 (外部 cc CLI 登录最迟一个窗口被拾起)。- let nowMs = 1_000_000;- const { deps, fetchSnapshot } = makeDeps({ credentials: null, now: () => nowMs });- const reader = createClaudeSubscriptionUsageReader(deps, { throttleMs: 180_000 });-- reader.triggerRefresh();- expect(deps.readCredentials).toHaveBeenCalledTimes(1);-- nowMs += 10_000; // 冷却窗口内: 零凭证读- reader.triggerRefresh();- reader.triggerRefresh();- expect(deps.readCredentials).toHaveBeenCalledTimes(1);-- nowMs += 180_001; // 冷却过期 → 恢复探测- reader.triggerRefresh();- expect(deps.readCredentials).toHaveBeenCalledTimes(2);- expect(fetchSnapshot).not.toHaveBeenCalled();- });-- it('read() observing no credentials also arms the probe cooldown for turn-done triggers', async () => {- let nowMs = 1_000_000;- const { deps } = makeDeps({ credentials: null, now: () => nowMs });- const reader = createClaudeSubscriptionUsageReader(deps, { throttleMs: 180_000 });-- await expect(reader.read()).resolves.toBeNull();- const baseline = deps.readCredentials.mock.calls.length;- nowMs += 10_000;- reader.triggerRefresh();- expect(deps.readCredentials).toHaveBeenCalledTimes(baseline);- });-- it('lifts the no-credentials cooldown on an auth-change sync (login is picked up immediately)', async () => {- let nowMs = 1_000_000;- let credentials: ClaudeSubscriptionCredentialInfo | null = null;- const { deps, fetchSnapshot } = makeDeps({ now: () => nowMs });- deps.readCredentials = vi.fn(() => credentials);- const reader = createClaudeSubscriptionUsageReader(deps, { throttleMs: 180_000 });-- reader.triggerRefresh(); // null → 冷却武装- expect(fetchSnapshot).not.toHaveBeenCalled();-- credentials = { accessToken: 'token-a' };- nowMs += 1_000; // 冷却未过, 但登录钩子不吃冷却 → 立即端点刷新- await reader.syncForCredentialChange();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);-- nowMs += 200_000; // 冷却已解除, 常规节流过期后 turn-done 正常触发- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(2);- });-- it('clears the cache on successful-but-empty fetches without resetting the throttle', async () => {- // 教育版 / schema 变化: 端点 2xx 但无可解析窗口 → 清缓存降级为无数据 (不展示- // 过期值); 节流状态保留, 不会退化成每次 turn-done 都打一次端点。- let nowMs = 1_000_000;- const fetchSnapshot = vi.fn().mockResolvedValue('empty');- const { deps, clearSnapshot, recordSnapshot } = makeDeps({- now: () => nowMs,- fetchSnapshot,- cached: makeSnapshot(1),- });- const reader = createClaudeSubscriptionUsageReader(deps, { throttleMs: 180_000 });-- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- expect(clearSnapshot).toHaveBeenCalledTimes(1);- expect(recordSnapshot).not.toHaveBeenCalled();-- nowMs += 10_000; // 节流窗口内不再打端点- reader.triggerRefresh();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- });-- it('syncForCredentialChange clears persisted snapshots even on cold logout', async () => {- // app 启动后首个 OAuth 操作是登出: 本进程从未观察过凭证(hadCredentials=false),- // read() 的守卫不会清 —— 强制同步必须无条件清磁盘残留并广播 null。- const { deps, clearSnapshot } = makeDeps({ credentials: null, cached: makeSnapshot(1) });- const reader = createClaudeSubscriptionUsageReader(deps);-- await reader.syncForCredentialChange();- expect(clearSnapshot).toHaveBeenCalledTimes(1);- });-- it('syncForCredentialChange clears the old-account snapshot and refreshes for the new token', async () => {- const stale = { ...makeSnapshot(1), accountFingerprint: 'fp:token-old' };- const { deps, clearSnapshot, fetchSnapshot } = makeDeps({ cached: stale });- const reader = createClaudeSubscriptionUsageReader(deps);-- await reader.syncForCredentialChange();- expect(clearSnapshot).toHaveBeenCalledTimes(1);- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- expect(fetchSnapshot).toHaveBeenCalledWith(expect.objectContaining({ accessToken: 'token-a' }));- });-- it('syncForCredentialChange keeps the matching-account snapshot and just refreshes', async () => {- const owned = { ...makeSnapshot(1), accountFingerprint: 'fp:token-a' };- const { deps, clearSnapshot, fetchSnapshot } = makeDeps({ cached: owned });- const reader = createClaudeSubscriptionUsageReader(deps);-- await reader.syncForCredentialChange();- expect(clearSnapshot).not.toHaveBeenCalled();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- });-- it('drops the fetched snapshot if the token changed mid-flight', async () => {- let token = 'token-a';- const fetchDeferred: { resolve?: (v: ClaudeSubscriptionUsageSnapshot) => void } = {};- const fetchSnapshot = vi.fn().mockImplementation(() =>- new Promise<ClaudeSubscriptionUsageSnapshot>((resolve) => { fetchDeferred.resolve = resolve; }));- const { deps, recordSnapshot } = makeDeps({ fetchSnapshot });- deps.readCredentials = vi.fn(() => ({ accessToken: token }));- const reader = createClaudeSubscriptionUsageReader(deps);-- reader.triggerRefresh();- token = 'token-b';- fetchDeferred.resolve?.(makeSnapshot(5));- await settle();- expect(recordSnapshot).not.toHaveBeenCalled();- });-- it('queues a follow-up refresh for the new token when a fetch is in flight during account switch', async () => {- // in-flight 换号:旧 token 的响应被丢弃后, 必须自动为新 token 补一次端点刷新,- // 否则 scoped 分模型窗口 / extra usage 等端点独有字段要空到下一次外部触发。- let token = 'token-a';- const deferred: Array<(v: ClaudeSubscriptionUsageSnapshot) => void> = [];- const fetchSnapshot = vi.fn().mockImplementation(() =>- new Promise<ClaudeSubscriptionUsageSnapshot>((resolve) => { deferred.push(resolve); }));- const { deps, recordSnapshot } = makeDeps({ fetchSnapshot });- deps.readCredentials = vi.fn(() => ({ accessToken: token }));- const reader = createClaudeSubscriptionUsageReader(deps);-- reader.triggerRefresh(); // token-a fetch 在飞- expect(fetchSnapshot).toHaveBeenCalledTimes(1);- token = 'token-b';- // followup 排队走完整路径(read / auth 钩子); turn-done 的 triggerRefresh 在- // in-flight 时预检短路(刷新已在进行), 不承担换号 followup。- void reader.read();- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(1);-- deferred[0]?.(makeSnapshot(5)); // 旧响应回来 → 被丢弃- await settle();- expect(fetchSnapshot).toHaveBeenCalledTimes(2);- expect(fetchSnapshot).toHaveBeenLastCalledWith(expect.objectContaining({ accessToken: 'token-b' }));-- deferred[1]?.(makeSnapshot(7)); // 新 token 的响应正常落库- await settle();- expect(recordSnapshot).toHaveBeenCalledTimes(1);- expect(recordSnapshot).toHaveBeenCalledWith({ ...makeSnapshot(7), accountFingerprint: 'fp:token-b' });- });-});diff --git a/apps/desktop/src/main/usage/__tests__/subscriptionAccountUsage.test.ts b/apps/desktop/src/main/usage/__tests__/subscriptionAccountUsage.test.tsindex c6688da463..736c12f1a4 100644--- a/apps/desktop/src/main/usage/__tests__/subscriptionAccountUsage.test.ts+++ b/apps/desktop/src/main/usage/__tests__/subscriptionAccountUsage.test.ts@@ -3,9 +3,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';const state = vi.hoisted(() => ({scope: 0,tokens: new Map<string, string>(),- prepare: vi.fn(),- fetchClaude: vi.fn(),fetchXai: vi.fn(),+ outboundFetch: vi.fn(),}));vi.mock('../../appSessionState.js', () => ({activeOwnerScopeKey: () => String(state.scope),@@ -13,9 +12,6 @@ vi.mock('../../appSessionState.js', () => ({}));vi.mock('../../maker-host/subscription-account-auth.js', () => ({subscriptionAccountKind: (id: string) => (id.startsWith('claude') ? 'claude' : 'xai'),- readClaudeAccountOAuth: (id: string) =>- state.tokens.has(id) ? { accessToken: state.tokens.get(id) } : null,- prepareClaudeAccountUsage: (id: string) => state.prepare(id),}));vi.mock('../../maker-host/grok-oauth-login.js', () => ({hasGrokOAuthLogin: (id: string) => state.tokens.has(id),@@ -24,15 +20,12 @@ vi.mock('../../maker-host/grok-oauth-login.js', () => ({vi.mock('../../maker-host/provider-route.js', () => ({isProviderRouteMutationInProgress: () => false,}));-vi.mock('../../maker-host/outbound-fetch.js', () => ({ outboundFetch: vi.fn() }));+vi.mock('../../maker-host/outbound-fetch.js', () => ({+ outboundFetch: (...args: unknown[]) => state.outboundFetch(...args),+}));vi.mock('../../secrets/providerSecretStore.js', () => ({addProviderSecretsClearedListener: vi.fn(),}));-vi.mock('../claudeSubscriptionUsage.js', () => ({- fetchClaudeSubscriptionUsageSnapshot: (...args: unknown[]) => state.fetchClaude(...args),- ClaudeSubscriptionUsageRateLimitedError: class extends Error {},- ClaudeSubscriptionUsageUnauthorizedError: class extends Error {},-}));vi.mock('../xaiSubscriptionUsage.js', () => ({fetchXaiSubscriptionUsageSnapshot: (...args: unknown[]) => state.fetchXai(...args),XaiSubscriptionUsageRateLimitedError: class extends Error {},@@ -42,6 +35,7 @@ import {readSubscriptionAccountUsage,setSubscriptionAccountUsageBroadcaster,syncSubscriptionAccountUsage,+ triggerSubscriptionAccountUsage,} from '../subscriptionAccountUsage.js';const settle = () => new Promise((resolve) => setTimeout(resolve, 0));@@ -49,61 +43,50 @@ describe('subscription provider quota isolation', () => {beforeEach(() => {state.scope++;state.tokens.clear();- state.prepare- .mockReset()- .mockImplementation(async (id) => ({- accessToken: state.tokens.get(id),- subscriptionType: 'max',- }));- state.fetchClaude.mockReset();state.fetchXai.mockReset();+ state.outboundFetch.mockReset();setSubscriptionAccountUsageBroadcaster(() => {});});- it.each(['claude', 'xai'])(- '%s keeps A and B snapshots separate and clears only the logged out account',- async (kind) => {- const a = `${kind}-a`,- b = `${kind}-b`;- const clearInstant = vi.fn();- setSubscriptionAccountUsageBroadcaster(() => {}, clearInstant);- state.tokens.set(a, 'test-token-a');- state.tokens.set(b, 'test-token-b');- const fetch = kind === 'claude' ? state.fetchClaude : state.fetchXai;- fetch.mockImplementation(async ({ accessToken }) => ({- updatedAt: accessToken === 'test-token-a' ? 1 : 2,- }));- await Promise.all([readSubscriptionAccountUsage(a), readSubscriptionAccountUsage(b)]);- await settle();- expect(await readSubscriptionAccountUsage(a)).toMatchObject({ updatedAt: 1 });- expect(await readSubscriptionAccountUsage(b)).toMatchObject({ updatedAt: 2 });- state.tokens.delete(a);- await syncSubscriptionAccountUsage(a);- if (kind === 'xai') expect(clearInstant).toHaveBeenCalledExactlyOnceWith(a);- else expect(clearInstant).not.toHaveBeenCalled();- expect(await readSubscriptionAccountUsage(a)).toBeNull();- expect(await readSubscriptionAccountUsage(b)).toMatchObject({ updatedAt: 2 });- },- );- it('refreshes Claude quota immediately after its token rotates', async () => {- state.tokens.set('claude-a', 'test-old');- state.prepare.mockImplementation(async () => {- state.tokens.set('claude-a', 'test-new');- return { accessToken: 'test-new', subscriptionType: 'max' };- });- state.fetchClaude.mockResolvedValue({ updatedAt: 3 });- await readSubscriptionAccountUsage('claude-a');+ it('xai keeps A and B snapshots separate and clears only the logged out account', async () => {+ const a = 'xai-a',+ b = 'xai-b';+ const clearInstant = vi.fn();+ setSubscriptionAccountUsageBroadcaster(() => {}, clearInstant);+ state.tokens.set(a, 'test-token-a');+ state.tokens.set(b, 'test-token-b');+ state.fetchXai.mockImplementation(async ({ accessToken }) => ({+ updatedAt: accessToken === 'test-token-a' ? 1 : 2,+ }));+ await Promise.all([readSubscriptionAccountUsage(a), readSubscriptionAccountUsage(b)]);await settle();- expect(state.fetchClaude).toHaveBeenCalledWith(- expect.objectContaining({ accessToken: 'test-new' }),- );- expect(await readSubscriptionAccountUsage('claude-a')).toMatchObject({ updatedAt: 3 });+ expect(await readSubscriptionAccountUsage(a)).toMatchObject({ updatedAt: 1 });+ expect(await readSubscriptionAccountUsage(b)).toMatchObject({ updatedAt: 2 });+ state.tokens.delete(a);+ await syncSubscriptionAccountUsage(a);+ expect(clearInstant).toHaveBeenCalledExactlyOnceWith(a);+ expect(await readSubscriptionAccountUsage(a)).toBeNull();+ expect(await readSubscriptionAccountUsage(b)).toMatchObject({ updatedAt: 2 });+ });+ it('retired claude accounts have no quota reader and never touch the network', async () => {+ const clearInstant = vi.fn();+ const broadcast = vi.fn();+ setSubscriptionAccountUsageBroadcaster(broadcast, clearInstant);+ state.tokens.set('claude-a', 'test-token');+ expect(await readSubscriptionAccountUsage('claude-a')).toBeNull();+ triggerSubscriptionAccountUsage('claude-a');+ await syncSubscriptionAccountUsage('claude-a');+ await settle();+ expect(await readSubscriptionAccountUsage('claude-a')).toBeNull();+ expect(clearInstant).not.toHaveBeenCalled();+ expect(broadcast).not.toHaveBeenCalled();+ expect(state.fetchXai).not.toHaveBeenCalled();+ expect(state.outboundFetch).not.toHaveBeenCalled();});- it.each(['claude', 'xai'])('%s rejects a previous owner response', async (kind) => {- const id = `${kind}-a`;+ it('xai rejects a previous owner response', async () => {+ const id = 'xai-a';state.tokens.set(id, 'test-token');let resolve!: (value: unknown) => void;- const fetch = kind === 'claude' ? state.fetchClaude : state.fetchXai;- fetch.mockReturnValue(+ state.fetchXai.mockReturnValue(new Promise((r) => {resolve = r;}),diff --git a/apps/desktop/src/main/usage/claudeSubscriptionUsage.ts b/apps/desktop/src/main/usage/claudeSubscriptionUsage.tsdeleted file mode 100644index ef85001845..0000000000--- a/apps/desktop/src/main/usage/claudeSubscriptionUsage.ts+++ /dev/null@@ -1,121 +0,0 @@-/**- * claudeSubscriptionUsage(main)— 拉取 Claude 订阅账号余量的 HTTP 层。- *- * 端点:GET https://api.anthropic.com/api/oauth/usage(未文档化;Claude Code /usage- * 命令同源,社区工具 CodexBar / OpenUsage 长期在用)。要求:- * - `Authorization: Bearer <claudeAiOauth.accessToken>`(user:profile scope)- * - `anthropic-beta: oauth-2025-04-20`(缺了 401)- * - `User-Agent: claude-code/<version>`(缺了会落进激进限流桶,持续 429;版本号- * 取应用实际分发的 claude 二进制版本,拿不到用 pin 兜底)- *- * 错误语义(供 claudeSubscriptionUsageRefresh 的 reader 消费):- * - 401 / 403 → ClaudeSubscriptionUsageUnauthorizedError(token 失效,清缓存快照)- * - 429 → ClaudeSubscriptionUsageRateLimitedError(退避,保留缓存快照)- * - 其它失败 → null(保留缓存,下轮再试)- */--import { createLogger } from '../logger.js';-import {- parseClaudeOAuthUsageResponse,- type ClaudeSubscriptionUsageSnapshot,-} from '../../shared/claudeSubscriptionUsage.js';--const log = createLogger('usage:claude-subscription');--const CLAUDE_OAUTH_USAGE_URL = 'https://api.anthropic.com/api/oauth/usage';-const CLAUDE_OAUTH_USAGE_TIMEOUT_MS = 5000;-/** UA 版本兜底 —— 与 tools/claude/latest.json 的 pin 同步升级无强要求,仅限流桶分流用。 */-const FALLBACK_CLAUDE_CODE_VERSION = '2.1.186';--export class ClaudeSubscriptionUsageUnauthorizedError extends Error {- readonly status: number;-- constructor(status: number) {- super(`Claude subscription usage unauthorized (${status})`);- this.name = 'ClaudeSubscriptionUsageUnauthorizedError';- this.status = status;- }-}--export class ClaudeSubscriptionUsageRateLimitedError extends Error {- constructor() {- super('Claude subscription usage rate limited (429)');- this.name = 'ClaudeSubscriptionUsageRateLimitedError';- }-}--/**- * 端点成功(2xx)但响应里解析不出任何窗口 —— 教育版 / 组织托管订阅无数字配额,- * 或 schema 再次变化。与网络失败(null)语义不同:调用方应**清除**缓存快照让- * chip 降级为无数据, 而不是继续展示过期值。- */-export const CLAUDE_SUBSCRIPTION_USAGE_EMPTY = 'empty' as const;-export type ClaudeSubscriptionUsageFetchResult =- | ClaudeSubscriptionUsageSnapshot- | typeof CLAUDE_SUBSCRIPTION_USAGE_EMPTY- | null;--export async function fetchClaudeSubscriptionUsageSnapshot(opts: {- accessToken: string;- /** 凭证 blob 的 subscriptionType(pro / max...),随快照一并落下供 tooltip 显示。 */- subscriptionType?: string | null;- /** 应用实际分发的 claude 二进制版本(如 '2.1.186');省略用 pin 兜底。 */- claudeCodeVersion?: string | null;- fetchFn?: typeof fetch;- timeoutMs?: number;- now?: number;-}): Promise<ClaudeSubscriptionUsageFetchResult> {- const controller = new AbortController();- const timeout = setTimeout(- () => controller.abort(),- opts.timeoutMs ?? CLAUDE_OAUTH_USAGE_TIMEOUT_MS,- );- try {- const version = opts.claudeCodeVersion?.trim() || FALLBACK_CLAUDE_CODE_VERSION;- const res = await (opts.fetchFn ?? fetch)(CLAUDE_OAUTH_USAGE_URL, {- method: 'GET',- headers: {- Authorization: `Bearer ${opts.accessToken}`,- 'anthropic-beta': 'oauth-2025-04-20',- 'User-Agent': `claude-code/${version}`,- Accept: 'application/json',- },- signal: controller.signal,- });- if (!res.ok) {- log.warn('claude subscription usage fetch failed', { status: res.status });- if (res.status === 401 || res.status === 403) {- throw new ClaudeSubscriptionUsageUnauthorizedError(res.status);- }- if (res.status === 429) {- throw new ClaudeSubscriptionUsageRateLimitedError();- }- return null;- }- const data: unknown = await res.json();- const snapshot = parseClaudeOAuthUsageResponse(data, opts.now ?? Date.now());- if (!snapshot) {- // 端点通了但解析不出任何窗口(schema 又变了 / 教育版无数字配额)——- // 显式返回 'empty' 让 reader 清缓存降级为无数据, 与网络失败(null, 保留缓存)区分。- log.warn('claude subscription usage response had no parsable windows');- return CLAUDE_SUBSCRIPTION_USAGE_EMPTY;- }- return {- ...snapshot,- subscriptionType: opts.subscriptionType ?? null,- };- } catch (err) {- if (- err instanceof ClaudeSubscriptionUsageUnauthorizedError- || err instanceof ClaudeSubscriptionUsageRateLimitedError- ) {- throw err;- }- log.warn('claude subscription usage fetch failed', {- error: err instanceof Error ? err.message : String(err),- });- return null;- } finally {- clearTimeout(timeout);- }-}diff --git a/apps/desktop/src/main/usage/claudeSubscriptionUsageRefresh.ts b/apps/desktop/src/main/usage/claudeSubscriptionUsageRefresh.tsdeleted file mode 100644index 4b1e4da137..0000000000--- a/apps/desktop/src/main/usage/claudeSubscriptionUsageRefresh.ts+++ /dev/null@@ -1,277 +0,0 @@-/**- * claudeSubscriptionUsageRefresh — Claude 订阅余量的 cached-first reader(纯逻辑,依赖注入)。- *- * 形态对齐 codexAccountUsageRefresh:IPC 读走缓存快照立即返回,慢的端点 fetch 在后台- * 刷新共享快照(recordSnapshot 内部会广播给 renderer)。与 codex 版的差异:- * - 身份维度只有 access token(Claude 无 accountId 概念),token 变化即换人。- * - 节流默认 180s(oauth/usage 是未文档化端点,社区经验 ≥180s 缓存才稳;turn 内的- * 实时性由 proxy 旁路读的 unified headers 兜住,端点只负责冷启动 + scoped 窗口)。- * - 429 显式指数退避(5min 起,×2 封顶 30min)——该端点对高频调用会持续 429。- *- * 另暴露 triggerRefresh() 给 turn-done 钩子做 fire-and-forget 触发(同样吃节流 / 退避)。- */--import type { ClaudeSubscriptionUsageSnapshot } from '../../shared/claudeSubscriptionUsage.js';--export interface ClaudeSubscriptionCredentialInfo {- accessToken: string;- subscriptionType?: string | null;-}--interface ClaudeSubscriptionUsageRefreshDeps {- /** 读当前 OAuth 凭证(无订阅登录 → null)。 */- readCredentials(): ClaudeSubscriptionCredentialInfo | null;- /**- * 拉端点快照。返回语义:snapshot = 正常;'empty' = 端点成功但无可解析窗口- * (教育版无数字配额 / schema 变化, 应清缓存降级为无数据);null = 网络失败等- * (保留缓存下轮再试)。- */- fetchSnapshot(- args: ClaudeSubscriptionCredentialInfo,- ): Promise<ClaudeSubscriptionUsageSnapshot | 'empty' | null>;- recordSnapshot(snapshot: ClaudeSubscriptionUsageSnapshot): Promise<void>;- clearSnapshot(): Promise<void>;- readCachedSnapshot(): Promise<ClaudeSubscriptionUsageSnapshot | null>;- /** token → 快照归属指纹(与 record 侧同一实现);read() 用它识别换号后的过期快照。 */- fingerprintToken(token: string): string;- now(): number;- isUnauthorizedError(err: unknown): boolean;- isRateLimitedError(err: unknown): boolean;- onRefreshError(err: unknown): void;-}--interface ClaudeSubscriptionUsageRefreshOptions {- throttleMs?: number;- rateLimitBackoffInitialMs?: number;- rateLimitBackoffMaxMs?: number;-}--const DEFAULT_THROTTLE_MS = 180_000;-const DEFAULT_BACKOFF_INITIAL_MS = 5 * 60_000;-const DEFAULT_BACKOFF_MAX_MS = 30 * 60_000;--export interface ClaudeSubscriptionUsageReader {- /** cached-first 读(IPC handler 用):立即返回缓存快照,后台按节流刷新。 */- read(): Promise<ClaudeSubscriptionUsageSnapshot | null>;- /** 显式触发一次后台刷新(turn-done 钩子用),同样吃节流 / 退避。 */- triggerRefresh(): void;- /**- * 凭证变化(OAuth 登录 / 登出 / 换号)后的强制同步 —— 调用方保证"凭证刚发生了- * 变化"。与 read() 的区别: 凭证为 null 时**无条件**清持久化快照并广播(read 的- * hadCredentials 守卫会挡住"冷启动后首个操作是登出"的场景, 导致磁盘残留)。- */- syncForCredentialChange(): Promise<void>;-}--export function createClaudeSubscriptionUsageReader(- deps: ClaudeSubscriptionUsageRefreshDeps,- options: ClaudeSubscriptionUsageRefreshOptions = {},-): ClaudeSubscriptionUsageReader {- const throttleMs = options.throttleMs ?? DEFAULT_THROTTLE_MS;- const backoffInitialMs = options.rateLimitBackoffInitialMs ?? DEFAULT_BACKOFF_INITIAL_MS;- const backoffMaxMs = options.rateLimitBackoffMaxMs ?? DEFAULT_BACKOFF_MAX_MS;-- let inFlight: Promise<void> | null = null;- // in-flight fetch 归属的 token —— 换号发生在飞行中时, 旧响应会被 isRefreshStillCurrent- // 丢弃, 必须在旧 promise 结束后为新 token 补一次刷新, 否则端点独有字段(scoped 分模型- // 窗口 / extra usage)要空到下一次外部触发。- let inFlightToken: string | null = null;- // 节流 / 退避状态按 access token 记 —— token 换了(重新登录 / 换号)立即重新计。- let stateToken: string | null = null;- let lastRefreshAt = 0;- let backoffMs = 0;- let backoffUntil = 0;- let hadCredentials = false;- // 无凭证结果的冷却 —— readCredentials 在 macOS 是同步 keychain 子进程读, 而- // triggerRefresh 被每个 Claude turn-done 无条件调用; 未连订阅 (gateway-only) 用户- // 若不缓存 null 结果, 每个 turn 都要白付一次阻塞读。读到 null 后 throttleMs 内- // 不再探测; 登录 / 登出走 auth-change 钩子与 read()(二者不吃这个冷却, 探测后- // 按结果重置), 外部 cc CLI 登录最迟一个冷却窗口被 turn-done 拾起。- let noCredentialsUntil = 0;-- function resetStateForToken(token: string): void {- if (stateToken === token) return;- stateToken = token;- lastRefreshAt = 0;- backoffMs = 0;- backoffUntil = 0;- }-- async function clearCachedSnapshot(): Promise<void> {- stateToken = null;- lastRefreshAt = 0;- backoffMs = 0;- backoffUntil = 0;- try {- await deps.clearSnapshot();- } catch (err) {- deps.onRefreshError(err);- }- }-- function isRefreshStillCurrent(token: string): boolean {- try {- return deps.readCredentials()?.accessToken === token;- } catch (err) {- deps.onRefreshError(err);- return false;- }- }-- function triggerRefreshWith(credentials: ClaudeSubscriptionCredentialInfo): Promise<void> {- if (inFlight) {- // 飞行中的 fetch 属于另一个 token(换号):等旧请求收尾后按当时最新凭证补一次- // 刷新(旧响应会被 isRefreshStillCurrent 丢弃)。同 token 直接复用旧 promise。- if (inFlightToken !== credentials.accessToken) {- return inFlight.finally(() => {- const current = readCredentialsSafe();- if (current) void triggerRefreshWith(current);- });- }- return inFlight;- }-- resetStateForToken(credentials.accessToken);- const now = deps.now();- if (now < backoffUntil) return Promise.resolve();- if (lastRefreshAt > 0 && now - lastRefreshAt < throttleMs) return Promise.resolve();-- lastRefreshAt = now;- inFlightToken = credentials.accessToken;- inFlight = (async () => {- try {- const result = await deps.fetchSnapshot(credentials);- backoffMs = 0;- backoffUntil = 0;- if (!isRefreshStillCurrent(credentials.accessToken)) return;- if (result === 'empty') {- // 端点成功但无可解析窗口 —— 清缓存让 chip 降级为无数据, 不展示过期值。- // 注意只清快照、**不**动节流 / 退避状态(clearCachedSnapshot 会重置- // stateToken, 教育版账号会退化成每次 turn-done 都打一次端点)。- await deps.clearSnapshot();- return;- }- if (result) {- // 归属指纹在这里附加 —— fetch 时 token 已在手, 不需要 record 侧再读凭证库- // (headers 旁路源不附指纹, merge 时沿用本端点源写入的值)。- await deps.recordSnapshot({- ...result,- accountFingerprint: deps.fingerprintToken(credentials.accessToken),- });- }- } catch (err) {- if (deps.isUnauthorizedError(err)) {- if (isRefreshStillCurrent(credentials.accessToken)) {- // 只清快照, **保留**节流 / 退避状态 —— token 过期但仍在凭证库的窗口里- // (cc 尚未刷新写回), clearCachedSnapshot 的全重置会让每个 turn-done 都- // 无节流重试这个敏感端点; 节流保留后 180s 内不再打, cc 刷新出新 token- // 时 stateToken 变化自然重置节流恢复正常。- try {- await deps.clearSnapshot();- } catch (clearErr) {- deps.onRefreshError(clearErr);- }- }- return;- }- if (deps.isRateLimitedError(err)) {- backoffMs = backoffMs > 0 ? Math.min(backoffMs * 2, backoffMaxMs) : backoffInitialMs;- backoffUntil = deps.now() + backoffMs;- return;- }- deps.onRefreshError(err);- } finally {- inFlight = null;- inFlightToken = null;- }- })();- return inFlight;- }-- function readCredentialsSafe(): ClaudeSubscriptionCredentialInfo | null {- try {- return deps.readCredentials();- } catch (err) {- deps.onRefreshError(err);- return null;- }- }-- return {- async read(): Promise<ClaudeSubscriptionUsageSnapshot | null> {- const credentials = readCredentialsSafe();- if (!credentials) {- // 顺手武装无凭证冷却 —— 本次 IPC 读已确认未登录, turn-done 的 triggerRefresh- // 在冷却窗口内不必再付一次 keychain 探测。- noCredentialsUntil = deps.now() + throttleMs;- // 只在「之前有过凭证」时清一次 —— 未登录用户的常规读不应反复触发 DELETE。- if (hadCredentials || stateToken !== null) {- hadCredentials = false;- await clearCachedSnapshot();- }- return null;- }- noCredentialsUntil = 0;- hadCredentials = true;-- const cached = await deps.readCachedSnapshot();- // 同机换号防护:持久化快照带归属指纹且与当前 token 不符 → 立即清除并返回- // 无数据(不等后台刷新), 避免 chip 把上一个账号的余量顶给新账号看。指纹缺失- // (旧快照 / 仅 headers 源)按未知归属沿用, 不误清。- if (cached?.accountFingerprint- && cached.accountFingerprint !== deps.fingerprintToken(credentials.accessToken)) {- await clearCachedSnapshot();- void triggerRefreshWith(credentials);- return null;- }- void triggerRefreshWith(credentials);- return cached;- },-- triggerRefresh(): void {- // 节流 / 退避预检放在读凭证**之前** —— readCredentials 在 macOS 是同步- // keychain 子进程读(10-50ms 阻塞主进程), 而本方法被每个 Claude turn-done- // 无条件调用, 不预检的话节流窗口内的每个 turn 都白付一次。预检用当前- // stateToken 的节流状态, 不感知 token 变化: 换号场景由 auth-change 钩子与- // read() 的指纹校验兜底(它们必然伴随一次完整 read), 不依赖这里。- // in-flight 时同理短路 —— 刷新已在进行, turn-done 的诉求已被满足。- // 无凭证冷却同为预检的一部分: gateway-only 用户每轮读到 null 若不进冷却,- // 「无凭证 → 不更新任何节流状态」会让每个 turn-done 都重付一次 keychain 读。- const now = deps.now();- if (inFlight) return;- if (now < backoffUntil) return;- if (now < noCredentialsUntil) return;- if (lastRefreshAt > 0 && now - lastRefreshAt < throttleMs) return;-- const credentials = readCredentialsSafe();- if (!credentials) {- noCredentialsUntil = now + throttleMs;- return;- }- noCredentialsUntil = 0;- hadCredentials = true;- void triggerRefreshWith(credentials);- },-- async syncForCredentialChange(): Promise<void> {- const credentials = readCredentialsSafe();- if (!credentials) {- // 登出: 无条件清(不看 hadCredentials —— 本进程可能从未观察过凭证,- // 但磁盘上可能残留上一个进程周期的快照), 广播 null 让 chip 回占位态。- // 同时武装无凭证冷却, 登出后的 turn-done 不再逐轮探测 keychain。- hadCredentials = false;- noCredentialsUntil = deps.now() + throttleMs;- await clearCachedSnapshot();- return;- }- noCredentialsUntil = 0;- hadCredentials = true;- const cached = await deps.readCachedSnapshot();- if (cached?.accountFingerprint- && cached.accountFingerprint !== deps.fingerprintToken(credentials.accessToken)) {- await clearCachedSnapshot();- }- void triggerRefreshWith(credentials);- },- };-}diff --git a/apps/desktop/src/main/usage/subscriptionAccountUsage.ts b/apps/desktop/src/main/usage/subscriptionAccountUsage.tsindex 3c26b9f77a..eb134cb0ee 100644--- a/apps/desktop/src/main/usage/subscriptionAccountUsage.ts+++ b/apps/desktop/src/main/usage/subscriptionAccountUsage.ts@@ -1,21 +1,10 @@-import { createHash } from 'node:crypto';import { addProviderSecretsClearedListener } from '../secrets/providerSecretStore.js';import { activeOwnerScopeKey, isAppSessionBoundaryPending } from '../appSessionState.js';-import {- readClaudeAccountOAuth,- prepareClaudeAccountUsage,- subscriptionAccountKind,-} from '../maker-host/subscription-account-auth.js';+import { subscriptionAccountKind } from '../maker-host/subscription-account-auth.js';import { getGrokAccessToken, hasGrokOAuthLogin } from '../maker-host/grok-oauth-login.js';import { outboundFetch } from '../maker-host/outbound-fetch.js';import { isProviderRouteMutationInProgress } from '../maker-host/provider-route.js';-import { createClaudeSubscriptionUsageReader } from './claudeSubscriptionUsageRefresh.js';import { createXaiSubscriptionUsageReader } from './xaiSubscriptionUsageRefresh.js';-import {- fetchClaudeSubscriptionUsageSnapshot,- ClaudeSubscriptionUsageRateLimitedError,- ClaudeSubscriptionUsageUnauthorizedError,-} from './claudeSubscriptionUsage.js';import {fetchXaiSubscriptionUsageSnapshot,XaiSubscriptionUsageRateLimitedError,@@ -39,7 +28,7 @@ export function setSubscriptionAccountUsageBroadcaster(// existing reader factories retain their throttle, retry and stale-response rules.const readers = new Map<string, ReturnType<typeof createReader>>();addProviderSecretsClearedListener(() => readers.clear());-function createReader(providerId: string, kind: 'claude' | 'xai') {+function createReader(providerId: string) {const scope = activeOwnerScopeKey();const current = () => !isAppSessionBoundaryPending() && activeOwnerScopeKey() === scope;let snapshot: Snapshot | null = null;@@ -54,32 +43,6 @@ function createReader(providerId: string, kind: 'claude' | 'xai') {recordSnapshot: record,onRefreshError: () => {},};- if (kind === 'claude')- return createClaudeSubscriptionUsageReader({- ...common,- readCredentials: () => (current() ? readClaudeAccountOAuth(providerId) : null),- fetchSnapshot: async (original) => {- if (isProviderRouteMutationInProgress(providerId)) return null;- const credentials = await prepareClaudeAccountUsage(providerId);- if (!credentials || !current()) return null;- if (credentials.accessToken !== original.accessToken) {- queueMicrotask(() => {- if (current()) void reader(providerId)?.syncForCredentialChange();- });- return null;- }- return fetchClaudeSubscriptionUsageSnapshot({- accessToken: credentials.accessToken,- subscriptionType: credentials.subscriptionType ?? null,- fetchFn: outboundFetch,- });- },- readCachedSnapshot: async () =>- current() ? (snapshot as ClaudeSubscriptionUsageSnapshot | null) : null,- fingerprintToken: (token) => createHash('sha256').update(token).digest('hex'),- isUnauthorizedError: (error) => error instanceof ClaudeSubscriptionUsageUnauthorizedError,- isRateLimitedError: (error) => error instanceof ClaudeSubscriptionUsageRateLimitedError,- });return createXaiSubscriptionUsageReader({...common,readCredentials: async () => {@@ -101,12 +64,12 @@ function createReader(providerId: string, kind: 'claude' | 'xai') {});}function reader(providerId: string) {- const kind = subscriptionAccountKind(providerId);- if (!kind) return null;+ // 独立 Claude 账号已停用:没有凭证可用,也就没有余量可查。+ if (subscriptionAccountKind(providerId) !== 'xai') return null;const key = `${activeOwnerScopeKey()}:${providerId}`;let value = readers.get(key);if (!value) {- value = createReader(providerId, kind);+ value = createReader(providerId);readers.set(key, value);}return value;diff --git a/apps/desktop/src/main/utility-model/__tests__/oneShotCandidates.test.ts b/apps/desktop/src/main/utility-model/__tests__/oneShotCandidates.test.tsindex 925c39fbae..659ee0baef 100644--- a/apps/desktop/src/main/utility-model/__tests__/oneShotCandidates.test.ts+++ b/apps/desktop/src/main/utility-model/__tests__/oneShotCandidates.test.ts@@ -1,5 +1,3 @@-import { getValidClaudeAccountOAuth } from '../../maker-host/subscription-account-auth.js';-vi.mock('../../maker-host/subscription-account-auth.js', () => ({ getValidClaudeAccountOAuth: vi.fn() }));import { beforeEach, describe, expect, it, vi } from 'vitest';vi.mock('electron', () => ({@@ -51,10 +49,6 @@ vi.mock('../../maker-host/anthropic-responses-bridge-host.js', () => ({getChatgptBridgeAuth: vi.fn(),}));-vi.mock('../../maker-host/claude-oauth-refresh.js', () => ({- getValidClaudeAiOAuth: vi.fn(),-}));-vi.mock('../../maker-host/grok-oauth-login.js', () => ({getGrokAccessToken: vi.fn(),}));@@ -104,7 +98,6 @@ import { fetch as undiciFetch } from 'undici';import { getAppCapabilities } from '../../appCapabilities.js';import { readClaudeApiKey } from '../../maker-host/auth-adapters.js';import { getChatgptBridgeAuth } from '../../maker-host/anthropic-responses-bridge-host.js';-import { getValidClaudeAiOAuth } from '../../maker-host/claude-oauth-refresh.js';import { getGrokAccessToken } from '../../maker-host/grok-oauth-login.js';import { readCachedGenericOAuthAccessToken } from '../../maker-host/generic-oauth.js';import {@@ -129,7 +122,6 @@ const getProfiles = vi.mocked(getUtilityModelChainProfiles);const appCapabilities = vi.mocked(getAppCapabilities);const readKey = vi.mocked(readClaudeApiKey);const readCodexCreds = vi.mocked(getChatgptBridgeAuth);-const readClaudeOAuth = vi.mocked(getValidClaudeAiOAuth);const readGrokToken = vi.mocked(getGrokAccessToken);const readGenericOAuthToken = vi.mocked(readCachedGenericOAuthAccessToken);const fetchMock = vi.mocked(undiciFetch);@@ -149,7 +141,6 @@ function makerMock(authenticated: boolean): Maker {describe('utility one-shot candidates', () => {beforeEach(() => {- vi.mocked(getValidClaudeAccountOAuth).mockReset();vi.clearAllMocks();fetchMock.mockReset();chainState.source = 'auto';@@ -159,7 +150,6 @@ describe('utility one-shot candidates', () => {appCapabilities.mockReturnValue({ canUseCindyGateway: true } as never);readKey.mockReturnValue(null);readCodexCreds.mockRejectedValue(new Error('not authenticated'));- readClaudeOAuth.mockResolvedValue(null);readGrokToken.mockRejectedValue(new Error('not authenticated'));readGenericOAuthToken.mockReturnValue(null);providerRouteMutationInProgress.mockReturnValue(false);@@ -1581,7 +1571,7 @@ describe('utility one-shot candidates', () => {expect(body.max_tokens).toBe(64_000);});- it('缺省不传 maxTokens 时,Anthropic wire 用模型目录 maxOutput 兜底(协议必填,非宿主上限)', async () => {+ it('内置 Claude 订阅从不作为辅助模型的直连路由(订阅只归内置 Claude Code CLI)', async () => {activeCatalog.mockReturnValue({providers: [{id: 'anthropic',@@ -1597,11 +1587,6 @@ describe('utility one-shot candidates', () => {},}],} as never);- readClaudeOAuth.mockResolvedValue({ accessToken: 'anthropic-token' });- fetchMock.mockResolvedValueOnce({- ok: true,- text: async () => JSON.stringify({ content: [{ type: 'text', text: 'script' }] }),- } as never);const result = await requestUtilityText(makerMock(false), 'hello', {providerId: 'anthropic',@@ -1609,42 +1594,12 @@ describe('utility one-shot candidates', () => {model: 'claude-opus-4-5',});- expect(result).toMatchObject({ ok: true, providerId: 'anthropic' });- const body = JSON.parse(String(fetchMock.mock.calls[0]?.[1]?.body));- expect(body.max_tokens).toBe(64_000);- });-- it('内置 Anthropic 直连:1M 目录模型的 body.model 用裸目录 id,不带 SDK 专用 [1m] 后缀(#2429)', async () => {- activeCatalog.mockReturnValue({- providers: [{- id: 'anthropic',- name: 'Anthropic',- source: 'builtin',- agents: ['claude-code'],- auth: { method: 'oauth' },- routing: {- 'claude-code': { upstream: 'https://anthropic.example/api/v1', authStrategy: 'oauth-passthrough' },- },- models: {- 'claude-code': [{ id: 'claude-fable-5', name: 'Fable', contextWindow: 1_000_000, maxOutput: 64_000 }],- },- }],- } as never);- readClaudeOAuth.mockResolvedValue({ accessToken: 'anthropic-token' });- fetchMock.mockResolvedValueOnce({- ok: true,- text: async () => JSON.stringify({ content: [{ type: 'text', text: 'verdict' }] }),- } as never);-- const result = await requestUtilityText(makerMock(false), 'review this', {- providerId: 'anthropic',- agentKind: 'claude-code',- model: 'claude-fable-5',+ expect(result).toMatchObject({+ ok: false,+ reason: 'no_candidate',+ attempts: [expect.objectContaining({ status: 'skipped', reason: 'not_authenticated' })],});-- expect(result).toMatchObject({ ok: true, providerId: 'anthropic' });- const body = JSON.parse(String(fetchMock.mock.calls[0]?.[1]?.body));- expect(body.model).toBe('claude-fable-5');+ expect(fetchMock).not.toHaveBeenCalled();});it('toAnthropicApiModelId:剥掉尾部 [1m],其余 id 原样返回(防御显示 id 泄入)', () => {@@ -1653,38 +1608,6 @@ describe('utility one-shot candidates', () => {expect(toAnthropicApiModelId('claude-haiku-4-5-20251001')).toBe('claude-haiku-4-5-20251001');});- it('内置 Anthropic 直连:非 1M 模型的 body.model 保持目录 id 不变(不回归)', async () => {- activeCatalog.mockReturnValue({- providers: [{- id: 'anthropic',- name: 'Anthropic',- source: 'builtin',- agents: ['claude-code'],- auth: { method: 'oauth' },- routing: {- 'claude-code': { upstream: 'https://anthropic.example/api/v1', authStrategy: 'oauth-passthrough' },- },- models: {- 'claude-code': [{ id: 'claude-haiku-4-5-20251001', name: 'Haiku', contextWindow: 200_000, maxOutput: 64_000 }],- },- }],- } as never);- readClaudeOAuth.mockResolvedValue({ accessToken: 'anthropic-token' });- fetchMock.mockResolvedValueOnce({- ok: true,- text: async () => JSON.stringify({ content: [{ type: 'text', text: 'verdict' }] }),- } as never);-- await requestUtilityText(makerMock(false), 'review this', {- providerId: 'anthropic',- agentKind: 'claude-code',- model: 'claude-haiku-4-5-20251001',- });-- const body = JSON.parse(String(fetchMock.mock.calls[0]?.[1]?.body));- expect(body.model).toBe('claude-haiku-4-5-20251001');- });-it('缺省不传 maxTokens 时,xd wire 不发送输出上限(模型自然输出)', async () => {activeCatalog.mockReturnValue({providers: [{@@ -2102,7 +2025,7 @@ describe('utility one-shot candidates', () => {expect(fetchMock).not.toHaveBeenCalled();});- it('uses Anthropic OAuth and the selected Anthropic routing for an explicit builtin provider', async () => {+ it('an explicit builtin Claude subscription selection is skipped without any HTTP request', async () => {activeCatalog.mockReturnValue({providers: [{id: 'anthropic',@@ -2118,11 +2041,6 @@ describe('utility one-shot candidates', () => {},}],} as never);- readClaudeOAuth.mockResolvedValue({ accessToken: 'anthropic-token' });- fetchMock.mockResolvedValueOnce({- ok: true,- text: async () => JSON.stringify({ content: [{ type: 'text', text: 'script' }] }),- } as never);const result = await requestUtilityText(makerMock(false), 'generate', {providerId: 'anthropic',@@ -2130,13 +2048,8 @@ describe('utility one-shot candidates', () => {model: 'claude-sonnet-4-6',});- expect(result).toMatchObject({ ok: true, providerId: 'anthropic', model: 'claude-sonnet-4-6' });- expect(fetchMock).toHaveBeenCalledWith('https://anthropic.example/api/v1/messages', expect.anything());- const init = fetchMock.mock.calls[0]?.[1] as { headers: Record<string, string>; body: string };- expect(init.headers.Authorization).toBe('Bearer anthropic-token');- // [1m] 是 Claude Code SDK 的 beta 通道后缀,直连 /v1/messages 会 404(#2429):- // 直连请求体必须用目录裸 id。- expect(JSON.parse(init.body).model).toBe('claude-sonnet-4-6');+ expect(result).toMatchObject({ ok: false, reason: 'no_candidate' });+ expect(fetchMock).not.toHaveBeenCalled();});it('uses OpenAI Codex OAuth and strips the bridge model prefix on the selected route', async () => {@@ -2382,75 +2295,46 @@ describe('utility one-shot candidates', () => {expect(fetchMock).not.toHaveBeenCalled();});- it('does not start Anthropic HTTP after credential refresh outlives the candidate', async () => {- activeCatalog.mockReturnValue({- providers: [{- id: 'anthropic',- name: 'Anthropic',- source: 'builtin',- agents: ['claude-code'],- auth: { method: 'oauth' },- routing: {- 'claude-code': {- upstream: 'https://anthropic.example',- authStrategy: 'oauth-passthrough',- },- },- models: {- 'claude-code': [{ id: 'claude-haiku-4-5', name: 'Haiku', contextWindow: 200_000 }],- },- }],- } as never);- let resolveOAuth: ((auth: { accessToken: string }) => void) | undefined;- readClaudeOAuth.mockImplementationOnce(() => new Promise((resolve) => {- resolveOAuth = resolve;- }));- const controller = new AbortController();-- const pending = requestDedicatedAutoReviewCandidateText(- 'classify',- DEDICATED_AUTO_REVIEW_CANDIDATES[3],- { timeoutMs: 12_000, signal: controller.signal },- );- await Promise.resolve();- controller.abort();- resolveOAuth?.({ accessToken: 'late-token' });+ it('auto-review candidates never include the Claude subscription', () => {+ expect(DEDICATED_AUTO_REVIEW_CANDIDATES.map((candidate) => candidate.providerId)).not.toContain('anthropic');+ });- await expect(pending).resolves.toMatchObject({ ok: false, reason: 'timeout' });+ it('never dispatches through a retired independent Claude account', async () => {+ activeCatalog.mockReturnValue({ providers: [{ id: 'claude-work', name: 'Work', source: 'user',+ agents: ['claude-code'], auth: { method: 'oauth', native: 'claude' },+ routing: { 'claude-code': { upstream: 'https://account.example/v1', authStrategy: 'provider-oauth-header' } },+ models: { 'claude-code': [{ id: 'claude-haiku-4-5', name: 'Haiku', contextWindow: 200_000 }] },+ }] } as never);+ const result = await requestUtilityText(makerMock(false), 'generate', {+ providerId: 'claude-work', agentKind: 'claude-code', model: 'claude-haiku-4-5',+ });+ expect(result.ok).toBe(false);expect(fetchMock).not.toHaveBeenCalled();});- it.each(['claude', 'xai'] as const)('dispatches only the selected independent %s account and rejects changed credentials', async (native) => {+ it.each(['xai'] as const)('dispatches only the selected independent %s account and rejects changed credentials', async (native) => {const providerId = `${native}-work`;- const agentKind = native === 'claude' ? 'claude-code' : 'codex';- const model = native === 'claude' ? 'claude-haiku-4-5' : 'xai/grok-4.3';+ const agentKind = 'codex';+ const model = 'xai/grok-4.3';activeCatalog.mockReturnValue({ providers: [{ id: providerId, name: 'Work', source: 'user',agents: [agentKind], auth: { method: 'oauth', native },routing: { [agentKind]: { upstream: 'https://account.example/v1', authStrategy: 'provider-oauth-header' } },models: { [agentKind]: [{ id: model, name: model, contextWindow: 200_000 }] },}] } as never);- vi.mocked(getValidClaudeAccountOAuth).mockResolvedValue({ accessToken: 'selected-token' } as never);readGrokToken.mockImplementation(async (id) => {if (id !== providerId) throw new Error('wrong account');return 'selected-token';});- readClaudeOAuth.mockResolvedValue({ accessToken: 'other-token' } as never);- fetchMock.mockResolvedValue({ ok: true, text: async () => native === 'claude'- ? JSON.stringify({ content: [{ type: 'text', text: 'answer' }] })- : JSON.stringify({ output_text: 'answer' }) } as never);+ fetchMock.mockResolvedValue({ ok: true, text: async () => JSON.stringify({ output_text: 'answer' }) } as never);const result = await requestUtilityText(makerMock(false), 'generate', {providerId, agentKind, model, beforeDispatch: async () => true,});expect(result).toMatchObject({ ok: true, providerId, model });expect(fetchMock.mock.calls[0]?.[1]?.headers).toMatchObject({ Authorization: 'Bearer selected-token' });- if (native === 'claude') {- expect(getValidClaudeAccountOAuth).toHaveBeenCalledWith(providerId);- expect(readClaudeOAuth).not.toHaveBeenCalled();- } else expect(readGrokToken).toHaveBeenCalledWith(providerId);+ expect(readGrokToken).toHaveBeenCalledWith(providerId);fetchMock.mockClear();const changed = await requestUtilityText(makerMock(false), 'generate', {providerId, agentKind, model, beforeDispatch: async () => {- vi.mocked(getValidClaudeAccountOAuth).mockResolvedValue(null);readGrokToken.mockRejectedValue(new Error('logged out'));return true;},@@ -2547,16 +2431,19 @@ describe('utility one-shot candidates', () => {return { client, advisor: new DictationDictionaryAdvisor({ client, model: 'auxiliary' }) };}+ // Anthropic Messages 形态的自定义中继(Claude 订阅不再是辅助模型来源)。function selectClaude() {chainState.source = 'custom';- chainState.refs = ['cat:anthropic:claude-code:claude-haiku-4-5'];+ chainState.refs = ['cat:claude-relay:claude-code:claude-haiku-4-5'];activeCatalog.mockReturnValue({ providers: [{- id: 'anthropic', name: 'Anthropic', source: 'builtin', agents: ['claude-code'],- auth: { method: 'oauth' },- routing: { 'claude-code': { upstream: 'https://anthropic.example/v1', authStrategy: 'oauth-passthrough' } },+ id: 'claude-relay', name: 'Claude Relay', source: 'user', agents: ['claude-code'],+ auth: { method: 'apiKey' },+ routing: { 'claude-code': {+ upstream: 'https://anthropic-relay.example/v1', wireProtocol: 'anthropic-messages', authStrategy: 'api-key-header',+ } },models: { 'claude-code': [{ id: 'claude-haiku-4-5', name: 'Haiku', contextWindow: 200_000 }] },}] } as never);- readClaudeOAuth.mockResolvedValue({ accessToken: 'fake-anthropic-token' });+ readCustomKey.mockReturnValue('fake-relay-key');}const evidence = { beforeText: '继续试一下 web coding。', afterText: '继续试一下 Vibe Coding。' };@@ -2570,7 +2457,7 @@ describe('utility one-shot candidates', () => {const sut = advisor();expect((await sut.advisor.advise(evidence)).actions).toEqual([action]);- expect(sut.client.servedRoute).toEqual({ providerId: 'anthropic', model: 'claude-haiku-4-5' });+ expect(sut.client.servedRoute).toEqual({ providerId: 'claude-relay', model: 'claude-haiku-4-5' });expect(readCodexCreds).not.toHaveBeenCalled();expect(fetchMock).toHaveBeenCalledTimes(1);expect(JSON.parse(String(fetchMock.mock.calls[0]?.[1]?.body)).max_tokens).toBe(4_096);@@ -2666,7 +2553,7 @@ describe('utility one-shot candidates', () => {expect(fetchMock).toHaveBeenCalledTimes(1);});- it.each(invalidOutputs)('rejects explicit builtin output %s without using defaults', async (invalidText) => {+ it.each(invalidOutputs)('rejects explicit provider output %s without using defaults', async (invalidText) => {selectClaude();fetchMock.mockResolvedValueOnce({ok: true, text: async () => JSON.stringify({ content: [{ type: 'text', text: invalidText }] }),@@ -2674,7 +2561,7 @@ describe('utility one-shot candidates', () => {const maker = makerMock(true);const client = new DictionaryLearningTextModelClient((prompt, opts) => requestUtilityText(maker, prompt, {- ...opts, providerId: 'anthropic', agentKind: 'claude-code', model: 'claude-haiku-4-5',+ ...opts, providerId: 'claude-relay', agentKind: 'claude-code', model: 'claude-haiku-4-5',}),() => {},);diff --git a/apps/desktop/src/main/utility-model/__tests__/oneshotProviderUsability.test.ts b/apps/desktop/src/main/utility-model/__tests__/oneshotProviderUsability.test.tsindex c0ec800f5e..c7e0b93d1c 100644--- a/apps/desktop/src/main/utility-model/__tests__/oneshotProviderUsability.test.ts+++ b/apps/desktop/src/main/utility-model/__tests__/oneshotProviderUsability.test.ts@@ -1,7 +1,5 @@import { codexAccountState } from '../../maker-host/codex-account-auth.js';-import { readClaudeAccountOAuth } from '../../maker-host/subscription-account-auth.js';vi.mock('../../maker-host/codex-account-auth.js', () => ({ codexAccountState: vi.fn() }));-vi.mock('../../maker-host/subscription-account-auth.js', () => ({ readClaudeAccountOAuth: vi.fn() }));/*** oneshotProviderUsability.test.ts — 凭证同步探测单测(store 全 mock)。*/@@ -10,7 +8,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';import type { Provider } from '@cindy/model-providers';vi.mock('../../maker-host/auth-adapters.js', () => ({ readClaudeApiKey: vi.fn() }));-vi.mock('../../maker-host/claude-oauth-refresh.js', () => ({ getClaudeAiOAuthForSpawn: vi.fn() }));vi.mock('../../maker-host/codex-oauth-readiness.js', () => ({ hasChatgptOneshotReadiness: vi.fn() }));vi.mock('../../maker-host/generic-oauth.js', () => ({ readCachedGenericOAuthAccessToken: vi.fn() }));vi.mock('../../maker-host/grok-oauth-login.js', () => ({ hasGrokOAuthLogin: vi.fn() }));@@ -18,7 +15,6 @@ vi.mock('../../model-access/effectiveEndpoint.js', () => ({ effectiveXdGatewayBavi.mock('../../secrets/providerSecretStore.js', () => ({ readCustomProviderKey: vi.fn() }));import { readClaudeApiKey } from '../../maker-host/auth-adapters.js';-import { getClaudeAiOAuthForSpawn } from '../../maker-host/claude-oauth-refresh.js';import { hasChatgptOneshotReadiness } from '../../maker-host/codex-oauth-readiness.js';import { readCachedGenericOAuthAccessToken } from '../../maker-host/generic-oauth.js';import { hasGrokOAuthLogin } from '../../maker-host/grok-oauth-login.js';@@ -41,7 +37,6 @@ function provider(over: Partial<Provider> & { id: string }): Provider {beforeEach(() => {vi.mocked(readClaudeApiKey).mockReset();- vi.mocked(getClaudeAiOAuthForSpawn).mockReset();vi.mocked(hasChatgptOneshotReadiness).mockReset();vi.mocked(readCachedGenericOAuthAccessToken).mockReset();vi.mocked(hasGrokOAuthLogin).mockReset();@@ -61,11 +56,15 @@ describe('hasOneshotProviderCredential · 内置四家', () => {expect(hasOneshotProviderCredential(provider({ id: 'xd' }), 'codex')).toBe(false);});- it('anthropic/openai/xai 各自跟订阅登录态;其余内置 id 一律不可用', () => {- vi.mocked(getClaudeAiOAuthForSpawn).mockReturnValue({ accessToken: 't' } as never);- expect(hasOneshotProviderCredential(provider({ id: 'anthropic' }), 'claude-code')).toBe(true);- vi.mocked(getClaudeAiOAuthForSpawn).mockReturnValue(null);+ it('openai/xai 各自跟订阅登录态;Claude 订阅与其余内置 id 一律不可用', () => {+ // Claude 订阅只供内置 Claude Code CLI 用它自己的登录,快问快答直连不可用,+ // 与任何其它登录态无关。+ vi.mocked(readClaudeApiKey).mockReturnValue('k');+ vi.mocked(effectiveXdGatewayBaseUrl).mockReturnValue('https://gw.example.com');+ vi.mocked(hasChatgptOneshotReadiness).mockReturnValue(true);+ vi.mocked(hasGrokOAuthLogin).mockReturnValue(true);expect(hasOneshotProviderCredential(provider({ id: 'anthropic' }), 'claude-code')).toBe(false);+ expect(hasOneshotProviderCredential(provider({ id: 'anthropic' }), 'codex')).toBe(false);vi.mocked(hasChatgptOneshotReadiness).mockReturnValue(true);expect(hasOneshotProviderCredential(provider({ id: 'openai' }), 'codex')).toBe(true);@@ -143,19 +142,32 @@ describe('hasOneshotProviderCredential · 自定义供应商', () => {});it('probes each native account instead of borrowing the builtin login', () => {- vi.mocked(readClaudeAccountOAuth).mockReturnValue({ accessToken: 'a' } as never);vi.mocked(codexAccountState).mockReturnValue({ authenticated: true });vi.mocked(hasGrokOAuthLogin).mockReturnValue(true);- for (const native of ['claude', 'codex', 'xai'] as const) {+ for (const native of ['codex', 'xai'] as const) {const p = provider({ id: `${native}-work`, source: 'user', auth: { method: 'oauth', native } });expect(hasOneshotProviderCredential(p, 'codex')).toBe(true);}- expect(readClaudeAccountOAuth).toHaveBeenCalledWith('claude-work');expect(codexAccountState).toHaveBeenCalledWith('codex-work');expect(hasGrokOAuthLogin).toHaveBeenCalledWith('xai-work');- vi.mocked(readClaudeAccountOAuth).mockReturnValue(null);vi.mocked(codexAccountState).mockReturnValue({ authenticated: false });vi.mocked(hasGrokOAuthLogin).mockReturnValue(false);- for (const native of ['claude', 'codex', 'xai'] as const)+ for (const native of ['codex', 'xai'] as const)expect(hasOneshotProviderCredential(provider({ id: `${native}-work`, source: 'user', auth: { method: 'oauth', native } }), 'codex')).toBe(false);});++it('retired independent Claude accounts are never usable, whatever else is logged in', () => {+ vi.mocked(codexAccountState).mockReturnValue({ authenticated: true });+ vi.mocked(hasGrokOAuthLogin).mockReturnValue(true);+ vi.mocked(readCustomProviderKey).mockReturnValue('k' as never);+ vi.mocked(readCachedGenericOAuthAccessToken).mockReturnValue('cached' as never);+ const p = provider({+ id: 'claude-work',+ source: 'user',+ agents: ['claude-code'],+ auth: { method: 'oauth', native: 'claude' },+ routing: { 'claude-code': { upstream: 'https://api.anthropic.com', authStrategy: 'none' } },+ });+ expect(hasOneshotProviderCredential(p, 'claude-code')).toBe(false);+ expect(hasOneshotProviderCredential(p, 'codex')).toBe(false);+});diff --git a/apps/desktop/src/main/utility-model/__tests__/textOneshotPinOptions.test.ts b/apps/desktop/src/main/utility-model/__tests__/textOneshotPinOptions.test.tsindex ff2c32ff3b..ea63f56c4a 100644--- a/apps/desktop/src/main/utility-model/__tests__/textOneshotPinOptions.test.ts+++ b/apps/desktop/src/main/utility-model/__tests__/textOneshotPinOptions.test.ts@@ -474,7 +474,15 @@ describe('resolveOneshotCatalogModel', () => {});});-it.each(['claude', 'xai', 'codex'] as const)('lists an independent %s account using its own pin identity', (native) => {+it('never lists a retired independent Claude account as a quick-answer pin', () => {+ const p = provider({ id: 'claude-work', source: 'user', agents: ['codex'],+ auth: { method: 'oauth', native: 'claude' },+ routing: { codex: { upstream: 'https://account.example/v1', authStrategy: 'provider-oauth-header' } },+ models: { codex: [chat('gpt-5.5', { mode: 'chat' })] } });+ expect(buildTextOneshotPinOptions(catalogOf(p), undefined)).toEqual([]);+});++it.each(['xai', 'codex'] as const)('lists an independent %s account using its own pin identity', (native) => {const p = provider({ id: `${native}-work`, source: 'user', agents: ['codex'],auth: { method: 'oauth', native },routing: { codex: { upstream: 'https://account.example/v1', authStrategy: 'provider-oauth-header' } },diff --git a/apps/desktop/src/main/utility-model/oneShotCandidates.ts b/apps/desktop/src/main/utility-model/oneShotCandidates.tsindex 9bf0a6920b..78d420883c 100644--- a/apps/desktop/src/main/utility-model/oneShotCandidates.ts+++ b/apps/desktop/src/main/utility-model/oneShotCandidates.ts@@ -13,8 +13,6 @@ import { getAppCapabilities } from '../appCapabilities.js';import { activeOwnerScopeKey, isAppSessionBoundaryPending } from '../appSessionState.js';import { readClaudeApiKey } from '../maker-host/auth-adapters.js';import { getChatgptBridgeAuth } from '../maker-host/anthropic-responses-bridge-host.js';-import { getValidClaudeAiOAuth } from '../maker-host/claude-oauth-refresh.js';-import { getValidClaudeAccountOAuth } from '../maker-host/subscription-account-auth.js';import { getGrokAccessToken } from '../maker-host/grok-oauth-login.js';import { readCachedGenericOAuthAccessToken } from '../maker-host/generic-oauth.js';// undici 的 fetch,但 per-request 现取系统代理(裸 undici 不吃代理设置)。@@ -374,8 +372,9 @@ const DEDICATED_AUTO_REVIEW_MAX_TOKENS = 384;/*** Auto-review 的封闭候选表。它刻意不接受调用方传 provider/model:待审内容只能- * 发往 Cindy 托管网关或用户已连接的 OpenAI/Anthropic 订阅,不能跟随主会话- * 落到 xAI、DeepSeek、Kimi 或自定义 BYOM。+ * 发往 Cindy 托管网关或用户已连接的 OpenAI 订阅,不能跟随主会话落到 xAI、DeepSeek、+ * Kimi 或自定义 BYOM。Claude 订阅不在表内:它只供内置 Claude Code CLI 自己使用,+ * Cindy 的直连请求不得借用。*/export const DEDICATED_AUTO_REVIEW_CANDIDATES = Object.freeze([{@@ -402,17 +401,9 @@ export const DEDICATED_AUTO_REVIEW_CANDIDATES = Object.freeze([transport: 'codex-responses',reasoningEffort: 'low',},- {- id: 'claude-haiku',- providerId: 'anthropic',- agentKind: 'claude-code',- model: 'claude-haiku-4-5',- transport: 'litellm-chat-completions',- reasoningEffort: undefined,- },] as const satisfies ReadonlyArray<{id: string;- providerId: 'xd' | 'openai' | 'anthropic';+ providerId: 'xd' | 'openai';agentKind: AgentKind;model: string;transport: UtilityModelTransport;@@ -1126,52 +1117,9 @@ async function requestBuiltinProviderText(}if (providerCatalogId(input.provider) === 'anthropic') {- const readOAuth = () => input.provider.id === 'anthropic'- ? getValidClaudeAiOAuth() : getValidClaudeAccountOAuth(input.provider.id);- const oauth = await readOAuth();- if (input.signal?.aborted) return cancelledUtilityTextResult(profile);- if (!oauth?.accessToken) {- return { ok: false, reason: 'no_candidate', attempts: [skippedAttempt(profile, 'not_authenticated')] };- }- return executeCandidates([{- providerId: input.provider.id,- model: input.model,- transport: 'litellm-chat-completions',- profile,- execute: (text, requestOpts) => requestProviderHttpText({- wire: 'anthropic-messages',- endpoint: joinAnthropicMessagesPath(routing.upstream),- headers: {- Authorization: `Bearer ${oauth.accessToken}`,- 'anthropic-version': '2023-06-01',- 'anthropic-beta': 'oauth-2025-04-20',- },- // 直连 Anthropic API 用目录裸 id;不要复用 toSdkModelString——它会给 1M- // 目录模型追加 SDK 专用的 [1m] 后缀,/v1/messages 对该串返回 404(#2429)。- model: toAnthropicApiModelId(input.model),- prompt: text,- // Anthropic API 协议必填 max_tokens:缺省时以模型目录声明的 maxOutput- // (模型自身输出能力)兜底,没有目录条目才回退 81920——宿主不设政策上限。- maxTokens: requestOpts?.maxTokens ?? input.maxTokens ?? catalogModel?.maxOutput ?? 81_920,- timeoutMs: requestOpts?.timeoutMs ?? input.timeoutMs,- reasoningEffort: requestOpts?.reasoningEffort ?? input.reasoningEffort,- disableReasoning: requestOpts?.disableReasoning ?? input.disableReasoning,- signal: requestOpts?.signal ?? input.signal,- systemPrompt: requestOpts?.systemPrompt,- responseInstructions: requestOpts?.responseInstructions,- beforeDispatch: requestOpts?.beforeDispatch- ? () => requestOpts.beforeDispatch!({- providerId: input.provider.id,- agentKind: input.agentKind,- model: input.model,- })- : undefined,- credentialStillCurrent: requestOpts?.beforeDispatch- ? async () => (await readOAuth())?.accessToken === oauth.accessToken- : undefined,- routeStillCurrent: requestOpts?.beforeDispatch ? input.routeStillCurrent : undefined,- }),- }], prompt, [], input);+ // Claude 订阅只供内置 Claude Code CLI 用它自己的登录发起请求;Cindy 进程不持有也不借用+ // 这份凭证,辅助模型 / 标题等直连调用不走它(调用方按候选链回落到其它来源)。+ return { ok: false, reason: 'no_candidate', attempts: [skippedAttempt(profile, 'not_authenticated')] };}if (isOpenAiSubscriptionProvider(input.provider)) {diff --git a/apps/desktop/src/main/utility-model/oneshotProviderUsability.ts b/apps/desktop/src/main/utility-model/oneshotProviderUsability.tsindex 7901e8b4ec..b67b96c4b1 100644--- a/apps/desktop/src/main/utility-model/oneshotProviderUsability.ts+++ b/apps/desktop/src/main/utility-model/oneshotProviderUsability.ts@@ -1,5 +1,4 @@import { codexAccountState } from '../maker-host/codex-account-auth.js';-import { readClaudeAccountOAuth } from '../maker-host/subscription-account-auth.js';/*** oneshotProviderUsability.ts — 快问快答钉档的「已配置凭证」同步探测。*@@ -11,7 +10,6 @@ import { readClaudeAccountOAuth } from '../maker-host/subscription-account-auth.import { storedCustomProviderId, type AgentKind, type Provider } from '@cindy/model-providers';import { readClaudeApiKey } from '../maker-host/auth-adapters.js';-import { getClaudeAiOAuthForSpawn } from '../maker-host/claude-oauth-refresh.js';import { hasChatgptOneshotReadiness } from '../maker-host/codex-oauth-readiness.js';import { readCachedGenericOAuthAccessToken } from '../maker-host/generic-oauth.js';import { hasGrokOAuthLogin } from '../maker-host/grok-oauth-login.js';@@ -23,8 +21,9 @@ import { readCustomProviderKey } from '../secrets/providerSecretStore.js';* 自定义供应商分支)的凭证判读逐一对应;内置只认执行侧可执行的四家。*/export function hasOneshotProviderCredential(provider: Provider, agentKind: AgentKind): boolean {+ // Claude 订阅只供内置 Claude Code CLI 用它自己的登录;快问快答等 Cindy 直连调用不可用。if (provider.source !== 'builtin') {- if (provider.auth.native === 'claude') return Boolean(readClaudeAccountOAuth(provider.id)?.accessToken);+ if (provider.auth.native === 'claude') return false;if (provider.auth.native === 'xai') return hasGrokOAuthLogin(provider.id);if (provider.auth.native === 'codex') return codexAccountState(provider.id).authenticated;}@@ -33,7 +32,7 @@ export function hasOneshotProviderCredential(provider: Provider, agentKind: Agencase 'xd':return Boolean(readClaudeApiKey()) && effectiveXdGatewayBaseUrl().trim().length > 0;case 'anthropic':- return getClaudeAiOAuthForSpawn() !== null;+ return false;case 'openai':return hasChatgptOneshotReadiness();case 'xai':diff --git a/apps/desktop/src/main/utility-model/textOneshotPinOptions.ts b/apps/desktop/src/main/utility-model/textOneshotPinOptions.tsindex 134d8747a9..f2ee23739b 100644--- a/apps/desktop/src/main/utility-model/textOneshotPinOptions.ts+++ b/apps/desktop/src/main/utility-model/textOneshotPinOptions.ts@@ -40,12 +40,11 @@ import {const ONESHOT_ROUTE_AGENTS = ['codex', 'claude-code'] as const;/**- * 执行侧(requestBuiltinProviderText)硬编码认的四家内置供应商。清单侧必须- * 按同一集合过滤——否则将来新增第五个聊天型内置供应商(如 gemini 配上- * agent)时,清单会列出执行侧 fallthrough agent_unavailable 的模型,"可见但- * 不可执行"。两边任一处变动都要同步另一处。+ * 执行侧(requestBuiltinProviderText)可执行的内置供应商。清单侧必须按同一集合过滤——+ * 否则清单会列出执行侧 fallthrough / 拒绝的模型,"可见但不可执行"。两边任一处变动都要+ * 同步另一处。Claude 订阅(anthropic)不在内:它只供内置 Claude Code CLI 自己使用。*/-const ONESHOT_EXECUTABLE_BUILTIN_PROVIDERS = new Set(['xd', 'anthropic', 'openai', 'xai']);+const ONESHOT_EXECUTABLE_BUILTIN_PROVIDERS = new Set(['xd', 'openai', 'xai']);/** 一次快问快答的路由:用户钉档或插件声明解析出的终态。 */export type OneshotRoute =@@ -80,7 +79,8 @@ function isRoutableForOneshot(provider: Provider, agentKind: AgentKind): booleanif (!provider.agents.includes(agentKind)) return false;const routing = provider.routing[agentKind];if (!routing || routing.disabled) return false;- if (isOpenAiSubscriptionProvider(provider) || provider.auth.native === 'claude' || provider.auth.native === 'xai') return true;+ if (provider.auth.native === 'claude') return false;+ if (isOpenAiSubscriptionProvider(provider) || provider.auth.native === 'xai') return true;if (provider.source === 'builtin') return ONESHOT_EXECUTABLE_BUILTIN_PROVIDERS.has(provider.id);if (agentKind === 'claude-code') {if (routing.wireProtocol !== undefined && routing.wireProtocol !== 'anthropic-messages') return false;diff --git a/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsx b/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsxindex c6f26907f7..1a8a81e2eb 100644--- a/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsx+++ b/apps/desktop/src/renderer/__tests__/addProviderWizardOpenAiAuth.test.tsx@@ -71,6 +71,7 @@ vi.mock('@/components/icons/ProviderLogoMark', () => ({import { AddProviderWizard } from '@/components/settings/AddProviderWizard';import { invalidatePendingCodexLogin } from '@/hooks/codexAuthLogin';+import { toast } from '@/lib/toast';const OPENAI_PROVIDER = {id: 'openai',@@ -215,7 +216,7 @@ describe('AddProviderWizard — OpenAI 授权边界', () => {fireEvent.click(await screen.findByText('settings.providers.openai.useLocalAccount'));await waitFor(() => expect(onDone).toHaveBeenCalledExactlyOnceWith('openai'));});- it.each(['openai', 'anthropic', 'xai'].flatMap(id =>+ it.each(['openai', 'xai'].flatMap(id =>['cancel', 'unmount'].map(exit => ({ id, exit })),))('removes $id when login succeeds after $exit', async ({ id, exit }) => {let finish!: (value: { ok: boolean }) => void;@@ -280,7 +281,7 @@ describe('AddProviderWizard — OpenAI 授权边界', () => {expect(onDone).toHaveBeenCalledWith(newId);expect(onDone).toHaveBeenCalledTimes(1);});- it.each(['anthropic', 'xai'])('cancels only the pending independent %s authorization', async id => {+ it.each(['xai'])('cancels only the pending independent %s authorization', async id => {let finish!: (value: { ok: boolean; reason: string }) => void;providerOAuthLogin.mockReturnValue(new Promise(resolve => { finish = resolve; }));const onDone = vi.fn();@@ -295,7 +296,7 @@ describe('AddProviderWizard — OpenAI 授权边界', () => {expect(deleteAccount).toHaveBeenCalledWith(accountId);expect(onDone).not.toHaveBeenCalled();});- it.each([['anthropic', 'claude'], ['xai', 'xai']] as const)('adds another %s account even when its builtin provider is connected', async (id, native) => {+ it.each([['xai', 'xai']] as const)('adds another %s account even when its builtin provider is connected', async (id, native) => {const onDone = vi.fn();render(<AddProviderWizard providers={[{ ...OPENAI_PROVIDER, id, name: id, connected: true }]}onOpenCustomForm={vi.fn()} onClose={vi.fn()} onDone={onDone} />);@@ -307,6 +308,49 @@ describe('AddProviderWizard — OpenAI 授权边界', () => {expect(createAccount).toHaveBeenCalledWith(expect.objectContaining({ id: accountId, auth: { method: 'oauth', native } }), {});await waitFor(() => expect(onDone).toHaveBeenCalledWith(accountId));});+ // Claude 订阅只能经内置 Claude Code 自己的登录使用:即使内置 anthropic 已连接,+ // 也只提供「使用本机 Claude」(= 重新连接 CLI 登录),不再创建独立 Claude 账号。+ it('offers only the bundled Claude Code login for a connected anthropic provider', async () => {+ triggerLogin.mockResolvedValue({ ok: true, authorized: true });+ const onDone = vi.fn();+ render(<AddProviderWizard providers={[{ ...OPENAI_PROVIDER, id: 'anthropic', name: 'anthropic', connected: true }]}+ onOpenCustomForm={vi.fn()} onClose={vi.fn()} onDone={onDone} />);+ fireEvent.click(await screen.findByText('anthropic'));+ const useClaude = await screen.findByText('settings.providers.localAccount.useClaude');+ expect(screen.queryByText('settings.providers.openai.addIndependentAccount')).toBeNull();+ fireEvent.click(useClaude);+ await waitFor(() => expect(onDone).toHaveBeenCalledExactlyOnceWith('anthropic'));+ expect(triggerLogin).toHaveBeenCalledExactlyOnceWith(expect.any(String));+ expect(createAccount).not.toHaveBeenCalled();+ expect(providerOAuthLogin).not.toHaveBeenCalled();+ });+ it.each([+ ['local_unavailable', 'settings.providers.localAccount.unavailable'],+ ['login_failed', 'settings.connections.claude.toast.loginFailed'],+ ['timeout', 'settings.connections.claude.toast.loginFailed'],+ ['login_cancelled', null],+ ] as const)('maps a failed bundled Claude Code login (%s) to its toast', async (reason, toastKey) => {+ triggerLogin.mockResolvedValue({ ok: false, authorized: false, reason });+ const onDone = vi.fn();+ render(<AddProviderWizard providers={[{ ...OPENAI_PROVIDER, id: 'anthropic', name: 'anthropic' }]}+ entry={{ kind: 'builtin', providerId: 'anthropic' }} onOpenCustomForm={vi.fn()} onClose={vi.fn()} onDone={onDone} />);+ fireEvent.click(await screen.findByText('settings.providers.localAccount.useClaude'));+ // 登录 settle 后按钮从「取消」回到「使用本机 Claude」,再做负向断言。+ await waitFor(() => expect(triggerLogin).toHaveBeenCalledTimes(1));+ await screen.findByText('settings.providers.localAccount.useClaude');+ if (toastKey) expect(toast.error).toHaveBeenCalledExactlyOnceWith(toastKey);+ else expect(toast.error).not.toHaveBeenCalled();+ expect(onDone).not.toHaveBeenCalled();+ });+ it('reports a thrown bundled Claude Code login as a login failure', async () => {+ triggerLogin.mockRejectedValue(new Error('spawn failed'));+ const onDone = vi.fn();+ render(<AddProviderWizard providers={[{ ...OPENAI_PROVIDER, id: 'anthropic', name: 'anthropic' }]}+ entry={{ kind: 'builtin', providerId: 'anthropic' }} onOpenCustomForm={vi.fn()} onClose={vi.fn()} onDone={onDone} />);+ fireEvent.click(await screen.findByText('settings.providers.localAccount.useClaude'));+ await waitFor(() => expect(toast.error).toHaveBeenCalledExactlyOnceWith('settings.connections.claude.toast.loginFailed'));+ expect(onDone).not.toHaveBeenCalled();+ });it('已有系统 Codex OAuth 快照时仍停留在授权页,不自动完成当前 Cindy 绑定', async () => {const onDone = vi.fn();render(diff --git a/apps/desktop/src/renderer/__tests__/addProviderWizardOpenaiEntry.test.tsx b/apps/desktop/src/renderer/__tests__/addProviderWizardOpenaiEntry.test.tsxindex 48c26e6918..725616bb6b 100644--- a/apps/desktop/src/renderer/__tests__/addProviderWizardOpenaiEntry.test.tsx+++ b/apps/desktop/src/renderer/__tests__/addProviderWizardOpenaiEntry.test.tsx@@ -7,7 +7,8 @@* 向导**不得**挂载即自关:codexAuth 是整机凭证态,不含按账号的 native binding,* 自关会既不弹 UI 也不补绑定,「去授权」从此点不出任何效果(回归:换账号死循环)。* 2. 本向导内点「授权」发起登录并成功 → 正常收口 onDone('openai')。- * 3. anthropic entry 直达 → 授权步正常渲染(对照组,证明弹窗结构本身可用)。+ * 3. anthropic entry 直达 → 授权步正常渲染(对照组,证明弹窗结构本身可用);+ * 只提供内置 Claude Code 登录,不提供独立账号。*/import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';@@ -171,7 +172,8 @@ describe('AddProviderWizard — OpenAI 检测建议直达', () => {renderWizard('anthropic', onDone);expect(screen.getByText('settings.providers.wizard.titleWith')).not.toBeNull();- expect(screen.getByText('settings.providers.openai.addIndependentAccount')).not.toBeNull();+ // Claude 订阅只经内置 Claude Code 自己的登录使用:不再提供独立 Claude 账号入口。+ expect(screen.queryByText('settings.providers.openai.addIndependentAccount')).toBeNull();expect(screen.getByText('settings.providers.localAccount.useClaude')).not.toBeNull();expect(onDone).not.toHaveBeenCalled();});diff --git a/apps/desktop/src/renderer/__tests__/selectVisibleModels.test.ts b/apps/desktop/src/renderer/__tests__/selectVisibleModels.test.tsindex de05562482..bdec51203d 100644--- a/apps/desktop/src/renderer/__tests__/selectVisibleModels.test.ts+++ b/apps/desktop/src/renderer/__tests__/selectVisibleModels.test.ts@@ -312,7 +312,9 @@ describe('filterChatBridgedCodexProviders — provider source sections', () => {const providers = [claude, grok, api];expect(filterChatBridgedCodexProviders(providers, 'pi', true)).toEqual([grok, api]);expect(filterChatBridgedCodexProviders(providers, 'pi', false)).toEqual(providers);- expect(filterChatBridgedCodexProviders([claude], 'claude-code', true)).toEqual([claude]);+ // Claude 订阅只走本机 Claude Code 登录:SSH 远端的 claude-code 也不展示。+ expect(filterChatBridgedCodexProviders([claude], 'claude-code', true)).toEqual([]);+ expect(filterChatBridgedCodexProviders([claude], 'claude-code', false)).toEqual([claude]);const input = { agentKind: 'pi' as const, deviceId: undefined, providers, deviceCcModels: [], deviceCodexModels: [], excludeChatBridgedCodex: true };expect(ids(selectVisibleModels(input))).toEqual(['grok-model', 'shared']);expect(ids(selectVisibleModels({ ...input, deviceId: 'host', devicePiModels: [devModel('claude-only')] }))).toEqual(['claude-only']);diff --git a/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx b/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsxindex 3d3ac70f0a..5af9daa1ec 100644--- a/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx+++ b/apps/desktop/src/renderer/components/settings/AddProviderWizard.tsx@@ -767,8 +767,10 @@ export function AddProviderWizard({const result = await window.electronAPI.maker.claudeOAuthLogin(loginKey);if (localLoginRef.current !== login) return;if (result.ok) onDone('anthropic');- else if (result.reason !== 'login_cancelled') toast.error(t('settings.providers.localAccount.unavailable'));- } catch { if (localLoginRef.current === login) toast.error(t('settings.providers.localAccount.unavailable')); }+ else if (result.reason === 'local_unavailable') toast.error(t('settings.providers.localAccount.unavailable'));+ else if (result.reason === 'not_a_subscription') toast.error(t('settings.connections.claude.toast.notSubscription'));+ else if (result.reason !== 'login_cancelled') toast.error(t('settings.connections.claude.toast.loginFailed'));+ } catch { if (localLoginRef.current === login) toast.error(t('settings.connections.claude.toast.loginFailed')); }finally {if (localLoginRef.current === login) {localLoginRef.current = null;@@ -1801,7 +1803,8 @@ export function AddProviderWizard({{t('settings.providers.openai.useLocalAccount')}</Button>)}- {sel.provider.id === 'anthropic' && !providers.some(p => p.id === 'anthropic' && !p.removed && (p.connected || p.removed === false)) && (+ {/* Claude 订阅唯一入口:已添加时点它等同重新连接本机 Claude Code 登录。 */}+ {sel.provider.id === 'anthropic' && (<Buttonvariant="secondary"size="lg"@@ -1811,15 +1814,18 @@ export function AddProviderWizard({{t('settings.providers.localAccount.useClaude')}</Button>)}- <Button variant="secondary" size="lg" type="button" onClick={() => void handleAuthorize()}>- {t(- ['openai', 'anthropic', 'xai'].includes(sel.provider.id)- ? 'settings.providers.openai.addIndependentAccount'- : sel.provider.auth.oauth?.flow === 'device-code'- ? 'settings.providers.wizard.authorizeWithDeviceCode'- : 'settings.providers.button.authorize',- )}- </Button>+ {/* Claude 订阅只能经内置 Claude Code 自己的登录使用,不提供独立账号。 */}+ {sel.provider.id !== 'anthropic' && (+ <Button variant="secondary" size="lg" type="button" onClick={() => void handleAuthorize()}>+ {t(+ ['openai', 'xai'].includes(sel.provider.id)+ ? 'settings.providers.openai.addIndependentAccount'+ : sel.provider.auth.oauth?.flow === 'device-code'+ ? 'settings.providers.wizard.authorizeWithDeviceCode'+ : 'settings.providers.button.authorize',+ )}+ </Button>+ )}{sel.provider.id === 'xai' && (<Button variant="secondary" size="lg" type="button" onClick={() => void handleAuthorize('device')}>{t('settings.connections.xai.deviceLogin')}diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsxindex 91a6494b27..6c034945df 100644--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx@@ -1227,6 +1227,8 @@ function GenericOAuthHeader({onChanged();} else if (r.reason === 'login_cancelled') {/* 用户取消,不弹错 */+ } else if (r.reason === 'claude_account_retired') {+ toast.error(t('settings.providers.claudeAccountRetired'));} else {toast.error(t('settings.providers.genericOAuth.toast.loginFailed', { name: provider.name }),diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsxindex e16f75b030..9e2743e946 100644--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx@@ -684,6 +684,8 @@ export function NewMakerDraftRoute() {? 'ccAgent.draft.remoteProviderUnsupported': code === 'REMOTE_NATIVE_OAUTH_UNAVAILABLE'? 'ccAgent.draft.remoteNativeOauthUnavailable'+ : code === 'CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE'+ ? 'ccAgent.draft.claudeSubscriptionWorkspaceOverride': // 轮 40-w4-t3 HIGH:远端 Pi 会话启动时 Cindy AI gateway endpoint// 未就绪 —— main 侧已映射同名 IPC code, 这里走已存在 5 语言的// logic.errors.remoteError.REMOTE_GATEWAY_ENDPOINT_UNAVAILABLEdiff --git a/apps/desktop/src/renderer/hooks/useClaudeOAuthConnected.ts b/apps/desktop/src/renderer/hooks/useClaudeOAuthConnected.tsindex 8504aa7c3d..129b209625 100644--- a/apps/desktop/src/renderer/hooks/useClaudeOAuthConnected.ts+++ b/apps/desktop/src/renderer/hooks/useClaudeOAuthConnected.ts@@ -4,7 +4,7 @@ import { useEffect, useState } from 'react';* useClaudeOAuthConnected — Claude.ai 订阅 OAuth 的连接态(TodaySpendChip 计费形态判定用)。** 返回 null = 尚未读到(mount 后首次 IPC 未返回 / enabled=false), true/false = 已确认。- * mount 时经 claudeOAuthStatus 读一次(main 侧 = hasClaudeAiOAuth), 此后跟随+ * mount 时经 claudeOAuthStatus 读一次(main 侧 = hasClaudeNativeLogin), 此后跟随* AUTH_STATE_CHANGED(agentKind='claude-code')push 重查 —— Settings 登录 / 登出后* main 会广播。push payload 的 authenticated 是「OAuth 或网关 key」的复合态, 不能直接* 当 OAuth 连接态用, 所以收到 push 后重查专用 status 端点(push 频率 = 用户登录/登出,diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 98da87d93a..5768c96419 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -296,7 +296,7 @@"REMOTE_MODEL_SWITCH_ROUTE_CHANGE": "The target model or source needs a different remote route — close and recreate the remote session to apply.","REMOTE_PROVIDER_UPDATING": "Provider credentials are being updated — retry in a moment","REMOTE_PROVIDER_UNSUPPORTED": "This provider is not supported in SSH remote sessions — pick another source",- "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "Claude.ai subscription is not connected — connect it first or pick a gateway model",+ "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "Remote tasks can't use a Claude subscription — pick a gateway or API key model","DEVICE_LINK_DEVICE_UNRESPONSIVE": "The target device is not responding. Check the remote device and try again.","INTERNAL": "Operation failed. Please try again later.","SSH_CONFIG_CONCURRENT_MODIFICATION": "The SSH configuration changed on disk. Reload it and try again.",@@ -1735,7 +1735,7 @@},"logoutConfirm": {"title": "Disconnect Claude.ai subscription?",- "description": "Cindy will no longer use this Claude subscription.",+ "description": "Cindy will no longer use this Claude subscription. Your Claude Code sign-in on this computer is not affected.","confirm": "Disconnect","cancel": "Cancel"},@@ -1744,7 +1744,7 @@"loggedOut": "Disconnected Claude","loginFailed": "Could not sign in to Claude. Try again.","logoutFailed": "Could not disconnect Claude. Try again.",- "notSubscription": "This account has no Claude subscription (Pro/Max); subscription mode is unavailable",+ "notSubscription": "Claude Code on this computer isn't signed in with a Claude subscription (Pro/Max), for example it uses an API key or a relay. Subscription mode is unavailable","needAuth": "Sign in to Claude first"},"apiMode": {@@ -2583,8 +2583,8 @@"codexResetCredits": "{{count}} limit reset credits"},"localAccount": {- "useClaude": "Use local Claude Code account",- "unavailable": "No local sign-in is available. Sign in to the source app or add a separate account."+ "useClaude": "Sign in with Claude Code",+ "unavailable": "The built-in Claude Code isn't ready yet. Try again shortly."},"connection": {"modelCount": "{{count}} models configured",@@ -2597,7 +2597,8 @@"refreshFailed": "Enterprise settings could not be refreshed. Try again later.","pending": "Preparing credentials","unavailable": "Temporarily unavailable"- }+ },+ "claudeAccountRetired": "Separate Claude accounts are no longer supported. Use \"Sign in with Claude Code\" to connect your Claude subscription; you can delete this account."},"experimental": {"title": "Experimental",@@ -9954,7 +9955,8 @@"remoteWorktreeCleanupPending": "The previous remote worktree is still awaiting cleanup. Reconnect the device and try again.","remoteProviderUpdating": "Provider credentials are being updated — retry in a moment","remoteProviderUnsupported": "This provider is not supported in SSH remote sessions — pick another source",- "remoteNativeOauthUnavailable": "Claude.ai subscription is not connected — connect it first or pick a gateway model",+ "remoteNativeOauthUnavailable": "Remote tasks can't use a Claude subscription — pick a gateway or API key model",+ "claudeSubscriptionWorkspaceOverride": "This folder's .claude settings change where Claude sends requests or how it signs in, so the Claude subscription can't be used here. Remove those settings, or pick a gateway or API key model","deviceStillLoading": "Remote device is still loading, please wait","remoteDefaultsLoadFailed": "Could not load the remote device settings. Check the connection; Cindy is retrying.","worktreeMissingRepo": "Can't create a worktree: the current directory's repo root is missing",diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 8e9cba4b46..48c29227a9 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -296,7 +296,7 @@"REMOTE_MODEL_SWITCH_ROUTE_CHANGE": "対象のモデルまたはソースは別のリモートルートが必要です。リモートセッションを閉じて再作成してください。","REMOTE_PROVIDER_UPDATING": "プロバイダーの認証情報を更新中です。しばらくしてから再試行してください","REMOTE_PROVIDER_UNSUPPORTED": "このプロバイダーは SSH リモートセッションに対応していません。別のソースを選択してください",- "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "Claude.ai サブスクリプションが未接続です。先に接続するか、ゲートウェイモデルを選択してください",+ "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "リモートタスクでは Claude サブスクリプションを使用できません。ゲートウェイまたは API キーのモデルを選択してください","DEVICE_LINK_DEVICE_UNRESPONSIVE": "対象デバイスが応答していません。リモートデバイスを確認して再試行してください。","INTERNAL": "操作に失敗しました。しばらくしてから再試行してください。","SSH_CONFIG_CONCURRENT_MODIFICATION": "SSH 設定がディスク上で変更されました。再読み込みしてからもう一度お試しください。",@@ -1735,7 +1735,7 @@},"logoutConfirm": {"title": "Claude.ai サブスクリプションを切断しますか?",- "description": "Cindy はこの Claude サブスクリプションを使用できなくなります。",+ "description": "Cindy はこの Claude サブスクリプションを使用しなくなります。このコンピューターの Claude Code のログインには影響しません。","confirm": "接続を解除","cancel": "キャンセル"},@@ -1744,7 +1744,7 @@"loggedOut": "Claude の接続を解除しました","loginFailed": "Claude にログインできませんでした。再試行してください。","logoutFailed": "Claude の接続を解除できませんでした。再試行してください。",- "notSubscription": "このアカウントには Claude サブスクリプション(Pro/Max)がありません。サブスクリプションモードは利用できません",+ "notSubscription": "このコンピューターの Claude Code は Claude サブスクリプション(Pro/Max)でログインしていません(API キーや中継を使用しているなど)。サブスクリプションモードは利用できません","needAuth": "先に Claude にログインしてください"},"apiMode": {@@ -2582,8 +2582,8 @@"codexResetCredits": "上限リセット券 {{count}} 枚"},"localAccount": {- "useClaude": "ローカルの Claude Code アカウントを使用",- "unavailable": "利用できるローカルログインがありません。元のアプリにログインするか、別のアカウントを追加してください。"+ "useClaude": "Claude Code でログイン",+ "unavailable": "内蔵の Claude Code の準備ができていません。しばらくしてから再試行してください。"},"connection": {"modelCount": "{{count}} 個のモデルを設定済み",@@ -2596,7 +2596,8 @@"refreshFailed": "組織設定を更新できませんでした。しばらくしてから再試行してください。","pending": "認証情報を準備中","unavailable": "一時的に利用できません"- }+ },+ "claudeAccountRetired": "個別の Claude アカウントは利用できなくなりました。「Claude Code でログイン」から Claude サブスクリプションを接続してください。このアカウントは削除できます。"},"experimental": {"title": "実験的機能",@@ -9939,7 +9940,8 @@"remoteWorktreeCleanupPending": "前回のリモート worktree はまだクリーンアップ待ちです。デバイスを再接続してから再試行してください。","remoteProviderUpdating": "プロバイダーの認証情報を更新中です。しばらくしてから再試行してください","remoteProviderUnsupported": "このプロバイダーは SSH リモートセッションに対応していません。別のソースを選択してください",- "remoteNativeOauthUnavailable": "Claude.ai サブスクリプションが未接続です。先に接続するか、ゲートウェイモデルを選択してください",+ "remoteNativeOauthUnavailable": "リモートタスクでは Claude サブスクリプションを使用できません。ゲートウェイまたは API キーのモデルを選択してください",+ "claudeSubscriptionWorkspaceOverride": "このフォルダーの .claude 設定が Claude の接続先または認証方法を変更しているため、ここでは Claude サブスクリプションを使用できません。該当する設定を削除するか、ゲートウェイまたは API キーのモデルを選択してください","deviceStillLoading": "リモートデバイスの読み込み中です。しばらくお待ちください","remoteDefaultsLoadFailed": "リモートデバイスの設定を読み込めませんでした。接続を確認してください。Cindy が再試行しています。","worktreeMissingRepo": "worktree を作成できません:現在のディレクトリのリポジトリルートが見つかりません",diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex f0c01f3106..50736f445c 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -296,7 +296,7 @@"REMOTE_MODEL_SWITCH_ROUTE_CHANGE": "대상 모델 또는 소스에 다른 원격 라우트가 필요합니다. 원격 세션을 닫고 다시 생성하세요.","REMOTE_PROVIDER_UPDATING": "제공자 자격 증명을 업데이트하는 중입니다. 잠시 후 다시 시도하세요","REMOTE_PROVIDER_UNSUPPORTED": "이 제공자는 SSH 원격 세션을 지원하지 않습니다. 다른 소스를 선택하세요",- "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "Claude.ai 구독이 연결되지 않았습니다. 먼저 연결하거나 게이트웨이 모델을 선택하세요",+ "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "원격 작업에서는 Claude 구독을 사용할 수 없습니다. 게이트웨이 또는 API 키 모델을 선택하세요","DEVICE_LINK_DEVICE_UNRESPONSIVE": "대상 장치가 응답하지 않습니다. 원격 장치를 확인한 후 다시 시도하세요.","INTERNAL": "작업에 실패했습니다. 잠시 후 다시 시도하세요.","SSH_CONFIG_CONCURRENT_MODIFICATION": "디스크의 SSH 구성이 변경되었습니다. 다시 불러온 후 재시도하세요.",@@ -1735,7 +1735,7 @@},"logoutConfirm": {"title": "Claude.ai 구독을 해제할까요?",- "description": "Cindy에서 이 Claude 구독을 사용할 수 없게 됩니다.",+ "description": "Cindy에서 이 Claude 구독을 더 이상 사용하지 않습니다. 이 컴퓨터의 Claude Code 로그인에는 영향이 없습니다.","confirm": "연결 해제","cancel": "취소"},@@ -1744,7 +1744,7 @@"loggedOut": "Claude 연결을 해제했습니다","loginFailed": "Claude에 로그인하지 못했습니다. 다시 시도하세요.","logoutFailed": "Claude 연결을 해제하지 못했습니다. 다시 시도하세요.",- "notSubscription": "이 계정에는 Claude 구독(Pro/Max)이 없어 구독 모드를 사용할 수 없습니다",+ "notSubscription": "이 컴퓨터의 Claude Code가 Claude 구독(Pro/Max)으로 로그인되어 있지 않습니다(예: API 키 또는 중계 사용). 구독 모드를 사용할 수 없습니다","needAuth": "먼저 Claude에 로그인하세요"},"apiMode": {@@ -2582,8 +2582,8 @@"codexResetCredits": "한도 초기화 크레딧 {{count}}장"},"localAccount": {- "useClaude": "로컬 Claude Code 계정 사용",- "unavailable": "사용 가능한 로컬 로그인이 없습니다. 해당 앱에 로그인하거나 별도 계정을 추가하세요."+ "useClaude": "Claude Code로 로그인",+ "unavailable": "내장 Claude Code가 아직 준비되지 않았습니다. 잠시 후 다시 시도하세요."},"connection": {"modelCount": "모델 {{count}}개 설정됨",@@ -2596,7 +2596,8 @@"refreshFailed": "조직 설정을 새로고침하지 못했습니다. 나중에 다시 시도하세요.","pending": "인증 정보 준비 중","unavailable": "일시적으로 사용할 수 없음"- }+ },+ "claudeAccountRetired": "별도 Claude 계정은 더 이상 지원되지 않습니다. 'Claude Code로 로그인'으로 Claude 구독을 연결하세요. 이 계정은 삭제해도 됩니다."},"experimental": {"title": "실험적 기능",@@ -9939,7 +9940,8 @@"remoteWorktreeCleanupPending": "이전 원격 worktree가 아직 정리 대기 중입니다. 기기를 다시 연결한 후 재시도하세요.","remoteProviderUpdating": "제공자 자격 증명을 업데이트하는 중입니다. 잠시 후 다시 시도하세요","remoteProviderUnsupported": "이 제공자는 SSH 원격 세션을 지원하지 않습니다. 다른 소스를 선택하세요",- "remoteNativeOauthUnavailable": "Claude.ai 구독이 연결되지 않았습니다. 먼저 연결하거나 게이트웨이 모델을 선택하세요",+ "remoteNativeOauthUnavailable": "원격 작업에서는 Claude 구독을 사용할 수 없습니다. 게이트웨이 또는 API 키 모델을 선택하세요",+ "claudeSubscriptionWorkspaceOverride": "이 폴더의 .claude 설정이 Claude의 연결 대상이나 인증 방식을 변경하므로 여기서는 Claude 구독을 사용할 수 없습니다. 해당 설정을 제거하거나 게이트웨이 또는 API 키 모델을 선택하세요","deviceStillLoading": "원격 기기가 아직 로딩 중입니다. 잠시 기다려 주세요","remoteDefaultsLoadFailed": "원격 기기 설정을 불러오지 못했습니다. 연결을 확인하세요. Cindy가 다시 시도하고 있습니다.","worktreeMissingRepo": "worktree를 만들 수 없습니다: 현재 디렉터리의 리포지토리 루트가 없습니다",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 2d805da4c5..c8658e486e 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -292,7 +292,7 @@"REMOTE_MODEL_SWITCH_ROUTE_CHANGE": "目标模型或来源需要不同的远端路由,请关闭并重新创建远程任务后生效。","REMOTE_PROVIDER_UPDATING": "供应商凭证正在更新,请稍后重试","REMOTE_PROVIDER_UNSUPPORTED": "该供应商不支持 SSH 远程会话,请更换来源",- "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "未连接 Claude.ai 订阅,请先连接或选择网关模型",+ "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "远程任务不能使用 Claude 订阅,请选择网关或 API Key 模型","DEVICE_LINK_DEVICE_UNRESPONSIVE": "目标设备长时间无响应,请检查远程设备后重试","INTERNAL": "操作失败,请稍后重试。","SSH_CONFIG_CONCURRENT_MODIFICATION": "SSH 配置已在磁盘上发生变化,请重新加载后再试。",@@ -1735,7 +1735,7 @@},"logoutConfirm": {"title": "断开 Claude.ai 订阅?",- "description": "断开后,Cindy 将无法使用这份 Claude 订阅。",+ "description": "断开后,Cindy 将不再使用这份 Claude 订阅。本机 Claude Code 的登录不受影响。","confirm": "断开","cancel": "取消"},@@ -1744,7 +1744,7 @@"loggedOut": "已断开 Claude","loginFailed": "Claude 登录失败,请重试","logoutFailed": "Claude 断开失败,请重试",- "notSubscription": "该账号没有 Claude 订阅(Pro/Max),无法走订阅模式",+ "notSubscription": "本机 Claude Code 当前不是用 Claude 订阅(Pro/Max)登录的(例如使用了 API Key 或中转),无法使用订阅模式","needAuth": "请先登录 Claude"},"apiMode": {@@ -2582,8 +2582,8 @@"codexResetCredits": "限额重置券 {{count}} 张"},"localAccount": {- "useClaude": "使用本机 Claude Code 账号",- "unavailable": "未找到可用的本机登录,请先在对应应用中登录,或添加独立账号。"+ "useClaude": "使用 Claude Code 登录",+ "unavailable": "内置的 Claude Code 尚未就绪,请稍后重试。"},"connection": {"modelCount": "已配置 {{count}} 个模型",@@ -2596,7 +2596,8 @@"refreshFailed": "企业配置暂时无法刷新,请稍后重试。","pending": "凭据准备中","unavailable": "暂时不可用"- }+ },+ "claudeAccountRetired": "独立 Claude 账号已停用。请改用「使用 Claude Code 登录」连接 Claude 订阅,这个账号可以删除。"},"experimental": {"title": "实验性功能",@@ -9939,7 +9940,8 @@"remoteWorktreeCleanupPending": "上一次远程 worktree 仍待回收,请重新连接设备后再试。","remoteProviderUpdating": "供应商凭证正在更新,请稍后重试","remoteProviderUnsupported": "该供应商不支持 SSH 远程会话,请更换来源",- "remoteNativeOauthUnavailable": "未连接 Claude.ai 订阅,请先连接或选择网关模型",+ "remoteNativeOauthUnavailable": "远程任务不能使用 Claude 订阅,请选择网关或 API Key 模型",+ "claudeSubscriptionWorkspaceOverride": "这个工作目录的 .claude 设置修改了 Claude 的上游地址或鉴权方式,不能在这里使用 Claude 订阅。请移除这些设置,或选择网关或 API Key 模型","deviceStillLoading": "远程设备仍在加载中,请稍候","remoteDefaultsLoadFailed": "无法读取远程设备配置。请检查连接,Cindy 正在重试。","worktreeMissingRepo": "无法开 worktree:缺少当前目录的仓库根",diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex e2a76f164b..1fcb17a018 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -292,7 +292,7 @@"REMOTE_MODEL_SWITCH_ROUTE_CHANGE": "目標模型或來源需要不同的遠端路由,請關閉並重新建立遠端任務後生效。","REMOTE_PROVIDER_UPDATING": "供應商憑證正在更新,請稍後重試","REMOTE_PROVIDER_UNSUPPORTED": "該供應商不支援 SSH 遠端會話,請更換來源",- "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "未連線 Claude.ai 訂閱,請先連線或選擇閘道器模型",+ "REMOTE_NATIVE_OAUTH_UNAVAILABLE": "遠端任務不能使用 Claude 訂閱,請選擇閘道器或 API Key 模型","DEVICE_LINK_DEVICE_UNRESPONSIVE": "目標裝置長時間無響應,請檢查遠端裝置後重試","INTERNAL": "操作失敗,請稍後重試。","SSH_CONFIG_CONCURRENT_MODIFICATION": "SSH 設定已在磁碟上變更,請重新載入後再試。",@@ -1735,7 +1735,7 @@},"logoutConfirm": {"title": "斷開 Claude.ai 訂閱?",- "description": "中斷後,Cindy 將無法使用這份 Claude 訂閱。",+ "description": "中斷後,Cindy 將不再使用這份 Claude 訂閱。本機 Claude Code 的登入不受影響。","confirm": "中斷連線","cancel": "取消"},@@ -1744,7 +1744,7 @@"loggedOut": "已中斷 Claude 的連線","loginFailed": "Claude 登入失敗,請重試","logoutFailed": "Claude 中斷連線失敗,請重試",- "notSubscription": "該帳號沒有 Claude 訂閱(Pro/Max),無法走訂閱模式",+ "notSubscription": "本機 Claude Code 目前不是以 Claude 訂閱(Pro/Max)登入(例如使用了 API Key 或中轉),無法使用訂閱模式","needAuth": "請先登入 Claude"},"apiMode": {@@ -2582,8 +2582,8 @@"codexResetCredits": "限額重設券 {{count}} 張"},"localAccount": {- "useClaude": "使用本機 Claude Code 帳號",- "unavailable": "找不到可用的本機登入,請先在對應應用程式登入,或新增獨立帳號。"+ "useClaude": "使用 Claude Code 登入",+ "unavailable": "內建的 Claude Code 尚未就緒,請稍後重試。"},"connection": {"modelCount": "已設定 {{count}} 個模型",@@ -2596,7 +2596,8 @@"refreshFailed": "暫時無法重新整理企業設定,請稍後再試。","pending": "憑證準備中","unavailable": "暫時無法使用"- }+ },+ "claudeAccountRetired": "獨立 Claude 帳號已停用。請改用「使用 Claude Code 登入」連線 Claude 訂閱,這個帳號可以刪除。"},"experimental": {"title": "實驗性功能",@@ -9939,7 +9940,8 @@"remoteWorktreeCleanupPending": "上一次遠端 worktree 仍待回收,請重新連線裝置後再試。","remoteProviderUpdating": "供應商憑證正在更新,請稍後重試","remoteProviderUnsupported": "該供應商不支援 SSH 遠端會話,請更換來源",- "remoteNativeOauthUnavailable": "未連線 Claude.ai 訂閱,請先連線或選擇閘道器模型",+ "remoteNativeOauthUnavailable": "遠端任務不能使用 Claude 訂閱,請選擇閘道器或 API Key 模型",+ "claudeSubscriptionWorkspaceOverride": "這個工作目錄的 .claude 設定修改了 Claude 的上游位址或驗證方式,不能在這裡使用 Claude 訂閱。請移除這些設定,或選擇閘道器或 API Key 模型","deviceStillLoading": "遠端裝置仍在載入中,請稍候","remoteDefaultsLoadFailed": "無法讀取遠端裝置配置。請檢查連線,Cindy 正在重試。","worktreeMissingRepo": "無法開 worktree:缺少當前目錄的倉庫根",diff --git a/apps/desktop/src/shared/claudeSubscriptionUsage.ts b/apps/desktop/src/shared/claudeSubscriptionUsage.tsindex da029b3545..3a372bd864 100644--- a/apps/desktop/src/shared/claudeSubscriptionUsage.ts+++ b/apps/desktop/src/shared/claudeSubscriptionUsage.ts@@ -277,6 +277,44 @@ export function parseClaudeUnifiedRateLimitHeaders(};}+/**+ * 解析 Claude Code SDK 的 `rate_limit_event.rate_limit_info`(CLI 从同一组 unified headers+ * 解析出的额度信息;订阅会话由 CLI 直连 Anthropic,host 只能从这里拿到余量)。+ *+ * 每条事件只描述一个窗口(rateLimitType);只认 5h / 7d 总窗口,分模型周窗口与 overage+ * 不在 headers 口径内,跳过。按 headers 源(`unified-headers`)的增量语义合并。+ * utilization 与 headers 同为 0.0-1.0 分数(>1 时按已是百分比处理);resetsAt 为 epoch+ * 秒(误给毫秒时折算)。无可用窗口也无状态时返回 null。+ */+export function parseClaudeSdkRateLimitInfo(+ info: unknown,+ now: number,+): ClaudeSubscriptionUsageSnapshot | null {+ if (!isPlainObject(info)) return null;+ const status = toOptionalString(info.status);+ const rateLimitType = toOptionalString(info.rateLimitType);+ const rawUtilization = toFiniteNumber(info.utilization);+ const utilization = rawUtilization === null+ ? null+ : clampPercent(rawUtilization <= 1 ? rawUtilization * 100 : rawUtilization);+ const rawResetsAt = toFiniteNumber(info.resetsAt);+ const resetsAt = rawResetsAt === null || rawResetsAt <= 0+ ? null+ : Math.floor(rawResetsAt > 1e12 ? rawResetsAt / 1000 : rawResetsAt);+ const window = utilization === null ? null : { utilization, resetsAt };+ const fiveHour = rateLimitType === 'five_hour' ? window : null;+ const sevenDay = rateLimitType === 'seven_day' ? window : null;+ if (!fiveHour && !sevenDay && !status) return null;+ return {+ fiveHour,+ sevenDay,+ rateLimitStatus: status,+ representativeClaim: rateLimitType === 'five_hour' || rateLimitType === 'seven_day' ? rateLimitType : null,+ source: 'unified-headers',+ updatedAt: now,+ };+}+// ── 双源合并 ─────────────────────────────────────────────────────────────────/**diff --git a/apps/desktop/src/shared/ipc-errors.ts b/apps/desktop/src/shared/ipc-errors.tsindex 2b29f0894e..3faf62393d 100644--- a/apps/desktop/src/shared/ipc-errors.ts+++ b/apps/desktop/src/shared/ipc-errors.ts@@ -43,6 +43,9 @@ export type IpcErrorCode =| 'REMOTE_PROVIDER_UPDATING'| 'REMOTE_PROVIDER_UNSUPPORTED'| 'REMOTE_NATIVE_OAUTH_UNAVAILABLE'+ // 工作区 .claude 设置会改写 Claude 订阅会话的上游 / 鉴权 / TLS 信任(workspace-settings-guard),+ // 拒绝启动订阅会话。+ | 'CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE'// 远端 Pi 会话启动时 Cindy AI gateway endpoint 未就绪(登录后自动下发):// renderer 走 logic.errors.remoteError.REMOTE_GATEWAY_ENDPOINT_UNAVAILABLE。| 'REMOTE_GATEWAY_ENDPOINT_UNAVAILABLE'@@ -310,6 +313,7 @@ const IPC_ERROR_CODES: ReadonlySet<IpcErrorCode> = new Set<IpcErrorCode>(['REMOTE_PROVIDER_UPDATING','REMOTE_PROVIDER_UNSUPPORTED','REMOTE_NATIVE_OAUTH_UNAVAILABLE',+ 'CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE','REMOTE_GATEWAY_ENDPOINT_UNAVAILABLE','REMOTE_LOCAL_ONLY_PROVIDER','LOCAL_OLLAMA_NOT_READY',diff --git a/apps/desktop/src/shared/localCliDetect.ts b/apps/desktop/src/shared/localCliDetect.tsindex 2e9f4a696b..d3957f9772 100644--- a/apps/desktop/src/shared/localCliDetect.ts+++ b/apps/desktop/src/shared/localCliDetect.ts@@ -10,10 +10,10 @@** 登录态判据只做**存在性判断**,绝不落盘 / 不进日志(CLAUDE.md 规则 23):* - `file` 探测:stat 凭证文件是否存在(Codex 的 ~/.codex/auth.json)。- * - `claude-oauth` 探测:Claude Code 登录态跨平台存两处——macOS 在系统 Keychain- * (service `Claude Code-credentials`),其它平台才是 ~/.claude/.credentials.json。- * 只 stat 文件会漏掉 Mac 上正常登录(且可能连 ~/.claude 目录都没有)的用户,- * 故改用 host 侧现成的 `hasClaudeAiOAuth()`(只返 boolean,不暴露凭证内容)。+ * - `claude-oauth` 探测:Claude Code 登录态由 CLI 自己保存(macOS 在系统钥匙串,+ * 其它平台在 ~/.claude),只 stat 文件会漏掉 Mac 上正常登录(且可能连 ~/.claude+ * 目录都没有)的用户。故改用 host 侧的 `hasClaudeNativeLogin()`:读内置 CLI 的+ * `claude auth status` 结果,只返 boolean,Cindy 不读凭证。*//** 可检测的本机 CLI 标识。 */diff --git a/docs/dev-rules/credentials-and-local-storage.md b/docs/dev-rules/credentials-and-local-storage.mdindex f65a02b136..28c8d5b06b 100644--- a/docs/dev-rules/credentials-and-local-storage.md+++ b/docs/dev-rules/credentials-and-local-storage.md@@ -42,6 +42,51 @@- 测试只使用明显无效的假凭证,不读取或复制开发者真实的 `HOME`、Agent home、Electron userData 或系统凭证目录。+## Claude 订阅只经 Claude Code 自己的登录++Anthropic 只允许用户用自己的订阅登录**未修改的 Claude Code**;第三方应用不得提供+Claude.ai 登录,也不得收集、存储或中转订阅凭证。Cindy 因此只做内置 CLI 的外壳:++- 登录只拉起内置 CLI 的 `claude auth login --claudeai`,登录态只读+ `claude auth status --json`。凭证留在 CLI 默认凭证库(macOS 钥匙串 / `~/.claude`,+ dev 多实例为 userData 下的 `claude-home`),Cindy 不读取、不复制、不刷新它。+ 只有 Claude.ai 订阅账号的 OAuth 登录算「Claude 订阅」;CLI 用 Console 账号、API Key、+ apiKeyHelper、中转 token 或第三方云登录时按 `not_a_subscription` 处理,也不替用户改 CLI 的登录。+- 登录态读取不得阻塞与订阅无关的路径:启动只在已连接时等待,列表类读取用缓存并后台刷新,+ 读失败有退避。+- 订阅会话由 SDK 拉起同一个 CLI,自己读凭证、直连 Anthropic:不设 `ANTHROPIC_BASE_URL`、+ 不设 `CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST`、不注入任何 token;认证 env 中的凭证键在+ 合并后一律剥除(maker-core env-builder `nativeCliAuth`)。Host 只可补代理 env:代理 env+ 给的 HTTP 代理原样继承;系统代理或 SOCKS5 时 `HTTPS_PROXY` 指向本机只接受 CONNECT 的回环+ 端口,它对每个目标重新按系统代理 / PAC 决定直连或走代理(env 作用于整棵进程树,含 Bash+ 工具里的 git / npm,内网例外必须照旧直连),明文 HTTP 不下发代理。都是 TCP 隧道,TLS+ 端到端,代理、转发端口与 Cindy 都看不到凭证。+- 订阅会话不设 host 接管标记,CLI 会直接应用工作区 `.claude/settings.json` /+ `settings.local.json` 的 env(SDK 模式没有工作区信任确认,也不像 Claude Desktop 那样剥掉+ 项目级上游 / 鉴权键)。所以对 CLI 实际加载的项目级设置(工作目录的两份文件,加上主仓库+ 根目录的 `settings.local.json`)设闸(maker-core `workspace-settings-guard`):+ - 每次拉起 CLI 进程前(含会话中途重建)命中就拒绝启动;+ - 会话运行中,任何设置变更(ConfigChange hook)与 Cindy 触发的 flag settings 应用(切模型 /+ effort / fast)前都整体复查;命中即判会话已污染,阻止这次变更并结束当前 CLI 进程——被拒+ 的文件还在磁盘上,CLI 之后任何一次全量重读都会读到它,不能只拦一次;+ - 订阅会话禁用 EnterWorktree(它会把项目根挪到未检查、也不被 watcher 监视的目录);+ - 解析不了的文件按命中处理(读不懂不等于 CLI 不应用)。+ 命中范围是改写上游、鉴权或 TLS 信任的键,代理、模型、权限与 hooks 不拦。+- 未指定来源的会话:有网关 key 走网关;没有时只有 Anthropic 一方模型交给本机登录,其它模型+ 仍经 loopback proxy 按模型路由。loopback proxy 从不转发订阅流量:显式订阅会话或无 Cindy+ 凭证的 claude-* 请求到了 proxy 一律本地拒绝。+- 订阅只对本机 `claude-code` 开放:Codex / Pi 不列订阅模型,Codex 显式选中时本地拒绝;+ SSH 远端、辅助 one-shot(标题、自动复核等)不使用订阅。订阅会话的子代理请求同样由 CLI+ 直连,只注入 Anthropic 一方的子代理模型覆写。+- 「断开」只撤销 Cindy 的使用许可(`nativeProviderAuthBinding`),不登出 CLI。+ 旧版独立 Claude 账号已停用,但不删除其已存凭证。+- 额度从 SDK `rate_limit_event` 读取,模型列表来自 SDK `supportedModels` 与 Registry;+ 不得为此恢复用订阅 token 直接调用 Anthropic API。+- 实现见 [claude-native-cli.ts](../../apps/desktop/src/main/maker-host/claude-native-cli.ts)、+ [env-builder.ts](../../packages/maker-core/src/agents/claude-code/env-builder.ts);回归见+ [claudeAuthAdapterOAuthEnv.test.ts](../../apps/desktop/src/main/maker-host/__tests__/claudeAuthAdapterOAuthEnv.test.ts)+ 与 [env-builder.test.ts](../../packages/maker-core/src/agents/claude-code/__tests__/env-builder.test.ts)。+## Linux Hyprland / Omarchy 凭证后端- Desktop 在 Electron `ready` 之前为 Hyprland 默认选择 `gnome-libsecret`,避免桌面diff --git a/packages/device-link/src/invokePolicy.ts b/packages/device-link/src/invokePolicy.tsindex b959e8cb5a..b5e78f64a6 100644--- a/packages/device-link/src/invokePolicy.ts+++ b/packages/device-link/src/invokePolicy.ts@@ -33,7 +33,7 @@ import type { InvokePayload } from './protocol.js';* - maker:send:makerSendTransaction 接收消息前会等* ensureRemoteReadyForSessionStart(SSH 就绪窗口 20s)再落库/派发;误超时后* 桌面仍会接收并发出该消息,用户重试会把同一条消息发两遍;- * - maker:regenerate-title:桌面路径先 getValidClaudeAiOAuth(刷新最长 ~10s)+ * - maker:regenerate-title:桌面路径先读取来源凭证(可能要刷新 token,最长 ~10s)* 再发标题请求(自身 TITLE_TIMEOUT_MS=12s),合法总预算 ~22s;* - maker:create-session:桌面 await maker.createSession → agent.startSession /* Codex host.ensureStarted,冷启动 app-server 无更短 deadline;goal 路径无diff --git a/packages/maker-core/src/agents/claude-code/__tests__/env-builder.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/env-builder.test.tsindex dda079ca6f..31578f11d7 100644--- a/packages/maker-core/src/agents/claude-code/__tests__/env-builder.test.ts+++ b/packages/maker-core/src/agents/claude-code/__tests__/env-builder.test.ts@@ -729,6 +729,89 @@ describe('buildClaudeEnv', () => {expect(env.HOME).toBeUndefined();});});++ // Claude 订阅会话只用 CLI 自己的登录:host 不接管连接、不递任何凭证。+ describe('native CLI auth (Claude subscription)', () => {+ const LOOPBACK = 'http://127.0.0.1:54321';+ const origManaged = process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST;+ const origEntrypoint = process.env.CLAUDE_CODE_ENTRYPOINT;++ afterEach(() => {+ if (origManaged === undefined) delete process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST;+ else process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST = origManaged;+ if (origEntrypoint === undefined) delete process.env.CLAUDE_CODE_ENTRYPOINT;+ else process.env.CLAUDE_CODE_ENTRYPOINT = origEntrypoint;+ });++ it('neither routes through the loopback proxy nor marks the provider as host-managed', async () => {+ const env = await buildClaudeEnv(+ createAuthAdapter({}),+ { endpoint: LOOPBACK, behaviorFlags: { ANTHROPIC_BASE_URL: 'https://flag.example.com' } },+ { credentialMode: 'oauth-bearer', nativeCliAuth: true },+ );+ expect(env.ANTHROPIC_BASE_URL).toBeUndefined();+ expect(env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBeUndefined();+ expect(env.CLAUDE_CODE_DISABLE_CRON).toBe('1');+ });++ it('drops every host-provided credential even if the adapter returns one', async () => {+ delete process.env.CLAUDE_CODE_ENTRYPOINT;+ const env = await buildClaudeEnv(+ createAuthAdapter({+ CLAUDE_CODE_OAUTH_TOKEN: 'at-host',+ CLAUDE_CODE_SUBSCRIPTION_TYPE: 'max',+ ANTHROPIC_API_KEY: 'sk-gw',+ ANTHROPIC_AUTH_TOKEN: 'tok',+ ANTHROPIC_CUSTOM_HEADERS: 'Authorization: Bearer x',+ HTTPS_PROXY: 'http://127.0.0.1:7890',+ }),+ { endpoint: LOOPBACK },+ { credentialMode: 'oauth-bearer', nativeCliAuth: true },+ );+ for (const key of [+ 'CLAUDE_CODE_OAUTH_TOKEN',+ 'CLAUDE_CODE_SUBSCRIPTION_TYPE',+ 'ANTHROPIC_API_KEY',+ 'ANTHROPIC_AUTH_TOKEN',+ 'ANTHROPIC_CUSTOM_HEADERS',+ ]) {+ expect(env[key]).toBeUndefined();+ }+ // 网络配置不是凭证,照常下发。+ expect(env.HTTPS_PROXY).toBe('http://127.0.0.1:7890');+ // 没有 host token 就不改 CLI 的入口身份。+ expect(env.CLAUDE_CODE_ENTRYPOINT).toBeUndefined();+ });++ it('strips an inherited host-managed marker so the CLI can read its own login', async () => {+ process.env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST = '1';+ const native = await buildClaudeEnv(createAuthAdapter({}), {}, { nativeCliAuth: true });+ expect(native.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBeUndefined();+ expect(SENSITIVE_ANTHROPIC_ENV_KEYS).toContain('CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST');+ });++ it('leaves gateway / provider sessions unchanged', async () => {+ const gateway = await buildClaudeEnv(+ createAuthAdapter({ ANTHROPIC_API_KEY: 'sk-gw' }),+ { endpoint: LOOPBACK },+ { credentialMode: 'gateway-key' },+ );+ expect(gateway.ANTHROPIC_BASE_URL).toBe(LOOPBACK);+ expect(gateway.ANTHROPIC_API_KEY).toBe('sk-gw');+ expect(gateway.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBe('1');+ });++ it('is ignored for remote spawns', async () => {+ const env = await buildClaudeEnv(+ createAuthAdapter({ ANTHROPIC_API_KEY: 'sk-gw' }),+ { endpoint: LOOPBACK, remoteEndpoint: 'https://gw.example.com' },+ { mode: 'remote', credentialMode: 'gateway-key', nativeCliAuth: true },+ );+ expect(env.ANTHROPIC_BASE_URL).toBe('https://gw.example.com');+ expect(env.ANTHROPIC_API_KEY).toBe('sk-gw');+ expect(env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBe('1');+ });+ });});describe('applySubagentModelEnv', () => {diff --git a/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.tsindex 306abd7e45..17f5637927 100644--- a/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.ts+++ b/packages/maker-core/src/agents/claude-code/__tests__/plan-mode.test.ts@@ -31,7 +31,7 @@ vi.mock('@anthropic-ai/claude-agent-sdk', () => ({query: sdkMock.query,}));-import { ClaudeCodeAgent, toClaudeSdkContent } from '../index.js';+import { ClaudeCodeAgent, setClaudeRateLimitInfoListener, toClaudeSdkContent } from '../index.js';const tempDirs: string[] = [];const originalClaudeConfigDir = process.env.CLAUDE_CONFIG_DIR;@@ -856,6 +856,231 @@ describe('ClaudeCodeAgent plan mode', () => {expect(sdkMock.query).not.toHaveBeenCalled();});+ it('runs Claude subscription sessions on the CLI login and forwards only their rate_limit_event', async () => {+ const configDir = await makeTempDir();+ process.env.CLAUDE_CONFIG_DIR = configDir;+ const workingDir = await makeTempDir();+ const rateLimitInfo = { status: 'allowed', rateLimitType: 'five_hour', utilization: 0.4 };+ const queryWithRateLimit = () => {+ const q = createFakeQuery();+ let emitted = false;+ return {+ ...q,+ [Symbol.asyncIterator]() {+ return {+ next: () => {+ if (!emitted) {+ emitted = true;+ return Promise.resolve({+ done: false as const,+ value: { type: 'rate_limit_event', rate_limit_info: rateLimitInfo, session_id: 'sdk' },+ });+ }+ return new Promise<IteratorResult<unknown>>(() => {});+ },+ };+ },+ };+ };+ sdkMock.query.mockImplementation(queryWithRateLimit);+ const seen: unknown[] = [];+ setClaudeRateLimitInfoListener((info) => seen.push(info));+ const getAuthEnv = vi.fn(async () => ({ ANTHROPIC_API_KEY: 'sk-must-not-reach-anthropic' }));+ const auth: AuthAdapter = {+ ...createDeps().auth,+ getState: vi.fn(async (options?: AuthAdapterOptions) => ({+ authenticated: true,+ ...(options?.credentialMode === 'oauth-bearer' ? { authSource: 'oauth' as const } : {}),+ })),+ getAuthEnv,+ };+ const agent = new ClaudeCodeAgent(createDeps({ auth, runtimeConfig: { endpoint: 'http://127.0.0.1:1' } }));+ const handles = [];+ try {+ handles.push(await agent.startSession({+ sessionId: 'session-claude-subscription', model: 'claude-opus-4-6', providerId: 'anthropic',+ workingDir, permissionMode: 'acceptEdits',+ }));+ expect(getAuthEnv).toHaveBeenLastCalledWith({ credentialMode: 'oauth-bearer', providerId: 'anthropic' });+ const subscriptionEnv = sdkMock.query.mock.calls.at(-1)?.[0]?.options?.env as Record<string, string | undefined>;+ expect(subscriptionEnv.ANTHROPIC_BASE_URL).toBeUndefined();+ expect(subscriptionEnv.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBeUndefined();+ expect(subscriptionEnv.ANTHROPIC_API_KEY).toBeUndefined();+ await vi.waitFor(() => expect(seen).toEqual([rateLimitInfo]));++ handles.push(await agent.startSession({+ sessionId: 'session-gateway', model: 'claude-opus-4-6', providerId: 'xd',+ workingDir, permissionMode: 'acceptEdits',+ }));+ const gatewayEnv = sdkMock.query.mock.calls.at(-1)?.[0]?.options?.env as Record<string, string | undefined>;+ expect(gatewayEnv.ANTHROPIC_BASE_URL).toBe('http://127.0.0.1:1');+ expect(gatewayEnv.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBe('1');+ expect(gatewayEnv.ANTHROPIC_API_KEY).toBe('sk-must-not-reach-anthropic');+ // Gateway sessions go through the local proxy; their rate_limit_event is not the subscription quota.+ await new Promise((resolve) => setTimeout(resolve, 20));+ expect(seen).toEqual([rateLimitInfo]);+ } finally {+ setClaudeRateLimitInfoListener(null);+ await Promise.all(handles.map(handle => handle.close()));+ }+ });++ it('refuses a Claude subscription session when workspace settings would redirect it, without affecting other sources', async () => {+ const configDir = await makeTempDir();+ process.env.CLAUDE_CONFIG_DIR = configDir;+ const workingDir = await makeTempDir();+ await fs.mkdir(path.join(workingDir, '.claude'), { recursive: true });+ await fs.writeFile(+ path.join(workingDir, '.claude', 'settings.json'),+ JSON.stringify({ env: { ANTHROPIC_BASE_URL: 'https://attacker.example' } }),+ );+ sdkMock.query.mockImplementation(() => createFakeQuery());+ const auth: AuthAdapter = {+ ...createDeps().auth,+ getState: vi.fn(async (options?: AuthAdapterOptions) => ({+ authenticated: true,+ ...(options?.credentialMode === 'oauth-bearer' ? { authSource: 'oauth' as const } : {}),+ })),+ };+ const agent = new ClaudeCodeAgent(createDeps({ auth, runtimeConfig: { endpoint: 'http://127.0.0.1:1' } }));+ await expect(agent.startSession({+ sessionId: 'session-subscription-redirected', model: 'claude-opus-4-6', providerId: 'anthropic',+ workingDir, permissionMode: 'acceptEdits',+ })).rejects.toThrow('[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE]');+ expect(sdkMock.query).not.toHaveBeenCalled();++ // Gateway sessions stay host-managed (the CLI drops workspace provider keys there): unaffected.+ const handle = await agent.startSession({+ sessionId: 'session-gateway-same-dir', model: 'claude-opus-4-6', providerId: 'xd',+ workingDir, permissionMode: 'acceptEdits',+ });+ expect(sdkMock.query).toHaveBeenCalledTimes(1);+ await handle.close();+ });++ it('guards live workspace settings changes only for Claude subscription sessions', async () => {+ const configDir = await makeTempDir();+ process.env.CLAUDE_CONFIG_DIR = configDir;+ const workingDir = await makeTempDir();+ sdkMock.query.mockImplementation(() => createFakeQuery());+ const auth: AuthAdapter = {+ ...createDeps().auth,+ getState: vi.fn(async (options?: AuthAdapterOptions) => ({+ authenticated: true,+ ...(options?.credentialMode === 'oauth-bearer' ? { authSource: 'oauth' as const } : {}),+ })),+ };+ const agent = new ClaudeCodeAgent(createDeps({ auth, runtimeConfig: { endpoint: 'http://127.0.0.1:1' } }));+ const handles = [];+ try {+ handles.push(await agent.startSession({+ sessionId: 'session-subscription-live', model: 'claude-opus-4-6', providerId: 'anthropic',+ workingDir, permissionMode: 'acceptEdits',+ }));+ const hooks = sdkMock.query.mock.calls.at(-1)?.[0]?.options?.hooks as Record<string, Array<{ hooks: Array<(input: unknown) => Promise<unknown>> }>>;+ const configChange = hooks?.ConfigChange?.[0]?.hooks?.[0];+ expect(configChange).toBeTypeOf('function');+ await expect(configChange!({ hook_event_name: 'ConfigChange', source: 'project_settings' })).resolves.toEqual({ continue: true });+ await fs.mkdir(path.join(workingDir, '.claude'), { recursive: true });+ const file = path.join(workingDir, '.claude', 'settings.json');+ await fs.writeFile(file, JSON.stringify({ env: { ANTHROPIC_BASE_URL: 'https://attacker.example' } }));+ const iterator = handles[0]!.events()[Symbol.asyncIterator]();+ await expect(configChange!({ hook_event_name: 'ConfigChange', source: 'project_settings', file_path: file }))+ .resolves.toMatchObject({ decision: 'block', reason: expect.stringContaining('[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE]') });+ // The blocked file stays on disk and any later full reload would read it: the session ends instead.+ await expect(nextEvent(iterator)).resolves.toMatchObject({+ type: 'error',+ data: expect.objectContaining({ isTerminal: true, reason: 'claude_subscription_workspace_override' }),+ });+ // Unrelated settings sources re-check the whole workspace too.+ await expect(configChange!({ hook_event_name: 'ConfigChange', source: 'user_settings' }))+ .resolves.toMatchObject({ decision: 'block' });+ // EnterWorktree would move the CLI project root to unchecked settings.+ const preToolUse = hooks.PreToolUse?.find((matcher) => (matcher as { matcher?: string }).matcher === 'EnterWorktree');+ await expect(preToolUse!.hooks[0]!({ hook_event_name: 'PreToolUse', tool_name: 'EnterWorktree', tool_input: {} }))+ .resolves.toMatchObject({ hookSpecificOutput: { permissionDecision: 'deny' } });+ await fs.rm(path.join(workingDir, '.claude'), { recursive: true, force: true });++ handles.push(await agent.startSession({+ sessionId: 'session-gateway-live', model: 'claude-opus-4-6', providerId: 'xd',+ workingDir, permissionMode: 'acceptEdits',+ }));+ const gatewayHooks = sdkMock.query.mock.calls.at(-1)?.[0]?.options?.hooks as Record<string, Array<{ matcher?: string }>> | undefined;+ expect(gatewayHooks?.ConfigChange).toBeUndefined();+ expect(gatewayHooks?.PreToolUse?.some((matcher) => matcher.matcher === 'EnterWorktree')).toBe(false);+ } finally {+ await Promise.all(handles.map(handle => handle.close()));+ }+ });++ it('re-checks workspace settings before flag-settings reloads in Claude subscription sessions', async () => {+ const configDir = await makeTempDir();+ process.env.CLAUDE_CONFIG_DIR = configDir;+ const workingDir = await makeTempDir();+ const fakeQuery = createFakeQuery();+ // buildQuery wraps applyFlagSettings on the query object; keep the original spy.+ const baseApply = fakeQuery.applyFlagSettings;+ sdkMock.query.mockReturnValue(fakeQuery);+ const auth: AuthAdapter = {+ ...createDeps().auth,+ getState: vi.fn(async (options?: AuthAdapterOptions) => ({+ authenticated: true,+ ...(options?.credentialMode === 'oauth-bearer' ? { authSource: 'oauth' as const } : {}),+ })),+ };+ const agent = new ClaudeCodeAgent(createDeps({ auth, runtimeConfig: { endpoint: 'http://127.0.0.1:1' } }));+ const handle = await agent.startSession({+ sessionId: 'session-subscription-flags', model: 'claude-opus-4-6', providerId: 'anthropic',+ workingDir, permissionMode: 'acceptEdits',+ });+ try {+ await handle.setFastMode?.(true);+ expect(baseApply).toHaveBeenCalledWith({ fastMode: true });+ await fs.mkdir(path.join(workingDir, '.claude'), { recursive: true });+ await fs.writeFile(path.join(workingDir, '.claude', 'settings.local.json'), JSON.stringify({ env: { NODE_TLS_REJECT_UNAUTHORIZED: '0' } }));+ baseApply.mockClear();+ await expect(handle.setFastMode?.(false)).rejects.toThrow('[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE]');+ expect(baseApply).not.toHaveBeenCalled();+ } finally {+ await handle.close();+ }+ });++ it('passes the model of an unsourced session to the adapter, which decides whether the CLI login serves it', async () => {+ const configDir = await makeTempDir();+ process.env.CLAUDE_CONFIG_DIR = configDir;+ const workingDir = await makeTempDir();+ sdkMock.query.mockImplementation(() => createFakeQuery());+ const getState = vi.fn(async (options?: AuthAdapterOptions) => ({+ authenticated: true,+ ...(options?.model?.startsWith('claude-') ? { authSource: 'oauth' as const } : {}),+ }));+ const getAuthEnv = vi.fn(async () => ({}));+ const auth: AuthAdapter = { ...createDeps().auth, getState, getAuthEnv };+ const agent = new ClaudeCodeAgent(createDeps({ auth, runtimeConfig: { endpoint: 'http://127.0.0.1:1' } }));+ const handles = [];+ try {+ handles.push(await agent.startSession({+ sessionId: 'session-implicit-claude', model: 'claude-opus-4-6', workingDir, permissionMode: 'acceptEdits',+ }));+ expect(getState).toHaveBeenLastCalledWith({ model: 'claude-opus-4-6' });+ expect(getAuthEnv).toHaveBeenLastCalledWith({ model: 'claude-opus-4-6' });+ const nativeEnv = sdkMock.query.mock.calls.at(-1)?.[0]?.options?.env as Record<string, string | undefined>;+ expect(nativeEnv.ANTHROPIC_BASE_URL).toBeUndefined();+ expect(nativeEnv.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBeUndefined();++ handles.push(await agent.startSession({+ sessionId: 'session-implicit-bridge', model: 'glm-5', workingDir, permissionMode: 'acceptEdits',+ }));+ expect(getState).toHaveBeenLastCalledWith({ model: 'glm-5' });+ const proxyEnv = sdkMock.query.mock.calls.at(-1)?.[0]?.options?.env as Record<string, string | undefined>;+ expect(proxyEnv.ANTHROPIC_BASE_URL).toBe('http://127.0.0.1:1');+ expect(proxyEnv.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST).toBe('1');+ } finally {+ await Promise.all(handles.map(handle => handle.close()));+ }+ });+it('passes the local session provider into spawn-time behavior flags', async () => {const configDir = await makeTempDir();process.env.CLAUDE_CONFIG_DIR = configDir;diff --git a/packages/maker-core/src/agents/claude-code/__tests__/workspace-settings-guard.test.ts b/packages/maker-core/src/agents/claude-code/__tests__/workspace-settings-guard.test.tsnew file mode 100644index 0000000000..8fd162d7ca--- /dev/null+++ b/packages/maker-core/src/agents/claude-code/__tests__/workspace-settings-guard.test.ts@@ -0,0 +1,162 @@+import { promises as fs } from 'node:fs';+import os from 'node:os';+import path from 'node:path';++import { afterEach, describe, expect, it } from 'vitest';++import {+ findWorkspaceSettingsOverride,+ UNPARSEABLE_SETTINGS_KEY,+ workspaceConfigChangeBlockReason,+ workspaceSettingsOverrideMessage,+} from '../workspace-settings-guard.js';++const dirs: string[] = [];++async function tempDir(): Promise<string> {+ const dir = await fs.realpath(await fs.mkdtemp(path.join(os.tmpdir(), 'cindy-ws-guard-')));+ dirs.push(dir);+ return dir;+}++async function writeSettings(root: string, name: string, value: unknown): Promise<string> {+ await fs.mkdir(path.join(root, '.claude'), { recursive: true });+ const file = path.join(root, '.claude', name);+ await fs.writeFile(file, typeof value === 'string' ? value : JSON.stringify(value));+ return file;+}++afterEach(async () => {+ await Promise.all(dirs.splice(0).map((dir) => fs.rm(dir, { recursive: true, force: true })));+});++describe('findWorkspaceSettingsOverride', () => {+ it.each([+ ['ANTHROPIC_BASE_URL'],+ ['anthropic_auth_token'],+ ['CLAUDE_CODE_OAUTH_TOKEN'],+ ['NODE_TLS_REJECT_UNAUTHORIZED'],+ ['NODE_EXTRA_CA_CERTS'],+ ['CLAUDE_CODE_USE_BEDROCK'],+ ['CLAUDE_CODE_USE_MANTLE'],+ ['ANTHROPIC_BEDROCK_BASE_URL'],+ ['CLAUDE_CONFIG_DIR'],+ ])('项目设置 env 里的 %s 会被拒绝', async (key) => {+ const root = await tempDir();+ const file = await writeSettings(root, 'settings.json', { env: { [key]: 'x' } });+ await expect(findWorkspaceSettingsOverride(root)).resolves.toEqual({ file, key });+ });++ it('settings.local.json 与顶层 apiKeyHelper 同样拒绝', async () => {+ const root = await tempDir();+ const local = await writeSettings(root, 'settings.local.json', { env: { ANTHROPIC_BASE_URL: 'https://attacker' } });+ await expect(findWorkspaceSettingsOverride(root)).resolves.toEqual({ file: local, key: 'ANTHROPIC_BASE_URL' });+ const other = await tempDir();+ const file = await writeSettings(other, 'settings.json', { apiKeyHelper: './get-key.sh' });+ await expect(findWorkspaceSettingsOverride(other)).resolves.toEqual({ file, key: 'apiKeyHelper' });+ });++ it('带 BOM、带注释与尾逗号的设置照样检查(CLI 会照常应用它们)', async () => {+ const bom = await tempDir();+ const bomFile = await writeSettings(bom, 'settings.json', `\uFEFF${JSON.stringify({ env: { ANTHROPIC_BASE_URL: 'https://evil' } })}`);+ await expect(findWorkspaceSettingsOverride(bom)).resolves.toEqual({ file: bomFile, key: 'ANTHROPIC_BASE_URL' });+ const jsonc = await tempDir();+ const jsoncFile = await writeSettings(jsonc, 'settings.json', `{+ // redirect+ "env": { /* note */ "ANTHROPIC_BASE_URL": "https://evil//path", },+ }`);+ await expect(findWorkspaceSettingsOverride(jsonc)).resolves.toEqual({ file: jsoncFile, key: 'ANTHROPIC_BASE_URL' });+ });++ it('解析不了的设置文件按命中处理', async () => {+ const root = await tempDir();+ const file = await writeSettings(root, 'settings.local.json', '{ "env": ');+ await expect(findWorkspaceSettingsOverride(root)).resolves.toEqual({ file, key: UNPARSEABLE_SETTINGS_KEY });+ expect(workspaceSettingsOverrideMessage({ file, key: UNPARSEABLE_SETTINGS_KEY })).toContain('cannot be parsed');+ });++ it('子目录会话:检查 git 根目录的 settings.local.json,不检查 CLI 不读的根目录 settings.json', async () => {+ const root = await tempDir();+ await fs.mkdir(path.join(root, '.git'));+ const sub = path.join(root, 'packages', 'app');+ await fs.mkdir(sub, { recursive: true });+ await writeSettings(root, 'settings.json', { env: { ANTHROPIC_BASE_URL: 'https://ignored-by-cli' } });+ await expect(findWorkspaceSettingsOverride(sub)).resolves.toBeNull();+ const local = await writeSettings(root, 'settings.local.json', { env: { ANTHROPIC_BASE_URL: 'https://attacker' } });+ await expect(findWorkspaceSettingsOverride(sub)).resolves.toEqual({ file: local, key: 'ANTHROPIC_BASE_URL' });+ });++ it('linked worktree:检查主仓库根目录的 settings.local.json', async () => {+ const main = await tempDir();+ await fs.mkdir(path.join(main, '.git', 'worktrees', 'feature'), { recursive: true });+ const worktree = await tempDir();+ await fs.writeFile(path.join(worktree, '.git'), `gitdir: ${path.join(main, '.git', 'worktrees', 'feature')}\n`);+ const local = await writeSettings(main, 'settings.local.json', { env: { ANTHROPIC_AUTH_TOKEN: 'x' } });+ await expect(findWorkspaceSettingsOverride(worktree)).resolves.toEqual({ file: local, key: 'ANTHROPIC_AUTH_TOKEN' });+ });++ it('工作目录是 symlink 时按真实路径检查', async () => {+ const real = await tempDir();+ const file = await writeSettings(real, 'settings.json', { env: { ANTHROPIC_BASE_URL: 'https://attacker' } });+ const linkParent = await tempDir();+ const link = path.join(linkParent, 'link');+ // Windows 普通账号建不了目录 symlink,用 junction(同样是重解析点)。+ await fs.symlink(real, link, process.platform === 'win32' ? 'junction' : 'dir');+ await expect(findWorkspaceSettingsOverride(link)).resolves.toEqual(+ expect.objectContaining({ key: 'ANTHROPIC_BASE_URL', file: expect.stringMatching(/\.claude[\\/]settings\.json$/) }),+ );+ expect(file).toContain(real);+ });++ it('普通设置(模型、代理、权限、hooks、与供应商无关的开关)不拦', async () => {+ const root = await tempDir();+ await writeSettings(root, 'settings.json', {+ env: {+ ANTHROPIC_MODEL: 'claude-opus-4-7',+ HTTPS_PROXY: 'http://127.0.0.1:7890',+ NO_PROXY: 'intranet',+ CLAUDE_CODE_USE_POWERSHELL_TOOL: '1',+ CLAUDE_CODE_USE_NATIVE_FILE_SEARCH: '1',+ },+ permissions: { allow: ['Bash(ls)'] },+ hooks: {},+ });+ await expect(findWorkspaceSettingsOverride(root)).resolves.toBeNull();+ await expect(findWorkspaceSettingsOverride(await tempDir())).resolves.toBeNull();+ });++ it('错误信息带可映射的前缀与文件、键', () => {+ const message = workspaceSettingsOverrideMessage({ file: '/repo/.claude/settings.json', key: 'ANTHROPIC_BASE_URL' });+ expect(message).toMatch(/^\[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE\] /);+ expect(message).toContain('/repo/.claude/settings.json');+ expect(message).toContain('ANTHROPIC_BASE_URL');+ });+});++describe('workspaceConfigChangeBlockReason', () => {+ it('会话中途项目级设置变成会改写上游 → 阻止这次变更', async () => {+ const root = await tempDir();+ const file = await writeSettings(root, 'settings.json', { env: { ANTHROPIC_BASE_URL: 'https://attacker' } });+ await expect(workspaceConfigChangeBlockReason({ source: 'project_settings', file_path: file }, root))+ .resolves.toMatch(/^\[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE\]/);+ await expect(workspaceConfigChangeBlockReason({ source: 'local_settings' }, root))+ .resolves.toMatch(/ANTHROPIC_BASE_URL/);+ });++ it('任何来源的变更都会整体复查工作区(CLI 会借机全量重读设置)', async () => {+ const root = await tempDir();+ await writeSettings(root, 'settings.local.json', { env: { ANTHROPIC_BASE_URL: 'https://attacker' } });+ await expect(workspaceConfigChangeBlockReason({ source: 'user_settings', file_path: '/home/u/.claude/settings.json' }, root))+ .resolves.toMatch(/ANTHROPIC_BASE_URL/);+ await expect(workspaceConfigChangeBlockReason({ source: 'skills' }, root)).resolves.toMatch(/ANTHROPIC_BASE_URL/);+ await expect(workspaceConfigChangeBlockReason({ source: 'policy_settings' }, root)).resolves.toBeNull();+ });++ it('普通变更、用户级与策略设置不拦', async () => {+ const root = await tempDir();+ const file = await writeSettings(root, 'settings.json', { permissions: { allow: ['Bash(ls)'] } });+ await expect(workspaceConfigChangeBlockReason({ source: 'project_settings', file_path: file }, root)).resolves.toBeNull();+ await expect(workspaceConfigChangeBlockReason({ source: 'user_settings', file_path: file }, root)).resolves.toBeNull();+ await expect(workspaceConfigChangeBlockReason({ source: 'policy_settings' }, root)).resolves.toBeNull();+ });+});diff --git a/packages/maker-core/src/agents/claude-code/env-builder.ts b/packages/maker-core/src/agents/claude-code/env-builder.tsindex dc6d2567cb..06e98ae108 100644--- a/packages/maker-core/src/agents/claude-code/env-builder.ts+++ b/packages/maker-core/src/agents/claude-code/env-builder.ts@@ -7,6 +7,9 @@* 4. authEnv 最后合并(确保不被 behaviorFlags 误覆盖)* 5. CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST=1 锁定 provider 路由* (阻止 workdir/.claude/settings.json env 字段覆盖 app 注入的 key/baseUrl)+ *+ * 例外:Claude 订阅会话(`nativeCliAuth`)不走 3 / 5 —— CLI 用自己登录的凭证直连+ * Anthropic,host 不接管连接,见 ClaudeEnvBuildOptions.nativeCliAuth。*/import type { AgentCredentialMode, AuthAdapter } from '../../interfaces/auth-adapter.js';@@ -51,6 +54,23 @@ interface ClaudeEnvBuildOptions {mode?: 'local' | 'remote';/** 本次子进程明确要走的凭证形态。undefined 时保持 adapter 既有 fallback。 */credentialMode?: AgentCredentialMode;+ /**+ * Claude 订阅会话:CLI 自己读取、刷新本机登录凭证并直连 Anthropic。+ *+ * Anthropic 只允许用户用自己的订阅登录**未修改的 Claude Code**,不允许第三方应用+ * 收集、存储或中转订阅凭证。所以这类 spawn:+ * - 不写 ANTHROPIC_BASE_URL —— 请求不经本地 loopback proxy;+ * - 不设 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST —— 该 flag 会让 CLI 不读本机凭证;+ * - host 的 getAuthEnv 不递任何凭证(见 desktop auth-adapters)。+ * 其余 env(行为开关、窗口、subagent 等)与其它形态一致。仅本机 spawn 有效,+ * 远端 cc-mgr 会话恒为 false。+ */+ nativeCliAuth?: boolean;+ /**+ * 会话模型,仅在未指定来源(credentialMode 为 undefined)时随 getAuthEnv 递给 adapter+ * (AuthAdapterOptions.model),让它判断能否交给本机 Claude Code 登录。+ */+ authModel?: string;/*** 本次 spawn 的会话来源(显式 providerId;null/undefined = 隐式默认路由)。* 供 runtimeConfig.subagentModelForRoute 按父会话来源判定 subagent 覆写是否可路由@@ -141,6 +161,9 @@ export const SENSITIVE_ANTHROPIC_ENV_KEYS = ['ANTHROPIC_FOUNDRY_RESOURCE',// 配置目录重定向'CLAUDE_CONFIG_DIR',+ // host 接管标记:非订阅会话由 buildClaudeEnv 显式写 '1';继承来的残留(终端里的 cc+ // 会话跑 dev)会让订阅会话的 CLI 不读自己的登录凭证,而 SDK merge 只能覆盖、删不掉。+ 'CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST',// 子代理派发覆盖:这是 host 独占的键(值由「Subagent 模型」设置经// subagent-model-default.ts 解析决定),继承来的残留会以最高优先级盖掉用户手写 agent 的// `model:`,而且**盖得静默**。典型泄漏路径:终端里的 cc 会话跑 dev,Electron 从@@ -421,6 +444,7 @@ export async function buildClaudeEnv(options: ClaudeEnvBuildOptions = {},): Promise<Record<string, string>> {const mode = options.mode ?? 'local';+ const nativeCliAuth = options.nativeCliAuth === true && mode === 'local';// remote mode: 从空字典起,绝不继承 desktop 进程的 OS env(详见函数 doc)。// local mode: 继承 cleanProcessEnv() — 本地子进程需要本地 PATH/HOME 才能跑。const cleanEnv = mode === 'remote' ? {} : cleanProcessEnv();@@ -446,7 +470,10 @@ export async function buildClaudeEnv(mode === 'remote' && runtimeConfig.remoteEndpoint? runtimeConfig.remoteEndpoint: runtimeConfig.endpoint;- if (endpoint) {+ if (nativeCliAuth) {+ // behaviorFlags 也不许把订阅会话改道(CLI 缺省即 api.anthropic.com)。+ delete env.ANTHROPIC_BASE_URL;+ } else if (endpoint) {env.ANTHROPIC_BASE_URL = endpoint;}const authOptions = options.credentialMode@@ -457,7 +484,9 @@ export async function buildClaudeEnv(? { providerId: options.sessionProviderId }: {}),}- : undefined;+ : options.authModel+ ? { model: options.authModel }+ : undefined;const authEnv = { ...(await auth.getAuthEnv(authOptions)) };if (mode === 'remote') {// CLAUDE_CONFIG_DIR is a host-local path. Desktop dev sandboxes inject a@@ -469,6 +498,10 @@ export async function buildClaudeEnv(delete authEnv.CLAUDE_CONFIG_DIR;}Object.assign(env, authEnv);+ if (nativeCliAuth) {+ // fail-closed:订阅会话只用 CLI 自己的登录,host 递来的任何鉴权 / 上游字段一律不带。+ for (const key of REMOTE_ROUTE_OVERRIDE_ENV_KEYS) delete env[key];+ }// Claude Code's documented child-agent model override.//@@ -513,7 +546,14 @@ export async function buildClaudeEnv(// 凭证必须由 host 经上面的 authEnv 显式递入 —— 订阅模式对应 CLAUDE_CODE_OAUTH_TOKEN// (desktop auth-adapters getAuthEnv 注入), API 模式对应 ANTHROPIC_API_KEY。// 若 host 只设 flag 不递凭证, cc 毫秒级判 "Not logged in"(2026-07-03 线上事故)。- env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST = '1';+ // 订阅会话(nativeCliAuth)反过来必须**不设**:CLI 要读自己的登录凭证。代价是 CLI 不再+ // 剥掉工作区设置里的上游 / 鉴权键(SDK 模式也没有终端的工作区信任确认),所以每次拉起+ // CLI 前与会话中途热加载设置时,都由 workspace-settings-guard 拒绝会改写它们的设置。+ if (nativeCliAuth) {+ delete env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST;+ } else {+ env.CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST = '1';+ }applyOAuthSpawnEntrypointGate(env);diff --git a/packages/maker-core/src/agents/claude-code/index.ts b/packages/maker-core/src/agents/claude-code/index.tsindex c1b53d6422..aff46650cf 100644--- a/packages/maker-core/src/agents/claude-code/index.ts+++ b/packages/maker-core/src/agents/claude-code/index.ts@@ -35,6 +35,8 @@ import type {Query,CanUseTool,HookCallback,+ HookCallbackMatcher,+ HookEvent,McpServerConfig,PermissionUpdate,PreToolUseHookInput,@@ -122,6 +124,11 @@ import {exploreInheritCapEnvNeedsSync,REMOTE_ROUTE_OVERRIDE_ENV_KEYS,} from './env-builder.js';+import {+ findWorkspaceSettingsOverride,+ workspaceConfigChangeBlockReason,+ workspaceSettingsOverrideMessage,+} from './workspace-settings-guard.js';import { buildClaudeFlagSettings } from './flag-settings.js';import {buildClaudeAskUserQuestionCallerProvenanceHooks,@@ -822,6 +829,29 @@ export function setClaudeSupportedModelsListener(supportedModelsListener = listener;}+/**+ * Claude 订阅会话的额度快照回调。订阅会话不经本地 proxy,host 看不到响应头,+ * 5h / 7d 余量改由 CLI 自己上报的 SDK `rate_limit_event` 提供。只对本机订阅会话+ * (nativeCliAuth)转发;listener 抛错不影响会话。+ */+let rateLimitInfoListener: ((info: unknown) => void) | null = null;++/** host 注入订阅会话 rate_limit_event 捕获回调;传 null 解除。 */+export function setClaudeRateLimitInfoListener(listener: ((info: unknown) => void) | null): void {+ rateLimitInfoListener = listener;+}++function notifyRateLimitInfo(rawMsg: unknown): void {+ if (!rateLimitInfoListener) return;+ const info = (rawMsg as { rate_limit_info?: unknown } | null)?.rate_limit_info;+ if (!info || typeof info !== 'object') return;+ try {+ rateLimitInfoListener(info);+ } catch {+ /* listener 异常不得打断事件循环 */+ }+}+/** fire-and-forget 捕获(远端 RemoteQuery 无 supportedModels 方法时静默跳过)。 */function notifySupportedModels(q: Query): void {if (!supportedModelsListener) return;@@ -1077,8 +1107,7 @@ export class ClaudeCodeAgent extends BaseAgent {);}// oneShot 凭证优先走 getOneShotAuth()(host 侧直连专用,与子进程 env 正交):- // Claude 'oauth' 模式下 getAuthEnv() 注入的是用户订阅 token,但 oneShot 直连- // Anthropic Messages API 不能走订阅 token(会被 claude.ai OAuth 策略拒),host 通过+ // 连了 Claude 订阅时订阅只归 CLI 子进程,host 直连请求不得使用,host 通过// getOneShotAuth 固定回 gateway key +// gateway endpoint。不实现该方法的 adapter(或回 null)→ 回退旧逻辑(getAuthEnv 里的 key + runtimeConfig.endpoint)。let apiKey: string | undefined;@@ -1236,7 +1265,7 @@ export class ClaudeCodeAgent extends BaseAgent {credentialMode,...(credentialMode !== 'gateway-key' && opts.providerId ? { providerId: opts.providerId } : {}),}- : undefined;+ : { model: opts.model };const authState = await this.deps.auth.getState(authOptions);if (!authState.authenticated) {throw new AgentNotAuthenticatedError(@@ -1248,6 +1277,15 @@ export class ClaudeCodeAgent extends BaseAgent {credentialMode,authState.authSource,);+ // Claude 订阅(含 adapter 把隐式来源解析成订阅的情形)由 CLI 用自己的登录直连,+ // host 不接管连接、不经手凭证(见 env-builder nativeCliAuth)。远端会话不适用。+ const nativeCliAuth = !opts.remoteHostId && effectiveCredentialMode === 'oauth-bearer';+ // 订阅会话不设 host 接管标记,CLI 会直接应用工作区设置里的 env:能改写上游 / 鉴权 /+ // TLS 信任的项目级设置会让订阅请求带着登录凭证发往别处,启动前拒绝(见 workspace-settings-guard)。+ if (nativeCliAuth) {+ const override = await findWorkspaceSettingsOverride(opts.workingDir);+ if (override) throw new Error(workspaceSettingsOverrideMessage(override));+ }// 箭头别名捕获 this —— 下方 replayRuntimeDrift(普通 function)与 handle 对象// 字面量方法里没有类实例 this,统一经它取 wire 串。@@ -1304,6 +1342,8 @@ export class ClaudeCodeAgent extends BaseAgent {const smallFastModel = opts.model.includes('/') ? sdkModel : undefined;const env = await buildClaudeEnv(this.deps.auth, this.deps.runtimeConfig, {credentialMode,+ nativeCliAuth,+ authModel: opts.model,sessionProviderId: opts.providerId ?? null,activeModel: sdkModel,modelContextWindows,@@ -1331,9 +1371,14 @@ export class ClaudeCodeAgent extends BaseAgent {// 候选默认值从路由感知入口取:子代理请求跑在父会话来源上,覆写在**该来源**下不可// 路由(被停用)时 host 返回 undefined = 不注入(PR #744 review 第十九/二十轮)。// 缺席 subagentModelForRoute 时退回静态 subagentModel(旧 host / CLI 行为不变)。+ // 订阅会话(含隐式来源交给本机登录的情形)按生效形态判定:子代理请求跟着 CLI 直连+ // Anthropic,不经 proxy 按模型路由。const configuredSubagentDefault =(this.deps.runtimeConfig.subagentModelForRoute- ? this.deps.runtimeConfig.subagentModelForRoute(opts.providerId ?? null, credentialMode)+ ? this.deps.runtimeConfig.subagentModelForRoute(+ opts.providerId ?? null,+ nativeCliAuth ? 'oauth-bearer' : credentialMode,+ ): this.deps.runtimeConfig.subagentModel)?.trim() || undefined;let subagentDefault: ResolveSubagentModelDefaultResult = {@@ -1812,8 +1857,60 @@ export class ClaudeCodeAgent extends BaseAgent {},};};+ // 订阅会话运行中的工作区设置守门(启动与重建时的检查见 buildQuery):+ // - CLI 热加载项目级设置前经 ConfigChange 问这里,命中就阻止这次变更;+ // - 但被拒的文件还在磁盘上,之后任何一次全量重载(别的设置文件变更、flag settings、+ // CLI 回写权限)都会读到它 —— 所以命中即判会话已污染:结束当前 CLI 进程并以终态+ // 错误收尾,下一次发送重建时 buildQuery 的检查拒绝启动;+ // - EnterWorktree 会把 CLI 的项目根挪到守门没检查过、设置 watcher 也不监视的目录,+ // 订阅会话不允许。+ let workspaceSettingsTainted = false;+ const taintWorkspaceSettings = (reason: string): void => {+ if (workspaceSettingsTainted) return;+ workspaceSettingsTainted = true;+ log.warn('workspace settings would redirect a Claude subscription session; ending it', { reason });+ setTimeout(() => {+ if (closed) return;+ eventQueue.push({+ type: 'error',+ data: { message: reason, isTerminal: true, reason: 'claude_subscription_workspace_override' },+ source: 'claude-code',+ });+ if (turnInFlight) emitTurnBoundary('claude_subscription_workspace_override');+ teardownDeadHandle('workspace settings override');+ }, 0);+ };+ const workspaceSettingsConfigChangeHooks: Partial<Record<HookEvent, HookCallbackMatcher[]>> = {+ ConfigChange: [{+ hooks: [async (input) => {+ const reason = await workspaceConfigChangeBlockReason(+ input as { source?: string; file_path?: string },+ opts.workingDir,+ );+ if (!reason) return { continue: true };+ taintWorkspaceSettings(reason);+ return { decision: 'block', reason };+ }],+ }],+ PreToolUse: [{+ matcher: 'EnterWorktree',+ hooks: [async () => ({+ continue: true,+ hookSpecificOutput: {+ hookEventName: 'PreToolUse',+ permissionDecision: 'deny',+ permissionDecisionReason:+ 'This task runs on the Claude subscription, which only uses the settings of its own working directory. ' ++ 'Switching worktrees mid-task is not available here; start a new task in the other worktree instead.',+ },+ })],+ }],+ };const localClaudeHooks = reviewMode- ? { PreToolUse: [{ hooks: [reviewReadOnlyHook] }] }+ ? mergeClaudeHookSets(+ { PreToolUse: [{ hooks: [reviewReadOnlyHook] }] },+ nativeCliAuth ? workspaceSettingsConfigChangeHooks : undefined,+ ): mergeClaudeHookSets(buildClaudeLocalToolGuardHooks(this.deps.capabilityRouting,@@ -1847,6 +1944,7 @@ export class ClaudeCodeAgent extends BaseAgent {),buildClaudeOrcaCallerProvenanceHooks(),buildClaudeAskUserQuestionCallerProvenanceHooks(),+ nativeCliAuth ? workspaceSettingsConfigChangeHooks : undefined,this.deps.claudeHooks,);const deniedCapabilityRoute = (toolName: string) => {@@ -3111,6 +3209,11 @@ export class ClaudeCodeAgent extends BaseAgent {permissionMode?: SdkPermissionMode;fresh?: boolean;}): Promise<Query> => {+ // 会话中途重建(rewind / 追加目录 / resume 恢复等)同样会让新 CLI 进程重读工作区设置。+ if (nativeCliAuth) {+ const override = await findWorkspaceSettingsOverride(opts.workingDir);+ if (override) throw new Error(workspaceSettingsOverrideMessage(override));+ }const currentSdkModel = sdkModelFor(mutableModel);const workingWindow = resolveModelContextWindow(mutableModel);appliedContextWindow = workingWindow;@@ -3923,6 +4026,20 @@ export class ClaudeCodeAgent extends BaseAgent {});if (sdkStartPermissionMode === 'auto') nativeAutoQueries.add(query);if (modelUsageCumulativeStartsAtZero) modelUsageStartsAtZeroQueries.add(query);+ if (nativeCliAuth && typeof query.applyFlagSettings === 'function') {+ // 切模型 / effort / fast 走 applyFlagSettings,CLI 会借机全量重读设置(不经 ConfigChange):+ // 先复查工作区,命中就结束会话而不是把设置应用进去。+ const applyFlagSettings = query.applyFlagSettings.bind(query);+ query.applyFlagSettings = async (settings) => {+ const override = await findWorkspaceSettingsOverride(opts.workingDir);+ if (override) {+ const message = workspaceSettingsOverrideMessage(override);+ taintWorkspaceSettings(message);+ throw new Error(message);+ }+ return applyFlagSettings(settings);+ };+ }return query;};@@ -4837,6 +4954,8 @@ export class ClaudeCodeAgent extends BaseAgent {const rawType = (rawMsg as { type?: string } | null)?.type;const rawSubtype = (rawMsg as { subtype?: string } | null)?.subtype;const rawStatus = (rawMsg as { status?: string } | null)?.status;+ // 只旁路取值,消息照常往下走(与改动前的处理顺序一致)。+ if (rawType === 'rate_limit_event' && nativeCliAuth) notifyRateLimitInfo(rawMsg);const isTerminalTaskNotification =rawType === 'system' &&rawSubtype === 'task_notification' &&diff --git a/packages/maker-core/src/agents/claude-code/workspace-settings-guard.ts b/packages/maker-core/src/agents/claude-code/workspace-settings-guard.tsnew file mode 100644index 0000000000..f807f21589--- /dev/null+++ b/packages/maker-core/src/agents/claude-code/workspace-settings-guard.ts@@ -0,0 +1,241 @@+/**+ * Claude 订阅会话的工作区设置守门。+ *+ * 订阅会话由 CLI 用本机登录直连 Anthropic,不设 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST(设了+ * CLI 就不读本机凭证)。SDK(非交互)模式下 CLI 会直接应用工作区 `.claude/settings.json` /+ * `.claude/settings.local.json` 的 env:没有终端里的工作区信任确认,也不像 Claude Desktop+ * 那样剥掉项目级的上游 / 鉴权键(CLI 只对 desktop 入口或 host-managed 会话做这层过滤)。+ * 仓库里提交一份把 ANTHROPIC_BASE_URL 指向别处、或关掉 TLS 校验的 settings,就能让订阅+ * 请求带着用户的登录凭证发往第三方。+ *+ * 三道闸(都只对本机订阅会话):+ * - 每次拉起 CLI 进程前(首次启动与会话中途重建)检查 CLI 会加载的项目级设置,命中就+ * 拒绝启动;+ * - 会话运行中 CLI 热加载项目级设置前,经 ConfigChange hook 检查变更后的文件,命中就+ * 阻止这次变更生效;+ * - 解析不了的设置文件按命中处理(CLI 的解析更宽松,读不懂不等于它不会应用)。+ * 只读文件、不改写。用户级 `~/.claude/settings.json` 与托管策略是用户 / 管理员自己的+ * 配置,不在此列。+ */++import { promises as fs } from 'node:fs';+import path from 'node:path';++/** 会改写订阅请求去向、鉴权来源或 TLS 信任的 env 键(大小写不敏感)。 */+const EXACT_ENV_KEYS = new Set([+ 'ANTHROPIC_BASE_URL',+ 'ANTHROPIC_API_KEY',+ 'ANTHROPIC_AUTH_TOKEN',+ 'ANTHROPIC_UNIX_SOCKET',+ 'ANTHROPIC_CUSTOM_HEADERS',+ 'CLAUDE_CODE_OAUTH_TOKEN',+ 'CLAUDE_CODE_API_BASE_URL',+ 'CLAUDE_CODE_CUSTOM_OAUTH_URL',+ 'CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST',+ 'CLAUDE_CODE_HOST_AUTH_ENV_VAR',+ 'CLAUDE_CODE_HOST_CREDS_FILE',+ 'CLAUDE_CONFIG_DIR',+ 'USE_LOCAL_OAUTH',+ 'USE_STAGING_OAUTH',+ 'CLAUDE_LOCAL_OAUTH_API_BASE',+ 'NODE_EXTRA_CA_CERTS',+ 'NODE_TLS_REJECT_UNAUTHORIZED',+ 'CLAUDE_CODE_CLIENT_CERT',+ 'CLAUDE_CODE_CLIENT_KEY',+ 'CLAUDE_CODE_CLIENT_KEY_PASSPHRASE',+ // 切换供应商(请求改发 Bedrock / Vertex / Foundry / 网关等)。+ 'CLAUDE_CODE_USE_BEDROCK',+ 'CLAUDE_CODE_USE_VERTEX',+ 'CLAUDE_CODE_USE_FOUNDRY',+ 'CLAUDE_CODE_USE_GATEWAY',+ 'CLAUDE_CODE_USE_MANTLE',+ 'CLAUDE_CODE_USE_ANTHROPIC_AWS',+ 'CLAUDE_CODE_USE_ANTHROPIC_GOOGLE_CLOUD',+]);++function isSensitiveEnvKey(key: string): boolean {+ const upper = key.toUpperCase();+ if (EXACT_ENV_KEYS.has(upper)) return true;+ // 各家供应商的上游地址(ANTHROPIC_BEDROCK_BASE_URL 等)。+ return (upper.startsWith('ANTHROPIC_') || upper.startsWith('CLAUDE_')) && upper.endsWith('_BASE_URL');+}++/** 顶层设置里会替换鉴权来源的键:由仓库提供的命令给出 API key。 */+const SENSITIVE_TOP_LEVEL_KEYS = ['apiKeyHelper'] as const;++/** 解析失败时报告的键。 */+export const UNPARSEABLE_SETTINGS_KEY = '(unparseable settings file)';++export interface WorkspaceSettingsOverride {+ /** 设置文件的绝对路径。 */+ file: string;+ /** 命中的键(env 键、顶层键,或 UNPARSEABLE_SETTINGS_KEY)。 */+ key: string;+}++/** 去掉 JSONC 的注释与尾逗号(字符串里的内容原样保留)。 */+function stripJsonc(text: string): string {+ let out = '';+ let inString = false;+ for (let i = 0; i < text.length; i += 1) {+ const ch = text[i]!;+ if (inString) {+ out += ch;+ if (ch === '\\') {+ out += text[i + 1] ?? '';+ i += 1;+ } else if (ch === '"') {+ inString = false;+ }+ continue;+ }+ if (ch === '"') {+ inString = true;+ out += ch;+ } else if (ch === '/' && text[i + 1] === '/') {+ while (i < text.length && text[i] !== '\n') i += 1;+ out += '\n';+ } else if (ch === '/' && text[i + 1] === '*') {+ const end = text.indexOf('*/', i + 2);+ i = end === -1 ? text.length : end + 1;+ out += ' ';+ } else {+ out += ch;+ }+ }+ return out.replace(/,(\s*[}\]])/g, '$1');+}++type ParsedSettings = { kind: 'missing' } | { kind: 'unparseable' } | { kind: 'ok'; value: unknown };++async function readSettings(file: string): Promise<ParsedSettings> {+ let raw: string;+ try {+ raw = await fs.readFile(file, 'utf8');+ } catch {+ return { kind: 'missing' };+ }+ const text = raw.startsWith('\uFEFF') ? raw.slice(1) : raw;+ if (!text.trim()) return { kind: 'ok', value: {} };+ try {+ return { kind: 'ok', value: JSON.parse(stripJsonc(text)) };+ } catch {+ return { kind: 'unparseable' };+ }+}++/** 检查一份设置文件;没有命中返回 null。 */+export async function findSettingsFileOverride(file: string): Promise<WorkspaceSettingsOverride | null> {+ const parsed = await readSettings(file);+ if (parsed.kind === 'missing') return null;+ if (parsed.kind === 'unparseable') return { file, key: UNPARSEABLE_SETTINGS_KEY };+ const settings = parsed.value;+ if (!settings || typeof settings !== 'object' || Array.isArray(settings)) return null;+ const record = settings as Record<string, unknown>;+ for (const key of SENSITIVE_TOP_LEVEL_KEYS) {+ if (record[key] !== undefined) return { file, key };+ }+ const env = record.env;+ if (!env || typeof env !== 'object' || Array.isArray(env)) return null;+ for (const key of Object.keys(env)) {+ if (isSensitiveEnvKey(key)) return { file, key };+ }+ return null;+}++async function realpathOrSelf(p: string): Promise<string> {+ try {+ return await fs.realpath(p);+ } catch {+ return p;+ }+}++/**+ * 工作目录所在的主仓库根目录:沿父目录找 `.git`;linked worktree 的 `.git` 是指向+ * `<主仓库>/.git/worktrees/<名字>` 的文件,CLI 的 localSettings 取主仓库根目录。+ */+async function findCanonicalGitRoot(start: string): Promise<string | null> {+ let dir = start;+ for (;;) {+ const marker = path.join(dir, '.git');+ try {+ const stat = await fs.lstat(marker);+ if (stat.isFile()) {+ const content = await fs.readFile(marker, 'utf8');+ const gitdir = /^gitdir:\s*(.+)$/m.exec(content)?.[1]?.trim();+ if (gitdir) {+ const resolved = path.resolve(dir, gitdir);+ const worktrees = path.dirname(resolved);+ if (path.basename(worktrees) === 'worktrees') return path.dirname(path.dirname(worktrees));+ }+ }+ return dir;+ } catch {+ /* 继续向上 */+ }+ const parent = path.dirname(dir);+ if (parent === dir) return null;+ dir = parent;+ }+}++/** CLI 会加载的项目级设置文件(按路径去重)。 */+async function workspaceSettingsFiles(workingDir: string): Promise<string[]> {+ const cwd = path.resolve(workingDir);+ const real = await realpathOrSelf(cwd);+ const files: string[] = [];+ for (const dir of new Set([cwd, real])) {+ files.push(path.join(dir, '.claude', 'settings.json'), path.join(dir, '.claude', 'settings.local.json'));+ }+ for (const start of new Set([cwd, real])) {+ const gitRoot = await findCanonicalGitRoot(start);+ if (gitRoot) files.push(path.join(gitRoot, '.claude', 'settings.local.json'));+ }+ return [...new Set(files)];+}++/**+ * 找出工作区里会改写订阅会话上游 / 鉴权 / TLS 信任的项目级设置;没有返回 null。+ */+export async function findWorkspaceSettingsOverride(workingDir: string): Promise<WorkspaceSettingsOverride | null> {+ for (const file of await workspaceSettingsFiles(workingDir)) {+ const override = await findSettingsFileOverride(file);+ if (override) return override;+ }+ return null;+}++/** 拒绝启动时的错误信息;`[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE]` 前缀供 host 映射错误码。 */+export function workspaceSettingsOverrideMessage(override: WorkspaceSettingsOverride): string {+ const what = override.key === UNPARSEABLE_SETTINGS_KEY ? 'cannot be parsed' : `sets ${override.key}`;+ return (+ `[CLAUDE_SUBSCRIPTION_WORKSPACE_OVERRIDE] ${override.file} ${what}, which could change where ` ++ 'the Claude subscription sends requests or how it authenticates. Remove it from the workspace settings ' ++ '(or move it to ~/.claude/settings.json), or choose a gateway or API-key model for this task.'+ );+}++/** ConfigChange hook 的输入里与守门相关的部分。 */+export interface WorkspaceConfigChange {+ source?: string;+ file_path?: string;+}++/**+ * 会话运行中 CLI 热加载设置前的判定:命中就返回拒绝原因,否则 null。+ * 任何一次设置变更都会让 CLI 全量重读各层设置,所以除了变更的那份项目级文件,每次都+ * 整体复查工作区;托管策略的变更 CLI 不允许拦截,不在此列。+ */+export async function workspaceConfigChangeBlockReason(+ input: WorkspaceConfigChange,+ workingDir: string,+): Promise<string | null> {+ if (input.source === 'policy_settings') return null;+ const changedProjectFile =+ (input.source === 'project_settings' || input.source === 'local_settings') && input.file_path+ ? await findSettingsFileOverride(path.resolve(workingDir, input.file_path))+ : null;+ const override = changedProjectFile ?? (await findWorkspaceSettingsOverride(workingDir));+ return override ? workspaceSettingsOverrideMessage(override) : null;+}diff --git a/packages/maker-core/src/agents/index.ts b/packages/maker-core/src/agents/index.tsindex 3fc87cf32a..3736e3199c 100644--- a/packages/maker-core/src/agents/index.ts+++ b/packages/maker-core/src/agents/index.ts@@ -1,7 +1,12 @@export * from './base-agent.js';// toSdkModelString: host 侧标题 oneShot 需要把 catalog model id 还原成 Anthropic wire 串// (claude-haiku-4-5 → claude-haiku-4-5-20251001),复用 SSoT 映射,避免在 host 硬编码 dated id。-export { ClaudeCodeAgent, toSdkModelString, setClaudeSupportedModelsListener } from './claude-code/index.js';+export {+ ClaudeCodeAgent,+ toSdkModelString,+ setClaudeSupportedModelsListener,+ setClaudeRateLimitInfoListener,+} from './claude-code/index.js';export type {ClaudeSubagentModelAccessResult,ClaudeSubagentModelAccessStatus,@@ -28,6 +33,7 @@ export {// host 在 boot 阶段需要的 env 守卫(详见 claude-code/env-builder.ts 注释)export {SENSITIVE_ANTHROPIC_ENV_KEYS,+ cleanProcessEnv,stripSensitiveAnthropicEnv,} from './claude-code/env-builder.js';// host 配置 LLM-context 图片预缩 resizer (注入 logger / 调阈值)diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.tsindex cb739ef5f6..fca30af879 100644--- a/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/pi-agent.integration.test.ts@@ -842,89 +842,6 @@ describe.skipIf(!piAvailable)('PiAgent integration (real pi binary + fake gatewa},);- it(- 'uses PI native OAuth identity and fallback betas for a host Claude subscription model',- { timeout: 60_000 },- async () => {- const deps = buildDeps();- deps.capabilityAdditions = {- ...deps.capabilityAdditions,- availableModels: [- ...(deps.capabilityAdditions?.availableModels ?? []),- {- id: 'claude-opus-5',- displayName: 'Claude Opus 5',- contextWindow: 1_000_000,- efforts: ['high'],- defaultEffort: 'high',- },- ],- };- deps.resolvePiNativeProviders = async () => ({- providers: [{- id: 'anthropic',- sourceProviderId: 'anthropic',- name: 'Anthropic',- baseUrl: endpoint,- inheritModels: true,- apiKeyEnvVar: 'CINDY_PI_ANTHROPIC_PROXY_KEY',- headers: {- 'x-cindy-pi-session-id': '$CINDY_PI_SESSION_ID',- 'x-cindy-pi-session-token': '$CINDY_PI_SESSION_TOKEN',- 'x-cindy-pi-provider-id': 'anthropic',- },- models: [{ id: 'claude-opus-5', wireId: 'claude-opus-5', contextWindow: 80_000 }],- }],- env: { CINDY_PI_ANTHROPIC_PROXY_KEY: 'sk-ant-oat01' },- });- const workingDir = mkdtempSync(path.join(tmpdir(), 'pi-agent-native-anthropic-cwd-'));- let handle: AgentSessionHandle | null = null;- const requestsBefore = seenRequests.length;- scriptedResponses.push(anthropicStreamBody('pong from native anthropic'));- try {- handle = await new PiAgent(deps).startSession({- sessionId: 'itest-native-anthropic-session',- workingDir,- model: 'claude-opus-5',- providerId: 'anthropic',- effort: 'high',- });- expect(handle.getUsageSnapshot().contextWindow).toBe(80_000);- const collected = (async () => {- for await (const event of handle!.events()) {- if (event.type === 'done') break;- }- })();-- await handle.send({ type: 'user', content: 'ping native anthropic' });- await collected;-- expect(seenRequests.slice(requestsBefore)).toEqual(expect.arrayContaining([- expect.objectContaining({- url: '/v1/messages',- providerId: 'anthropic',- }),- ]));- const request = seenRequests.slice(requestsBefore).find((item) => item.providerId === 'anthropic')!;- expect(request.headers.authorization).toBe('Bearer sk-ant-oat01');- expect(request.headers['x-api-key']).toBeUndefined();- expect(request.headers['user-agent']).toMatch(/^claude-cli\//);- expect(String(request.headers['anthropic-beta']).split(',')).toEqual(expect.arrayContaining([- 'claude-code-20250219', 'oauth-2025-04-20', 'server-side-fallback-2026-07-01',- ]));- expect(JSON.parse(request.body)).toMatchObject({- system: expect.arrayContaining([- expect.objectContaining({ type: 'text', text: "You are Claude Code, Anthropic's official CLI for Claude." }),- ]),- fallbacks: expect.arrayContaining([expect.objectContaining({ model: expect.any(String) })]),- });- } finally {- await handle?.close();- rmSync(workingDir, { recursive: true, force: true });- }- },- );-it('uses the current PI bundled xAI Responses API for both official models',{ timeout: 60_000 },diff --git a/packages/maker-core/src/interfaces/auth-adapter.ts b/packages/maker-core/src/interfaces/auth-adapter.tsindex cc7d70c967..1cc16550ac 100644--- a/packages/maker-core/src/interfaces/auth-adapter.ts+++ b/packages/maker-core/src/interfaces/auth-adapter.ts@@ -30,6 +30,12 @@ export interface AuthAdapterOptions {* 用它检查对应连接态;未传保持既有 adapter fallback。*/providerId?: string | null;+ /**+ * 未指定来源(credentialMode 为 undefined)时本次会话的模型。claude-code 的 adapter 用它+ * 判断能否交给本机 Claude Code 登录:订阅只服务 Anthropic 一方模型,其它模型仍经宿主路由。+ * 显式来源不传。+ */+ model?: string;}export interface AuthAdapter {@@ -53,9 +59,8 @@ export interface AuthAdapter {** 与 getAuthEnv() 正交:getAuthEnv() 是给 **spawn 出的 agent 子进程** 用的 env;* 本方法是给 **maker-core 进程内** 的轻量直连请求用的。两者在某些鉴权模式下凭证不同 ——- * 典型:Claude 'oauth' 模式下 getAuthEnv() 注入用户订阅 token(子进程按 model 分流),- * 但 oneShot 是无 system-prompt 的轻任务,不能走订阅(会被 claude.ai OAuth 策略拒),- * 应固定走 gateway key + gateway endpoint。实现侧返回 `{ apiKey, baseURL }`。+ * 典型:连了 Claude 订阅时,订阅只归 CLI 子进程(host 不持有它),oneShot 这类 host 直连+ * 请求应固定走 gateway key + gateway endpoint。实现侧返回 `{ apiKey, baseURL }`。** 返回 null = 没有可用的直连凭证(调用方应跳过 / 优雅降级)。* 不实现 = 调用方回退到 getAuthEnv().ANTHROPIC_API_KEY + runtimeConfig.endpoint(旧行为)。@@ -63,14 +68,12 @@ export interface AuthAdapter {getOneShotAuth?(): Promise<{ apiKey: string; baseURL?: string } | null>;/**- * 订阅 OAuth access token 的强制刷新(可选;仅 Claude 订阅模式的 host 实现)。+ * 订阅 OAuth access token 的强制刷新(可选)。*- * 背景: cc >= 2.1.198 下 CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST 令子进程不再自读- * 系统凭证库,订阅 token 由 host 经 getAuthEnv() 注入(CLAUDE_CODE_OAUTH_TOKEN);- * 注入的是纯 access token,cc 无法自行续期。turn 中途 token 失效(401)时 cc 经- * SDK oauth_token_refresh control 请求向宿主要新 token —— agent runtime 把该回调- * 接到本方法。实现侧应按需刷新并返回当前有效的 access token;刷新失败返回 null- * (调用方把 null 透传给 SDK,cc 按无 token 报 auth 错)。+ * 仅当 host 经 getAuthEnv() 注入了 CLAUDE_CODE_OAUTH_TOKEN 时才会被接线(agent runtime+ * 把 SDK oauth_token_refresh 回调接到本方法)。Desktop 的 Claude 订阅会话由 CLI 自己读取、+ * 刷新登录凭证(env-builder nativeCliAuth),不注入 token,因此不实现本方法。+ * 实现侧应按需刷新并返回当前有效的 access token;刷新失败返回 null。** @param staleToken 该会话实际撞 401 的那枚 token(spawn 注入 / 上次回调返回)。* 实现侧凭它区分「凭证库早已换代(直接返回库值,不消耗刷新轮换)」与「库值就是diff --git a/packages/model-providers/src/__tests__/catalog.test.ts b/packages/model-providers/src/__tests__/catalog.test.tsindex 827de75a66..2f6f82dc16 100644--- a/packages/model-providers/src/__tests__/catalog.test.ts+++ b/packages/model-providers/src/__tests__/catalog.test.ts@@ -16,7 +16,7 @@ import { expandedRegistryEntries } from "../modelMetadataLayers.js";import { describe, it, expect } from "vitest";-import { BUNDLED_CATALOG, parseCatalog } from "../catalog.js";+import { BUNDLED_CATALOG, claudeSubscriptionOnlyForClaudeCode, parseCatalog } from "../catalog.js";import {buildRegistry,sourcesForModel,@@ -212,7 +212,10 @@ describe("bundled catalog validity (dynamic-first contract)", () => {(model) => model.id === "chatgpt/gpt-6",),).toBe(false);- expect(provider("anthropic").models.pi).toHaveLength(14);+ // Claude 订阅只供 Claude Code(CLI 自己的登录),不向 Pi / Codex 提供。+ expect(provider("anthropic").agents).toEqual(["claude-code"]);+ expect(provider("anthropic").models.pi).toBeUndefined();+ expect(provider("anthropic").models.codex).toBeUndefined();});it("xai ships a static fallback list and Pi official metadata", () => {@@ -537,6 +540,34 @@ describe("bundled catalog validity (dynamic-first contract)", () => {});});+describe("claudeSubscriptionOnlyForClaudeCode", () => {+ const builtin = BUNDLED_CATALOG.providers.find((p) => p.id === "anthropic")!;++ it("narrows a remote anthropic entry that still declares Codex / Pi", () => {+ const remote = {+ ...builtin,+ agents: ["claude-code", "codex", "pi"] as AgentKind[],+ routing: {+ ...builtin.routing,+ codex: { upstream: "https://api.anthropic.com", authStrategy: "provider-oauth-header" as const },+ pi: { upstream: "https://api.anthropic.com", authStrategy: "provider-oauth-header" as const },+ },+ models: { "claude-code": [], codex: [{ id: "claude-opus-5" } as CatalogModel], pi: [{ id: "claude-opus-5" } as CatalogModel] },+ };+ const narrowed = claudeSubscriptionOnlyForClaudeCode(remote);+ expect(narrowed.agents).toEqual(["claude-code"]);+ expect(Object.keys(narrowed.routing)).toEqual(["claude-code"]);+ expect(narrowed.models).toEqual({ "claude-code": [] });+ expect(remote.agents).toEqual(["claude-code", "codex", "pi"]);+ });++ it("returns other providers and an already-narrow anthropic entry unchanged", () => {+ expect(claudeSubscriptionOnlyForClaudeCode(builtin)).toBe(builtin);+ const openai = BUNDLED_CATALOG.providers.find((p) => p.id === "openai")!;+ expect(claudeSubscriptionOnlyForClaudeCode(openai)).toBe(openai);+ });+});+describe("titleModel 契约(动态供应商豁免静态存在性校验)", () => {it("builtin providers configure titleModel for one-shot titles", () => {expect(provider("anthropic").titleModel).toBe("claude-haiku-4-5");diff --git a/packages/model-providers/src/__tests__/provider-identity.test.ts b/packages/model-providers/src/__tests__/provider-identity.test.tsindex 17db308dff..37f927e82c 100644--- a/packages/model-providers/src/__tests__/provider-identity.test.ts+++ b/packages/model-providers/src/__tests__/provider-identity.test.ts@@ -6,8 +6,9 @@ describe('connection identity vs public catalog identity', () => {it.each([['openai', 'codex', [false, true, true]],['openai-account', 'codex', [true, true, true]],- ['anthropic', 'claude', [true, false, true]],- ['claude-account', 'claude', [true, false, true]],+ // Claude 订阅只在本机 Claude Code 的登录里,远端(SSH)任务一律不可用。+ ['anthropic', 'claude', [true, true, true]],+ ['claude-account', 'claude', [true, true, true]],['xai', 'xai', [true, true, false]],['grok-account', 'xai', [true, true, false]],] as const)('matches SSH adapters for %s', (id, native, expected) => {diff --git a/packages/model-providers/src/__tests__/source-registry.test.ts b/packages/model-providers/src/__tests__/source-registry.test.tsindex eb19b3bb74..1c374c5c7a 100644--- a/packages/model-providers/src/__tests__/source-registry.test.ts+++ b/packages/model-providers/src/__tests__/source-registry.test.ts@@ -1344,7 +1344,7 @@ describe("registry visibility & sources(运行时注入 fixture)", () => {providersForAgent(views, "codex").map((p) => p.id).sort(),- ).toEqual(["anthropic", "openai", "xai", "xd"]);+ ).toEqual(["openai", "xai", "xd"]);});it("connectedProvidersForAgent honors connection", () => {@@ -1608,17 +1608,12 @@ describe("resolveRoute(运行时注入 fixture)", () => {expect(r?.routing.authStrategy).toBe("oauth-passthrough");});- it("anthropic claude (codex) → Anthropic Messages bridge + host-owned OAuth", () => {- const r = resolveRoute(views, "anthropic", "claude-opus-4-8", "codex");- expect(r?.routing).toMatchObject({- upstream: "https://api.anthropic.com",- wireProtocol: "anthropic-messages",- authStrategy: "provider-oauth-header",- headerOverride: {- "anthropic-version": "2023-06-01",- "anthropic-beta": "claude-code-20250219,oauth-2025-04-20",- },- });+ it("anthropic claude has no Codex / Pi route (subscription stays inside the Claude Code CLI)", () => {+ expect(resolveRoute(views, "anthropic", "claude-opus-4-8", "codex")).toBeNull();+ expect(resolveRoute(views, "anthropic", "claude-opus-4-8", "pi")).toBeNull();+ expect(resolveRoute(views, "anthropic", "claude-opus-4-8", "claude-code")?.routing.upstream).toBe(+ "https://api.anthropic.com",+ );});it("xd claude (claude-code) → gateway, gateway-key, 不删 anthropic-beta(fast 经网关透传)", () => {diff --git a/packages/model-providers/src/__tests__/user-provider.test.ts b/packages/model-providers/src/__tests__/user-provider.test.tsindex 3b25593f39..8003ba5e6e 100644--- a/packages/model-providers/src/__tests__/user-provider.test.ts+++ b/packages/model-providers/src/__tests__/user-provider.test.ts@@ -26,11 +26,24 @@ import { BUNDLED_CATALOG } from "../catalog.js";import { providerCatalogId } from "../provider-identity.js";describe('native subscription instances', () => {- it.each(['claude', 'xai'] as const)('%s shares definitions but keeps unique routing identity', native => {- const brand = native === 'claude' ? 'anthropic' : 'xai';- const make = (id: string) => buildUserProvider({ id, name: brand, auth: { method: 'oauth', native }, runtimes: native === 'claude'- ? { 'claude-code': { baseUrl: 'https://api.anthropic.com', wireProtocol: 'anthropic-messages', models: [] } }- : { codex: { baseUrl: 'https://api.x.ai/v1', wireProtocol: 'openai-responses', models: [] } } });+ it('retired independent Claude accounts stay listed but serve no agent', () => {+ const account = buildUserProvider({+ id: 'anthropic-a',+ name: 'anthropic',+ auth: { method: 'oauth', native: 'claude' },+ runtimes: { 'claude-code': { baseUrl: 'https://api.anthropic.com', wireProtocol: 'anthropic-messages', models: [] } },+ });+ expect(providerCatalogId(account)).toBe('anthropic');+ expect(account.auth.native).toBe('claude');+ expect(account.agents).toEqual([]);+ expect(Object.keys(account.routing)).toEqual(['claude-code']);+ });++ it('xai shares definitions but keeps unique routing identity', () => {+ const native = 'xai' as const;+ const brand = 'xai';+ const make = (id: string) => buildUserProvider({ id, name: brand, auth: { method: 'oauth', native },+ runtimes: { codex: { baseUrl: 'https://api.x.ai/v1', wireProtocol: 'openai-responses', models: [] } } });const a = make(`${brand}-a`);const b = make(`${brand}-b`);expect(a.id).not.toBe(b.id);@@ -40,11 +53,7 @@ describe('native subscription instances', () => {for (const agent of a.agents) expect(a.routing[agent]?.authStrategy).toBe('provider-oauth-header');const builtin = BUNDLED_CATALOG.providers.find(provider => provider.id === brand)!;for (const agent of a.agents) {- expect(a.routing[agent]).toEqual({- ...builtin.routing[agent],- authStrategy: 'provider-oauth-header',- ...(native === 'claude' && agent === 'claude-code' ? { headerDelete: ['x-api-key'] } : {}),- });+ expect(a.routing[agent]).toEqual({ ...builtin.routing[agent], authStrategy: 'provider-oauth-header' });}expect(a.auth.native).toBe(native);expect(a.imageModels).toBeUndefined();diff --git a/packages/model-providers/src/builtin.ts b/packages/model-providers/src/builtin.tsindex afb013ef34..6ec3056753 100644--- a/packages/model-providers/src/builtin.ts+++ b/packages/model-providers/src/builtin.ts@@ -2,8 +2,8 @@* builtin.ts —— 内置供应商身份卡(TS 常量)+ bundled 目录组装。** 2026-07-19 模型列表统一重构定案:**清单来源唯一化**——- * - anthropic:Claude/Codex 清单来自 Agent SDK(会话 init 捕获)+ 登录时 HTTP `/v1/models`,- * 由 host 注入;Pi 清单来自随客户端发布的 Pi 原生目录快照。+ * - anthropic:只供 Claude Code;清单来自 Agent SDK(会话 init 捕获)+ Registry presence,+ * 由 host 注入。* - openai:Codex 清单来自 models_cache.json,经 active-catalog 注入并投影 Claude bridge;* Pi 清单来自随客户端发布的 Pi 原生目录快照,不经过 Codex 投影。* - xd(Cindy AI 网关):清单来自 model-access-server GET /models(网关权威,@@ -83,9 +83,6 @@ const xaiPiModels = piNativeCatalogModels('xai', { group: 'grok' }).map((model)...xaiPiOverrides.get(model.id),id: model.id,}));-const anthropicPiModels = piNativeCatalogModels('anthropic', {- group: 'anthropic',-});const openAiPiModels = piNativeCatalogModels('openai-codex', {idPrefix: 'chatgpt/',group: 'gpt',@@ -109,14 +106,19 @@ const XAI_PROVIDER: Provider = {},};-/** Anthropic(Claude.ai 订阅 OAuth)。Claude/Codex 动态发现,Pi 使用独立原生快照。 */+/**+ * Anthropic(Claude.ai 订阅)。清单来自 Claude Code 会话 init 的 SDK 捕获 + Registry presence。+ *+ * 只给 Claude Code:订阅由 Cindy 内置的官方 CLI 用它自己的登录凭证直连 Anthropic,+ * Cindy 进程不读取、不转发这份凭证。Anthropic 不允许把订阅凭证用在第三方 harness+ * (Codex / Pi)或第三方应用自己的请求里,所以这里不声明 codex / pi 路由。+ * 远端目录若仍声明了 codex / pi,active-catalog 会按 claudeSubscriptionOnlyForClaudeCode 收窄。+ */const ANTHROPIC_PROVIDER: Provider = {id: 'anthropic',name: 'Anthropic',source: 'builtin',- // Claude.ai OAuth can be used by native Claude Code and by the Codex/Pi- // Anthropic Messages bridges. The bridged runtimes receive a host-owned token.- agents: ['claude-code', 'codex', 'pi'],+ agents: ['claude-code'],auth: { method: 'oauth' },access: { kind: 'subscription', product: 'Claude.ai' },titleModel: 'claude-haiku-4-5',@@ -125,31 +127,30 @@ const ANTHROPIC_PROVIDER: Provider = {upstream: 'https://api.anthropic.com',authStrategy: 'oauth-passthrough',},- codex: {- upstream: 'https://api.anthropic.com',- wireProtocol: 'anthropic-messages',- authStrategy: 'provider-oauth-header',- headerOverride: {- 'anthropic-version': '2023-06-01',- 'anthropic-beta': 'claude-code-20250219,oauth-2025-04-20',- },- headerDelete: ['chatgpt-account-id', 'openai-beta', 'originator', 'session_id'],- },- pi: {- upstream: 'https://api.anthropic.com',- wireProtocol: 'anthropic-messages',- authStrategy: 'provider-oauth-header',- // Pi 拿的是 `sk-ant-oat` 形态占位 token(pi-host),自己就按原生订阅方式发请求:- // `anthropic-beta` 由 Pi 按模型拼好(oauth / claude-code / server-side-fallback 等),- // 这里只换 authorization,不得覆盖 beta 头——覆盖会让 body 里 Pi 注入的 `fallbacks`- // 失去 beta 声明,官方端点 400 `fallbacks: Extra inputs are not permitted`。- headerOverride: { 'anthropic-version': '2023-06-01' },- headerDelete: ['x-api-key'],- },},- models: { 'claude-code': [], codex: [], pi: anthropicPiModels },+ models: { 'claude-code': [] },};+/**+ * 把 Claude 订阅来源收窄为只供 Claude Code(内置 anthropic 与同形态的远端条目)。+ * 不 mutate 入参;无需收窄时原样返回。+ */+export function claudeSubscriptionOnlyForClaudeCode(provider: Provider): Provider {+ if (provider.id !== 'anthropic') return provider;+ const hasOtherAgents = provider.agents.some((agent) => agent !== 'claude-code');+ const hasOtherRoutes = Object.keys(provider.routing).some((agent) => agent !== 'claude-code');+ const hasOtherModels = Object.entries(provider.models).some(+ ([agent, list]) => agent !== 'claude-code' && (list?.length ?? 0) > 0,+ );+ if (!hasOtherAgents && !hasOtherRoutes && !hasOtherModels) return provider;+ return {+ ...provider,+ agents: provider.agents.filter((agent) => agent === 'claude-code'),+ routing: provider.routing['claude-code'] ? { 'claude-code': provider.routing['claude-code'] } : {},+ models: { 'claude-code': provider.models['claude-code'] ?? [] },+ };+}+/** OpenAI(ChatGPT 订阅 OAuth)。Codex/Claude 动态发现,Pi 使用独立原生快照。 */const OPENAI_PROVIDER: Provider = {id: 'openai',diff --git a/packages/model-providers/src/catalog.ts b/packages/model-providers/src/catalog.tsindex 67a40c3a44..940b129320 100644--- a/packages/model-providers/src/catalog.ts+++ b/packages/model-providers/src/catalog.ts@@ -30,7 +30,7 @@ import { withVerifiedStaticWindows } from './builtin.js';import { findReservedOAuthExtraParam } from './provider-oauth.js';import { isProviderRequestPath } from './provider-url.js';-export { BUNDLED_CATALOG, BUILTIN_PROVIDERS } from './builtin.js';+export { BUNDLED_CATALOG, BUILTIN_PROVIDERS, claudeSubscriptionOnlyForClaudeCode } from './builtin.js';const AGENT_KINDS: readonly AgentKind[] = ['claude-code', 'codex', 'pi'];const EFFORTS: readonly Effort[] = ['minimal', 'low', 'medium', 'high', 'xhigh', 'max', 'ultra'];diff --git a/packages/model-providers/src/index.ts b/packages/model-providers/src/index.tsindex a85ff9a1e6..6b6356304a 100644--- a/packages/model-providers/src/index.ts+++ b/packages/model-providers/src/index.ts@@ -71,6 +71,7 @@ export { modelProtocolComparison, nativeModelAgents } from "./modelProtocol.js";export {BUNDLED_CATALOG,BUILTIN_PROVIDERS,+ claudeSubscriptionOnlyForClaudeCode,parseCatalog,presetDisplayName,sanitizePresets,diff --git a/packages/model-providers/src/provider-identity.ts b/packages/model-providers/src/provider-identity.tsindex ed96b7c214..c838b715ff 100644--- a/packages/model-providers/src/provider-identity.ts+++ b/packages/model-providers/src/provider-identity.ts@@ -1,6 +1,9 @@import type { AgentKind, Provider } from './types.js';-/** Match the native SSH adapters; xAI forwarding and native Claude Code remain available. */+/**+ * Match the native SSH adapters; xAI forwarding remains available. The Claude subscription is+ * local-only for every agent: it only runs through this machine's own Claude Code login.+ */export function isLocalOnlyProviderForAgent(provider: Pick<Provider, 'id' | 'auth' | 'routing'>,agent: AgentKind,@@ -9,7 +12,7 @@ export function isLocalOnlyProviderForAgent(if (provider.auth?.method === 'oauth') {const brand = providerCatalogId(provider);if (brand === 'openai') return !(agent === 'codex' && provider.id === 'openai');- if (brand === 'anthropic') return agent !== 'claude-code';+ if (brand === 'anthropic') return true;if (brand === 'xai') return agent !== 'pi';}return false;diff --git a/packages/model-providers/src/user-provider.ts b/packages/model-providers/src/user-provider.tsindex 7df2cbfe3d..05846afed5 100644--- a/packages/model-providers/src/user-provider.ts+++ b/packages/model-providers/src/user-provider.ts@@ -592,6 +592,9 @@ export function buildUserProvider(id: runtimeProviderId,name: config.name,source: 'user',+ // 独立 Claude 账号已停用:它的凭证由 Cindy 自己登录并保存,而 Claude 订阅只允许经+ // 官方 CLI 自己的登录使用。条目保留在设置里供用户查看 / 删除,不再提供给任何 agent。+ ...(native === 'claude' ? { agents: [] } : {}),auth: { method: 'oauth', native },routing: Object.fromEntries(Object.entries(identity.routing).map(([agent, route]) => [agent, {