Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(providers): preserve member grants across group relays
DavidShenb558faa41c30
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.tsindex 68ee4be3d5..8c0929315b 100644--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts@@ -53,7 +53,7 @@ vi.mock('../providerShareApi.js', () => ({}));vi.mock('../dispatch.js', () => ({getControllerDisplayName: vi.fn(), providerShareActiveControllers: vi.fn(),- revokeProviderShareControllers: vi.fn(), setProviderShareAccess: vi.fn(),+ revalidateRemoteModelAccess: vi.fn(async () => undefined), revokeProviderShareControllers: vi.fn(), setProviderShareAccess: vi.fn(),}));vi.mock('../providerShareHost.js', () => ({startProviderShareHost: vi.fn(), stopProviderShareHost: vi.fn(),diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.tsindex 6b5b20bed9..dd8a986747 100644--- a/apps/desktop/src/main/device-link/dispatch.ts+++ b/apps/desktop/src/main/device-link/dispatch.ts@@ -425,6 +425,7 @@ function logProviderShareDenial(src: string, where: string, reason?: string): vo}export interface RemoteAgentHandler {+ revalidateModelAccess?(): Promise<void>;handle(controller: string, raw: unknown): Promise<unknown>;abortAll(): void;/** 结束匹配控制端的任务(供应商分享被关闭)。 */@@ -446,6 +447,10 @@ export interface RemoteAgentHandler {}let remoteAgentHandler: RemoteAgentHandler | null = null;+export async function revalidateRemoteModelAccess(): Promise<void> {+ await remoteAgentHandler?.revalidateModelAccess?.();+}+export function setRemoteAgentHandler(handler: RemoteAgentHandler | null): void {remoteAgentHandler = handler;}diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex bbd88f2ee5..b5eba08fd5 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -1,6 +1,6 @@import { isRemoteAgentLimitsPatch } from '../../shared/remoteAgentLimits.js';import { readRemoteAgentLimitsState, saveRemoteAgentLimits } from '../remote-agent/host/limitsStore.js';-import { remoteAgentLimitUsage } from './dispatch.js';+import { remoteAgentLimitUsage, revalidateRemoteModelAccess } from './dispatch.js';import { isRemoteAgentIdleRelease } from '../../shared/remoteAgentIdleRelease.js';import { readRemoteAgentIdleReleaseState, saveRemoteAgentIdleRelease } from '../remote-agent/controller/idleReleaseStore.js';/**@@ -751,6 +751,9 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => voidif (!provider) throwIpcError('NOT_FOUND', 'This provider is no longer available');if (command.action === 'set-model-access') {await remoteModelAccess.set(command.providerId, command.models, command.memberId, assertScope);+ assertScope();+ await revalidateRemoteModelAccess();+ assertScope();emit(PROVIDER_SHARE_IPC.OWNED_CHANGED, null);emit(MAKER_PUSH.PROVIDER_CHANGED, {});tapWindowBroadcast(MAKER_PUSH.PROVIDER_CHANGED, {});diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.tsindex 7720613e25..50213faada 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts@@ -276,7 +276,7 @@ describe('Claude proxy routing for shared-provider guests', () => {const wireId = (id: string) => providerId === 'openai' ? id.replace(/^chatgpt\//, ''): providerId === 'xai' ? id.replace(/^xai\//, '') : id;let allowedModel = first.id;- if (trust === 'guest') registerGuestProviderRoute('pi-model-guest', providerId, model => model === allowedModel);+ if (trust === 'guest') registerGuestProviderRoute('pi-model-guest', providerId, async model => model === allowedModel);else bindHostedSessionProvider('pi-model-guest', providerId, (id, model) => id === providerId && model === allowedModel);registerGuestProviderRoute('other-person', providerId, () => false);const disposers = [@@ -401,13 +401,13 @@ describe('guest provider route store', () => {expect(guestProviderRouteForToken(token)).toBeNull();});- it('matches models of the shared provider only, ignoring the 1M suffix', () => {+ it('matches models of the shared provider only, ignoring the 1M suffix', async () => {installProviders();- expect(guestProviderOffersModel('shared-a', 'claude-code', 'shared-model')).toBe(true);- expect(guestProviderOffersModel('shared-a', 'claude-code', 'shared-model[1m]')).toBe(true);- expect(guestProviderOffersModel('shared-a', 'claude-code', 'other-model')).toBe(false);- expect(guestProviderOffersModel('shared-a', 'codex', 'shared-model')).toBe(false);- expect(guestProviderOffersModel('shared-a', 'claude-code', '')).toBe(false);+ expect(await guestProviderOffersModel('shared-a', 'claude-code', 'shared-model')).toBe(true);+ expect(await guestProviderOffersModel('shared-a', 'claude-code', 'shared-model[1m]')).toBe(true);+ expect(await guestProviderOffersModel('shared-a', 'claude-code', 'other-model')).toBe(false);+ expect(await guestProviderOffersModel('shared-a', 'codex', 'shared-model')).toBe(false);+ expect(await guestProviderOffersModel('shared-a', 'claude-code', '')).toBe(false);});it('keeps only the shared provider\'s Codex routes for a guest host', () => {diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.tsindex a0a73f8a22..d98ade9aad 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeProxyScopeGate.test.ts@@ -124,9 +124,9 @@ describe('cc routingTransform — xAI 会话的辅助请求回落默认路由 (i});});- it('claude-haiku 分类器请求(oauth-spawn)→ 换网关 key,不去 api.x.ai', () => {+ it('claude-haiku 分类器请求(oauth-spawn)→ 换网关 key,不去 api.x.ai', async () => {const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-haiku-4-5-20251001' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);@@ -136,21 +136,21 @@ describe('cc routingTransform — xAI 会话的辅助请求回落默认路由 (i});});- it('claude-haiku 分类器请求(gateway-spawn 带 x-api-key)→ passthrough 走默认网关', () => {+ it('claude-haiku 分类器请求(gateway-spawn 带 x-api-key)→ passthrough 走默认网关', async () => {const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-haiku-4-5-20251001' },ctxWith({ ...SESSION_HEADER, 'x-api-key': 'sk-frozen' }),);expect(decision).toBeNull();});- it('claude-haiku 分类器请求(provider-oauth spawn 带占位 x-api-key)→ 换网关 key,不 passthrough (#831)', () => {+ it('claude-haiku 分类器请求(provider-oauth spawn 带占位 x-api-key)→ 换网关 key,不 passthrough (#831)', async () => {// codex→cc 切换后的 openai/xai 来源会话:cc 子进程 env 里是占位 key,分类器请求带着它// 落到 ② 段。占位 key 不是可用凭证,按「无凭证」处理换网关 key;此前被误判成// gateway-spawn passthrough → 网关确定性 401 → 首次权限请求即 auto→ask 降级。const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-haiku-4-5-20251001' },ctxWith({ ...SESSION_HEADER, 'x-api-key': 'xdt-provider-auth-placeholder-key' }),);@@ -159,10 +159,10 @@ describe('cc routingTransform — xAI 会话的辅助请求回落默认路由 (i});});- it('占位 x-api-key 且无网关 key → 维持 passthrough(与改动前行为一致,上游 401)', () => {+ it('占位 x-api-key 且无网关 key → 维持 passthrough(与改动前行为一致,上游 401)', async () => {gatewayKey = null;const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-haiku-4-5-20251001' },ctxWith({ ...SESSION_HEADER, 'x-api-key': 'xdt-provider-auth-placeholder-key' }),);@@ -204,9 +204,9 @@ describe('cc routingTransform — xAI 会话的辅助请求回落默认路由 (i});});- it('网关 key 在时的 claude-* 默认路由不受影响:照常换网关 key', () => {+ it('网关 key 在时的 claude-* 默认路由不受影响:照常换网关 key', async () => {const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-haiku-4-5-20251001' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);@@ -215,19 +215,19 @@ describe('cc routingTransform — xAI 会话的辅助请求回落默认路由 (i});});- it('显式选了供应商的会话,② 段回落不写入计费路由观察表(registry 只记默认路由会话)', () => {+ it('显式选了供应商的会话,② 段回落不写入计费路由观察表(registry 只记默认路由会话)', async () => {const transform = createModelRoutingTransform();- transform(+ await transform({ model: 'claude-haiku-4-5-20251001' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);expect(readClaudeSessionRoute('sess-grok')).toBeNull();});- it('未选供应商的会话行为不变:② 段照常记录默认路由(no-break)', () => {+ it('未选供应商的会话行为不变:② 段照常记录默认路由(no-break)', async () => {clearSessionProvider('sess-grok');const transform = createModelRoutingTransform();- transform(+ await transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);@@ -755,10 +755,10 @@ describe('pi routingTransform — xdt session header selects the Pi provider rou['openai', '/codex/responses'],['xai', '/v1/responses'],['xai', '/v1/chat/completions'],- ] as const)('routes native %s PI requests to a local raw forwarder at %s', (providerId, url) => {+ ] as const)('routes native %s PI requests to a local raw forwarder at %s', async (providerId, url) => {setSessionProvider('sess-pi', providerId);registerPiProxySession('sess-pi', 'session-secret', () => providerId);- const decision = createModelRoutingTransform()(+ const decision = await createModelRoutingTransform()(undefined,ctxWith({'x-cindy-pi-session-id': 'sess-pi',@@ -780,7 +780,7 @@ describe('pi routingTransform — xdt session header selects the Pi provider rou{ scope: 'subagent-route' },);- const allowed = createModelRoutingTransform()(+ const allowed = await createModelRoutingTransform()(undefined,ctxWith({'x-cindy-pi-session-id': 'sess-pi',@@ -812,10 +812,10 @@ describe('pi routingTransform — xdt session header selects the Pi provider rouit.each([['openai', '/codex/responses'],['xai', '/v1/responses'],- ] as const)('trusts the host-resolved implicit %s PI source when persistence is empty', (providerId, url) => {+ ] as const)('trusts the host-resolved implicit %s PI source when persistence is empty', async (providerId, url) => {clearSessionProvider('sess-pi');registerPiProxySession('sess-pi', 'session-secret', () => providerId);- const decision = createModelRoutingTransform()(+ const decision = await createModelRoutingTransform()(undefined,ctxWith({'x-cindy-pi-session-id': 'sess-pi',diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.tsindex 6d7fbe0188..de3fd1fb16 100644--- a/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/claudeSessionRouteObservation.test.ts@@ -82,10 +82,10 @@ describe('claude session route observation (routing transform ② 段)', () => {clearSessionProvider('sess-1');});- it('records gateway for x-api-key (gateway-spawn) passthrough even when the live key is gone', () => {+ it('records gateway for x-api-key (gateway-spawn) passthrough even when the live key is gone', async () => {const transform = createModelRoutingTransform();// 本机 key 已清(gatewayKey=null), 但 child 冻结的 x-api-key 仍在请求上。- const decision = transform(+ const decision = await transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, 'x-api-key': 'sk-frozen' }),);@@ -94,10 +94,10 @@ describe('claude session route observation (routing transform ② 段)', () => {expect(takeClaudeRequestRoute(1)).toEqual({ sessionId: 'sess-1', route: 'gateway' });});- it('records gateway for oauth-spawn requests swapped onto the gateway key', () => {+ it('records gateway for oauth-spawn requests swapped onto the gateway key', async () => {gatewayKey = 'sk-live';const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);@@ -105,9 +105,9 @@ describe('claude session route observation (routing transform ② 段)', () => {expect(readClaudeSessionRoute('sess-1')).toBe('gateway');});- it('refuses no-credential anthropic requests locally instead of relaying them, and records nothing', () => {+ it('refuses no-credential anthropic requests locally instead of relaying them, and records nothing', async () => {const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);@@ -115,13 +115,13 @@ describe('claude session route observation (routing transform ② 段)', () => {expect(readClaudeSessionRoute('sess-1')).toBeNull();});- it('records exact routes for explicitly selected XD and Anthropic providers', () => {+ it('records exact routes for explicitly selected XD and Anthropic providers', async () => {setSessionProvider('sess-1', 'xd');routeMocks.resolveSessionRouteDecision.mockReturnValueOnce({headerOverride: { 'x-api-key': 'sk-gw' },});expect(- createModelRoutingTransform()(+ await createModelRoutingTransform()({ model: 'claude-opus-4-8[1m]' },{ ...ctxWith(SESSION_HEADER), reqId: 21 } as never,),@@ -132,7 +132,7 @@ describe('claude session route observation (routing transform ② 段)', () => {setSessionProvider('sess-1', 'anthropic');routeMocks.resolveSessionRouteDecision.mockClear();expect(- createModelRoutingTransform()(+ await createModelRoutingTransform()({ model: 'claude-opus-4-8[1m]' },{ ...ctxWith(SESSION_HEADER), reqId: 22 } as never,),@@ -141,9 +141,9 @@ describe('claude session route observation (routing transform ② 段)', () => {expect(takeClaudeRequestRoute(22)).toBeNull();});- it('records gateway for an explicitly selected XD passthrough with a frozen child key', () => {+ it('records gateway for an explicitly selected XD passthrough with a frozen child key', async () => {setSessionProvider('sess-1', 'xd');- const decision = createModelRoutingTransform()(+ const decision = await createModelRoutingTransform()({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, 'x-api-key': 'sk-frozen' }, 23),);@@ -164,10 +164,10 @@ describe('claude session route observation (routing transform ② 段)', () => {expect(readClaudeSessionRoute('sess-1')).toBeNull();});- it('routes but does not record when the request has no session header', () => {+ it('routes but does not record when the request has no session header', async () => {gatewayKey = 'sk-live';const transform = createModelRoutingTransform();- const decision = transform(+ const decision = await transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ authorization: 'Bearer sk-ant-oat01' }),);@@ -175,17 +175,17 @@ describe('claude session route observation (routing transform ② 段)', () => {expect(readClaudeSessionRoute('sess-1')).toBeNull();});- it('corrects the recorded route when credentials change between requests', () => {+ it('corrects the recorded route when credentials change between requests', async () => {const transform = createModelRoutingTransform();// 第一笔: 无 key → 本地拒绝,不记录。- transform(+ await transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);expect(readClaudeSessionRoute('sess-1')).toBeNull();// 用户配上网关 key → 下一笔换 key 走网关, 观察值自动纠正。gatewayKey = 'sk-live';- transform(+ await transform({ model: 'claude-opus-4-8[1m]' },ctxWith({ ...SESSION_HEADER, authorization: 'Bearer sk-ant-oat01' }),);diff --git a/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.tsindex e165b50c0e..245e375819 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexCustomContextCatalog.test.ts@@ -8,6 +8,7 @@ import nativeFallbackPrompt from '../codex-native-fallback-prompt.md?raw';import {extractBundledCodexModelCatalog,prepareCodexCustomContextCatalog,+ prepareCodexGuestModelCatalog,patchCodexModelMaxContextWindow,nativeCodexFallbackModel,} from '../codex-custom-context-catalog.js';@@ -38,6 +39,18 @@ async function createFixtureBinary(}describe('Codex custom context model catalog', () => {+ // Unit: a guest's native Codex children used the unfiltered binary catalog.+ // One granted model must keep native metadata while the ungranted sibling+ // disappears from the actual model_catalog_json passed to app-server.+ it('writes only granted models for the guest app-server and preserves custom context metadata', async () => {+ const granted = { slug: 'gpt-5.5', base_instructions: 'native prompt', context_window: 272000 };+ const { root, binaryPath } = await createFixtureBinary({ models: [granted, { slug: 'private-model' }] });+ const prepared = await prepareCodexGuestModelCatalog({ binaryPath, codexHome: root,+ modelIds: ['gpt-5.5'], baseCatalog: { models: [{ ...granted, max_context_window: 1000000 }, { slug: 'private-model' }] } });+ expect(JSON.parse(await fs.readFile(prepared.catalogPath, 'utf8')).models).toEqual([{ ...granted, max_context_window: 1000000 }]);+ expect(prepared.extraArgs).toEqual(['-c', `model_catalog_json=${JSON.stringify(prepared.catalogPath)}`]);+ await expect(prepareCodexGuestModelCatalog({ binaryPath, codexHome: root, modelIds: [] })).rejects.toThrow('no authorized models');+ });it('extracts the complete embedded catalog across chunk boundaries', async () => {const catalog = {models: [diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.tsindex b17b61e268..6a202475f9 100644--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts@@ -40,7 +40,8 @@ function ctx(url: string, headers: Record<string, string> = {}, method = 'POST')return { reqId: 1, method, url, headers } as never;}-async function statusOf(decision: RoutingDecision | null | undefined): Promise<number | undefined> {+async function statusOf(input: RoutingDecision | null | undefined | Promise<RoutingDecision | null | undefined>): Promise<number | undefined> {+ const decision = await input;if (!decision?.localHandler) return undefined;let status: number | undefined;const res = { headersSent: false, writeHead: (code: number) => { status = code; return res; }, end: () => res };@@ -86,9 +87,9 @@ describe('Codex proxy guard for shared-provider guests', () => {expect(await statusOf(await request())).toBe(403);});- it('lets a guest request for a shared model continue to the session route', () => {+ it('lets a guest request for a shared model continue to the session route', async () => {const guard = createCodexGuestRoutingGuard('shared-a', 'env-key');- expect(guard({ model: 'shared-model' }, ctx('/responses', { 'thread-id': 'guest-thread' }))).toBeUndefined();+ expect(await guard({ model: 'shared-model' }, ctx('/responses', { 'thread-id': 'guest-thread' }))).toBeUndefined();});it('refuses a model the shared provider does not offer, even from the guest session', async () => {@@ -104,7 +105,7 @@ describe('Codex proxy guard for shared-provider guests', () => {const guard = createCodexGuestRoutingGuard('shared-a', 'env-key');const path = `${CODEX_CUSTOM_PROVIDER_ROUTE_ROOT}/0123456789abcdef0123/responses`;const request = () => guard({ model: 'shared-model' }, ctx(path, { 'thread-id': 'guest-thread' }));- expect(request()).toBeUndefined();+ expect(await request()).toBeUndefined();expect(await statusOf(guard({ model: 'shared-model' }, ctx(path)))).toBe(403);allowed = false;expect(await statusOf(request())).toBe(403);@@ -162,7 +163,7 @@ describe('Codex proxy guard for shared-provider guests', () => {'x-openai-subagent': 'guardian','x-codex-parent-thread-id': 'guest-thread',}));- expect(request()).toBeUndefined();+ expect(await request()).toBeUndefined();expect(await statusOf(guard(body, ctx(path, { 'thread-id': 'guest-thread' })))).toBe(403);allowed = false;expect(await statusOf(request())).toBe(403);@@ -178,18 +179,18 @@ describe('Codex proxy guard for shared-provider guests', () => {expect(await statusOf(guard({ model: 'shared-model' }, ctx('/responses', { 'thread-id': 'owner-thread' })))).toBe(403);});- it('routes an unresolved request straight to the default upstream only when that is the shared provider', () => {+ it('routes an unresolved request straight to the default upstream only when that is the shared provider', async () => {const gateway = createCodexGuestRoutingGuard('xd', 'env-key');// 模型核对按 xd 的目录:这里的 fixture 没有 xd 模型,所以推理请求被拒;非推理路径只看默认路由。- expect(gateway({ model: 'gpt-image-1' }, ctx('/images/generations'))).toBeNull();+ expect(await gateway({ model: 'gpt-image-1' }, ctx('/images/generations'))).toBeNull();const mismatched = createCodexGuestRoutingGuard('xd', 'oauth-bearer');return statusOf(mismatched({ model: 'gpt-image-1' }, ctx('/images/generations'))).then((status) => expect(status).toBe(403));});- it('leaves custom-provider paths and control-plane requests to the frozen routing', () => {+ it('leaves custom-provider paths and control-plane requests to the frozen routing', async () => {const guard = createCodexGuestRoutingGuard('shared-a', 'env-key');- expect(guard({ model: 'other-model' }, ctx(`${CODEX_CUSTOM_PROVIDER_ROUTE_ROOT}/0123456789abcdef0123/responses`))).toBeUndefined();- expect(guard(undefined, ctx('/models', {}, 'GET'))).toBeUndefined();+ expect(await guard({ model: 'other-model' }, ctx(`${CODEX_CUSTOM_PROVIDER_ROUTE_ROOT}/0123456789abcdef0123/responses`))).toBeUndefined();+ expect(await guard(undefined, ctx('/models', {}, 'GET'))).toBeUndefined();});});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 b8ad287a84..24dcf038b6 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@@ -601,11 +601,11 @@ function unavailablePiProviderRoute(providerId: string): RoutingDecision {export function createModelRoutingTransform(): RoutingTransform {// guest:供应商分享受邀者的 Claude Code 请求(带路由令牌,已核对模型),按其会话显式来源路由,// 不走隐式推断与默认网关(分享的就是网关时除外)。缺省 = 本机用户自己的请求,路由不变。- const route = (+ const route = async (body: unknown,ctx: RequestTransformCtx,guest?: GuestProviderRoute,- ): RoutingDecision | null | Promise<RoutingDecision | null> => {+ ): Promise<RoutingDecision | null> => {const claimedPiSessionId = headerValue(ctx.headers, 'x-cindy-pi-session-id');const claimedPiSessionToken = headerValue(ctx.headers, 'x-cindy-pi-session-token');if (@@ -704,9 +704,13 @@ export function createModelRoutingTransform(): RoutingTransform {if (pathModel) requestModels.push(decodeURIComponent(pathModel[1]));}}- const deniedModel = requestModels.find(model => piGuest- ? !guestProviderOffersModel(piGuest.providerId, 'pi', model, piGuest.sessionId)- : !hostedProviderOffersModel(piSessionId, providerId, 'pi', model));+ let deniedModel: string | undefined;+ for (const model of requestModels) {+ const allowed = piGuest+ ? await guestProviderOffersModel(piGuest.providerId, 'pi', model, piGuest.sessionId)+ : hostedProviderOffersModel(piSessionId, providerId, 'pi', model);+ if (!allowed) { deniedModel = model; break; }+ }if (requestModels.length === 0 || deniedModel !== undefined) {return piGuest ? refuseGuestForeignRoute(deniedModel ?? ''): refuseGuestProviderRoute(403, 'remote_model_not_allowed', 'This model is not available for this remote task.');@@ -1099,7 +1103,7 @@ export function createModelRoutingTransform(): RoutingTransform {headerDelete: [...new Set([...(resolved?.headerDelete ?? []), GUEST_ROUTE_HEADER])],};};- const routeGuest = (token: string): ReturnType<typeof route> => {+ const routeGuest = async (token: string): ReturnType<typeof route> => {const guest = guestProviderRouteForToken(token);if (!guest) {return refuseGuestProviderRoute(401, 'invalid_guest_route', 'Invalid or expired shared-provider session.');@@ -1113,7 +1117,7 @@ export function createModelRoutingTransform(): RoutingTransform {: refuseGuestProviderRoute(403, 'shared_provider_only', 'This request is outside the provider shared with you.');}const wireModel = typeof body.model === 'string' ? body.model : '';- if (!guestProviderOffersModel(guest.providerId, 'claude-code', wireModel, guest.sessionId)) return refuseGuestForeignRoute(wireModel);+ if (!await guestProviderOffersModel(guest.providerId, 'claude-code', wireModel, guest.sessionId)) return refuseGuestForeignRoute(wireModel);return route(body, ctx, guest);};try {diff --git a/apps/desktop/src/main/maker-host/codex-custom-context-catalog.ts b/apps/desktop/src/main/maker-host/codex-custom-context-catalog.tsindex 4920a81a46..e7d2a36895 100644--- a/apps/desktop/src/main/maker-host/codex-custom-context-catalog.ts+++ b/apps/desktop/src/main/maker-host/codex-custom-context-catalog.ts@@ -311,6 +311,41 @@ async function persistCatalog(codexHome: string, content: string): Promise<strinreturn file;}+async function catalogWithModels(base: CodexModelCatalog, bundled: CodexModelCatalog, modelIds: readonly string[], binaryPath: string): Promise<CodexModelCatalog> {+ let instructions: string | undefined;+ for (const modelId of new Set(modelIds)) {+ if (base.models.some(model => model.slug === modelId)) continue;+ const native = findCodexCatalogModel(bundled, modelId);+ if (native) {+ base = { ...base, models: [...base.models, { ...native, slug: modelId }] };+ continue;+ }+ if (instructions === undefined) {+ // Verify the CLI's unknown-model prompt once for the entire guest catalog.+ const binary = await fs.readFile(binaryPath);+ const unixPrompt = nativeFallbackPrompt.replace(/\r\n/g, '\n');+ const windowsPrompt = unixPrompt.replace(/\n/g, '\r\n');+ instructions = binary.includes(Buffer.from(unixPrompt)) ? unixPrompt+ : binary.includes(Buffer.from(windowsPrompt)) ? windowsPrompt : undefined;+ if (instructions === undefined) throw new Error('Codex native fallback metadata changed; update the bundled compatibility descriptor');+ }+ base = { ...base, models: [...base.models, nativeCodexFallbackModel(modelId, instructions)] };+ }+ return base;+}++/** A guest app-server and its native children receive only the granted catalog. */+export async function prepareCodexGuestModelCatalog(params: {+ binaryPath: string; codexHome: string; modelIds: readonly string[]; baseCatalog?: CodexModelCatalog;+}): Promise<{ catalogPath: string; extraArgs: string[] }> {+ if (!params.modelIds.length) throw new Error('shared-provider Codex host has no authorized models');+ const native = await readNativeCodexCatalog(params.binaryPath, params.codexHome);+ const base = await catalogWithModels(params.baseCatalog ?? native, native, params.modelIds, params.binaryPath);+ const catalog = { ...base, models: base.models.filter(model => params.modelIds.includes(model.slug)) };+ const catalogPath = await persistCatalog(params.codexHome, `${JSON.stringify(catalog)}\n`);+ return { catalogPath, extraArgs: buildCodexModelCatalogSpawnArgs(catalogPath) };+}+export async function prepareCodexCustomContextCatalog(params: {binaryPath: string;codexHome: string;@@ -324,24 +359,7 @@ export async function prepareCodexCustomContextCatalog(params: {let base = params.baseCatalog === undefined? bundled: normalizeNativeCatalog(parseCodexModelCatalog(JSON.stringify(params.baseCatalog)));- if (!base.models.some((model) => model.slug === params.modelId)) {- const native = findCodexCatalogModel(bundled, params.modelId);- if (native) base = { ...base, models: [...base.models, { ...native, slug: params.modelId }] };- else {- // A runtime upgrade must not silently replace an unknown model's native prompt.- const binary = await fs.readFile(params.binaryPath);- // Git checkout and native CLI builds can use different line endings.- // Verify both byte-exact variants regardless of this checkout's format.- const unixPrompt = nativeFallbackPrompt.replace(/\r\n/g, '\n');- const windowsPrompt = unixPrompt.replace(/\n/g, '\r\n');- const instructions = binary.includes(Buffer.from(unixPrompt)) ? unixPrompt- : binary.includes(Buffer.from(windowsPrompt)) ? windowsPrompt : null;- if (instructions === null) {- throw new Error('Codex native fallback metadata changed; update the bundled compatibility descriptor');- }- base = { ...base, models: [...base.models, nativeCodexFallbackModel(params.modelId, instructions)] };- }- }+ base = await catalogWithModels(base, bundled, [params.modelId], params.binaryPath);const patched = patchCodexModelMaxContextWindow(base,params.modelId,diff --git a/apps/desktop/src/main/maker-host/codex-image-model-rewrite.ts b/apps/desktop/src/main/maker-host/codex-image-model-rewrite.tsindex efbe805e3f..d18607b8bd 100644--- a/apps/desktop/src/main/maker-host/codex-image-model-rewrite.ts+++ b/apps/desktop/src/main/maker-host/codex-image-model-rewrite.ts@@ -4,13 +4,13 @@ import type { RoutingDescriptor } from '@cindy/model-providers';/** Check image grants and bind JSON/multipart requests to the selected deployment. */export function createCodexImageModelRewrite(binding: RoutingDescriptor['imageModel'],- allowsModel?: (model: string) => boolean,+ allowsModel?: (model: string) => boolean | Promise<boolean>,): NonNullable<RoutingDecision['transformRequestBody']> {- const checkModel = (model: unknown): void => {+ const checkModel = async (model: unknown): Promise<void> => {if (typeof model !== 'string' || !model || (binding && model !== binding.wireModel)) {throw new Error('Image request does not match the Provider binding');}- if (allowsModel && !allowsModel(binding?.litellmModel ?? model)) {+ if (allowsModel && !await allowsModel(binding?.litellmModel ?? model)) {throw new Error('Image model is not available for this remote task');}};@@ -39,7 +39,7 @@ export function createCodexImageModelRewrite() {throw new Error('Image request does not match the Provider binding');}- checkModel(parsed.model);+ await checkModel(parsed.model);return binding ? { body: Buffer.from(JSON.stringify({ ...parsed, model: binding.litellmModel })) } : { body };}if (mediaType === 'multipart/form-data') {@@ -54,7 +54,7 @@ export function createCodexImageModelRewrite(if (form.getAll('model').length !== 1) {throw new Error('Image request does not match the Provider binding');}- checkModel(form.get('model'));+ await checkModel(form.get('model'));if (!binding) return { body };form.set('model', binding.litellmModel);const encoded = new Response(form);diff --git a/apps/desktop/src/main/maker-host/codex-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.tsindex 6611bda151..bdcf504fb5 100644--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts@@ -2537,8 +2537,8 @@ export function createCodexGuestRoutingGuard(frozenAuthInjection?: CodexProxyAuthInjection,guestSessionId?: string,frozenRoutes?: readonly CodexCustomProviderRoute[],-): (body: unknown, ctx: RequestTransformCtx) => RoutingDecision | null | undefined {- return (body, ctx) => {+): (body: unknown, ctx: RequestTransformCtx) => Promise<RoutingDecision | null | undefined> {+ return async (body, ctx) => {const requestModel = isPlainObject(body) && typeof body.model === 'string' ? body.model : '';const requestSessionId = sessionIdFromHeaders(ctx.headers);// This proxy belongs to one guest. Headerless calls use that binding, and@@ -2560,15 +2560,15 @@ export function createCodexGuestRoutingGuard(const reviewerModel = requestModel === CODEX_AUTO_REVIEW_MODEL && guardianParentThreadIdFromHeaders(ctx.headers) && sessionId? reviewerModelBySession.get(sessionId): undefined;- if (!guestProviderModelAllowed(providerId, reviewerModel ?? requestModel, sessionId)) return codexGuestRouteRefusal();+ if (!await guestProviderModelAllowed(providerId, reviewerModel ?? requestModel, sessionId)) return codexGuestRouteRefusal();if (parseCodexCustomProviderPath(ctx.url).kind !== 'not-custom-provider-route') return undefined;const authInjection = frozenAuthInjection ?? getCodexProxyAuthInjection();if (ctx.url.split('?', 1)[0]?.endsWith('/responses')) {const effectiveModel = providerAwareGuardianReviewerModel(body, ctx.headers, authInjection) ?? requestModel;- if (effectiveModel !== requestModel && !guestProviderModelAllowed(providerId, effectiveModel, sessionId)) return codexGuestRouteRefusal();+ if (effectiveModel !== requestModel && !await guestProviderModelAllowed(providerId, effectiveModel, sessionId)) return codexGuestRouteRefusal();const offered = effectiveModel === CODEX_AUTO_REVIEW_MODEL? isOpenAiSubscriptionProviderId(providerId)- : guestProviderOffersModel(providerId, 'codex', effectiveModel, sessionId ?? undefined);+ : await guestProviderOffersModel(providerId, 'codex', effectiveModel, sessionId ?? undefined);if (!offered) return codexGuestRouteRefusal();}if (requestSessionId) {@@ -2836,9 +2836,6 @@ function resolveCodexCustomProviderRoutingDecision(? guestProviderModelAllowed(route.providerId, model, sessionId): hostedSessionModelAllowed(sessionId, route.providerId, model): undefined;- if (allowsImageModel && requestModel && !allowsImageModel(frozenRouting.imageModel?.litellmModel ?? requestModel)) {- return codexCustomProviderRouteFailure(403, 'remote_model_not_allowed');- }return resolveFrozenProviderRouteDecision(route.providerId,frozenRouting,@@ -2847,7 +2844,10 @@ function resolveCodexCustomProviderRoutingDecision(_readGatewayKey(),wireModel,)- .then((resolved) => {+ .then(async (resolved) => {+ if (allowsImageModel && requestModel && !await allowsImageModel(frozenRouting.imageModel?.litellmModel ?? requestModel)) {+ return codexCustomProviderRouteFailure(403, 'remote_model_not_allowed');+ }if (!resolved?.decision || resolved.routing.disabled) {return codexCustomProviderRouteFailure(503, 'custom_provider_route_unavailable');}@@ -3414,8 +3414,8 @@ async function createCodexProxyHandle(// 供应商分享受邀者的任务:先过受邀者守门,只经分享的那一个供应商出站。const guestGuard = guestProviderId ? createCodexGuestRoutingGuard(guestProviderId, frozenAuthInjection, guestSessionId, frozenCustomProviderRoutes) : undefined;const route: RoutingTransform = guestGuard- ? (body, ctx) => {- const guarded = guestGuard(body, ctx);+ ? async (body, ctx) => {+ const guarded = await guestGuard(body, ctx);return guarded !== undefined ? guarded : modelRoute(body, ctx);}: modelRoute;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 0a256a79ff..3ffaeac8ff 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@@ -30,7 +30,7 @@ export interface GuestProviderRoute {interface Binding extends GuestProviderRoute {token: string;- allowsModel?: (model: string) => boolean;+ allowsModel?: (model: string) => boolean | Promise<boolean>;modelAccessRestricted?: () => boolean;}@@ -43,7 +43,7 @@ const bySession = new Map<string, Binding>();export function registerGuestProviderRoute(sessionId: string,providerId: string,- allowsModel?: (model: string) => boolean,+ allowsModel?: (model: string) => boolean | Promise<boolean>,modelAccessRestricted?: () => boolean,): { token: string; release(): void } {const token = randomBytes(32).toString('base64url');@@ -91,8 +91,13 @@ function bareModelId(model: string): string {}/** 核对目录与授权时优先匹配请求的窗口档位;单条目的旧 SDK 后缀别名仍兼容。 */-export function guestProviderOffersModel(providerId: string, agent: AgentKind, wireModel: string, sessionId?: string): boolean {- return providerOffersModel(providerId, agent, wireModel, sessionId ? bySession.get(sessionId)?.allowsModel : undefined);+export async function guestProviderOffersModel(providerId: string, agent: AgentKind, wireModel: string, sessionId?: string): Promise<boolean> {+ const models: string[] = [];+ providerOffersModel(providerId, agent, wireModel, model => { models.push(model); return false; });+ for (const model of models) {+ if (!sessionId || await guestProviderModelAllowed(providerId, model, sessionId)) return true;+ }+ return false;}/** Same-account remote tasks authorize each root/child request without pinning children to the parent provider. */@@ -122,10 +127,14 @@ function providerOffersModel(providerId: string, agent: AgentKind, wireModel: st}/** A shared proxy without a task identity cannot bypass an active member's model restrictions. */-export function guestProviderModelAllowed(providerId: string, model: string, sessionId: string | null | undefined): boolean {+export async function guestProviderModelAllowed(providerId: string, model: string, sessionId: string | null | undefined): Promise<boolean> {if (sessionId) {const binding = bySession.get(sessionId);- return binding?.providerId === providerId && (!binding.allowsModel || binding.allowsModel(model));+ if (binding?.providerId !== providerId) return false;+ try {+ const allowed = !binding.allowsModel || await binding.allowsModel(model);+ return allowed && bySession.get(sessionId) === binding && getSessionProvider(sessionId) === providerId;+ } catch { return false; }}return ![...bySession.values()].some((binding) => binding.providerId === providerId && binding.modelAccessRestricted?.());}diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.tsindex 5f48a8c7eb..ad73a3170d 100644--- a/apps/desktop/src/main/maker-host/index.ts+++ b/apps/desktop/src/main/maker-host/index.ts@@ -199,6 +199,7 @@ import { readModelContextLimit } from './model-context-limit-store.js';import { resolveDesktopModelContextProviderId, resolveDesktopModelEfforts } from './model-context-settings.js';import {prepareCodexCustomContextCatalog,+ prepareCodexGuestModelCatalog,} from './codex-custom-context-catalog.js';import { buildPiAgent } from './pi-host.js';import {@@ -2019,6 +2020,7 @@ export function getMaker(): Maker {}}let customContextCatalogArgs: string[] = [];+ let customContextCatalogPath: string | undefined;if (isCustomContext) {const modelId = ctx.customContextModel?.trim();const contextWindow = ctx.customContextWindow;@@ -2040,6 +2042,7 @@ export function getMaker(): Maker {? { baseCatalog: smartSubagentConfig.modelCatalog }: {}),});+ customContextCatalogPath = customCatalog.catalogPath;if (smartSubagentConfig) {smartSubagentConfig = {...smartSubagentConfig,@@ -2055,6 +2058,21 @@ export function getMaker(): Maker {throw fatal;}}+ if (guestProviderId) {+ try {+ const guestCatalog = await prepareCodexGuestModelCatalog({+ binaryPath: codexPath, codexHome: effectiveCodexHome,+ modelIds: ctx.deviceHostedGuestModelIds ?? [],+ ...(customContextCatalogPath ? { baseCatalog: JSON.parse(await fs.readFile(customContextCatalogPath, 'utf8')) } : {}),+ });+ customContextCatalogArgs = guestCatalog.extraArgs;+ } catch (error) {+ await releaseCodexCustomContextProxy(scopedProxyKey);+ const fatal = error instanceof Error ? error : new Error(String(error));+ (fatal as { codexSpawnConfigFatal?: boolean }).codexSpawnConfigFatal = true;+ throw fatal;+ }+ }const codexSubagentRoutingProfile = resolveCodexSubagentRoutingProfile(storedSubagentModelSettings,smartSubagentConfig,diff --git a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.tsindex 51eebee981..a3cc4a20e7 100644--- a/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/groupRelay.test.ts@@ -65,6 +65,7 @@ function fakeAgentHost(name: string, started: Started[], options: {/** 转分享的同意(本机是分享者)。 */reshare?: Parameters<typeof createRemoteAgentHost>[0]['reshare'];resolveProvider?: NonNullable<Parameters<typeof createRemoteAgentHost>[0]['providerAccess']>['resolve'];+ modelAccess?: Partial<NonNullable<Parameters<typeof createRemoteAgentHost>[0]['providerAccess']>>;bindGuestProviderRoute?: Parameters<typeof createRemoteAgentHost>[0]['bindGuestProviderRoute'];}) {return createRemoteAgentHost({@@ -124,6 +125,7 @@ function fakeAgentHost(name: string, started: Started[], options: {providerAccess: {resolve: options.resolveProvider ?? (async (_kind, _model, providerId) => providerId ?? 'shared-provider'),isAllowed: () => true,+ ...options.modelAccess,},...(options.guestRelayCapable === false ? {} : {bindGuestProviderRoute: options.bindGuestProviderRoute ?? (async () => ({ routeToken: 'route', modelIds: ['claude-opus'], release: () => {} })),@@ -207,6 +209,7 @@ function setup(options: {memberBinder?: Parameters<typeof createRemoteAgentHost>[0]['bindGuestProviderRoute'];/** 组所在电脑本机的 Agent 表现(组选中本机这一台时)。 */owner?: { failStart?: boolean; prepareImageEvent?: Parameters<typeof createRemoteAgentHost>[0]['prepareImageEvent'];+ modelAccess?: Partial<NonNullable<Parameters<typeof createRemoteAgentHost>[0]['providerAccess']>>;isAgentAvailable?: Parameters<typeof createRemoteAgentHost>[0]['isAgentAvailable'] };/** 截住组所在电脑发给组内电脑的请求(模拟回包丢失、应答慢)。 */intercept?: (agentDeviceId: string, request: Record<string, unknown>, forward: () => Promise<unknown>) => Promise<unknown>;@@ -309,6 +312,67 @@ function switchTokenIn(stream: Awaited<ReturnType<typeof openAsGuest>>['stream']}describe('provider group relay for shared users', () => {+ // Review 4328897446, unit: the old three-host harness never exercised the+ // original member's model restrictions at the executing computer. A allows+ // only opus, while the executor offers opus and sonnet; revoke opus mid-run.+ it('projects the original member catalog and rechecks every child call across the relay', async () => {+ const allowed = new Set(['claude-opus']);+ let executorAllowed = true;+ const binder = createGuestProviderRouteBinder({+ readProviders: async () => [{ id: MEMBER_MINI.providerId, models: { 'claude-code': [+ { id: 'claude-opus' }, { id: 'claude-sonnet' },+ ] } }] as never,+ guestAccess: () => null, ownerAllowed: () => true, providerAllowed: () => executorAllowed,+ modelAccess: { allows: () => true, read: () => ({ models: null, providerModels: null }) },+ });+ const check = vi.fn((_provider: string, controller: string, model?: string) => controller === GUEST_A && (!model || allowed.has(model)));+ const env = setup({ memberBinder: binder, owner: { modelAccess: {+ isAllowed: check, models: async () => [...allowed], restricted: () => true,+ } } });+ try {+ const { client } = await openAsGuest(env, GUEST_A, openPayload(SESSION));+ try {+ const input = env.memberStarted.mini[0].input;+ expect(input.guestProvider!.modelIds).toEqual(['claude-opus']);+ const allows = async (model: string) => {+ const response = await fetch(input.tunnel.url + '/cindy/model-access', { method: 'POST',+ headers: { Authorization: 'Bearer ' + input.tunnel.token }, body: JSON.stringify({ model }) });+ return (await response.json() as { allowed: boolean }).allowed;+ };+ expect(await allows('claude-opus')).toBe(true);+ expect(await allows('claude-sonnet')).toBe(false);+ allowed.clear();+ expect(await allows('claude-opus')).toBe(false);+ allowed.add('claude-opus');+ expect(await allows('claude-opus')).toBe(true);+ executorAllowed = false;+ expect(await allows('claude-opus')).toBe(false);+ expect(check).toHaveBeenCalledWith('shared-provider', GUEST_A, 'claude-sonnet');+ } finally { await client.close('close', 'navigation'); }+ } finally { for (const host of [env.owner, ...Object.values(env.members)]) { await host.abortAll(); host.dispose(); } }+ });++ it.each([true, false])('handles a legacy executor with restricted=%s and stops it when new restrictions appear', async restrictedAtStart => {+ let restricted = restrictedAtStart;+ const env = setup({+ plans: [{ kind: 'member', ...MEMBER_MINI }, { kind: 'member', ...MEMBER_STUDIO }],+ owner: { modelAccess: { models: async () => ['claude-opus'], restricted: () => restricted } },+ intercept: async (id, request, forward) => {+ const result = await forward();+ return id === 'mini' && request.op === 'caps' ? { ...(result as object), relayModelAccess: undefined } : result;+ },+ });+ try {+ const { client } = await openAsGuest(env, GUEST_A, openPayload(SESSION));+ try {+ expect(env.memberStarted.mini).toHaveLength(restrictedAtStart ? 0 : 1);+ expect(env.memberStarted.studio).toHaveLength(restrictedAtStart ? 1 : 0);+ restricted = true;+ await env.owner.revalidateModelAccess();+ expect(env.owner.runCount()).toBe(restrictedAtStart ? 1 : 0);+ } finally { await client.close('close', 'navigation'); }+ } finally { for (const host of [env.owner, ...Object.values(env.members)]) { await host.abortAll(); host.dispose(); } }+ });// Unit regression for review 4328468761: existing three-computer tests stubbed// the production binding. The real binder must start an owner-relayed guest,// keep its isolated home/provider, and release the proxy token on close.diff --git a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.tsindex fdeb4c48d3..86889b3390 100644--- a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts@@ -93,7 +93,26 @@ afterEach(() => {// have no direct-share member. Minimum: an authorized same-account controller// binding a guest-isolated task. Verify the real proxy grant, including revocation.describe('guest proxy binding for direct shares and same-account group relays', () => {- it.each(['relay', 'share'])('binds a %s with its live model permissions and a stable CLI catalog', async (kind) => {+ // Unit: an async authorization response must not resurrect a replaced binding.+ it('rejects a failed grant query or one arriving after the task binding was released', async () => {+ let finish!: (allowed: boolean) => void;+ let unavailable = true;+ const binder = createGuestProviderRouteBinder({+ readProviders: async () => [view('spark', ['opus', 'sonnet'])],+ guestAccess: () => null, ownerAllowed: () => true, providerAllowed: () => true,+ modelAccess: { allows: () => true, read: () => ({ models: null, providerModels: null }) },+ });+ const binding = await binder({ kind: 'claude-code', hostSessionId: 'late', providerId: 'spark', controller: 'owner', isCurrent: () => true,+ relayModelAccess: { models: ['opus'], allows: () => unavailable ? Promise.reject(new Error('link unavailable')) : new Promise(resolve => { finish = resolve; }) } });+ expect(binding!.modelIds).toEqual(['opus']);+ expect(await guestProviderModelAllowed('spark', 'opus', 'late')).toBe(false);+ unavailable = false;+ const request = guestProviderModelAllowed('spark', 'opus', 'late');+ binding!.release();+ finish(true);+ expect(await request).toBe(false);+ });+ it.each(['relay', 'share'])('binds a %s with its live model permissions and an authorized CLI catalog', async (kind) => {const controller = kind === 'relay' ? 'owner-device' : providerShareGuestPeer('share-1', 'member-1', 'guest-device');let active = true;let providerEnabled = true;@@ -112,20 +131,20 @@ describe('guest proxy binding for direct shares and same-account group relays',const input = { kind: 'claude-code' as const, hostSessionId: 'bound-guest', providerId: 'spark', controller, isCurrent: () => true };const binding = await binder(input);expect(binding).not.toBeNull();- expect(binding!.modelIds).toEqual(['opus', 'sonnet']);+ expect(binding!.modelIds).toEqual(['opus']);expect(guestProviderRouteForToken(binding!.routeToken)).toEqual({ sessionId: input.hostSessionId, providerId: 'spark' });const allows = (model: string) => guestProviderModelAllowed('spark', model, input.hostSessionId);- expect(allows('opus')).toBe(true);- expect(allows('sonnet')).toBe(false);+ expect(await allows('opus')).toBe(true);+ expect(await allows('sonnet')).toBe(false);providerModels.add('sonnet');- expect(allows('sonnet')).toBe(kind === 'relay');+ expect(await allows('sonnet')).toBe(kind === 'relay');memberModels.add('sonnet');- expect(allows('sonnet')).toBe(true);+ expect(await allows('sonnet')).toBe(true);providerEnabled = false;- expect(allows('opus')).toBe(false);+ expect(await allows('opus')).toBe(false);providerEnabled = true;active = false;- expect(allows('opus')).toBe(false);+ expect(await allows('opus')).toBe(false);expect(await binder(input)).toBeNull();binding!.release();expect(guestProviderRouteForToken(binding!.routeToken)).toBeNull();diff --git a/apps/desktop/src/main/remote-agent/host/providerAccess.ts b/apps/desktop/src/main/remote-agent/host/providerAccess.tsindex a698bc0404..ef47e82895 100644--- a/apps/desktop/src/main/remote-agent/host/providerAccess.ts+++ b/apps/desktop/src/main/remote-agent/host/providerAccess.ts@@ -9,7 +9,7 @@ import {type ProviderView,} from '@cindy/model-providers';import { isProviderSharePeer } from '@cindy/device-link';-import { registerGuestProviderRoute } from '../../maker-host/guest-provider-route-store.js';+import { registerGuestProviderRoute, guestProviderModelAllowed } from '../../maker-host/guest-provider-route-store.js';import type { RemoteAgentHostDeps } from './runHost.js';/** Shared users and same-account group relays both need a guest-isolated proxy binding. */@@ -23,12 +23,13 @@ export function createGuestProviderRouteBinder(deps: {read(providerId: string, memberId?: string): { models: readonly string[] | null; providerModels: readonly string[] | null };};}): NonNullable<RemoteAgentHostDeps['bindGuestProviderRoute']> {- return async ({ kind, hostSessionId, providerId, controller, isCurrent }) => {+ return async ({ kind, hostSessionId, providerId, controller, isCurrent, relayModelAccess }) => {const views = await deps.readProviders();// An obsolete asynchronous launch must never replace the current binding.if (!isCurrent()) return null;// A same-account group relay is isolated as a guest, but the group owner is- // not a direct-share member of this computer. Its grants are provider-wide.+ // not a direct-share member of this computer. Intersect this computer's+ // provider grants with the original member's live grant at the coordinator.const sharedPeer = isProviderSharePeer(controller);const memberId = sharedPeer ? deps.guestAccess(controller)?.memberId : undefined;const providerAllowed = (): boolean => {@@ -38,8 +39,14 @@ export function createGuestProviderRouteBinder(deps: {: deps.ownerAllowed(controller)) && deps.providerAllowed(providerId);};if (!providerAllowed()) return null;- const allowsModel = (model: string) => providerAllowed() && deps.modelAccess.allows(providerId, model, memberId);+ const localAllows = (model: string) => isCurrent() && providerAllowed() && deps.modelAccess.allows(providerId, model, memberId);+ const allowsModel = async (model: string) => localAllows(model)+ && (!relayModelAccess || await relayModelAccess.allows(model)) && localAllows(model);+ const modelIds = guestProviderModelIds(views, providerId, kind)+ .filter(model => localAllows(model) && (!relayModelAccess || relayModelAccess.models.includes(model)));+ if (!isCurrent()) return null;const binding = registerGuestProviderRoute(hostSessionId, providerId, allowsModel, () => {+ if (relayModelAccess) return true;try {const rule = deps.modelAccess.read(providerId, memberId);return rule.models !== null || rule.providerModels !== null;@@ -47,8 +54,8 @@ export function createGuestProviderRouteBinder(deps: {});return {routeToken: binding.token,- // Keep the CLI catalog stable; the proxy checks live grants per request.- modelIds: guestProviderModelIds(views, providerId, kind),+ modelIds,+ allowsModel: model => guestProviderModelAllowed(providerId, model, hostSessionId),release: binding.release,};};diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.tsindex fc80ea6ce5..8b45387d19 100644--- a/apps/desktop/src/main/remote-agent/host/runHost.ts+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts@@ -155,6 +155,7 @@ export interface HostedStartInput {export interface GuestProviderRouteBinding {routeToken: string;modelIds: string[];+ allowsModel?(model: string): Promise<boolean>;release(): void;}@@ -201,6 +202,8 @@ export interface RemoteAgentHostDeps {providerAccess?: {resolve(kind: RemoteAgentKind, model: string, providerId: string | null | undefined, controller: string): Promise<string | null>;isAllowed(providerId: string, controller: string, model?: string): boolean;+ models?(kind: RemoteAgentKind, providerId: string, controller: string): Promise<string[]>;+ restricted?(providerId: string, controller: string): boolean;};/** 同账号任务在启动前登记来源和逐请求的实时模型授权,子代理同样受此约束。 */bindOwnerProviderRoute?(hostSessionId: string, providerId: string, allowsModel?: (providerId: string, model: string) => boolean): OwnerProviderRouteBinding;@@ -216,6 +219,7 @@ export interface RemoteAgentHostDeps {providerId: string;controller: string;isCurrent(): boolean;+ relayModelAccess?: { models: string[]; allows(model: string): Promise<boolean> };}): Promise<GuestProviderRouteBinding | null>;/*** 供应商组(本机是组所在电脑,docs/product-rules/provider-groups.md §4):受邀者的新任务按组策略交给@@ -317,6 +321,7 @@ export interface RemoteAgentGroupRelayDeps {/** 本机作为组所在电脑把受邀者的任务转给组内电脑时的后端(代替本机的 Agent 会话)。 */interface RelayBackend {+ modelAccess?: boolean;client: RemoteAgentRunClient;member: GroupRelayMember;/** 第几次启动尝试(WebSocket 连接编号的前缀)。 */@@ -1106,7 +1111,23 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {run.workspaceDir = sessionRoot;run.virtualRoot = payload.virtualWorkspace ? mirrorRoot : undefined;const tunnel = await createRunTunnel({- http: (request, signal) => reverseHttp(run, request, signal),+ http: async (request, signal) => {+ // Pi API-key providers keep their native transports. Their adapter+ // checks this authenticated, run-local endpoint before opening a stream.+ if (request.path === '/cindy/model-access') {+ let model: unknown;+ try { model = JSON.parse(request.body?.toString('utf8') ?? '{}').model; } catch { /* deny */ }+ const current = () => !run.closing && !signal.aborted && deps.isOwnerCurrent(run.owner)+ && deps.isControllerAuthorized(run.controller);+ let allowed = false;+ try {+ allowed = run.trust === 'guest' && current() && typeof model === 'string'+ && !!model && model.length <= 512 && await run.guestRoute?.allowsModel?.(model) === true && current();+ } catch { /* Failed authorization must never open a native stream. */ }+ return { status: 200, headers: [['content-type', 'application/json']], body: Buffer.from(JSON.stringify({ allowed })) };+ }+ return reverseHttp(run, request, signal);+ },wsOpen: (connId, wsPath) => {(run.localWs ??= new Set()).add(connId);append(run, { t: 'ws', connId, kind: 'open', path: wsPath });@@ -1127,12 +1148,23 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {let guestProvider: HostedStartInput['guestProvider'];if (run.trust === 'guest') {if (!deps.bindGuestProviderRoute || !run.providerId) failProviderNotAllowed();+ const checkRelayModel = async (model?: string): Promise<unknown> => {+ const reply = await reverse(run, { type: 'model-access', ...(model ? { model } : {}) }, AbortSignal.timeout(10_000));+ return reply.type === 'callback' ? reply.value : undefined;+ };+ let relayModelAccess: { models: string[]; allows(model: string): Promise<boolean> } | undefined;+ if (run.relayKey && payload.relayModelAccess) {+ const models = await checkRelayModel();+ if (!Array.isArray(models) || !models.every(model => typeof model === 'string')) failProviderNotAllowed();+ relayModelAccess = { models, allows: async model => await checkRelayModel(model) === true };+ }const binding = await deps.bindGuestProviderRoute({kind: run.kind,hostSessionId,providerId: run.providerId,controller: run.controller,isCurrent: () => !run.closing,+ ...(relayModelAccess ? { relayModelAccess } : {}),});if (!binding) {if (!run.closing) failProviderNotAllowed();@@ -1344,7 +1376,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {/** 转给组内电脑的打开载荷:已按受邀者复核过;来源换成那台上的供应商,带防转圈标记与受邀者的 relay 键。 */function relayedOpenPayload(run: Run, payload: RemoteAgentOpenPayload, member: GroupRelayMember): RemoteAgentOpenPayload {// 「需要换一台」只在受邀者与本机之间:组内电脑不认识也不需要。受邀者自己填的转分享键不转发。- const { acceptsGroupSwitch: _accepts, groupSwitchToken: _token, reshareKey: _reshare, ...rest } = payload;+ const { acceptsGroupSwitch: _accepts, groupSwitchToken: _token, reshareKey: _reshare, relayModelAccess: _modelAccess, ...rest } = payload;// 分享来的组内电脑按这个人的转分享键核对它的主人是否同意过(provider-sharing.md §4.3)。const reshareKey = member.sameAccount ? undefined : reshareKeyForGuest(run.controller);return {@@ -1352,6 +1384,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {sessionId: relaySessionIdFor(run.controller, payload.sessionId),groupAssigned: true,relay: relayKeyFor(run.controller),+ ...(run.relay?.modelAccess ? { relayModelAccess: true } : {}),...(reshareKey ? { reshareKey } : {}),options: { ...payload.options, providerId: member.providerId },};@@ -1581,7 +1614,16 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {if (!run.closing) append(run, { t: 'state', state: forwarded });});},- onRequest: (request, signal) => reverse(run, request, signal),+ onRequest: async (request, signal) => {+ if (request.type !== 'model-access') return reverse(run, request, signal);+ const current = () => !run.closing && run.relay === backend && !signal.aborted+ && deps.isOwnerCurrent(run.owner) && deps.isControllerAuthorized(run.controller);+ const providerId = run.providerId;+ if (!current() || !providerId || !deps.providerAccess) return { type: 'callback', value: false };+ if (request.model) return { type: 'callback', value: deps.providerAccess.isAllowed(providerId, run.controller, request.model) };+ const models = await deps.providerAccess.models?.(run.kind, providerId, run.controller);+ return { type: 'callback', value: current() && models ? models.filter(model => deps.providerAccess!.isAllowed(providerId, run.controller, model)) : [] };+ },onWs: (item) => {if (run.closing || run.relay !== backend) return;const connId = relayConnId(attempt, item.connId);@@ -1602,7 +1644,9 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {run.relay = backend;try {const caps = await RemoteAgentRunClient.caps(connection.invoke);+ backend.modelAccess = caps.relayModelAccess === true && !!deps.providerAccess?.models;if (caps.virtualWorkspace !== true+ || (!backend.modelAccess && deps.providerAccess?.restricted?.(groupProviderId, run.controller))|| (current.sameAccount ? caps.guestRelay !== true : caps.reshareConsent !== true)) {throw new Error('[REMOTE_AGENT_PEER_TOO_OLD] the computer in the provider group cannot take shared tasks yet');}@@ -2243,6 +2287,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {...(deps.imageArtifacts ? { imageRecovery: true, imageRecoveryRelay: true } : {}),// 能按受邀者隔离运行(供应商级授权与出站边界都已接上),才接受组所在电脑中转过来的受邀者任务。...(deps.providerAccess && deps.bindGuestProviderRoute ? { guestRelay: true } : {}),+ ...(deps.providerAccess && deps.bindGuestProviderRoute ? { relayModelAccess: true } : {}),// 转分享的同意只对受邀者(把这里分享的供应商放进自己组的人)有意义。...(guest && deps.reshare ? { reshareConsent: true } : {}),...(guest && deps.reshare ? { reshareBatch: true } : {}),@@ -2548,6 +2593,13 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {async abortAll(reason: RemoteAgentTeardownReason = 'navigation'): Promise<void> {await Promise.all([...runs.values()].map((run) => finishRun(run, 'aborted', reason)));},+ /** Old execution hosts cannot retain a newly introduced member restriction. */+ async revalidateModelAccess(): Promise<void> {+ await Promise.all([...runs.values()]+ .filter(run => run.relay && !run.relay.modelAccess && run.providerId+ && deps.providerAccess?.restricted?.(run.providerId, run.controller))+ .map(run => finishRun(run, 'access-revoked', 'navigation')));+ },/** 立即结束某个控制端的全部任务(例如分享被关闭),不等巡检周期。 */async abortControllers(match: (controller: string) => boolean): Promise<void> {await Promise.all([...runs.values()]diff --git a/apps/desktop/src/main/remote-agent/host/service.ts b/apps/desktop/src/main/remote-agent/host/service.tsindex 1f4283611e..73f35a4378 100644--- a/apps/desktop/src/main/remote-agent/host/service.ts+++ b/apps/desktop/src/main/remote-agent/host/service.ts@@ -32,7 +32,7 @@ import { readTurnUsageResetAt } from '../../goal-host/usageLimit.js';import { getDesktopProviderService } from '../../maker-host/createDesktopProviderService.js';import { bindHostedSessionProvider } from '../../maker-host/session-provider-store.js';import { isRemoteProviderInvocationAllowed } from '../../maker-host/remote-provider-access-store.js';-import { createGuestProviderRouteBinder, resolveGuestProviderId, resolveSharedProviderId } from './providerAccess';+import { createGuestProviderRouteBinder, guestProviderModelIds, resolveGuestProviderId, resolveSharedProviderId } from './providerAccess';import { createRemoteAgentHost, type HostedStartInput, type RemoteAgentHost, type RunUsageRecord } from './runHost';import { purgeClaudeHostedSessionArtifacts, purgeClaudeHostedTranscripts, purgePiHostedSubagentRuns } from './transcripts';import { captureGeneratedImageStorage, generatedImageErrorCode, handleGeneratedImageArtifacts, prepareGeneratedImageTransport } from '../../cindy-media/generatedImageStorage';@@ -144,6 +144,21 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDatisControllerAuthorized,controllerTrust: (controller) => (isProviderSharePeer(controller) ? 'guest' : 'owner'),providerAccess: {+ models: async (kind, providerId, controller) => {+ const views = await getDesktopProviderService().listProviders({ allowSideEffects: false });+ const access = isProviderSharePeer(controller) ? providerShareGuestAccess(controller) : null;+ if (isProviderSharePeer(controller) && access?.providerId !== providerId) return [];+ return guestProviderModelIds(views, providerId, kind)+ .filter(model => isControllerAuthorized(controller) && isRemoteProviderInvocationAllowed(providerId)+ && remoteModelAccess.allows(providerId, model, access?.memberId));+ },+ restricted: (providerId, controller) => {+ try {+ const access = isProviderSharePeer(controller) ? providerShareGuestAccess(controller) : null;+ const rule = remoteModelAccess.read(providerId, access?.memberId);+ return rule.models !== null || rule.providerModels !== null;+ } catch { return true; }+ },resolve: async (kind, model, providerId, controller) => {const views = await getDesktopProviderService().listProviders({ allowSideEffects: false });const memberId = isProviderSharePeer(controller) ? providerShareGuestAccess(controller)?.memberId : undefined;@@ -208,6 +223,7 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDatvoid current.abortAll();},abortControllers: (match) => current.abortControllers(match),+ revalidateModelAccess: () => current.revalidateModelAccess(),abortReshare: (match, reshareKey) => current.abortReshare(match, reshareKey),purgeControllers: (match) => current.purgeControllers(match),activeControllers: () => current.activeControllers(),diff --git a/apps/desktop/src/main/remote-agent/wire.ts b/apps/desktop/src/main/remote-agent/wire.tsindex 3461c98b7d..83c61c6df4 100644--- a/apps/desktop/src/main/remote-agent/wire.ts+++ b/apps/desktop/src/main/remote-agent/wire.ts@@ -172,6 +172,8 @@ export interface RemoteAgentOpenPayload {* 隔离运行,会话记录与目录按(控制端, relay)分开。只发给 caps 声明了 guestRelay 的电脑。*/relay?: string;+ /** Capability-negotiated reverse checks against the original sharing member. */+ relayModelAccess?: boolean;/*** 供应商组转分享:组所在电脑把受邀者的任务转给分享来的组内电脑时,带上这个受邀者(按账号)的转分享键,* 与组所在电脑经 op `reshare` 报上去的键相同。那台的主人同意过这个人才运行;没同意或没带时拒绝。@@ -335,6 +337,7 @@ export function decodeOpenPayload(value: unknown): RemoteAgentOpenPayload {...(value.virtualWorkspace === true ? { virtualWorkspace: true } : {}),...(value.groupAssigned === true ? { groupAssigned: true } : {}),...(typeof value.relay === 'string' && REMOTE_AGENT_RELAY_KEY_PATTERN.test(value.relay) ? { relay: value.relay } : {}),+ ...(value.relayModelAccess === true ? { relayModelAccess: true } : {}),...(typeof value.reshareKey === 'string' && REMOTE_AGENT_RELAY_KEY_PATTERN.test(value.reshareKey)? { reshareKey: value.reshareKey }: {}),diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 49736f8d68..769a1d8c74 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -2808,6 +2808,16 @@ still use the same host-owned mail workflow as the chat card.旧控制端忽略新增字段仍由提供方执行调用权限检查;现有错误码 `REMOTE_AGENT_PROVIDER_NOT_ALLOWED` 也覆盖模型未开放。权限保存于客户端按账号隔离的配置,不改服务端 schema、数据库或 Mobile 原生指纹。+供应商组中转新增可选 caps / open 字段 `relayModelAccess: true`,只有显式声明此能力的执行电脑才接收需要限制模型的任务。+组所在电脑覆盖调用方自报的该字段;执行电脑通过既有 reverse request 发送 `{type:'model-access', model?}`,+由组所在电脑绑定当前运行、供应商和原成员,回复既有 `callback.value`:省略 model 返回获准目录 ID,指定 model 返回布尔授权。+启动取目录交集,后续每次请求重查原成员权限;不缓存肯定答复。复核最长 10 秒,超时、断连、旧运行、撤权或未知回复均拒绝,+只影响本次调用,不重置共享连接或自动重放。异步答复返回后执行端再次核对本地授权及绑定代次。+新组所在电脑给旧执行电脑只转发不限模型的任务;新增限制时结束尚在旧电脑运行的任务。旧组所在电脑不具备此能力,+需更新后才能提供中转成员模型范围保护。旧控制端无需理解 reverse 请求,它在组所在电脑消费;不新增通道或修改移动端原生配置。+Pi 的原生供应商适配器只暴露获准模型,在打开流前用既有本机任务隧道的 bearer token 请求 `/cindy/model-access`,+模型 ID 来自宿主冻结的授权映射。该路径由执行 Host 消费,复用同一绑定与复核,不转给控制端;凭证与消息内容不进入查询。+## 伙伴导入的消息机器人分类`companion-import` Remote Resource 的 client primitives 可追加 `companion-import-bots-v1`。只有声明它的控制端diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.mdindex 98a6aa275a..7ec79d3d47 100644--- a/docs/product-rules/provider-groups.md+++ b/docs/product-rules/provider-groups.md@@ -740,6 +740,9 @@## 14. 版本兼容原则:**没有更新的用户只是没有组,其他功能与现在一致**;新版本里没有建组的供应商,行为与现在完全一致。+模型范围限制另需执行电脑声明 `relayModelAccess`:组所在电脑只把受限成员的任务交给支持逐请求复核的电脑,+否则按既有启动失败流程尝试下一台,没有可用电脑时返回不可用。不限模型的旧电脑仍可接任务;新增限制时结束该旧任务,+不能继续沿用未受限制的路由。完整的模型范围保护要求组所在电脑与执行电脑均更新。新增的协议内容都是可选的,旧版本不认识就忽略:远程 Agent 解码只保留认识的字段(`apps/desktop/src/main/remote-agent/wire.ts`),不认识的错误码会显示成通用错误,所以新错误码只发给声明了支持的电脑。diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 9a12b31ea2..9d1f9f5812 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -581,6 +581,11 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):远程目录只提供可用模型;提供方还必须在创建、切换模型、发送下一轮消息及供应商组转发时校验权限,不能信任控制端传来的目录或模型 id。已开始的一轮不因修改勾选主动中断,下一轮或切换模型时按最新范围校验;同账号远程任务及受邀者经本机代理发出的后续模型请求(含子代理)也按实际供应商与模型复核最新范围。同账号子代理可使用已开放的其他供应商,不因父任务的来源而被固定到同一家;受邀者仍只能使用分享的供应商及个人授权范围。+受邀者执行端交给 Agent 与子代理的可选目录也只包含启动时获准的模型,不把供应商完整目录交给它们。+经供应商组转发后,每次实际模型请求仍由组所在电脑按原成员的最新范围复核,并与执行电脑本地权限取交集;+撤权、断连或无法完成复核时拒绝该请求。目录过滤不能替代请求校验;已运行任务中的旧目录也不能延续已撤销的权限。+Pi 的 API Key 直连保留原生 SDK,由既有原生适配器在打开每条流前经本任务隧道复核,不依赖是否经过 HTTP 代理。+受限任务不分给缺少这项复核能力的旧电脑;原本不限模型的旧电脑任务在新增限制时结束,重新分配到支持复核的电脑。## 13. 后续可选diff --git a/packages/device-link/src/__tests__/remoteAgent.test.ts b/packages/device-link/src/__tests__/remoteAgent.test.tsindex a058ce8846..5f4d5c4850 100644--- a/packages/device-link/src/__tests__/remoteAgent.test.ts+++ b/packages/device-link/src/__tests__/remoteAgent.test.ts@@ -55,6 +55,17 @@ describe('remote agent channel', () => {const caps = { version: 1, agents: [], maxRuns: 16, uploadChunkBytes: 1024, maxPayloadBytes: 2048 };expect(parseRemoteAgentCaps({ ...caps, guestRelay: true }).guestRelay).toBe(true);expect(parseRemoteAgentCaps({ ...caps, guestRelay: 'yes' })).not.toHaveProperty('guestRelay');+ // Restricted relays require an explicit capability; legacy/non-boolean+ // values cannot authorize forwarding to an older execution host.+ expect(parseRemoteAgentCaps(caps)).not.toHaveProperty('relayModelAccess');+ expect(parseRemoteAgentCaps({ ...caps, relayModelAccess: true }).relayModelAccess).toBe(true);+ expect(parseRemoteAgentCaps({ ...caps, relayModelAccess: 'yes' })).not.toHaveProperty('relayModelAccess');+ const request = { t: 'request', requestId: otherId, request: { type: 'model-access', model: 'opus' } };+ expect(parseRemoteAgentStreamItem(JSON.stringify(request))).toEqual(request);+ expect(parseRemoteAgentStreamItem(JSON.stringify({ ...request, request: { type: 'model-access' } }))).toMatchObject({ request: { type: 'model-access' } });+ for (const model of ['', 1, 'a'.repeat(513)]) {+ expect(() => parseRemoteAgentStreamItem(JSON.stringify({ ...request, request: { type: 'model-access', model } }))).toThrow('REMOTE_AGENT_INVALID');+ }});// 转分享(provider-sharing.md §4.3):组所在电脑把它分享的人报给分享来的组内电脑,由那台的主人逐人同意。diff --git a/packages/device-link/src/remoteAgent.ts b/packages/device-link/src/remoteAgent.tsindex 12a40a28f2..a4b42fbf94 100644--- a/packages/device-link/src/remoteAgent.ts+++ b/packages/device-link/src/remoteAgent.ts@@ -104,6 +104,7 @@ export interface RemoteAgentErrorInfo {/** 被控端请控制端处理的反向请求。 */export type RemoteAgentReverseRequest =+ | { type: 'model-access'; model?: string }| { type: 'interaction'; request: unknown }| {type: 'http';@@ -263,6 +264,8 @@ export interface RemoteAgentCaps {* 不声明的电脑,组所在电脑不给它分受邀者的任务(否则受邀者会拿到主人级权限)。*/guestRelay?: boolean;+ /** Group relays can query the original member's live model grants before dispatch. */+ relayModelAccess?: boolean;/*** 供应商组转分享:受邀者(组所在电脑)可以报上它分享的人、由这台的主人逐人同意(op `reshare`),组转来的受邀者任务* 只在同意过的人上运行。不声明的电脑给不出同意,组所在电脑不把受邀者的任务分给它。@@ -606,6 +609,7 @@ export function parseRemoteAgentCaps(value: unknown): RemoteAgentCaps {...(v.imageRecovery === true ? { imageRecovery: true } : {}),...(v.imageRecoveryRelay === true ? { imageRecoveryRelay: true } : {}),...(v.guestRelay === true ? { guestRelay: true } : {}),+ ...(v.relayModelAccess === true ? { relayModelAccess: true } : {}),...(v.reshareConsent === true ? { reshareConsent: true } : {}),...(v.reshareBatch === true ? { reshareBatch: true } : {}),};@@ -666,6 +670,9 @@ function headerList(value: unknown): Array<[string, string]> {function reverseRequest(value: unknown): RemoteAgentReverseRequest {const v = record(value);switch (v.type) {+ case 'model-access':+ if (v.model !== undefined && (typeof v.model !== 'string' || !v.model || v.model.length > 512)) invalid();+ return { type: 'model-access', ...(typeof v.model === 'string' ? { model: v.model } : {}) };case 'interaction':return { type: 'interaction', request: v.request };case 'http': {diff --git a/packages/maker-core/src/agents/base-agent.ts b/packages/maker-core/src/agents/base-agent.tsindex 1858e983f6..5d0c55f318 100644--- a/packages/maker-core/src/agents/base-agent.ts+++ b/packages/maker-core/src/agents/base-agent.ts@@ -1076,6 +1076,7 @@ export interface AgentDeps {deviceHostedGuestProviderId?: string;/** Owning guest session for model authorization on requests without thread headers. */deviceHostedGuestSessionId?: string;+ deviceHostedGuestModelIds?: readonly string[];},) => Promise<CodexExtraSpawnConfig>;diff --git a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.tsindex 1e6196540f..7e98a4afd8 100644--- a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts+++ b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts@@ -480,6 +480,7 @@ describe('Codex device-hosted guest sessions', () => {// 独占的 app-server 带上分享的供应商:host 据此只留这个供应商的路由,不开智能子代理调配。expect(options?.deviceHostedGuestProviderId).toBe('xd');expect(options?.deviceHostedGuestSessionId).toBe('hosted-session');+ expect(options?.deviceHostedGuestModelIds).toEqual(SHARED_PROVIDER.modelIds);// 不按 id 到本机用户的 Codex 历史里查找,不把本机托管技能投影进来,也不登记线程位置。expect(fixture.prepareCodexResumeSession).not.toHaveBeenCalled();expect(fixture.resolveCodexThreadStorage).not.toHaveBeenCalled();diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.tsindex 7e2f0b4fd7..c1a1f4e4ee 100644--- a/packages/maker-core/src/agents/codex/index.ts+++ b/packages/maker-core/src/agents/codex/index.ts@@ -2575,6 +2575,7 @@ export class CodexAgent extends BaseAgent {/** 受邀者任务的 app-server:值是分享给它的供应商(见 prepareCodexExtraSpawnConfig)。 */deviceHostedGuestProviderId?: string;deviceHostedGuestSessionId?: string;+ deviceHostedGuestModelIds?: readonly string[];} = {},): Promise<AppServerHost> {const key = opts.keyOverride ?? (opts.providerId ? `local-account:${opts.providerId}` : hostKey(remoteHostId));@@ -2804,6 +2805,7 @@ assertRouteCurrent();opts.deviceHostedGuestProviderId,opts.nativeStorageOnly,opts.deviceHostedGuestSessionId,+ opts.deviceHostedGuestModelIds,).finally(() => {// 成功: this.hosts 已赋值, 后续走快路径; 失败: 清掉 promise 让下次调用能重试const current = this.hostPromises.get(key);@@ -3054,6 +3056,7 @@ assertRouteCurrent();deviceHostedGuestProviderId?: string,nativeStorageOnly?: boolean,deviceHostedGuestSessionId?: string,+ deviceHostedGuestModelIds?: readonly string[],): Promise<AppServerHost> {const seq = (this.createHostSeqByKey.get(key) ?? 0) + 1;this.createHostSeqByKey.set(key, seq);@@ -3198,7 +3201,7 @@ assertRouteCurrent();customContextHostKey: `${key}:${generation}`,}: {}),- ...(deviceHostedGuestProviderId ? { deviceHostedGuestProviderId, deviceHostedGuestSessionId } : {}),+ ...(deviceHostedGuestProviderId ? { deviceHostedGuestProviderId, deviceHostedGuestSessionId, deviceHostedGuestModelIds } : {}),},);hostRetirementCleanup = cfg.onHostRetired;@@ -5154,7 +5157,7 @@ assertRouteCurrent();? { keyOverride: currentHostKey }: {}),...(localAuthPolicy === 'isolated' ? { localAuthPolicy } : {}),- ...(guestCodexHome && guestProviderId ? { deviceHostedGuestProviderId: guestProviderId, deviceHostedGuestSessionId: sid } : {}),+ ...(guestCodexHome && guestProviderId ? { deviceHostedGuestProviderId: guestProviderId, deviceHostedGuestSessionId: sid, deviceHostedGuestModelIds: hosted?.guestProvider?.modelIds } : {}),...(reviewMode? { hostPurpose: 'review' as const }: usesCustomContextHostdiff --git a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterAliases.test.ts b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterAliases.test.tsindex 73747c568b..6520f92600 100644--- a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterAliases.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterAliases.test.ts@@ -2,6 +2,18 @@ import { describe, expect, it } from 'vitest';import { nativeProviderAdapterAliases, PI_NATIVE_PROVIDER_ADAPTER_SOURCE } from '../native-provider-adapter-source.js';describe('nativeProviderAdapterAliases', () => {+ // Unit, sharing §12: native wire IDs differ from grant IDs. The generated+ // adapter must query the catalog identity rather than deny/bypass a bare alias.+ it.each([+ { source: 'openai', model: 'chatgpt/gpt', wire: 'gpt', grant: 'chatgpt/gpt' },+ { source: 'xai', model: 'xai/grok', wire: 'grok', grant: 'grok' },+ ])('maps $source native model aliases to the original grant', ({ source, model, wire, grant }) => {+ expect(nativeProviderAdapterAliases([{ id: 'runtime', sourceProviderId: source, name: 'Native',+ models: [{ id: model, wireId: wire }, { id: 'denied' }], modelIdAliases: { [grant]: model },+ }], [grant])).toEqual([{ id: 'runtime', name: 'Native', provider: 'runtime', models: [+ { id: model, grant }, { id: wire, grant },+ ] }]);+ });it('registers proxy-authenticated adapters without requiring an API key env', () => {expect(nativeProviderAdapterAliases([{ id: 'copilot-oauth', name: 'Copilot', adapterProvider: 'github-copilot' },diff --git a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.tsindex 33241bc262..dd3851f5b6 100644--- a/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/nativeProviderAdapterRefresh.test.ts@@ -1,14 +1,15 @@import { runInNewContext } from 'node:vm';import ts from 'typescript';-import { describe, expect, it } from 'vitest';+import { describe, expect, it, vi } from 'vitest';import { CINDY_BRIDGE_EXTENSION_SOURCE } from '../cindy-bridge-source.js';import { PI_NATIVE_PROVIDER_ADAPTER_SOURCE } from '../native-provider-adapter-source.js';-type RegisteredProvider = { id: string; auth: { apiKey?: unknown; oauth?: unknown }; getModels: () => unknown[] };+type RegisteredProvider = { id: string; auth: { apiKey?: unknown; oauth?: unknown }; getModels: () => unknown[];+ streamSimple(model: unknown, context: unknown, options: unknown): Promise<unknown> };-type Alias = { id: string; name: string; provider: string; keyEnv?: string };+type Alias = { id: string; name: string; provider: string; keyEnv?: string; models?: Array<{ id: string; grant: string }> };-function loadAdapter(initialAliases: Alias[] = []) {+function loadAdapter(initialAliases: Alias[] = [], network?: { fetch: unknown; stream: unknown }) {const env: Record<string, string> = {CINDY_PI_NATIVE_PROVIDER_ADAPTERS: JSON.stringify(initialAliases),CINDY_PI_KEY_OLD: 'old-secret',@@ -28,7 +29,8 @@ function loadAdapter(initialAliases: Alias[] = []) {},unregisterProvider(id: string) { actions.push(`unregister:${id}`); providers.delete(id); },};- let models: Array<{ provider: string; id: string }> = initialAliases.map((alias) => ({ provider: alias.id, id: 'old' }));+ let models: Array<{ provider: string; id: string }> = initialAliases.flatMap((alias) => alias.models+ ? ['allowed', 'denied'].map(id => ({ provider: alias.id, id })) : [{ provider: alias.id, id: 'old' }]);let nextModels = models;const ctx = {modelRegistry: {@@ -47,9 +49,12 @@ function loadAdapter(initialAliases: Alias[] = []) {}).outputText;const sandbox: Record<string, unknown> = {process: { env },+ CINDY_HOSTED: { guest: true, url: 'http://127.0.0.1:9', token: 'run-token' },+ fetch: network?.fetch, AbortSignal,__loadPiAi: async (name: string) => name.endsWith('/compat')- ? { getApiProvider: () => undefined }- : { lazyStream: () => undefined, envApiKeyAuth: (label: string, envVars: string[]) => ({ label, envVars }) },+ ? { getApiProvider: () => network ? { stream: network.stream, streamSimple: network.stream } : undefined }+ : { lazyStream: network ? (_model: unknown, factory: () => unknown) => factory() : () => undefined,+ envApiKeyAuth: (label: string, envVars: string[]) => ({ label, envVars }) },};runInNewContext(compiled, sandbox);const adapter = sandbox.adapter as {@@ -64,6 +69,35 @@ function loadAdapter(initialAliases: Alias[] = []) {}describe('Cindy native provider refresh bridge', () => {+ // Unit, sharing §12: Pi API-key transports bypass the HTTP proxy. The existing+ // refresh tests never opened a native stream. Execute the generated adapter:+ // only A is listed; revocation/failure must stop before the native SDK opens.+ it('filters inherited models and authorizes each guest native stream before calling the SDK', async () => {+ let allowed = true;+ const fetchGrant = vi.fn(async () => ({ ok: true, json: async () => ({ allowed }) }));+ const stream = vi.fn(async function* () {});+ const h = loadAdapter([{ id: 'byok', name: 'BYOK', provider: 'native', models: [{ id: 'allowed', grant: 'catalog-a' }] }],+ { fetch: fetchGrant, stream });+ const adapter = await h.adapter.registerCindyNativeProviderAdapters(h.pi);+ h.handlers.get('session_start')!({}, h.ctx);+ const provider = h.providers.get('byok')!;+ expect(provider.getModels()).toEqual([{ provider: 'byok', id: 'allowed' }]);+ const request = (id = 'allowed') => provider.streamSimple({ provider: 'byok', id, api: 'openai-responses' }, { messages: [] }, {});+ await request();+ expect(stream).toHaveBeenCalledTimes(1);+ expect(fetchGrant).toHaveBeenCalledWith('http://127.0.0.1:9/cindy/model-access', expect.objectContaining({+ headers: { Authorization: 'Bearer run-token', 'content-type': 'application/json' }, body: JSON.stringify({ model: 'catalog-a' }),+ }));+ allowed = false;+ await expect(request()).rejects.toThrow('not authorized');+ await expect(request('denied')).rejects.toThrow('not authorized');+ fetchGrant.mockRejectedValueOnce(new Error('disconnected'));+ await expect(request()).rejects.toThrow('disconnected');+ await adapter.refresh({ nonce: 'abcdefghijklmnop', env: {}, aliases: [{ id: 'byok', name: 'BYOK', provider: 'native', models: [] }] }, h.ctx, new Set());+ expect(h.providers.get('byok')!.getModels()).toEqual([]);+ await expect(h.providers.get('byok')!.streamSimple({ id: 'allowed' }, { messages: [] }, {})).rejects.toThrow('not authorized');+ expect(stream).toHaveBeenCalledTimes(1);+ });it('validates the entire nonce-bound snapshot before any env or provider mutation', () => {const { adapter } = loadAdapter();const nonce = 'abcdefghijklmnop';@@ -87,7 +121,7 @@ describe('Cindy native provider refresh bridge', () => {const h = loadAdapter([old]);const controller = await h.adapter.registerCindyNativeProviderAdapters(h.pi);h.handlers.get('session_start')?.({}, h.ctx);- h.providers.set('package-owned', { id: 'package-owned', auth: {}, getModels: () => [] });+ h.providers.set('package-owned', { id: 'package-owned', auth: {}, getModels: () => [], streamSimple: async () => undefined });h.setModels([{ provider: 'next', id: 'new-model' }]);const secrets = new Set(['CINDY_PI_KEY_OLD']);await controller.refresh({ nonce: 'abcdefghijklmnop', env: { CINDY_PI_KEY_NEXT: 'next-secret' }, aliases: [next] }, h.ctx, secrets);diff --git a/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.ts b/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.tsindex e54ca696d3..ee20aaf3d4 100644--- a/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.ts+++ b/packages/maker-core/src/agents/pi/__tests__/pi-device-hosted-guest.test.ts@@ -307,7 +307,7 @@ describe('Pi device-hosted guest sessions', () => {const registered: Array<string | null> = [];const deps: Partial<AgentDeps> = {resolvePiNativeProviders: async () => ({- providers: [byom('byom-a', 'model-a'), byom('byom-b', 'model-b')],+ providers: [{ ...byom('byom-a', 'model-a'), models: [{ id: 'model-a' }, { id: 'denied-model' }] }, byom('byom-b', 'model-b')],env: {CINDY_PI_KEY_BYOM_A: 'key-a',CINDY_PI_KEY_BYOM_B: 'key-b',@@ -336,6 +336,11 @@ describe('Pi device-hosted guest sessions', () => {const models = JSON.parse(readFileSync(path.join(configHome, 'models.json'), 'utf8'));expect(Object.keys(models.providers).sort()).toEqual(['byom-a', 'cindy']);expect(models.providers.cindy.models).toEqual([]);+ expect(models.providers['byom-a'].models.map((m: { id: string }) => m.id)).toEqual(['model-a']);+ expect(JSON.parse(env.CINDY_PI_NATIVE_PROVIDER_ADAPTERS!)).toEqual([{+ id: 'byom-a', name: 'byom-a', provider: 'byom-a', keyEnv: 'CINDY_PI_KEY_BYOM_A',+ models: [{ id: 'model-a', grant: 'model-a' }],+ }]);expect(env.CINDY_PI_KEY_BYOM_A).toBe('key-a');expect(env.CINDY_PI_BYOM_A_HEADER_authorization).toBe('header-a');expect(env.CINDY_PI_KEY_BYOM_B).toBeUndefined();@@ -356,7 +361,9 @@ describe('Pi device-hosted guest sessions', () => {it('keeps a guest sharing the Cindy gateway on gateway models only', async () => {const { deps, registered } = providerDeps();- const { handle, env, configHome } = await start(true, { deps });+ const { handle, env, configHome } = await start(true, { deps: { ...deps, capabilityAdditions: {+ availableModels: ['m', 'denied-gateway-model'].map(id => ({ id, displayName: id, contextWindow: 200000, efforts: [], defaultEffort: null })),+ } } });try {const models = JSON.parse(readFileSync(path.join(configHome, 'models.json'), 'utf8'));expect(Object.keys(models.providers)).toEqual(['cindy']);@@ -394,7 +401,7 @@ describe('Pi device-hosted guest sessions', () => {expect(env.CINDY_PI_BYOM_B_HEADER_authorization).toBe('header-b');expect(env.CINDY_PI_UNREFERENCED).toBe('stray');expect(env.CINDY_PI_VISION_BRIDGE_TEST).toBe('vision-secret');- expect(Object.keys(readSubagentRoutes(env)).sort()).toEqual(['m', 'model-a', 'model-b']);+ expect(Object.keys(readSubagentRoutes(env)).sort()).toEqual(['denied-model', 'm', 'model-a', 'model-b']);expect(new Set(registered)).toEqual(new Set(['byom-a', 'byom-b', null]));} finally {await handle.close();diff --git a/packages/maker-core/src/agents/pi/device-hosted-guest.ts b/packages/maker-core/src/agents/pi/device-hosted-guest.tsindex 0fe1e19b3f..3ee2d7e20c 100644--- a/packages/maker-core/src/agents/pi/device-hosted-guest.ts+++ b/packages/maker-core/src/agents/pi/device-hosted-guest.ts@@ -47,11 +47,21 @@ function referencedEnvNames(provider: PiNativeProvidersResult['providers'][numbeexport function restrictPiGuestNativeProviders<T extends PiNativeProvidersResult | null | undefined>(result: T,providerId: string,+ modelIds?: readonly string[],): T {if (!result) return result;+ const allowed = modelIds ? new Set(modelIds) : null;const shared = piGuestUsesGateway(providerId) ? [] : result.providers.filter((provider) => (provider.sourceProviderId ?? provider.id) === providerId,- );+ ).map(provider => {+ if (!allowed) return provider;+ const models = provider.models.filter(model => allowed.has(model.id)+ || allowed.has(`${providerId === 'openai' ? 'chatgpt' : providerId}/${model.id}`)+ || Object.entries(provider.modelIdAliases ?? {}).some(([alias, target]) => target === model.id && allowed.has(alias)));+ const kept = new Set(models.map(model => model.id));+ return { ...provider, models, modelIdAliases: Object.fromEntries(Object.entries(provider.modelIdAliases ?? {})+ .filter(([, target]) => kept.has(target))) };+ });const keptKeys = new Set(shared.flatMap(referencedEnvNames));return {...result,diff --git a/packages/maker-core/src/agents/pi/index.ts b/packages/maker-core/src/agents/pi/index.tsindex edc771254a..28a2a2bbd4 100644--- a/packages/maker-core/src/agents/pi/index.ts+++ b/packages/maker-core/src/agents/pi/index.ts@@ -2257,6 +2257,7 @@ export class PiAgent extends BaseAgent {disabledSkills?: DisabledSkillLaunchSnapshot;/** 受邀者分享的不是 Cindy 网关:网关 provider 块不写任何模型(Pi 选不到网关路由)。 */omitGatewayModels?: boolean;+ allowedModelIds?: readonly string[];} = {},): Promise<{cacheRoutes: Map<string, PiCacheCompatibility>;@@ -2285,11 +2286,12 @@ export class PiAgent extends BaseAgent {}this.deps.logger.warn('pi: runtimeConfig.endpoint missing — models.json will have no usable provider');}- const publicModels = opts.omitGatewayModels+ const gatewayModels = opts.omitGatewayModels? []: this.deps.resolvePiRuntimeModels?.() ?? this.capabilities.availableModels;+ const publicModels = opts.allowedModelIds ? gatewayModels.filter(model => opts.allowedModelIds!.includes(model.id)) : gatewayModels;const runtimeModels =- !opts.omitGatewayModels && retainedRuntimeModel && !publicModels.some((m) => m.id === retainedRuntimeModel.id)+ !opts.omitGatewayModels && retainedRuntimeModel && (!opts.allowedModelIds || opts.allowedModelIds.includes(retainedRuntimeModel.id)) && !publicModels.some((m) => m.id === retainedRuntimeModel.id)? [...publicModels, retainedRuntimeModel]: publicModels;const gatewayImageInputByModel = new Map<string, boolean>();@@ -2683,7 +2685,7 @@ export class PiAgent extends BaseAgent {const sessionNativeProviderResolver = (): AgentDeps['resolvePiNativeProviders'] => {const resolve = this.deps.resolvePiNativeProviders;if (!resolve || !guestProviderId) return resolve?.bind(this.deps);- return async (input) => restrictPiGuestNativeProviders(await resolve.call(this.deps, input), guestProviderId);+ return async (input) => restrictPiGuestNativeProviders(await resolve.call(this.deps, input), guestProviderId, hosted?.guestProvider?.modelIds);};const resolvePiNativeProviders = sessionNativeProviderResolver();const sessionPiAutoCompactPct = this.deps.runtimeConfig.piAutoCompactThresholdPct;@@ -3004,6 +3006,7 @@ export class PiAgent extends BaseAgent {// the current `cindy` provider and leak an invalid unnamespaced model id.// 受邀者分享的不是网关时,子代理不能改走网关。const routedGatewaySubagentModels = guestOmitsGateway ? [] : gatewaySubagentModels.filter((model) => {+ if (hostedGuest && !hosted?.guestProvider?.modelIds.includes(model.id)) return false;const resolverContext = { remote, runtimeBinaryPath: sessionRuntimeBinaryPath };const spec = this.deps.resolvePiGatewayModelSpec?.(PI_PROVIDER_ID, model.id, resolverContext);const api = spec?.api ?? this.deps.resolvePiGatewayModelApi?.(@@ -3295,6 +3298,7 @@ export class PiAgent extends BaseAgent {piCompactionPct: sessionPiAutoCompactPct,runtimeBinaryPath: sessionRuntimeBinaryPath,...(guestOmitsGateway ? { omitGatewayModels: true } : {}),+ ...(hostedGuest ? { allowedModelIds: hosted?.guestProvider?.modelIds } : {}),},);const explicitlyRequestedGateway = isExplicitPiGatewayProviderId(opts.providerId);@@ -5533,7 +5537,7 @@ export class PiAgent extends BaseAgent {...(proxyEnv ?? {}),// BYOM 原生 provider 的 api keys(键名对应 spec.apiKeyEnvVar,models.json 用 $ENV 引用)。...nativeEnv,- CINDY_PI_NATIVE_PROVIDER_ADAPTERS: JSON.stringify(nativeProviderAdapterAliases(nativeProviders)),+ CINDY_PI_NATIVE_PROVIDER_ADAPTERS: JSON.stringify(nativeProviderAdapterAliases(nativeProviders, hostedGuest ? hosted?.guestProvider?.modelIds : undefined)),// 外部 MCP header 真值只经 env 交给 bridge extension;host 生成独立名字,// 且这些键已进入 piSecretEnvNames,LLM 可调用的 bash 子进程拿不到。...mcpEnv,@@ -6744,6 +6748,7 @@ export class PiAgent extends BaseAgent {?? retainedRuntimeModel) : retainedLiveGatewayModel,gateway ? requestedProviderId : authProviderId,{ remote, fileOps, preview: true,+ allowedModelIds: hosted?.guestProvider?.modelIds,contextWindow: targetContextWindow ?? ctx.contextWindow ?? startupContextWindow,workingContextWindow: this.deps.resolveModelContextLimit?.(sourceId, model) ?? undefined,piCompactionPct: sessionPiAutoCompactPct,@@ -6759,8 +6764,8 @@ export class PiAgent extends BaseAgent {const envChanged = Object.keys({ ...nativeEnv, ...latestEnv }).some((key) => nativeEnv[key] !== latestEnv[key],);- const adaptersChanged = JSON.stringify(nativeProviderAdapterAliases(nativeProviders))- !== JSON.stringify(nativeProviderAdapterAliases(latestProviders));+ const adaptersChanged = JSON.stringify(nativeProviderAdapterAliases(nativeProviders, hostedGuest ? hosted?.guestProvider?.modelIds : undefined))+ !== JSON.stringify(nativeProviderAdapterAliases(latestProviders, hostedGuest ? hosted?.guestProvider?.modelIds : undefined));let gatewayCredentialChanged = false;if (remote && gateway) {try {@@ -6832,7 +6837,7 @@ export class PiAgent extends BaseAgent {const gatewayAuthEnv = remote && nextGateway? await this.deps.auth.getAuthEnv({ credentialMode: 'gateway-key', providerId: requestedProviderId }): authEnv;- const nextAliases = nativeProviderAdapterAliases(nextProviders);+ const nextAliases = nativeProviderAdapterAliases(nextProviders, hostedGuest ? hosted?.guestProvider?.modelIds : undefined);const mutableEnv = (value: Record<string, string>) => Object.fromEntries(Object.entries(value).filter(([key]) => /^CINDY_PI_KEY_[A-Z0-9_]+$/.test(key)|| key === PI_API_KEY_ENV || key === PI_SESSION_TOKEN_ENV@@ -6884,6 +6889,7 @@ export class PiAgent extends BaseAgent {nextGateway ? (nextDescriptor ?? retainedLiveGatewayModel ?? retainedRuntimeModel) : retainedLiveGatewayModel,nextGateway ? requestedProviderId : authProviderId,{ remote, fileOps, contextWindow: nextDescriptor?.contextWindow ?? ctx.contextWindow,+ allowedModelIds: hosted?.guestProvider?.modelIds,workingContextWindow: this.deps.resolveModelContextLimit?.(sourceId, model) ?? undefined,piCompactionPct: sessionPiAutoCompactPct, runtimeBinaryPath: sessionRuntimeBinaryPath,packages: nativePackagePaths,diff --git a/packages/maker-core/src/agents/pi/native-provider-adapter-source.ts b/packages/maker-core/src/agents/pi/native-provider-adapter-source.tsindex 1fb2dd8d88..d950f72164 100644--- a/packages/maker-core/src/agents/pi/native-provider-adapter-source.ts+++ b/packages/maker-core/src/agents/pi/native-provider-adapter-source.ts@@ -1,21 +1,30 @@/** Preserve Pi's provider-specific serializers for independently named Cindy connections. */export function nativeProviderAdapterAliases(- nativeProviders: Array<{ id: string; name: string; adapterProvider?: string; apiKeyEnvVar?: string }>,-): Array<{ id: string; name: string; provider: string; keyEnv?: string }> {- return nativeProviders.flatMap((provider) =>- provider.adapterProvider- ? [{- id: provider.id,- name: provider.name,- provider: provider.adapterProvider,- ...(provider.apiKeyEnvVar ? { keyEnv: provider.apiKeyEnvVar } : {}),- }]- : [],- );+ nativeProviders: Array<{ id: string; name: string; adapterProvider?: string; apiKeyEnvVar?: string;+ sourceProviderId?: string; models?: Array<{ id: string; wireId?: string }>; modelIdAliases?: Record<string, string> }>,+ guestModelIds?: readonly string[],+): Array<{ id: string; name: string; provider: string; keyEnv?: string; models?: Array<{ id: string; grant: string }> }> {+ return nativeProviders.flatMap((provider) => {+ const adapter = provider.adapterProvider ?? (guestModelIds ? provider.id : undefined);+ const source = provider.sourceProviderId ?? provider.id;+ const models = guestModelIds ? (provider.models ?? []).flatMap(model => {+ const grant = guestModelIds.find(id => id === model.id || provider.modelIdAliases?.[id] === model.id+ || id === `${source === 'openai' ? 'chatgpt' : source}/${model.id}`);+ return grant ? [...new Set([model.id, model.wireId ?? model.id])].map(id => ({ id, grant })) : [];+ }) : undefined;+ return adapter ? [{+ id: provider.id,+ name: provider.name,+ provider: adapter,+ ...(provider.apiKeyEnvVar ? { keyEnv: provider.apiKeyEnvVar } : {}),+ ...(models ? { models } : {}),+ }]+ : [];+ });}export const PI_NATIVE_PROVIDER_ADAPTER_SOURCE = String.raw`-type CindyAdapterAlias = { id: string; name: string; provider: string; keyEnv?: string };+type CindyAdapterAlias = { id: string; name: string; provider: string; keyEnv?: string; models?: Array<{ id: string; grant: string }> };type CindyProviderRefreshSnapshot = {nonce: string;env: Record<string, string>;@@ -58,9 +67,12 @@ function parseCindyProviderRefreshSnapshot(raw: unknown, nonce: string): CindyPr|| !cindyRefreshEnvAllowed(alias.keyEnv)|| !Object.hasOwn(env, alias.keyEnv))) return undefined;+ if (alias.models !== undefined && (!Array.isArray(alias.models) || alias.models.some((model: any) =>+ !model || typeof model.id !== 'string' || !model.id || typeof model.grant !== 'string' || !model.grant))) return undefined;seen.add(alias.id);aliases.push({ id: alias.id, name: alias.name, provider: alias.provider,- ...(alias.keyEnv ? { keyEnv: alias.keyEnv } : {}) });+ ...(alias.keyEnv ? { keyEnv: alias.keyEnv } : {}),+ ...(alias.models ? { models: alias.models.map((model: any) => ({ id: model.id, grant: model.grant })) } : {}) });}return { nonce, env, aliases };}@@ -87,9 +99,20 @@ async function registerCindyNativeProviderAdapters(pi: any) {if (!apis) throw new Error('Native provider adapter is unavailable');const { lazyStream, envApiKeyAuth, getApiProvider } = apis;for (const alias of currentAliases) {- const providerModels = models.filter((model: any) => model.provider === alias.id);- if (providerModels.length === 0) continue;+ const providerModels = models.filter((model: any) => model.provider === alias.id+ && (!alias.models || alias.models.some(allowed => allowed.id === model.id)));+ if (providerModels.length === 0 && !alias.models) continue;const stream = (model: any, context: any, options: any, simple: boolean) => lazyStream(model, async () => {+ if (alias.models) {+ const grant = alias.models.find(allowed => allowed.id === model.id)?.grant;+ if (!grant || !CINDY_HOSTED?.guest) throw new Error('The model is not authorized for this shared task');+ const signal = options?.signal ? AbortSignal.any([options.signal, AbortSignal.timeout(10000)]) : AbortSignal.timeout(10000);+ const response = await fetch(CINDY_HOSTED.url + '/cindy/model-access', {+ method: 'POST', headers: { Authorization: 'Bearer ' + CINDY_HOSTED.token, 'content-type': 'application/json' },+ body: JSON.stringify({ model: grant }), signal,+ });+ if (!response.ok || (await response.json()).allowed !== true) throw new Error('The model is not authorized for this shared task');+ }const api = getApiProvider(model.api);if (!api) throw new Error('The selected native provider API is unavailable');const nativeModel = { ...model, provider: alias.provider };