Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(providers): 隔离普通与 1M 模型授权
DavidShen4c837de55334
diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.tsindex cc7c8ca7c5..5cad19ffc3 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts@@ -188,6 +188,44 @@ describe('Claude proxy routing for shared-provider guests', () => {expect(await statusOf(await request(first.token))).toBe(403);});+ // Unit regression for review 4327117965: the real proxy must return 403 when+ // only the other catalog profile is granted. Existing coverage had one model+ // with a compatible [1m] wire alias, never two independently authorized entries.+ it.each([+ ['shared-model', 'shared-model[1m]'],+ ['shared-model[1m]', 'shared-model'],+ ])('keeps 1M catalog profiles distinct when only %s is granted', async (granted, denied) => {+ setCustomProviders([buildUserProvider({+ id: 'shared-a', name: 'Shared', runtimes: { 'claude-code': {+ baseUrl: SHARED_UPSTREAM, wireProtocol: 'anthropic-messages',+ models: [{ id: 'shared-model', name: 'Standard' }, { id: 'shared-model[1m]', name: '1M' }],+ } },+ })]);+ const { token } = registerGuestProviderRoute('guest-session', 'shared-a', model => model === granted);+ const request = (model: string) => Promise.resolve(transform(+ { model }, ctxWith({ [GUEST_ROUTE_HEADER]: token, 'x-api-key': 'placeholder' }),+ ));+ expect((await request(granted))?.upstreamOverride).toBe(SHARED_UPSTREAM);+ expect(await statusOf(await request(denied))).toBe(403);+ if (denied.endsWith('[1m]')) expect(await statusOf(await request(denied.replace('[1m]', '[1M]')))).toBe(403);+ });++ it('keeps disabled 1M catalog profiles from borrowing an enabled base profile', async () => {+ const provider = buildUserProvider({+ id: 'shared-a', name: 'Shared', runtimes: { 'claude-code': {+ baseUrl: SHARED_UPSTREAM, wireProtocol: 'anthropic-messages',+ models: [{ id: 'shared-model', name: 'Standard' }, { id: 'shared-model[1m]', name: '1M' }],+ } },+ });+ provider.models['claude-code']![1]!.disabled = true;+ setCustomProviders([provider]);+ const { token } = registerGuestProviderRoute('guest-session', 'shared-a', () => true);+ const decision = await Promise.resolve(transform(+ { model: 'shared-model[1m]' }, ctxWith({ [GUEST_ROUTE_HEADER]: token, 'x-api-key': 'placeholder' }),+ ));+ expect(await statusOf(decision)).toBe(403);+ });+it('refuses a body-less request unless the shared provider is the default gateway', async () => {const { token } = registerGuestProviderRoute('guest-session', 'shared-a');const decision = await Promise.resolve(transform(undefined, ctxWith({ [GUEST_ROUTE_HEADER]: token })));diff --git a/apps/desktop/src/main/maker-host/guest-provider-route-store.ts b/apps/desktop/src/main/maker-host/guest-provider-route-store.tsindex 847884426b..e5d4d5a881 100644--- a/apps/desktop/src/main/maker-host/guest-provider-route-store.ts+++ b/apps/desktop/src/main/maker-host/guest-provider-route-store.ts@@ -85,12 +85,12 @@ export function guestProviderRouteForSession(sessionId: string): GuestProviderRoreturn binding ? { sessionId: binding.sessionId, providerId: binding.providerId } : null;}-/** 1M 通道后缀只是窗口标记,不是另一个模型。 */+/** Legacy SDK aliases may differ by the 1M suffix when the catalog has only one profile. */function bareModelId(model: string): string {return model.trim().replace(/\[1m\]$/i, '');}-/** 按请求模型核对目录与授权;Claude Code 忽略 1M 通道后缀,Pi 保留精确的窗口档位。 */+/** 核对目录与授权时优先匹配请求的窗口档位;单条目的旧 SDK 后缀别名仍兼容。 */export function guestProviderOffersModel(providerId: string, agent: AgentKind, wireModel: string, sessionId?: string): boolean {const requested = bareModelId(wireModel);if (!requested) return false;@@ -102,7 +102,12 @@ export function guestProviderOffersModel(providerId: string, agent: AgentKind, wconst model = findCatalogModel(provider, wireModel, agent, { exact: true });return Boolean(model && !model.disabled && (!binding?.allowsModel || binding.allowsModel(model.id)));}- return (provider?.models[agent] ?? []).some((model) => !model.disabled && bareModelId(model.id) === requested+ const profiles = (provider?.models[agent] ?? []).filter(model => bareModelId(model.id) === requested);+ const longContext = /\[1m\]$/i.test(wireModel.trim());+ const exactProfiles = profiles.filter(model => /\[1m\]$/i.test(model.id.trim()) === longContext);+ // Select the catalog profile before checking grants or disabled state; neither+ // a denied nor a disabled profile may borrow access from its sibling.+ return (exactProfiles.length ? exactProfiles : profiles).some((model) => !model.disabled&& (!binding?.allowsModel || binding.allowsModel(model.id)));}diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex dd54799020..f0fe6aaaf8 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -575,6 +575,7 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):分享管理页中,每个人的行尾菜单提供「可用模型」。默认跟随供应商范围,也可指定个人子集;实际权限始终取供应商范围与个人范围的交集。取消全部模型表示不开放任何模型,不能解释为恢复默认。个人转分享的调用继续受该个人范围约束。+普通模型与 `[1m]` 作为独立目录条目存在时,授权分别按各自 ID 校验,不能通过后缀归一借用另一档的权限。模型范围存于提供方电脑,按账号隔离。旧配置默认跟随全部模型;读取损坏配置时拒绝调用,不能恢复为全部开放。远程目录只提供可用模型;提供方还必须在创建、切换模型、发送下一轮消息及供应商组转发时校验权限,不能信任控制端传来的目录或模型 id。