Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

feat(providers): 管理远程与分享的模型权限

DavidShenb8058918fe70
diff --git a/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx b/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx
index 78e2297d4f..67ab720d7c 100644
--- a/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx
+++ b/apps/desktop/scripts/fixtures/provider-share-insights/provider-share-insights-fixture.tsx
@@ -145,6 +145,12 @@ void mountPage({
favoriteRecovery?: { ownerStamp: unknown };
}) => {
switch (cmd.action) {
+ case 'get-model-access':
+ return { version: 1, models: null, providerModels: null, availableModels: [
+ { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6' },
+ { id: 'claude-opus-4-6', name: 'Claude Opus 4.6' },
+ { id: 'gpt-5.5', name: 'GPT-5.5' },
+ ] };
case 'get-visibility':
return visibility;
case 'set-visibility':
@@ -178,6 +184,8 @@ void mountPage({
};
case 'get-credential-consent':
return { skip: false };
+ case 'get-idle-release':
+ return { value: { idleMinutes: 0 }, defaults: { idleMinutes: 0 }, isCustomized: false };
case 'owned':
return {
ready: true,
diff --git a/apps/desktop/scripts/fixtures/remote-model-access/remote-model-access-fixture.tsx b/apps/desktop/scripts/fixtures/remote-model-access/remote-model-access-fixture.tsx
new file mode 100644
index 0000000000..7798a406c3
--- /dev/null
+++ b/apps/desktop/scripts/fixtures/remote-model-access/remote-model-access-fixture.tsx
@@ -0,0 +1,33 @@
+import { AppFrame, mountPage, subscription } from '../../ui-page/harness';
+import { RemoteModelAccessDialog, RemoteModelAccessSection } from '../../../src/renderer/features/provider-share/RemoteModelAccessSection';
+import type { RemoteModelSelection } from '../../../src/shared/remoteModelAccess';
+
+void mountPage({
+ host: (ctx) => {
+ let models: RemoteModelSelection = ctx.case === 'member' ? ['small'] : null;
+ return {
+ providerShare: {
+ onOwnedChanged: subscription('ownedShares'),
+ command: async (cmd: { action: string; models?: RemoteModelSelection }) => {
+ if (cmd.action === 'set-model-access') models = cmd.models ?? null;
+ return {
+ version: 1, models, providerModels: ctx.case === 'member' ? ['small', 'medium'] : null,
+ availableModels: [
+ { id: 'small', name: 'Claude Haiku' },
+ { id: 'medium', name: 'Claude Sonnet' },
+ { id: 'large', name: 'Claude Opus' },
+ ],
+ };
+ },
+ },
+ };
+ },
+ render: (ctx) => (
+ <AppFrame header={false}>
+ <div className="p-6">
+ <RemoteModelAccessSection providerId="fixture-provider" />
+ {ctx.case === 'member' && <RemoteModelAccessDialog providerId="fixture-provider" memberId="fixture-member" memberName="小林" onClose={() => {}} />}
+ </div>
+ </AppFrame>
+ ),
+});
diff --git a/apps/desktop/scripts/fixtures/remote-model-access/ui-page.mjs b/apps/desktop/scripts/fixtures/remote-model-access/ui-page.mjs
new file mode 100644
index 0000000000..21ca0f032c
--- /dev/null
+++ b/apps/desktop/scripts/fixtures/remote-model-access/ui-page.mjs
@@ -0,0 +1,31 @@
+import assert from 'node:assert/strict';
+
+export default {
+ name: 'remote-model-access',
+ entry: './remote-model-access-fixture.tsx',
+ viewport: { width: 760, height: 700 },
+ real: 'RemoteModelAccessSection, RemoteModelAccessDialog, product buttons, translations and themes',
+ notCovered: 'Live IPC, persisted permissions and cross-device calls. Names and models are fixture data.',
+ cases: {
+ default: { about: 'Provider-wide model selection' },
+ member: { about: 'Per-person model selection within the provider ceiling' },
+ },
+ async ready(page) {
+ await page.getByRole('button', { name: /.+/ }).first().waitFor();
+ },
+ async check(page, ui) {
+ if (ui.case === 'default') {
+ await page.getByRole('button', { name: await ui.t('providerShare.modelAccess.choose'), exact: true }).click();
+ }
+ const small = page.getByRole('checkbox', { name: 'Claude Haiku', exact: true });
+ await small.waitFor();
+ if (ui.case === 'member') {
+ assert.equal(await page.getByRole('checkbox', { name: 'Claude Opus', exact: true }).isEnabled(), false);
+ assert.equal(await small.isChecked(), true);
+ } else {
+ await small.uncheck();
+ assert.equal(await small.isChecked(), false);
+ }
+ await ui.capture('models');
+ },
+};
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts
index ca2897870a..bcdd7c9e7c 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts
@@ -190,6 +190,28 @@ describe('provider share invoke', () => {
}, 'anthropic') as { providers: unknown[] }).providers).toEqual([]);
});
+ it('returns only each member’s allowed models through the real picker read', async () => {
+ const second = providerShareGuestPeer('share-1', 'member-2', 'laptop');
+ setProviderShareAccess({
+ guestAccess: (src) => ({ ...ACCESS, memberId: src === GUEST ? 'member-1' : 'member-2' }),
+ ensureKnown: async () => undefined, hasShares: () => true,
+ modelAllowed: (src, _provider, model) => model === (src === GUEST ? 'small' : 'large'),
+ });
+ const { __testing: registry } = await import('../invoke-registry');
+ registry.reset();
+ registry.register('maker:provider:list', async () => ({ providers: [{
+ id: 'anthropic', remoteInvocationEnabled: true,
+ models: { 'claude-code': [{ id: 'small' }, { id: 'large' }] },
+ }] }));
+ try {
+ for (const [src, model] of [[GUEST, 'small'], [second, 'large']]) {
+ await expect(runInvoke(src, { channel: 'maker:provider:list', args: [] })).resolves.toMatchObject({
+ ok: true, result: { providers: [{ models: { 'claude-code': [{ id: model }] } }] },
+ });
+ }
+ } finally { registry.reset(); }
+ });
+
it('never hands the sharer account identity to the guest', () => {
const projected = __testing.projectProviderListForShare({
providers: [{
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
index cb153001b2..680ad01d56 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
@@ -16,6 +16,8 @@ const usageStores = vi.hoisted(() => ({ ownHistory: vi.fn(), memberHistory: vi.f
const memberNotes = vi.hoisted(() => ({ read: vi.fn(), set: vi.fn() }));
vi.mock('../providerShareQuota.js', () => ({ readProviderShareQuota: vi.fn(), readProviderShareQuotaAccount: vi.fn() }));
const visibility = vi.hoisted(() => ({ read: vi.fn(), set: vi.fn() }));
+const modelAccess = vi.hoisted(() => ({ read: vi.fn(), set: vi.fn(), allows: vi.fn() }));
+vi.mock('../remoteModelAccess.js', () => ({ remoteModelAccess: modelAccess }));
vi.mock('../providerShareVisibility.js', () => ({ providerShareVisibility: visibility }));
vi.mock('../providerShareMemberNotes.js', () => ({ providerShareMemberNotes: memberNotes }));
@@ -109,6 +111,8 @@ beforeEach(() => {
host.refresh.mockResolvedValue(undefined);
memberNotes.read.mockReturnValue({});
memberNotes.set.mockResolvedValue(undefined);
+ modelAccess.read.mockReturnValue({ models: null, providerModels: null });
+ modelAccess.set.mockImplementation(async (_provider, _models, _member, assertCurrent) => { assertCurrent(); });
host.snapshot.mockReturnValue([{ requests: [{ requestId: 'r1' }], members: [{ memberId: 'm1' }] }]);
usageStores.ownHistory.mockReturnValue({ self: { lastUsedAt: null, days: [] }, relays: [] });
usageStores.memberHistory.mockReturnValue([]);
@@ -348,6 +352,37 @@ describe('same-account share management during account transitions', () => {
});
});
+/* 用户要求的型号权限:生产命令入口验证成员归属和切号;原来的备注、分享开关不覆盖型号范围。
+ * 最小输入为另一供应商的同名成员以及读目录期间切号。unit,复用本文件进程内 fixture。 */
+describe('remote model access management', () => {
+ beforeEach(() => {
+ listProviders.mockResolvedValue([{ id: 'anthropic', models: { 'claude-code': [
+ { id: 'small', name: 'Small' }, { id: 'large', name: 'Large' }, { id: 'stopped', disabled: true },
+ ] } }]);
+ host.snapshot.mockReturnValue([{ providerId: 'anthropic', requests: [], members: [{ memberId: 'm1' }] }]);
+ });
+ it.each([undefined, 'm1'])('saves remote model permissions in the managed owner scope: member=%s', async (memberId) => {
+ const command = parseProviderShareCommand({ action: 'set-model-access', providerId: 'anthropic', memberId, models: ['small'] }) as ProviderShareManagementCommand;
+ const result = await executeProviderShareManagementCommand(command);
+ expect(modelAccess.set).toHaveBeenCalledWith('anthropic', ['small'], memberId, expect.any(Function));
+ expect(result).toMatchObject({ version: 1, availableModels: [{ id: 'small', name: 'Small' }, { id: 'large', name: 'Large' }] });
+ expect(api.setMember).not.toHaveBeenCalled();
+ });
+ it('refuses to modify a person who belongs to a different provider', async () => {
+ host.snapshot.mockReturnValue([{ providerId: 'other', members: [{ memberId: 'm1' }] }]);
+ await expect(executeProviderShareManagementCommand({ action: 'set-model-access', providerId: 'anthropic', memberId: 'm1', models: [] })).rejects.toThrow('NOT_FOUND');
+ expect(modelAccess.set).not.toHaveBeenCalled();
+ });
+ it('does not save a delayed model selection into a newly signed-in account', async () => {
+ listProviders.mockImplementationOnce(async () => { state.owner = 'owner-b'; return [{ id: 'anthropic', models: {} }]; });
+ await expect(executeProviderShareManagementCommand({ action: 'set-model-access', providerId: 'anthropic', models: [] })).rejects.toThrow('PRECONDITION_FAILED');
+ expect(modelAccess.set).not.toHaveBeenCalled();
+ });
+ it.each([['small', 'small'], [false], {}, undefined])('rejects invalid selection payload %#', (models) => {
+ expect(() => parseProviderShareCommand({ action: 'set-model-access', providerId: 'anthropic', models })).toThrow('INVALID_PARAMS');
+ });
+});
+
/* 分享可见性:生产管理/IPC入口补足远程设置与受邀者在途撤权、旧端返回差异。tier: unit。 */
describe('share visibility management and guest query', () => {
it('saves only the requested switch via the same-account management entry', async () => {
diff --git a/apps/desktop/src/main/device-link/__tests__/remoteModelAccess.test.ts b/apps/desktop/src/main/device-link/__tests__/remoteModelAccess.test.ts
new file mode 100644
index 0000000000..20a3c5756d
--- /dev/null
+++ b/apps/desktop/src/main/device-link/__tests__/remoteModelAccess.test.ts
@@ -0,0 +1,77 @@
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+vi.mock('../../appSessionState.js', () => ({ activeOwnerScopeKey: vi.fn(), ownerScopedUserDataPath: vi.fn() }));
+vi.mock('../../logger.js', () => ({ createLogger: () => ({ info: vi.fn(), warn: vi.fn() }) }));
+import * as locks from '../crossProcessLock';
+import { createRemoteModelAccessStore } from '../remoteModelAccess';
+import { isRemoteModelSelection } from '../../../shared/remoteModelAccess';
+
+/* 测试价值:用户要求本机与远程权限独立、按人限制。新生产存储的持久化、交集、空授权、损坏与切号
+ * 原有供应商开关测试均未覆盖。最小输入:供应商的两个型号、两个成员;unit,临时目录可靠回收。耗时见执行报告。 */
+let root: string;
+let owner: string;
+const filePath = () => path.join(root, owner, 'models.json');
+const make = () => createRemoteModelAccessStore({ filePath, scopeKey: () => owner });
+beforeEach(() => { root = fs.mkdtempSync(path.join(os.tmpdir(), 'cindy-remote-models-')); owner = 'a'; });
+afterEach(() => { vi.restoreAllMocks(); fs.rmSync(root, { recursive: true, force: true }); });
+
+describe('remote model permissions', () => {
+ it('keeps legacy access and future models open, distinguishes an empty grant, and restores inherited defaults', async () => {
+ const store = make();
+ expect(store.allows('p', 'future')).toBe(true);
+ await store.set('p', [], undefined, () => {});
+ expect(make().allows('p', 'future')).toBe(false);
+ await store.set('p', null, undefined, () => {});
+ expect(make().allows('p', 'future')).toBe(true);
+ });
+ it('intersects individual selections with the remote ceiling without changing other people or providers', async () => {
+ const store = make();
+ await store.set('p', ['small', 'large'], undefined, () => {});
+ await store.set('p', ['small', 'future'], 'alice', () => {});
+ await store.set('p', ['large'], 'bob', () => {});
+ expect([store.allows('p', 'small', 'alice'), store.allows('p', 'large', 'alice'), store.allows('p', 'future', 'alice')]).toEqual([true, false, false]);
+ expect(store.allows('p', 'large', 'bob')).toBe(true);
+ expect(store.allows('p', 'large', 'new-person')).toBe(true);
+ expect(store.allows('q', 'future', 'alice')).toBe(true);
+ await store.set('p', ['small'], undefined, () => {});
+ expect(store.allows('p', 'large', 'bob')).toBe(false);
+ await store.set('p', null, 'alice', () => {});
+ expect(make().read('p', 'alice').models).toBeNull();
+ });
+ it('isolates accounts and retains each account’s permissions after reopening', async () => {
+ const store = make();
+ await store.set('p', [], undefined, () => {});
+ owner = 'b';
+ expect(store.allows('p', 'large')).toBe(true);
+ await store.set('p', ['large'], 'alice', () => {});
+ owner = 'a';
+ expect(store.allows('p', 'large')).toBe(false);
+ owner = 'b';
+ expect(make().allows('p', 'small', 'alice')).toBe(false);
+ });
+ it('merges concurrent scope changes instead of overwriting another person’s selection', async () => {
+ await Promise.all([make().set('p', ['small'], 'alice', () => {}), make().set('p', ['large'], 'bob', () => {})]);
+ expect(make().read('p', 'alice').models).toEqual(['small']);
+ expect(make().read('p', 'bob').models).toEqual(['large']);
+ });
+ it('fails closed on damaged permissions and preserves the file for recovery', async () => {
+ fs.mkdirSync(path.dirname(filePath()), { recursive: true });
+ fs.writeFileSync(filePath(), '{broken');
+ const store = make();
+ expect(store.allows('p', 'large')).toBe(false);
+ await expect(store.set('p', ['large'], undefined, () => {})).rejects.toThrow();
+ expect(fs.readFileSync(filePath(), 'utf8')).toBe('{broken');
+ fs.writeFileSync(filePath(), JSON.stringify({ providers: { p: { models: 'invalid', members: {} } } }));
+ expect(make().allows('p', 'large')).toBe(false);
+ });
+ it('rejects an account change while waiting for the write lock', async () => {
+ vi.spyOn(locks, 'withCrossProcessLock').mockImplementationOnce(async (_file, _options, task) => { owner = 'b'; return task({ held: true }); });
+ await expect(make().set('p', [], undefined, () => {})).rejects.toThrow();
+ expect(fs.existsSync(filePath())).toBe(false);
+ });
+ it.each([{}, ['x', 'x'], [''], [' x'], [42], Array(4097).fill('m')])('refuses malformed model selections %#', (value) => {
+ expect(isRemoteModelSelection(value)).toBe(false);
+ });
+});
diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.ts
index c216da19b3..ce1a286173 100644
--- a/apps/desktop/src/main/device-link/dispatch.ts
+++ b/apps/desktop/src/main/device-link/dispatch.ts
@@ -384,6 +384,8 @@ export function setRemoteReviewInputGuard(guard: RemoteReviewInputGuard | null):
* 都被拒绝(fail-closed),也让本模块不必静态依赖账号与分享运行时。
*/
export interface ProviderShareAccessPort {
+ remoteModels?(providerId: string): string[] | null;
+ modelAllowed?(controller: string, providerId: string, model: string): boolean;
insights?(controller: string, request: unknown): Promise<unknown>;
insightsCurrent?(controller: string, result: unknown): boolean;
guestAccess(controller: string): { shareId: string; memberId: string; providerId: string } | null;
@@ -813,6 +815,9 @@ function projectInvokeResultForTunnel(
rest.logoKind = logoKind;
}
const providerId = typeof p.id === 'string' ? p.id : '';
+ delete rest.remoteModelIds;
+ const remoteModels = providerShareAccess?.remoteModels?.(providerId);
+ if (remoteModels != null) rest.remoteModelIds = remoteModels;
const visibility = modelVisibilityOverrides ?? {};
rest.models = projectModelsForController(p.models, providerId, visibility);
// Media uses the same preference key as the host visibility snapshot.
@@ -4238,7 +4243,7 @@ async function sharedProviderView(
// Own timing: the slow-invoke log must not file this read under the guest's channel.
const listed = await runAuthorizedInvoke(src, { channel: 'maker:provider:list', args: [] }, new RemoteInvokeTiming());
if (!listed.ok) return listed;
- const projected = projectProviderListForShare(listed.result, providerId) as { providers?: Array<Record<string, unknown>> };
+ const projected = projectProviderListForShare(listed.result, providerId, null, null, src) as { providers?: Array<Record<string, unknown>> };
const provider = projected.providers?.[0];
if (!provider) return null;
const agents = Array.isArray(provider.agents) ? provider.agents.filter((agent): agent is string => typeof agent === 'string') : [];
@@ -4272,7 +4277,7 @@ async function projectProviderShareRead(
const states = wantsStatus && offered
? await remoteAgentHandler?.sharedGroupStatus?.(providerId, src).catch(() => null) ?? null
: null;
- return { ok: true, value: projectProviderListForShare(result, providerId, providerShareGuestRunning(src), states) };
+ return { ok: true, value: projectProviderListForShare(result, providerId, providerShareGuestRunning(src), states, src) };
}
const view = await sharedProviderView(src, providerId);
if (view && 'ok' in view) return view;
@@ -4323,6 +4328,7 @@ function providerShareGuestRunning(src: string): number | null {
*/
function projectProviderListForShare(
result: unknown, providerId: string, guestRunning: number | null = null, groupStatus: ProviderShareGroupState[] | null = null,
+ controller?: string,
): unknown {
if (!result || typeof result !== 'object' || Array.isArray(result)) return result;
const value = result as { providers?: unknown; modelVisibilityOverrides?: unknown; providerOrder?: unknown };
@@ -4341,6 +4347,19 @@ function projectProviderListForShare(
...rest,
providers: providers.map((provider) => {
const scrubbed: Record<string, unknown> = { ...scrubSharedProvider(provider) };
+ if (controller && providerShareAccess?.modelAllowed) {
+ const allowed = (model: unknown) => Boolean(model) && typeof model === 'object'
+ && typeof (model as { id?: unknown }).id === 'string'
+ && providerShareAccess!.modelAllowed!(controller, providerId, (model as { id: string }).id);
+ if (scrubbed.models && typeof scrubbed.models === 'object') {
+ scrubbed.models = Object.fromEntries(Object.entries(scrubbed.models as Record<string, unknown>).map(([agent, models]) => [
+ agent, Array.isArray(models) ? models.filter(allowed) : [],
+ ]));
+ }
+ for (const field of ['imageModels', 'videoModels', 'audioModels', 'embeddingModels']) {
+ if (Array.isArray(scrubbed[field])) scrubbed[field] = (scrubbed[field] as unknown[]).filter(allowed);
+ }
+ }
delete scrubbed[PROVIDER_SHARE_GROUP_SIZE_FIELD];
delete scrubbed[PROVIDER_SHARE_GROUP_STATUS_FIELD];
if (groupSize !== null) scrubbed[PROVIDER_SHARE_GROUP_SIZE_FIELD] = groupSize;
diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.ts
index 15de99f5f1..dd9c20cf47 100644
--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts
+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts
@@ -40,6 +40,8 @@ import { getAuthState, getDeviceId } from '../authManager.js';
import { parseProviderShareInsights, PROVIDER_SHARE_INSIGHTS_CHANNEL } from '../../shared/providerShareInsights.js';
import { isProviderGroupProviderId } from '../../shared/providerGroup.js';
import { providerShareVisibility } from './providerShareVisibility.js';
+import { remoteModelAccess } from './remoteModelAccess.js';
+import { isRemoteModelSelection, type RemoteModelAccessView } from '../../shared/remoteModelAccess.js';
import { createProviderShareInsightsReader } from './providerShareInsights.js';
import { readProviderShareQuota, readProviderShareQuotaAccount } from './providerShareQuota.js';
import { isDataOwnerPushStamp } from '../../shared/dataOwnerPush.js';
@@ -67,6 +69,8 @@ import {
setProviderShareAccess,
} from './dispatch.js';
import { getDeviceLinkInvokeContext } from './invoke-context.js';
+import { tapWindowBroadcast } from './broadcast-tap.js';
+import { MAKER_PUSH } from '../maker-ipc/channels.js';
import { fetchIdentityCard, providerShareApi, providerShareLinkFor, sha256Hex } from './providerShareApi.js';
import { configureProviderShareApprovalWindows } from './providerShareApprovalWindows.js';
import {
@@ -345,6 +349,15 @@ export function parseProviderShareCommand(raw: unknown): ProviderShareCommand {
if (!raw || typeof raw !== 'object' || Array.isArray(raw)) throwIpcError('INVALID_PARAMS', 'Invalid command');
const value = raw as Record<string, unknown>;
switch (value.action) {
+ case 'get-model-access':
+ case 'set-model-access': {
+ if (!isProviderGroupProviderId(value.providerId)) throwIpcError('INVALID_PARAMS', 'Invalid providerId');
+ const memberId = value.memberId === undefined ? undefined : text(value.memberId, 'memberId', 128);
+ const scope = { providerId: value.providerId, ...(memberId !== undefined ? { memberId } : {}) };
+ if (value.action === 'get-model-access') return { action: value.action, ...scope };
+ if (!isRemoteModelSelection(value.models)) throwIpcError('INVALID_PARAMS', 'Invalid remote model selection');
+ return { action: value.action, ...scope, models: value.models === null ? null : [...value.models] };
+ }
case 'get-visibility':
case 'quota-account':
if (!isProviderGroupProviderId(value.providerId)) throwIpcError('INVALID_PARAMS', 'Invalid providerId');
@@ -719,6 +732,35 @@ async function createLink(
async function execute(command: ProviderShareCommand, assertCurrent: () => void = () => undefined): Promise<unknown> {
assertCurrent();
switch (command.action) {
+ case 'get-model-access':
+ case 'set-model-access': {
+ const assertOwner = captureProviderManagementScope();
+ const assertScope = () => { assertCurrent(); assertOwner(); };
+ if (command.memberId) {
+ requireRunning();
+ await refreshProviderShareHost('management');
+ assertScope();
+ const found = getProviderShareHostSnapshot().some((share) => share.providerId === command.providerId
+ && share.members.some((member) => member.memberId === command.memberId));
+ if (!found) throwIpcError('NOT_FOUND', 'This shared provider member is no longer available');
+ }
+ const providers = await getDesktopProviderService().listProviders({ allowSideEffects: false });
+ assertScope();
+ const provider = providers.find((entry) => entry.id === command.providerId);
+ if (!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);
+ emit(PROVIDER_SHARE_IPC.OWNED_CHANGED, null);
+ emit(MAKER_PUSH.PROVIDER_CHANGED, {});
+ tapWindowBroadcast(MAKER_PUSH.PROVIDER_CHANGED, {});
+ }
+ const availableModels = new Map<string, { id: string; name: string }>();
+ for (const entries of Object.values(provider.models)) for (const model of entries ?? []) {
+ if (!model.disabled) availableModels.set(model.id, { id: model.id, name: model.name || model.id });
+ }
+ return { version: 1, ...remoteModelAccess.read(command.providerId, command.memberId),
+ availableModels: [...availableModels.values()] } satisfies RemoteModelAccessView;
+ }
case 'get-visibility':
return providerShareVisibility.read(command.providerId);
case 'set-visibility': {
@@ -959,6 +1001,13 @@ export function registerProviderShareIpc(): void {
quota: readProviderShareQuota,
});
setProviderShareAccess({
+ remoteModels: (providerId) => {
+ try { return remoteModelAccess.read(providerId).providerModels; } catch { return []; }
+ },
+ modelAllowed: (controller, providerId, model) => {
+ const access = providerShareGuestAccess(controller);
+ return access?.providerId === providerId && remoteModelAccess.allows(providerId, model, access.memberId);
+ },
insights,
insightsCurrent: insights.isCurrent,
guestAccess: providerShareGuestAccess,
diff --git a/apps/desktop/src/main/device-link/remoteModelAccess.ts b/apps/desktop/src/main/device-link/remoteModelAccess.ts
new file mode 100644
index 0000000000..c1041bcaff
--- /dev/null
+++ b/apps/desktop/src/main/device-link/remoteModelAccess.ts
@@ -0,0 +1,83 @@
+import fs from 'node:fs';
+import { activeOwnerScopeKey, ownerScopedUserDataPath } from '../appSessionState.js';
+import { createLogger } from '../logger.js';
+import { createOverrideSettingsFile } from '../maker-host/override-settings-file.js';
+import { captureProviderManagementScope } from '../provider-group/managementScope.js';
+import { throwIpcError } from '../utils/ipcValidate.js';
+import { isRemoteModelSelection, type RemoteModelSelection } from '../../shared/remoteModelAccess.js';
+
+interface ProviderRule { models?: string[]; members: Record<string, string[]> }
+interface Settings { providers: Record<string, ProviderRule> | null }
+const object = (value: unknown): value is Record<string, unknown> => Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+const selection = (value: unknown): string[] => isRemoteModelSelection(value) && value !== null ? value : [];
+
+/** Remote-only authorization; local model preferences and supplier credentials never pass through this store. */
+export function createRemoteModelAccessStore(options: { filePath(): string; scopeKey(): string }) {
+ const store = createOverrideSettingsFile<Settings>({
+ ...options,
+ defaults: () => {
+ // An absent file preserves the old grant. An existing unreadable file must never restore full access.
+ try { fs.statSync(options.filePath()); return { providers: null }; }
+ catch (error) { return { providers: (error as NodeJS.ErrnoException).code === 'ENOENT' ? {} : null }; }
+ },
+ normalize(raw) {
+ const providers = (raw as Settings | null)?.providers;
+ if (!object(providers)) return { providers: null };
+ return { providers: Object.fromEntries(Object.entries(providers).map(([id, rule]) => {
+ if (!object(rule) || !object(rule.members)) return [id, { models: [], members: {} }];
+ return [id, {
+ ...('models' in rule ? { models: selection(rule.models) } : {}),
+ members: object(rule.members)
+ ? Object.fromEntries(Object.entries(rule.members).map(([member, ids]) => [member, selection(ids)])) : {},
+ }];
+ })) };
+ },
+ log: createLogger('remote-model-access'), label: 'remote-model-access',
+ maxBytes: 4 * 1024 * 1024, preserveUnreadableFile: true,
+ logLoadedValue: false, logReadErrorDetails: false,
+ });
+ function read(providerId: string, memberId?: string): { models: RemoteModelSelection; providerModels: RemoteModelSelection } {
+ store.invalidateIfChanged();
+ const providers = store.read().providers;
+ if (providers === null) throwIpcError('PRECONDITION_FAILED', 'Remote model permissions could not be read');
+ const rule = Object.hasOwn(providers, providerId) ? providers[providerId] : undefined;
+ const providerModels = rule?.models ?? null;
+ const models = memberId ? (rule && Object.hasOwn(rule.members, memberId) ? rule.members[memberId] : null) : providerModels;
+ return { models, providerModels };
+ }
+ return {
+ read,
+ allows(providerId: string, model: string, memberId?: string): boolean {
+ try {
+ const { models, providerModels } = read(providerId, memberId);
+ return Boolean(model) && (providerModels === null || providerModels.includes(model)) && (models === null || models.includes(model));
+ } catch { return false; }
+ },
+ async set(providerId: string, models: RemoteModelSelection, memberId: string | undefined, assertCurrent: () => void) {
+ if (!isRemoteModelSelection(models)) throwIpcError('INVALID_PARAMS', 'Invalid remote model selection');
+ assertCurrent();
+ await store.updateAtomic(({ value }) => {
+ assertCurrent();
+ if (value.providers === null) throwIpcError('PRECONDITION_FAILED', 'Remote model permissions could not be read');
+ const providers = { ...value.providers };
+ const previous = Object.hasOwn(providers, providerId) ? providers[providerId] : undefined;
+ const rule: ProviderRule = { ...previous, members: { ...previous?.members } };
+ if (memberId) {
+ if (models === null) delete rule.members[memberId];
+ else Object.defineProperty(rule.members, memberId, { value: [...models], enumerable: true, configurable: true, writable: true });
+ } else if (models === null) delete rule.models;
+ else rule.models = [...models];
+ if (rule.models === undefined && Object.keys(rule.members).length === 0) delete providers[providerId];
+ else Object.defineProperty(providers, providerId, { value: rule, enumerable: true, configurable: true, writable: true });
+ return { providers };
+ });
+ assertCurrent();
+ return read(providerId, memberId);
+ },
+ };
+}
+
+export const remoteModelAccess = createRemoteModelAccessStore({
+ filePath: () => ownerScopedUserDataPath('remote-model-access.json'),
+ scopeKey: () => { captureProviderManagementScope(); return activeOwnerScopeKey(); },
+});
diff --git a/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts
index fe3407f739..3237aeec65 100644
--- a/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/claudeProxyGuestRoute.test.ts
@@ -160,6 +160,20 @@ describe('Claude proxy routing for shared-provider guests', () => {
expect(getSessionProvider('guest-session')).toBeNull();
});
+ // The catalog offers this model, but each person's current grant must remain the authority.
+ it('isolates model grants for two people and enforces revocation on the next proxy request', async () => {
+ let allowed = true;
+ const first = registerGuestProviderRoute('first-person', 'shared-a', () => allowed);
+ const second = registerGuestProviderRoute('second-person', 'shared-a', () => false);
+ const request = (token: string) => Promise.resolve(transform(
+ { model: 'shared-model' }, ctxWith({ [GUEST_ROUTE_HEADER]: token, 'x-api-key': 'placeholder' }),
+ ));
+ expect((await request(first.token))?.upstreamOverride).toBe(SHARED_UPSTREAM);
+ expect(await statusOf(await request(second.token))).toBe(403);
+ allowed = false;
+ expect(await statusOf(await request(first.token))).toBe(403);
+ });
+
it('refuses a body-less request unless the shared provider is the default gateway', async () => {
const { token } = registerGuestProviderRoute('guest-session', 'shared-a');
const decision = await Promise.resolve(transform(undefined, ctxWith({ [GUEST_ROUTE_HEADER]: token })));
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts
index 684b09b393..b48a0ee7bb 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts
@@ -78,6 +78,20 @@ describe('Codex proxy guard for shared-provider guests', () => {
expect(await statusOf(guard({ model: 'codex/gpt-5.5' }, ctx('/responses', { 'thread-id': 'guest-thread' })))).toBe(403);
});
+ // A member allowlist must also guard the frozen custom path and take effect without restarting the task.
+ it('rechecks model grants for custom routes and refuses requests without a task identity', async () => {
+ let allowed = true;
+ registerGuestProviderRoute('guest-session', 'shared-a', (model) => allowed && model === 'shared-model', () => true);
+ 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 statusOf(guard({ model: 'shared-model' }, ctx(path)))).toBe(403);
+ allowed = false;
+ expect(await statusOf(request())).toBe(403);
+ expect(await statusOf(guard({ model: 'other-model' }, ctx(path, { 'thread-id': 'guest-thread' })))).toBe(403);
+ });
+
it('refuses requests that do not belong to the registered guest session', async () => {
const guard = createCodexGuestRoutingGuard('shared-a', 'env-key');
// 认不出会话:分享的是自定义供应商,没有可直达的默认路由。
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.ts
index 3d18a9ff51..e7e8b43f61 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
@@ -1066,7 +1066,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)) return refuseGuestForeignRoute(wireModel);
+ if (!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-proxy-host.ts b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
index e82610560a..8666157ae0 100644
--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts
+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
@@ -123,7 +123,7 @@ import {
} from './provider-route.js';
import type { CodexSubagentRouteSnapshot } from './codex-subagent-config.js';
import { getSessionProvider } from './session-provider-store.js';
-import { guestProviderOffersModel, guestProviderRouteForSession } from './guest-provider-route-store.js';
+import { guestProviderModelAllowed, guestProviderOffersModel, guestProviderRouteForSession } from './guest-provider-route-store.js';
import { isOpenAiSubscriptionProviderId } from './codex-account-auth.js';
import { composeResponseObservers } from './claude-rate-limit-headers-observer.js';
import { createProviderUpstreamErrorObserver, reportProviderUpstreamError } from './provider-upstream-error-observer.js';
@@ -2537,18 +2537,20 @@ export function createCodexGuestRoutingGuard(
frozenAuthInjection?: CodexProxyAuthInjection,
): (body: unknown, ctx: RequestTransformCtx) => RoutingDecision | null | undefined {
return (body, ctx) => {
- if (parseCodexCustomProviderPath(ctx.url).kind !== 'not-custom-provider-route') return undefined;
const requestModel = isPlainObject(body) && typeof body.model === 'string' ? body.model : '';
if (!requestModel) return undefined;
+ const sessionId = sessionIdFromHeaders(ctx.headers);
+ if (!guestProviderModelAllowed(providerId, 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();
const offered = effectiveModel === CODEX_AUTO_REVIEW_MODEL
? isOpenAiSubscriptionProviderId(providerId)
- : guestProviderOffersModel(providerId, 'codex', effectiveModel);
+ : guestProviderOffersModel(providerId, 'codex', effectiveModel, sessionIdFromHeaders(ctx.headers) ?? undefined);
if (!offered) return codexGuestRouteRefusal();
}
- const sessionId = sessionIdFromHeaders(ctx.headers);
if (sessionId) {
return guestProviderRouteForSession(sessionId)?.providerId === providerId
&& getSessionProvider(sessionId) === providerId
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.ts
index 06eb836f76..072851b370 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,6 +30,8 @@ export interface GuestProviderRoute {
interface Binding extends GuestProviderRoute {
token: string;
+ allowsModel?: (model: string) => boolean;
+ modelAccessRestricted?: () => boolean;
}
const byToken = new Map<string, Binding>();
@@ -41,9 +43,11 @@ const bySession = new Map<string, Binding>();
export function registerGuestProviderRoute(
sessionId: string,
providerId: string,
+ allowsModel?: (model: string) => boolean,
+ modelAccessRestricted?: () => boolean,
): { token: string; release(): void } {
const token = randomBytes(32).toString('base64url');
- const binding: Binding = { sessionId, providerId, token };
+ const binding: Binding = { sessionId, providerId, token, allowsModel, modelAccessRestricted };
const previous = bySession.get(sessionId);
if (previous) byToken.delete(previous.token);
byToken.set(token, binding);
@@ -87,11 +91,22 @@ function bareModelId(model: string): string {
}
/** 分享的供应商是否为这个 Agent 提供这个模型(请求里的模型串,忽略 1M 通道后缀)。 */
-export function guestProviderOffersModel(providerId: string, agent: AgentKind, wireModel: string): boolean {
+export function guestProviderOffersModel(providerId: string, agent: AgentKind, wireModel: string, sessionId?: string): boolean {
const requested = bareModelId(wireModel);
if (!requested) return false;
const provider = getActiveCatalog().providers.find((candidate) => candidate.id === providerId);
- return (provider?.models[agent] ?? []).some((model) => bareModelId(model.id) === requested);
+ const binding = sessionId ? bySession.get(sessionId) : undefined;
+ return (provider?.models[agent] ?? []).some((model) => !model.disabled && bareModelId(model.id) === requested
+ && (!binding?.allowsModel || binding.allowsModel(model.id)));
+}
+
+/** 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 {
+ if (sessionId) {
+ const binding = bySession.get(sessionId);
+ return binding?.providerId === providerId && (!binding.allowsModel || binding.allowsModel(model));
+ }
+ return ![...bySession.values()].some((binding) => binding.providerId === providerId && binding.modelAccessRestricted?.());
}
/**
diff --git a/apps/desktop/src/main/provider-group/management.ts b/apps/desktop/src/main/provider-group/management.ts
index 46f7781119..0dc4b0c8ac 100644
--- a/apps/desktop/src/main/provider-group/management.ts
+++ b/apps/desktop/src/main/provider-group/management.ts
@@ -20,7 +20,7 @@ export function parseProviderManagementRequest(raw: unknown): ProviderManagement
return { action: 'manage-group', command: command as ProviderGroupManagementCommand };
}
const command = parseProviderShareCommand(raw.command);
- if (!['owned', 'own-usage', 'usage-history', 'create-link', 'approve', 'reject', 'set-member', 'set-member-note', 'reshare-decide', 'get-run-limits', 'set-run-limits', 'reset-run-limits', 'get-visibility', 'set-visibility', 'quota-account'].includes(command.action)) {
+ if (!['owned', 'own-usage', 'usage-history', 'create-link', 'approve', 'reject', 'set-member', 'set-member-note', 'reshare-decide', 'get-run-limits', 'set-run-limits', 'reset-run-limits', 'get-visibility', 'set-visibility', 'quota-account', 'get-model-access', 'set-model-access'].includes(command.action)) {
throwIpcError('PERMISSION_DENIED', 'Only owner operations are available through management');
}
return { action: 'manage-share', command: command as ProviderShareManagementCommand };
diff --git a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts
index 064035c131..9c1ea5c7d3 100644
--- a/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts
+++ b/apps/desktop/src/main/remote-agent/__tests__/providerAccess.test.ts
@@ -116,7 +116,7 @@ function recordingHandle(input: HostedStartInput, calls: { sends: number; models
} as unknown as AgentSessionHandle;
}
-async function setup(allowed: Set<string>, guest?: { sharedProviderId: string }) {
+async function setup(allowed: Set<string>, guest?: { sharedProviderId: string }, modelAllowed: (id: string, model: string) => boolean = () => true) {
const project = path.join(root, 'proj');
fs.mkdirSync(project, { recursive: true });
const inputs: HostedStartInput[] = [];
@@ -134,9 +134,9 @@ async function setup(allowed: Set<string>, guest?: { sharedProviderId: string })
...(guest ? { controllerTrust: () => 'guest' as const } : {}),
providerAccess: {
resolve: async (kind, model, providerId) => guest
- ? resolveGuestProviderId(views, guest.sharedProviderId, (id) => allowed.has(id), kind, model, providerId)
- : resolveSharedProviderId(views, (id) => allowed.has(id), kind, model, providerId),
- isAllowed: (id) => allowed.has(id),
+ ? resolveGuestProviderId(views, guest.sharedProviderId, (id) => allowed.has(id) && modelAllowed(id, model), kind, model, providerId)
+ : resolveSharedProviderId(views, (id) => allowed.has(id) && modelAllowed(id, model), kind, model, providerId),
+ isAllowed: (id, _controller, model) => allowed.has(id) && modelAllowed(id, model ?? ''),
},
...(guest ? {
bindGuestProviderRoute: async ({ hostSessionId, providerId }: { hostSessionId: string; providerId: string }) => {
@@ -202,7 +202,7 @@ describe('remote agent provider access on the computer running the agent', () =>
const { host, calls, start } = await setup(new Set(['spark']));
const handle = await start('spark');
await handle.setModel!('opus');
- // 不带来源的换模型原样到达 Agent(沿用当前来源),不经授权核对。
+ // 不带来源的换模型仍原样到达 Agent;现在也会复核远程型号范围。
expect(calls.models.at(-1)).toEqual(['opus', null]);
await handle.close({ reason: 'navigation' });
host.dispose();
@@ -240,3 +240,25 @@ describe('shared-provider guest models on the computer running the agent', () =>
host.dispose();
});
});
+
+/* 用户要求的型号授权此前只有目录隐藏;最小输入为允许一个型号,随后撤回。
+ * 经生产 startRemoteAgentSession → host 协议验证创建、无来源切模型、发消息与插话;沿用本文件 unit fixture。 */
+describe.each([false, true])('remote model access, shared guest=%s', (guest) => {
+ it('blocks a model on start, a model-only switch, and sends after access is revoked', async () => {
+ const models = new Set(['opus']);
+ const { host, calls, inputs, start } = await setup(new Set(['spark']), guest ? { sharedProviderId: 'spark' } : undefined, (_id, model) => models.has(model));
+ try {
+ await expect(start('spark', 'sonnet')).rejects.toThrow('REMOTE_AGENT_PROVIDER_NOT_ALLOWED');
+ expect(inputs).toHaveLength(0);
+ const handle = await start('spark', 'opus');
+ await expect(handle.setModel!('sonnet')).rejects.toThrow('REMOTE_AGENT_PROVIDER_NOT_ALLOWED');
+ expect(calls.models).toHaveLength(0);
+ await handle.send({ content: [{ type: 'text', text: 'allowed' }] } as never);
+ models.clear();
+ await expect(handle.send({ content: [{ type: 'text', text: 'blocked' }] } as never)).rejects.toThrow('REMOTE_AGENT_PROVIDER_NOT_ALLOWED');
+ await expect(handle.steer!({ content: [{ type: 'text', text: 'blocked' }] } as never)).rejects.toThrow('REMOTE_AGENT_PROVIDER_NOT_ALLOWED');
+ expect(calls.sends).toBe(1);
+ await handle.close({ reason: 'navigation' });
+ } finally { host.dispose(); }
+ });
+});
diff --git a/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts b/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts
index 37b0ce8dfd..4e25221f39 100644
--- a/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts
+++ b/apps/desktop/src/main/remote-agent/controller/deviceCatalog.ts
@@ -8,7 +8,7 @@
* 换模型、协同 Worker、定时任务的默认来源都只能落在这些供应商上。
*/
import { CONTROLLER_CAPABILITY_PROVIDER_LOGO_KINDS_V2 } from '@cindy/device-link';
-import { effectiveSourceIdForModel, getModel, isModelSelectableForNewRoute, type ProviderView, type AgentKind } from '@cindy/model-providers';
+import { effectiveSourceIdForModel, getModel, isModelSelectableForNewRoute, remoteInvocationModels, type ProviderView, type AgentKind } from '@cindy/model-providers';
type RemoteInvoke = (
deviceId: string,
@@ -56,7 +56,7 @@ export async function readDeviceProviderViews(invoke: RemoteInvoke, deviceId: st
if (!result.ok) {
throw Object.assign(new Error(result.error?.message ?? 'provider list unavailable'), { code: result.error?.code });
}
- return parseDeviceProviderViews(result.result).filter((view) => view.remoteInvocationEnabled === true);
+ return parseDeviceProviderViews(result.result).filter((view) => view.remoteInvocationEnabled === true).map(remoteInvocationModels);
}
/** 与普通任务共用授权目录;失败不回落到本机的同名供应商。 */
diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.ts
index facb3654c6..e3a7dcf2c2 100644
--- a/apps/desktop/src/main/remote-agent/host/runHost.ts
+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts
@@ -197,7 +197,7 @@ export interface RemoteAgentHostDeps {
*/
providerAccess?: {
resolve(kind: RemoteAgentKind, model: string, providerId: string | null | undefined, controller: string): Promise<string | null>;
- isAllowed(providerId: string, controller: string): boolean;
+ isAllowed(providerId: string, controller: string, model?: string): boolean;
};
/** 同账号任务也须在启动前登记已核对开放的来源,不能只把 providerId 传给 Agent。 */
bindOwnerProviderRoute?(hostSessionId: string, providerId: string): OwnerProviderRouteBinding;
@@ -211,6 +211,7 @@ export interface RemoteAgentHostDeps {
kind: RemoteAgentKind;
hostSessionId: string;
providerId: string;
+ controller: string;
isCurrent(): boolean;
}): Promise<GuestProviderRouteBinding | null>;
/**
@@ -366,6 +367,8 @@ interface Run {
pushParts: Map<string, string>;
/** 这个任务正在用的本机供应商(已核对开放);没接供应商授权时为空。 */
providerId?: string;
+ /** Last authorized model, independent of delayed Agent state frames. */
+ authorizedModel?: string;
/** 受邀者任务的出站登记,任务结束时撤销。 */
guestRoute?: GuestProviderRouteBinding;
ownerRoute?: OwnerProviderRouteBinding;
@@ -1102,6 +1105,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
kind: run.kind,
hostSessionId,
providerId: run.providerId,
+ controller: run.controller,
isCurrent: () => !run.closing,
});
if (!binding) {
@@ -1671,7 +1675,8 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
}
if (method === 'setWritableDirs') callArgs = [confineGuestDirs(args[0], run.virtualRoot)];
const access = deps.providerAccess;
- if (access && method === 'send' && run.providerId && !access.isAllowed(run.providerId, run.controller)) {
+ if (access && (method === 'send' || method === 'steer') && run.providerId
+ && !access.isAllowed(run.providerId, run.controller, run.authorizedModel)) {
failProviderNotAllowed();
}
if (method === 'setModel') {
@@ -1684,6 +1689,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
callArgs = [args[0], { ...opts, providerId: relay.member.providerId }, ...args.slice(2)];
}
const value = await relay.client.callWithId(callId, method, callArgs);
+ if (method === 'setModel' && typeof args[0] === 'string') run.authorizedModel = args[0];
append(run, { t: 'result', callId, ok: true, ...(value !== undefined ? { value: JSON.parse(JSON.stringify(value)) } : {}) });
} catch (error) {
append(run, { t: 'result', callId, ok: false, error: relayErrorInfoFrom(error) });
@@ -1821,22 +1827,23 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
// 受邀者每次换模型都复核:来源钉在分享的供应商上(没带来源也显式带上),且它要提供这个模型。
let nextProviderId: string | undefined;
const access = deps.providerAccess;
- if (access && method === 'send' && run.providerId && !access.isAllowed(run.providerId, run.controller)) {
+ if (access && (method === 'send' || method === 'steer') && run.providerId
+ && !access.isAllowed(run.providerId, run.controller, run.authorizedModel)) {
failProviderNotAllowed();
}
if (access && method === 'setModel') {
const opts = args[1];
const optsObject = opts && typeof opts === 'object' && !Array.isArray(opts) ? opts : undefined;
const explicitProvider = optsObject !== undefined && 'providerId' in optsObject;
+ const requested = explicitProvider ? (optsObject as { providerId?: unknown }).providerId : run.providerId;
+ const resolved = await access.resolve(
+ run.kind,
+ typeof args[0] === 'string' ? args[0] : '',
+ typeof requested === 'string' ? requested : null,
+ run.controller,
+ );
+ if (!resolved) failProviderNotAllowed();
if (explicitProvider || run.trust === 'guest') {
- const requested = explicitProvider ? (optsObject as { providerId?: unknown }).providerId : run.providerId;
- const resolved = await access.resolve(
- run.kind,
- typeof args[0] === 'string' ? args[0] : '',
- typeof requested === 'string' ? requested : null,
- run.controller,
- );
- if (!resolved) failProviderNotAllowed();
nextProviderId = resolved;
callArgs = [args[0], { ...(optsObject ?? {}), providerId: resolved }, ...args.slice(2)];
}
@@ -1869,6 +1876,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
throw error;
}
if (nextProviderId && !run.closing) run.providerId = nextProviderId;
+ if (method === 'setModel' && typeof args[0] === 'string' && !run.closing) run.authorizedModel = args[0];
append(run, { t: 'result', callId, ok: true, ...(value !== undefined ? { value: JSON.parse(JSON.stringify(value)) } : {}) });
} catch (error) {
append(run, { t: 'result', callId, ok: false, error: remoteAgentErrorInfo(error) });
@@ -2257,6 +2265,10 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
failProviderNotAllowed();
}
// 供应商查询/组分配有 await;最终检查与登记间不能再等待,防止并发 open 超额。
+ if (providerId && deps.providerAccess && !deps.providerAccess.isAllowed(providerId, controller, payload.options.model)) {
+ reserved?.release();
+ failProviderNotAllowed();
+ }
try {
assertRunCapacity(controller);
} catch (error) {
@@ -2265,6 +2277,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {
}
const run: Run = {
id: request.runId,
+ authorizedModel: payload.options.model,
acceptsImageDeliveryReceipts: payload.acceptsImageDeliveryReceipts === true,
controller,
trust,
diff --git a/apps/desktop/src/main/remote-agent/host/service.ts b/apps/desktop/src/main/remote-agent/host/service.ts
index 7addb641fc..459c04a5c7 100644
--- a/apps/desktop/src/main/remote-agent/host/service.ts
+++ b/apps/desktop/src/main/remote-agent/host/service.ts
@@ -18,6 +18,7 @@ import {
import { setRemoteAgentHandler } from '../../device-link/dispatch.js';
import { remoteBackgroundInvoke } from '../../device-link/index.js';
import { providerShareGuestAccess } from '../../device-link/providerShareHost.js';
+import { remoteModelAccess } from '../../device-link/remoteModelAccess.js';
import { handleProviderShareReshare, providerShareReshareAllows } from '../../device-link/providerShareReshare.js';
import { createProviderGroupGuestRelay } from '../../provider-group/guestRelay.js';
import { providerGroupReshare } from '../../provider-group/reshareRuntime.js';
@@ -144,30 +145,47 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDat
providerAccess: {
resolve: async (kind, model, providerId, controller) => {
const views = await getDesktopProviderService().listProviders({ allowSideEffects: false });
+ const memberId = isProviderSharePeer(controller) ? providerShareGuestAccess(controller)?.memberId : undefined;
+ const allowed = (id: string) => isRemoteProviderInvocationAllowed(id) && remoteModelAccess.allows(id, model, memberId);
// 受邀者:来源钉在分享的供应商上,且要它提供所选模型(启动与每次换模型都核对)。
if (isProviderSharePeer(controller)) {
return resolveGuestProviderId(
views,
providerShareGuestAccess(controller)?.providerId,
- (id) => guestAllows(controller, id),
+ (id) => guestAllows(controller, id) && allowed(id),
kind,
model,
providerId,
);
}
- return resolveSharedProviderId(views, isRemoteProviderInvocationAllowed, kind, model, providerId);
+ return resolveSharedProviderId(views, allowed, kind, model, providerId);
+ },
+ isAllowed: (providerId, controller, model) => {
+ const access = isProviderSharePeer(controller) ? providerShareGuestAccess(controller) : null;
+ return (isProviderSharePeer(controller) ? guestAllows(controller, providerId) : isRemoteProviderInvocationAllowed(providerId))
+ && remoteModelAccess.allows(providerId, model ?? '', access?.memberId);
},
- isAllowed: (providerId, controller) =>
- isProviderSharePeer(controller) ? guestAllows(controller, providerId) : isRemoteProviderInvocationAllowed(providerId),
},
// 受邀者任务的出站登记:本机 proxy 只让它经分享的供应商、用它提供的模型。
- bindGuestProviderRoute: async ({ kind, hostSessionId, providerId, isCurrent }) => {
+ bindGuestProviderRoute: async ({ kind, hostSessionId, providerId, controller, isCurrent }) => {
const views = await getDesktopProviderService().listProviders({ allowSideEffects: false });
// 读目录期间这次启动可能已被取代:此时不再登记(登记与检查之间没有 await)。
if (!isCurrent()) return null;
- const binding = registerGuestProviderRoute(hostSessionId, providerId);
+ const access = providerShareGuestAccess(controller);
+ if (!access || access.providerId !== providerId || !guestAllows(controller, providerId)) return null;
+ const memberId = access.memberId;
+ const allowsModel = (model: string) => providerShareGuestAccess(controller)?.memberId === memberId
+ && guestAllows(controller, providerId) && remoteModelAccess.allows(providerId, model, memberId);
+ const binding = registerGuestProviderRoute(hostSessionId, providerId, allowsModel, () => {
+ try {
+ const rule = remoteModelAccess.read(providerId, memberId);
+ return rule.models !== null || rule.providerModels !== null;
+ } catch { return true; }
+ });
return {
routeToken: binding.token,
+ // Keep the provider catalog stable for the CLI; the proxy checks the live grant on every request.
+ // Filtering this launch-time snapshot would prevent using newly granted models until the task restarts.
modelIds: guestProviderModelIds(views, providerId, kind),
release: binding.release,
};
diff --git a/apps/desktop/src/renderer/__tests__/connectProviderBanner.test.tsx b/apps/desktop/src/renderer/__tests__/connectProviderBanner.test.tsx
index b7710e7e44..06e7eb80aa 100644
--- a/apps/desktop/src/renderer/__tests__/connectProviderBanner.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/connectProviderBanner.test.tsx
@@ -87,6 +87,22 @@ afterEach(() => {
});
describe('ConnectProviderBanner', () => {
+ // 2026-10-20 黑盒验收:分享任务已成功回复,本机零连接仍显示无模型引导。
+ // 现有用例只覆盖本机连接状态;最小输入为零本机来源 + 远程执行,tier: unit。
+ it('远程执行时隐藏本机引导,切回本机后恢复', () => {
+ const { rerender } = render(
+ <MemoryRouter><ConnectProviderBanner remote /></MemoryRouter>,
+ );
+ expect(screen.queryByTestId('connect-provider-banner')).toBeNull();
+ expect(localStorage.getItem('providerOnboarding.dismissedAt')).toBeNull();
+
+ rerender(<MemoryRouter><ConnectProviderBanner remote={false} /></MemoryRouter>);
+ expect(screen.getByTestId('connect-provider-banner')).not.toBeNull();
+
+ rerender(<MemoryRouter><ConnectProviderBanner remote /></MemoryRouter>);
+ expect(screen.queryByTestId('connect-provider-banner')).toBeNull();
+ });
+
it('零连接 + cloud → 渲染,CTA 落 /settings?tab=providers', () => {
renderBanner();
diff --git a/apps/desktop/src/renderer/__tests__/remoteCatalogSnapshot.test.ts b/apps/desktop/src/renderer/__tests__/remoteCatalogSnapshot.test.ts
index fe714cbf79..1073738f02 100644
--- a/apps/desktop/src/renderer/__tests__/remoteCatalogSnapshot.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteCatalogSnapshot.test.ts
@@ -1,6 +1,12 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import * as providers from '@/hooks/useDeviceProviders';
+import * as capabilities from '@/hooks/useAgentCapabilities';
+import { invalidateRemoteCatalogSnapshots, refreshRemoteCatalogSnapshot } from '@/lib/remoteCatalogSnapshot';
-beforeEach(() => vi.resetModules());
+beforeEach(() => {
+ invalidateRemoteCatalogSnapshots();
+ vi.clearAllMocks();
+});
afterEach(() => vi.unstubAllGlobals());
function deferred() {
@@ -12,6 +18,48 @@ function deferred() {
}
describe('remote catalog refresh scheduling', () => {
+ // 2026-10-20 黑盒验收:成员 A/B 使用同一个 shareId,B 的选择器显示 A 的模型。
+ // 现有覆盖只驱逐单设备;最小输入为账号边界前的缓存和在途读取,tier: unit。
+ it('clears all remote catalogs at an account boundary and rejects late old-owner results', async () => {
+ const oldRequest = deferred();
+ let owner = 'member-a';
+ const invoke = vi.fn(async (device: string, channel: string) => {
+ const model = owner;
+ if (device === 'share:pending' && model === 'member-a') await oldRequest.promise;
+ return channel === 'maker:provider:list'
+ ? { providers: [{
+ id: 'openai', name: 'OpenAI', connected: true, agents: ['codex'],
+ models: { codex: [{ id: model, name: model, contextWindow: 200000, efforts: [] }] },
+ }] }
+ : { availableModels: [{ id: model, displayName: model, contextWindow: 200000,
+ efforts: [], defaultEffort: null }], hasFastMode: false, effortLevels: [], permissionModes: [] };
+ });
+ vi.stubGlobal('window', { electronAPI: { deviceLink: { invoke } } });
+ await refreshRemoteCatalogSnapshot('share:common');
+ expect(providers.getCachedDeviceProviders('share:common')?.providers[0].models.codex?.[0]?.id).toBe('member-a');
+ const pending = refreshRemoteCatalogSnapshot('share:pending');
+ const queued = refreshRemoteCatalogSnapshot('share:pending');
+
+ invalidateRemoteCatalogSnapshots();
+ owner = 'member-b';
+ expect(providers.getCachedDeviceProviders('share:common')).toBeNull();
+ expect(capabilities.getCachedCapabilities('codex', 'share:common')).toBeNull();
+ const events = vi.fn();
+ const unsubscribe = providers.subscribeDeviceProviders('share:pending', events);
+ oldRequest.resolve();
+ await Promise.all([pending, queued]);
+ expect(events).not.toHaveBeenCalled();
+ expect(providers.getCachedDeviceProviders('share:pending')).toBeNull();
+ expect(capabilities.getCachedCapabilities('codex', 'share:pending')).toBeNull();
+
+ await Promise.all(['share:common', 'share:pending'].map(refreshRemoteCatalogSnapshot));
+ for (const device of ['share:common', 'share:pending']) {
+ expect(providers.getCachedDeviceProviders(device)?.providers[0].models.codex?.[0]?.id).toBe('member-b');
+ expect(capabilities.getCachedCapabilities('codex', device)?.availableModels[0].id).toBe('member-b');
+ }
+ unsubscribe();
+ });
+
it('lets another peer and a new link refresh while a retired link is still waiting', async () => {
const old = deferred();
let hold = true;
@@ -27,8 +75,7 @@ describe('remote catalog refresh scheduling', () => {
};
});
vi.stubGlobal('window', { electronAPI: { deviceLink: { invoke } } });
- const { refreshRemoteCatalogSnapshot: refresh } = await import('@/lib/remoteCatalogSnapshot');
- const providers = await import('@/hooks/useDeviceProviders');
+ const refresh = refreshRemoteCatalogSnapshot;
const first = refresh('old');
await vi.waitFor(() => expect(invoke).toHaveBeenCalledTimes(4));
const obsolete = refresh('old');
@@ -69,9 +116,6 @@ describe('remote catalog refresh scheduling', () => {
};
});
vi.stubGlobal('window', { electronAPI: { deviceLink: { invoke } } });
- const { refreshRemoteCatalogSnapshot } = await import('@/lib/remoteCatalogSnapshot');
- const providers = await import('@/hooks/useDeviceProviders');
- const capabilities = await import('@/hooks/useAgentCapabilities');
const events = vi.fn();
capabilities.subscribeDeviceCapabilities('test', 'codex', events);
const initial = refreshRemoteCatalogSnapshot('test');
diff --git a/apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts b/apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts
index d3b49cf45b..d0cc792f82 100644
--- a/apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts
+++ b/apps/desktop/src/renderer/components/new-chat/unifiedModelSelection.ts
@@ -18,6 +18,7 @@
*/
import type { ProviderView, UnifiedAgentCapability, UnifiedModelEntry } from '@cindy/model-providers';
+import { remoteInvocationModels } from '@cindy/model-providers';
import type { AgentKind } from '@/hooks/useAgentCapabilities';
import type { SelectableVendor } from '@/lib/agentVendors';
@@ -325,7 +326,7 @@ export type UnifiedRailFilter = UnifiedRailItem;
* 远程控制那台电脑时照常列全部,不经过这里。
*/
export function remoteAgentProviders(providers: readonly ProviderView[]): ProviderView[] {
- return providers.filter((provider) => provider.remoteInvocationEnabled === true);
+ return providers.filter((provider) => provider.remoteInvocationEnabled === true).map(remoteInvocationModels);
}
/** 该格按哪个供应商筛选(本机或远程供应商格);其余格不按供应商筛。 */
diff --git a/apps/desktop/src/renderer/components/onboarding/ConnectProviderBanner.tsx b/apps/desktop/src/renderer/components/onboarding/ConnectProviderBanner.tsx
index ad4f384795..1c53cdd661 100644
--- a/apps/desktop/src/renderer/components/onboarding/ConnectProviderBanner.tsx
+++ b/apps/desktop/src/renderer/components/onboarding/ConnectProviderBanner.tsx
@@ -18,14 +18,16 @@ import { useSignInToCindy } from '@/hooks/useSignInToCindy';
export function ConnectProviderBanner({
className,
style,
+ remote,
}: {
className?: string;
style?: CSSProperties;
+ remote?: boolean;
}) {
const { t } = useTranslation();
const navigate = useNavigate();
const signInToCindy = useSignInToCindy();
- const onboarding = useProviderOnboarding();
+ const onboarding = useProviderOnboarding({ remote });
if (!onboarding.visible) return null;
diff --git a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx
index dd54b226e1..053722df22 100644
--- a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx
+++ b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx
@@ -12,6 +12,7 @@ import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import type { ProviderView } from '@cindy/model-providers';
+import { remoteInvocationModels } from '@cindy/model-providers';
import { hasProviderLogo, ProviderLogoMark } from '@/components/icons/ProviderLogoMark';
import { RemoteSourceMark } from '@/components/icons/RemoteSourceMark';
@@ -92,7 +93,7 @@ export function useOwnRemoteProviderList(): OwnRemoteProviderList {
key,
deviceId: device.deviceId,
deviceName: device.name,
- provider,
+ provider: remoteInvocationModels(provider),
...(catalog.modelVisibilityOverrides !== undefined
? { modelVisibilityOverrides: catalog.modelVisibilityOverrides }
: {}),
diff --git a/apps/desktop/src/renderer/contexts/AuthContext.tsx b/apps/desktop/src/renderer/contexts/AuthContext.tsx
index 272e3b8021..2bd9e57e09 100644
--- a/apps/desktop/src/renderer/contexts/AuthContext.tsx
+++ b/apps/desktop/src/renderer/contexts/AuthContext.tsx
@@ -56,6 +56,7 @@ import { rememberSsoOrgIdentifier } from '@/state/ssoOrgHistory';
import { setDeferredUiAssignmentOwner } from '@/features/cc-agent/deferredUiAssignment';
import { invalidateProvidersSnapshot } from '@/lib/providersSnapshotStore';
import { preloadLocalCatalogSnapshot } from '@/lib/localCatalogSnapshot';
+import { invalidateRemoteCatalogSnapshots } from '@/lib/remoteCatalogSnapshot';
import { awaitDesktopLoginStateLoad, type DesktopLoginState } from '../../shared/authIpc';
import { getDataOwnerGeneration, setDataOwnerGeneration } from './dataOwnerGeneration';
@@ -143,6 +144,7 @@ function publishDataOwnerGeneration(
const ownerChanged = previousOwnerId !== dataOwnerId;
if (ownerChanged) {
resetTaskTagCatalogCache();
+ invalidateRemoteCatalogSnapshots();
}
// The pre-commit fence may already publish null. A committed owner change
// must still close sessions even when that published owner stays null.
diff --git a/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx b/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx
index fa683f4de3..c2860d4d99 100644
--- a/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx
+++ b/apps/desktop/src/renderer/contexts/__tests__/AuthContextInitializeCatch.test.tsx
@@ -55,6 +55,8 @@ vi.mock('@/lib/logger', () => ({
import { AuthProvider, useAuth } from '../AuthContext';
import { useLogin } from '@/hooks/useLogin';
+import { prefetchDeviceProviders, useDeviceProviders } from '@/hooks/useDeviceProviders';
+import { prefetchDeviceCapabilities, useAgentCapabilities } from '@/hooks/useAgentCapabilities';
function AuthProbe() {
const { isInitializing, isAuthenticated, user, loginState } = useAuth();
@@ -88,6 +90,35 @@ afterEach(() => {
});
describe('login recovery ignores abandoned IPC results', () => {
+ // 2026-10-20 黑盒验收:同一分享在换账号后残留上一成员的模型。
+ // 缓存测试未覆盖真实 AuthProvider 边界及已挂载的选择器;tier: unit。
+ it('clears mounted remote model lists at the logout boundary', async () => {
+ mocks.service.initialize.mockResolvedValue({
+ isAuthenticated: true, isCanary: false, dataOwnerId: 'member-a', ownerGeneration: 1,
+ deviceId: 'device', user: { id: 'member-a', name: 'Member A' },
+ });
+ const auth = renderHook(() => useAuth(), { wrapper: AuthProvider });
+ await waitFor(() => expect(auth.result.current.isInitializing).toBe(false));
+ Object.assign(window.electronAPI, { deviceLink: { invoke: vi.fn(async (_device: string, channel: string) => (
+ channel === 'maker:provider:list'
+ ? { providers: [{ id: 'openai', name: 'OpenAI', agents: ['codex'], connected: true,
+ models: { codex: [{ id: 'member-a', name: 'Member A', contextWindow: 200000, efforts: [] }] } }] }
+ : { availableModels: [{ id: 'member-a', displayName: 'Member A', contextWindow: 200000,
+ efforts: [], defaultEffort: null }], hasFastMode: false, effortLevels: [], permissionModes: [] }
+ )) } });
+ await Promise.all([prefetchDeviceProviders('share:common'), prefetchDeviceCapabilities('share:common')]);
+ const catalog = renderHook(() => ({
+ providers: useDeviceProviders('share:common'),
+ capabilities: useAgentCapabilities('codex', 'share:common'),
+ }));
+ expect(catalog.result.current.providers.providers).toHaveLength(1);
+ expect(catalog.result.current.capabilities.capabilities?.availableModels[0].id).toBe('member-a');
+ await act(async () => { await auth.result.current.logout(); });
+ expect(mocks.service.logout).toHaveBeenCalledOnce();
+ expect(catalog.result.current.providers.providers).toEqual([]);
+ expect(catalog.result.current.capabilities.capabilities).toBeNull();
+ });
+
it.each(['resolve', 'reject'] as const)(
'recovers a failed skip while the abandoned provider request later %ss',
async (settlement) => {
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
index d59885aee1..bebba59315 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
@@ -5601,10 +5601,14 @@ function CCAgentSessionContent({
)}
{/* 零可用模型引导条:与首屏引导卡共享判定与 dismiss(useProviderOnboarding),
- 组件自判 visible、不可见渲染 null。device-link 远程会话不出——连接态在被控端。 */}
- {!remoteDeviceId && (
- <ConnectProviderBanner style={{ width: inputWidth }} className="py-1" />
- )}
+ 按下一轮 Agent 执行位置判断,本机连接状态不用于远程任务。 */}
+ <ConnectProviderBanner
+ style={{ width: inputWidth }}
+ className="py-1"
+ remote={!!remoteDeviceId || !!session?.remoteHostId || !!(
+ pendingAgentDeviceId !== undefined ? pendingAgentDeviceId : agentDeviceId
+ )}
+ />
<div
className="mx-auto flex flex-col items-center gap-[10px]"
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index e24a0de4ec..60c0212ad5 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -1107,9 +1107,11 @@ export function NewMakerDraftRoute() {
wtBranchPreferenceErrorRef.current = false;
setWtBranchPreferenceError(false);
}, []);
- // 零可用模型引导卡:device-link 草稿不出(连接态在被控端,本机替它连不上)。
- const providerOnboarding = useProviderOnboarding();
- const showProviderOnboardingCard = providerOnboarding.visible && !isDeviceLinkDraft;
+ // 本机供应商连接引导只适用于在本机执行的草稿。
+ const providerOnboarding = useProviderOnboarding({
+ remote: isDeviceLinkDraft || isAgentDeviceDraft || !!effectiveRemoteHostId,
+ });
+ const showProviderOnboardingCard = providerOnboarding.visible;
const effectiveExtraDirs = draft.extraDirs;
const effectiveWritableDirs = draft.writableDirs;
const effectiveCollab = collab;
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
index 7e48c56c7d..821a688aff 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx
@@ -1,4 +1,5 @@
import { ProviderShareVisibilitySection } from './ProviderShareVisibilitySection';
+import { RemoteModelAccessSection, RemoteModelAccessDialog } from './RemoteModelAccessSection';
import { RemoteAgentIdleReleaseSection } from './RemoteAgentIdleReleaseSection';
import { RemoteAgentLimitsSection } from './RemoteAgentLimitsSection';
/**
@@ -85,6 +86,8 @@ export function ProviderShareManagePage({
const [remoteGroup, setRemoteGroup] = useState<ProviderGroupConfig | null>(initialGroup ?? null);
const [state, setState] = useState<ProviderShareOwnerState | null>(null);
const [noteMemberId, setNoteMemberId] = useState<string | null>(null);
+ const [modelMemberId, setModelMemberId] = useState<string | null>(null);
+ const modelTriggerRef = useRef<HTMLButtonElement | null>(null);
const noteTriggerRef = useRef<HTMLButtonElement | null>(null);
const [loadFailed, setLoadFailed] = useState(false);
const [loadErrorKey, setLoadErrorKey] = useState<string | null>(null);
@@ -331,9 +334,11 @@ export function ProviderShareManagePage({
onTogglePause: (member) => void setMember(member, member.status === 'paused' ? 'resume' : 'pause'),
onRemove: (member) => void removeMember(member),
onEditNote: (member, trigger) => { noteTriggerRef.current = trigger; setNoteMemberId(member.memberId); },
+ onModelAccess: (member, trigger) => { modelTriggerRef.current = trigger; setModelMemberId(member.memberId); },
onReshare: (member, reshare, decision) => void decideReshare(reshare, providerShareMemberName(member), decision),
}), [busy, decideReshare, loadFailed, providerClassificationReady, removeMember, setMember]);
const noteMember = members.find((member) => member.memberId === noteMemberId);
+ const modelMember = members.find((member) => member.memberId === modelMemberId);
return (
// 这一页自己滚动(设置页外层在「模型供应商」分区不滚)。始终预留滚动条槽位:展开组内电脑的配额、
@@ -502,6 +507,8 @@ export function ProviderShareManagePage({
</section>
)}
+ <RemoteModelAccessSection key={`models:${deviceId ?? 'local'}:${providerId}`} providerId={providerId} deviceId={deviceId} />
+
<ProviderGroupSection
providerId={providerId} providerName={providerName} deviceId={deviceId} deviceName={deviceName}
initialConfig={initialGroup} remoteProvider={remoteProvider} onConfigChange={setRemoteGroup}
@@ -551,6 +558,10 @@ export function ProviderShareManagePage({
}}
/>
)}
+ {modelMember && <RemoteModelAccessDialog key={`${deviceId ?? 'local'}:${modelMember.memberId}`}
+ providerId={providerId} deviceId={deviceId} memberId={modelMember.memberId}
+ memberName={providerShareMemberName(modelMember)} returnFocusTo={modelTriggerRef.current}
+ onClose={() => setModelMemberId(null)} />}
</div>
);
}
diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
index f34f6c5bba..8535bf5562 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx
@@ -749,6 +749,7 @@ function PartyTable({
onTogglePause={() => memberActions.onTogglePause(member)}
onRemove={() => memberActions.onRemove(member)}
onEditNote={(trigger) => memberActions.onEditNote(member, trigger)}
+ onModelAccess={memberActions.onModelAccess ? (trigger) => memberActions.onModelAccess!(member, trigger) : undefined}
/>
)}
</td>
diff --git a/apps/desktop/src/renderer/features/provider-share/RemoteModelAccessSection.tsx b/apps/desktop/src/renderer/features/provider-share/RemoteModelAccessSection.tsx
new file mode 100644
index 0000000000..970d06b116
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/RemoteModelAccessSection.tsx
@@ -0,0 +1,143 @@
+import { useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { ErrorNotice } from '@/components/ui/error-notice';
+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
+import { useOptionalAuthUser } from '@/contexts/AuthContext';
+import { isProviderManagementOutdated, providerShareManagementCommand } from '../provider-group/providerManagement';
+import type { RemoteModelAccessView, RemoteModelSelection } from '../../../shared/remoteModelAccess';
+import { ProviderShareDialog, ProviderShareDialogFooter, ProviderShareDialogTitle } from './ProviderShareDialog';
+
+const key = 'providerShare.modelAccess.';
+
+export function RemoteModelAccessSection({ providerId, deviceId }: { providerId: string; deviceId?: string }) {
+ const { t } = useTranslation();
+ useOptionalAuthUser();
+ const owner = getDataOwnerGeneration();
+ const [view, setView] = useState<RemoteModelAccessView | null>(null);
+ const [viewOwner, setViewOwner] = useState(owner);
+ const [error, setError] = useState<string | null>(null);
+ const [open, setOpen] = useState(false);
+ const trigger = useRef<HTMLButtonElement>(null);
+ useEffect(() => {
+ let active = true;
+ let sequence = 0;
+ setView(null);
+ const load = async () => {
+ const request = ++sequence;
+ try {
+ const next = await providerShareManagementCommand({ action: 'get-model-access', providerId }, deviceId);
+ if (!active || request !== sequence || !isDataOwnerGenerationCurrent(owner)) return;
+ if (next?.version !== 1) { setError(key + 'needsUpdate'); return; }
+ setView(next); setViewOwner(owner); setError(null);
+ } catch (reason) {
+ if (active && request === sequence && isDataOwnerGenerationCurrent(owner)) {
+ setView(null); setError(key + (isProviderManagementOutdated(reason) ? 'needsUpdate' : 'loadFailed'));
+ }
+ }
+ };
+ void load();
+ const off = window.electronAPI.providerShare.onOwnedChanged(() => { void load(); });
+ return () => { active = false; off(); };
+ }, [providerId, deviceId, owner]);
+ const currentView = isDataOwnerGenerationCurrent(viewOwner) ? view : null;
+ return (
+ <section className="mt-6 shrink-0" data-testid="remote-model-access">
+ <h3 className="text-13 font-medium leading-[1.5] text-[var(--settings-section-title)]">{t(key + 'title')}</h3>
+ <p className="mt-1 text-12 leading-[1.5] text-[var(--text-secondary)]">{t(key + 'description')}</p>
+ <div className="mt-3 flex items-center justify-between gap-4 rounded-xl border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)] px-4 py-3">
+ <span className="text-13 leading-[1.5] text-[var(--text-primary)]">
+ {currentView ? t(key + (currentView.models === null ? 'all' : 'selected'), { count: currentView.models?.length ?? 0 }) : t(key + 'loading')}
+ </span>
+ <Button ref={trigger} variant="secondary" size="sm" disabled={!currentView || Boolean(error)} onClick={() => setOpen(true)}>{t(key + 'choose')}</Button>
+ </div>
+ {error && <ErrorNotice role="alert" className="mt-2" message={t(error)} />}
+ {open && currentView && <RemoteModelAccessDialog providerId={providerId} deviceId={deviceId} returnFocusTo={trigger.current}
+ onClose={() => setOpen(false)} onSaved={(next) => { setView(next); setOpen(false); }} />}
+ </section>
+ );
+}
+
+export function RemoteModelAccessDialog({ providerId, deviceId, memberId, memberName, returnFocusTo, onClose, onSaved }: {
+ providerId: string; deviceId?: string; memberId?: string; memberName?: string;
+ returnFocusTo?: HTMLElement | null; onClose(): void; onSaved?(view: RemoteModelAccessView): void;
+}) {
+ const { t } = useTranslation();
+ const [storedView, setView] = useState<RemoteModelAccessView | null>(null);
+ const loadedOwner = useRef<ReturnType<typeof getDataOwnerGeneration> | null>(null);
+ const [models, setModels] = useState<RemoteModelSelection>(null);
+ const [search, setSearch] = useState('');
+ const [error, setError] = useState<string | null>(null);
+ const [saving, setSaving] = useState(false);
+ const inFlight = useRef(false);
+ const sequence = useRef(0);
+ const searchRef = useRef<HTMLInputElement>(null);
+ useOptionalAuthUser();
+ const owner = getDataOwnerGeneration();
+ useEffect(() => {
+ const request = ++sequence.current;
+ setView(null);
+ void providerShareManagementCommand({ action: 'get-model-access', providerId, memberId }, deviceId).then((next) => {
+ if (request !== sequence.current || !isDataOwnerGenerationCurrent(owner)) return;
+ if (next?.version !== 1) { setError(key + 'needsUpdate'); return; }
+ loadedOwner.current = owner;
+ setView(next); setModels(next.models); setError(null);
+ }, (reason) => {
+ if (request === sequence.current && isDataOwnerGenerationCurrent(owner)) setError(key + (isProviderManagementOutdated(reason) ? 'needsUpdate' : 'loadFailed'));
+ });
+ return () => { sequence.current++; };
+ }, [providerId, memberId, deviceId, owner]);
+ const view = loadedOwner.current && isDataOwnerGenerationCurrent(loadedOwner.current) ? storedView : null;
+ const providerAllows = (id: string) => !memberId || view?.providerModels === null || view?.providerModels.includes(id) === true;
+ const available = view?.availableModels ?? [];
+ // Preserve explicit selections for temporarily missing models; users can remove them without silently expanding a grant.
+ const missing = (view ? models ?? [] : []).filter((id) => !available.some((model) => model.id === id)).map((id) => ({ id, name: id }));
+ const rows = [...available, ...missing].filter((model) => `${model.name} ${model.id}`.toLowerCase().includes(search.toLowerCase()));
+ const save = async () => {
+ if (inFlight.current || !view) return;
+ inFlight.current = true; setSaving(true); setError(null);
+ const request = ++sequence.current;
+ try {
+ const next = await providerShareManagementCommand({ action: 'set-model-access', providerId, memberId, models }, deviceId);
+ if (request === sequence.current && isDataOwnerGenerationCurrent(owner)) {
+ if (next?.version !== 1) { setError(key + 'needsUpdate'); return; }
+ if (onSaved) onSaved(next); else onClose();
+ }
+ } catch (reason) {
+ if (request === sequence.current && isDataOwnerGenerationCurrent(owner)) setError(key + (isProviderManagementOutdated(reason) ? 'needsUpdate' : 'saveFailed'));
+ } finally { inFlight.current = false; setSaving(false); }
+ };
+ return (
+ <ProviderShareDialog open busy={saving} returnFocusTo={returnFocusTo} initialFocusRef={searchRef} onOpenChange={(next) => { if (!next) onClose(); }} maxWidth={520}>
+ <ProviderShareDialogTitle>{t(key + (memberId ? 'memberTitle' : 'choose'))}</ProviderShareDialogTitle>
+ <p className="mt-2 text-13 leading-[1.5] text-[var(--confirm-desc)]">{t(key + (memberId ? 'memberDescription' : 'description'), { name: memberName })}</p>
+ <label className="mt-4 flex min-h-8 items-center gap-2 text-13 leading-[1.5] text-[var(--text-primary)]">
+ <input type="checkbox" className="h-4 w-4 shrink-0 accent-[var(--text-primary)]" checked={models === null} disabled={!view || saving} onChange={(event) => setModels(event.target.checked ? null : [])} />
+ {t(key + (memberId ? 'inherit' : 'allFuture'))}
+ </label>
+ <div className="mt-3"><Input inputRef={searchRef} value={search} onChange={setSearch} placeholder={t(key + 'search')} aria-label={t(key + 'search')} disabled={!view || saving} /></div>
+ <div className="mt-2 max-h-72 overflow-y-auto overscroll-contain rounded-lg border border-[var(--border-default)] p-2" aria-busy={!view}>
+ {rows.map((model) => {
+ const allowed = providerAllows(model.id);
+ const checked = models === null ? allowed : models.includes(model.id);
+ return <label key={model.id} className="flex min-h-9 items-center gap-3 rounded-lg px-2 py-2 text-13 leading-[1.5] text-[var(--text-primary)] hover:bg-[var(--surface-hover)]">
+ <input type="checkbox" className="h-4 w-4 shrink-0 accent-[var(--text-primary)]" aria-label={model.name} checked={checked} disabled={!view || saving || (!allowed && !checked)} onChange={(event) => {
+ const current = models ?? available.filter((entry) => providerAllows(entry.id)).map((entry) => entry.id);
+ setModels(event.target.checked ? [...new Set([...current, model.id])] : current.filter((id) => id !== model.id));
+ }} />
+ <span className="min-w-0 flex-1 break-words">{model.name}{model.name !== model.id && <span className="block text-11 leading-[1.5] text-[var(--text-tertiary)]">{model.id}</span>}</span>
+ {!allowed && <span className="text-11 leading-[1.5] text-[var(--text-secondary)]">{t(key + 'notOpen')}</span>}
+ </label>;
+ })}
+ {rows.length === 0 && <p role="status" className="p-2 text-12 leading-[1.5] text-[var(--text-secondary)]">{t(key + (view ? 'empty' : 'loading'))}</p>}
+ </div>
+ {models?.length === 0 && <p className="mt-2 text-12 leading-[1.5] text-[var(--text-secondary)]">{t(key + 'none')}</p>}
+ {error && <ErrorNotice role="alert" className="mt-3" message={t(error)} />}
+ <ProviderShareDialogFooter>
+ <Button variant="secondary" disabled={saving} onClick={onClose}>{t('settings.providers.button.cancel')}</Button>
+ <Button variant="primary" disabled={!view || saving} onClick={() => { void save(); }}>{t('settings.providers.custom.save')}</Button>
+ </ProviderShareDialogFooter>
+ </ProviderShareDialog>
+ );
+}
diff --git a/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx b/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx
index 8b110f31a0..7dd32bbaf2 100644
--- a/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ShareMemberControls.tsx
@@ -3,7 +3,7 @@
* 分享状态、关闭/恢复与删除(收进行内 `···`,与组内电脑一行的「移出组」同一模式),以及经这个人的供应商组
* 转给别人用、已处理过的人(provider-sharing.md §4.3)。操作由「远程与分享」页执行,结果以 toast 说明。
*/
-import { CirclePause, CirclePlay, MoreHorizontal, Pencil, Trash2 } from 'lucide-react';
+import { CirclePause, CirclePlay, MoreHorizontal, Pencil, SlidersHorizontal, Trash2 } from 'lucide-react';
import { useRef } from 'react';
import { useTranslation } from 'react-i18next';
@@ -24,6 +24,7 @@ export interface ProviderShareMemberActions {
onTogglePause: (member: ProviderShareMemberView) => void;
onRemove: (member: ProviderShareMemberView) => void;
onEditNote: (member: ProviderShareMemberView, trigger: HTMLButtonElement | null) => void;
+ onModelAccess?: (member: ProviderShareMemberView, trigger: HTMLButtonElement | null) => void;
onReshare: (member: ProviderShareMemberView, reshare: ProviderShareReshareView, decision: 'approve' | 'reject') => void;
}
@@ -56,12 +57,14 @@ export function ShareMemberMenu({
onTogglePause,
onRemove,
onEditNote,
+ onModelAccess,
}: {
member: ProviderShareMemberView;
disabled: boolean;
onTogglePause: () => void;
onRemove: () => void;
onEditNote: (trigger: HTMLButtonElement | null) => void;
+ onModelAccess?: (trigger: HTMLButtonElement | null) => void;
}) {
const { t } = useTranslation();
const triggerRef = useRef<HTMLButtonElement>(null);
@@ -83,6 +86,10 @@ export function ShareMemberMenu({
</Tip>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
+ {onModelAccess && <DropdownMenuItem disabled={disabled} onClick={() => onModelAccess(triggerRef.current)}>
+ <SlidersHorizontal size={18} className="mr-2.5" />
+ {t('providerShare.modelAccess.memberTitle')}
+ </DropdownMenuItem>}
<DropdownMenuItem disabled={disabled} onClick={() => onEditNote(triggerRef.current)}>
<Pencil size={18} className="mr-2.5" />
{t(member.note ? 'providerShare.manage.memberNote.edit' : 'providerShare.manage.memberNote.add')}
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
index d978196754..772eecb93c 100644
--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx
@@ -198,6 +198,7 @@ beforeEach(() => {
vi.mocked(toast.success).mockClear();
command.mockReset();
command.mockImplementation(async (cmd: { action: string }) => {
+ if (cmd.action === 'get-model-access') return { version: 1, models: null, providerModels: null, availableModels: [] };
if (cmd.action === 'get-visibility') return { quota: false, usage: false };
if (cmd.action === 'owned') return owned();
if (cmd.action === 'own-usage') return ownUsage();
@@ -271,6 +272,25 @@ function renderPage(
}
describe('ProviderShareManagePage', () => {
+ // Verify the person's row opens a grant for that member, rather than editing the provider-wide policy.
+ it('opens and saves the selected person’s model grant from their row menu', async () => {
+ const respond = command.getMockImplementation()!;
+ const models = { version: 1, models: null, providerModels: null,
+ availableModels: [{ id: 'small', name: 'Small' }, { id: 'large', name: 'Large' }] };
+ command.mockImplementation(async (cmd) => {
+ if (cmd.action === 'get-model-access' || cmd.action === 'set-model-access') return models;
+ return respond(cmd);
+ });
+ renderPage();
+ fireEvent.click(within(await findMemberRow()).getByRole('button', { name: 'providerShare.modelAccess.memberTitle' }));
+ const dialog = await screen.findByRole('dialog');
+ fireEvent.click(await within(dialog).findByRole('checkbox', { name: 'Large' }));
+ fireEvent.click(within(dialog).getByRole('button', { name: 'settings.providers.custom.save' }));
+ await waitFor(() => expect(command).toHaveBeenCalledWith({
+ action: 'set-model-access', providerId: 'xd', memberId: 'mem-1', models: ['small'],
+ }));
+ });
+
/* 测试价值:2026-10-19 用户备注;生产页面的新增入口、保存/清空、原用户名与筛选同步显示。
* 现有测试只有暂停/删除。最小输入:一个成员,分别在本机和 studio 管理。tier: unit。
* 单文件实测 17.21 秒,其中导入 7.16 秒、30 用例 8.61 秒;复用既有页面与完整用量图表 fixture,
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteModelAccessSection.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteModelAccessSection.test.tsx
new file mode 100644
index 0000000000..b2795c5c07
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/RemoteModelAccessSection.test.tsx
@@ -0,0 +1,63 @@
+// @vitest-environment jsdom
+import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { RemoteModelAccessDialog, RemoteModelAccessSection } from '../RemoteModelAccessSection';
+import type { RemoteModelAccessView } from '../../../../shared/remoteModelAccess';
+
+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key, i18n: { language: 'en' } }) }));
+vi.mock('@/contexts/AuthContext', () => ({ useOptionalAuthUser: () => null }));
+/* 测试价值:用户新增的勾选授权保存、个人上限、失败保留草稿及旧端禁写。现有管理页 fixture 不单独驱动此弹窗;
+ * 最小输入:两个型号,仅开放一个,再清空个人选择。unit;真实组件与同账号管理 adapter,使用独立 jsdom。 */
+const local = vi.fn();
+const remote = vi.fn();
+const value = (): RemoteModelAccessView => ({ version: 1, models: null, providerModels: null,
+ availableModels: [{ id: 'small', name: 'Small' }, { id: 'large', name: 'Large' }] });
+beforeEach(() => {
+ local.mockReset().mockImplementation(async () => value());
+ remote.mockReset().mockImplementation(async (cmd) => local(cmd.request.command));
+ Object.assign(window, { electronAPI: {
+ providerShare: { command: local, onOwnedChanged: () => () => {} },
+ providerGroup: { command: remote },
+ } });
+});
+afterEach(() => cleanup());
+describe('remote model settings', () => {
+ it('opens the global selection from settings and saves only the checked model', async () => {
+ render(<RemoteModelAccessSection providerId="p" />);
+ const choose = screen.getByRole('button', { name: 'providerShare.modelAccess.choose' });
+ await waitFor(() => expect((choose as HTMLButtonElement).disabled).toBe(false));
+ fireEvent.click(choose);
+ const dialog = screen.getByRole('dialog');
+ fireEvent.click(await within(dialog).findByRole('checkbox', { name: 'Large' }));
+ fireEvent.click(within(dialog).getByRole('button', { name: 'settings.providers.custom.save' }));
+ await waitFor(() => expect(local).toHaveBeenCalledWith({ action: 'set-model-access', providerId: 'p', memberId: undefined, models: ['small'] }));
+ });
+ it.each([undefined, 'studio'])('respects the remote ceiling and allows an explicit empty personal grant: %s', async (deviceId) => {
+ local.mockImplementation(async () => ({ ...value(), providerModels: ['small'] }));
+ render(<RemoteModelAccessDialog providerId="p" memberId="alice" memberName="Alice" deviceId={deviceId} onClose={() => {}} />);
+ const large = await screen.findByRole('checkbox', { name: 'Large' }) as HTMLInputElement;
+ expect(large.disabled).toBe(true);
+ expect(large.checked).toBe(false);
+ fireEvent.click(screen.getByRole('checkbox', { name: 'Small' }));
+ fireEvent.click(screen.getByRole('button', { name: 'settings.providers.custom.save' }));
+ await waitFor(() => expect(local).toHaveBeenCalledWith({ action: 'set-model-access', providerId: 'p', memberId: 'alice', models: [] }));
+ if (deviceId) expect(remote).toHaveBeenCalledWith({ action: 'remote-manage', deviceId, request: { action: 'manage-share', command: expect.objectContaining({ action: 'set-model-access', memberId: 'alice', models: [] }) } });
+ else expect(remote).not.toHaveBeenCalled();
+ });
+ it('keeps the selection available for retry when saving fails', async () => {
+ local.mockImplementation(async (cmd) => { if (cmd.action === 'set-model-access') throw new Error('save failed'); return value(); });
+ render(<RemoteModelAccessDialog providerId="p" onClose={() => {}} />);
+ fireEvent.click(await screen.findByRole('checkbox', { name: 'Large' }));
+ fireEvent.click(screen.getByRole('button', { name: 'settings.providers.custom.save' }));
+ expect((await screen.findByRole('alert')).textContent).toContain('providerShare.modelAccess.saveFailed');
+ expect((screen.getByRole('checkbox', { name: 'Large' }) as HTMLInputElement).checked).toBe(false);
+ expect((screen.getByRole('checkbox', { name: 'Small' }) as HTMLInputElement).checked).toBe(true);
+ });
+ it('requires a supporting host instead of treating an old reply as unrestricted access', async () => {
+ local.mockResolvedValue({});
+ render(<RemoteModelAccessDialog providerId="p" deviceId="studio" onClose={() => {}} />);
+ expect((await screen.findByRole('alert')).textContent).toContain('providerShare.modelAccess.needsUpdate');
+ expect((screen.getByRole('button', { name: 'settings.providers.custom.save' }) as HTMLButtonElement).disabled).toBe(true);
+ expect(local).not.toHaveBeenCalledWith(expect.objectContaining({ action: 'set-model-access' }));
+ });
+});
diff --git a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts b/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts
index c3cbd1f303..25250fcb9f 100644
--- a/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts
+++ b/apps/desktop/src/renderer/hooks/useAgentCapabilities.ts
@@ -349,7 +349,7 @@ let localSnapshotRevision = 0;
const localListeners = new Set<(agent: AgentKind, caps: AgentCapabilities | null) => void>();
/** 远程能力缓存事件;驱逐时先标 stale,成功 / 失败后再结束这一轮刷新。 */
export type DeviceCapabilitiesEvent =
- | { status: 'loading' }
+ | { status: 'loading'; retainDisplaySnapshot?: boolean }
| { status: 'ready'; capabilities: AgentCapabilities }
| { status: 'error'; error: string };
/** 已挂载的远程能力订阅者;key 同缓存,provider revision 后可原子换入新快照。 */
@@ -482,7 +482,8 @@ export function useAgentCapabilities(
const key = cacheKey(agentKind, deviceId);
const applyRemoteEvent = (event: DeviceCapabilitiesEvent): void => {
if (event.status === 'loading') {
- // 保留上一份完整快照以避免空白帧,但显式标记为 stale,调用方不得据此改写选择。
+ // 仅同账号配置刷新保留显示快照,账号边界不能展示上一账号的模型。
+ if (!event.retainDisplaySnapshot) setCapabilities(null);
setOwnerKey(key);
setLoading(true);
setError(null);
@@ -597,7 +598,10 @@ export async function prefetchDeviceCapabilities(deviceId: string): Promise<void
}
/** device-link:被控设备下线 / 断链时驱逐其能力缓存(只清该设备的 key)。 */
-export function evictDeviceCapabilities(deviceId: string): void {
+export function evictDeviceCapabilities(
+ deviceId: string,
+ options?: { retainDisplaySnapshot?: boolean },
+): void {
const prefix = `${deviceId}:`;
for (const k of [...cache.keys()]) if (k.startsWith(prefix)) cache.delete(k);
for (const k of [...inflight.keys()]) if (k.startsWith(prefix)) inflight.delete(k);
@@ -606,8 +610,21 @@ export function evictDeviceCapabilities(deviceId: string): void {
// 已挂载 hook 必须同步知道旧快照已失效;否则 provider 新快照先到时会拿旧 capabilities
// 计算 fallback,并永久覆盖用户原本保存的模型偏好。
for (const agentKind of ALL_AGENT_KINDS) {
- notifyRemoteCapabilities(deviceId, agentKind, { status: 'loading' });
+ notifyRemoteCapabilities(deviceId, agentKind, {
+ status: 'loading',
+ ...(options?.retainDisplaySnapshot ? { retainDisplaySnapshot: true } : {}),
+ });
+ }
+}
+
+/** 只清远程能力,本机目录仍由本地刷新代际管理。 */
+export function evictAllRemoteCapabilities(): void {
+ const devices = new Set(deviceGen.keys());
+ for (const key of [...cache.keys(), ...inflight.keys(), ...remoteListeners.keys()]) {
+ const deviceId = key.slice(0, key.lastIndexOf(':'));
+ if (deviceId !== 'local') devices.add(deviceId);
}
+ for (const deviceId of devices) evictDeviceCapabilities(deviceId);
}
export type LocalCapabilitiesSnapshot = ReadonlyArray<readonly [AgentKind, AgentCapabilities]>;
diff --git a/apps/desktop/src/renderer/hooks/useDeviceProviders.ts b/apps/desktop/src/renderer/hooks/useDeviceProviders.ts
index 0c1f597e34..e33aa0ebb5 100644
--- a/apps/desktop/src/renderer/hooks/useDeviceProviders.ts
+++ b/apps/desktop/src/renderer/hooks/useDeviceProviders.ts
@@ -298,7 +298,8 @@ export function useDeviceProviders(deviceId?: string): UseDeviceProvidersResult
if (cancelled) return;
if (event.status === 'loading') {
retryGeneration = undefined;
- // 保留上一份完整列表避免视觉跳变,但让模型选择逻辑等待同轮新快照。
+ // 配置刷新可保留显示快照;断链或账号切换必须立即清掉旧目录。
+ if (!event.retainDisplaySnapshot) setPayload(EMPTY_PAYLOAD);
setOwnerDeviceId(deviceId);
setLoading(true);
setError(null);
@@ -419,3 +420,9 @@ export function evictDeviceProviders(
});
return deviceGen.get(deviceId)!;
}
+
+/** 账号边界:缓存、在途读取及挂载中的旧账号目录一起失效。 */
+export function evictAllDeviceProviders(): void {
+ const devices = new Set([...cache.keys(), ...inflight.keys(), ...listeners.keys(), ...deviceGen.keys()]);
+ for (const deviceId of devices) evictDeviceProviders(deviceId);
+}
diff --git a/apps/desktop/src/renderer/hooks/useProviderOnboarding.ts b/apps/desktop/src/renderer/hooks/useProviderOnboarding.ts
index c5882cc74e..55a0d63dc9 100644
--- a/apps/desktop/src/renderer/hooks/useProviderOnboarding.ts
+++ b/apps/desktop/src/renderer/hooks/useProviderOnboarding.ts
@@ -2,7 +2,7 @@
* useProviderOnboarding — 「连接供应商」引导(首屏卡片 + 会话 banner)的唯一判定
* 与数据装配点,两处 UI 都消费本 hook,防止判定口径漂移。
*
- * 判定口径是**全局零已连接来源**(`providers.some(p => p.connected) === false`),
+ * 判定口径是任务在本机执行且**本机零已连接来源**(`providers.some(p => p.connected) === false`),
* 而非 useConnectedSource 的 per-agent/per-model 口径:引导解决的是「一个可用模型
* 都没有」的产品空态,模型级空态(选中模型无来源)由 ChatInput / ModelSelector
* 自己处理,两层叙事不重复。
@@ -53,7 +53,7 @@ export interface DetectedProviderRow {
}
export interface UseProviderOnboardingReturn {
- /** 已加载且零已连接来源;可跳过的引导还受 dismiss 控制。 */
+ /** 本机执行、已加载且零已连接来源;可跳过的引导还受 dismiss 控制。 */
visible: boolean;
loading: boolean;
/** 登录三态:cloud 引导连接 Cindy AI;signed-out/local 引导去登录。 */
@@ -80,6 +80,8 @@ export interface UseProviderOnboardingReturn {
}
interface UseProviderOnboardingOptions {
+ /** 任务由远程 Agent、SSH 或被控电脑执行时,本机供应商引导不适用。 */
+ remote?: boolean;
/** 必须先连接来源的恢复入口传 false,不读取普通引导的关闭偏好。 */
dismissible?: boolean;
/** 卡片需要预设目录时传 true(banner 不需要,省一次 IPC)。 */
@@ -104,7 +106,7 @@ export function useProviderOnboarding(
if (!loading && hasAnyConnected) resetProviderOnboardingDismissal();
}, [loading, hasAnyConnected]);
- const visible = !loading && !hasAnyConnected && (options?.dismissible === false || !dismissed);
+ const visible = !options?.remote && !loading && !hasAnyConnected && (options?.dismissible === false || !dismissed);
const xdProvider = useMemo(() => providers.find((p) => p.id === 'xd'), [providers]);
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index e970c44999..b099eb685a 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -228,6 +228,25 @@
"closeAllDescription": "Guests will lose access. Task history is kept."
},
"providerShare": {
+ "modelAccess": {
+ "title": "Models allowed for remote use",
+ "description": "Only limits remote use. Local use is unchanged. Saved changes apply when creating a task, switching models, or sending the next message.",
+ "all": "All models",
+ "selected": "{{count}} models allowed",
+ "choose": "Choose models",
+ "memberTitle": "Allowed models",
+ "memberDescription": "Choose which models {{name}} can use, within the models open for remote use. These limits also apply to use reshared through this person.",
+ "inherit": "Follow remote model access",
+ "allFuture": "Allow all models, including future additions",
+ "search": "Search models",
+ "notOpen": "Not open remotely",
+ "empty": "No matching models",
+ "none": "No models selected. Remote calls will be blocked.",
+ "loading": "Loading model access…",
+ "loadFailed": "Could not load model access. Reopen these settings.",
+ "saveFailed": "Could not save model access. Try again.",
+ "needsUpdate": "Update Cindy on the provider’s computer to manage model access."
+ },
"entry": {
"label": "Remote & Sharing",
"pending_one": "{{count}} share request waiting",
@@ -12083,7 +12102,7 @@
"REMOTE_AGENT_BUSY": "Too many sessions are running on the other computer. End some of them and try again.",
"REMOTE_AGENT_UNSUPPORTED": "This Agent isn't available on the other computer. Install or sign in to it there, or pick another Agent.",
"REMOTE_AGENT_INVALID": "Something went wrong talking to the computer running the Agent. Try again; if it keeps happening, update Cindy on both computers.",
- "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "That computer hasn’t allowed remote use of this provider. On that computer, turn on “Allow remote use” in Settings → Providers, or pick another model.",
+ "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "That computer hasn’t granted you remote access to this provider or the selected model. Ask its owner to adjust access in Remote & Sharing, or pick another model.",
"REMOTE_AGENT_SHARE_PAUSED": "The owner has paused this share for you, so these models can’t be used until it’s resumed. Switch to another model to continue.",
"REMOTE_AGENT_SHARE_REMOVED": "This share is no longer available (the owner removed it or you left). Switch to another model to continue.",
"REMOTE_AGENT_SHARE_UNAVAILABLE": "The shared provider is temporarily unavailable. The owner's computer may be offline, or sharing is turned off for now. Try again later, or switch to another model to continue.",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 6eabd2bf0c..173819e49b 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -228,6 +228,25 @@
"closeAllDescription": "すべてのゲストがアクセスできなくなります。タスクの履歴は保持されます。"
},
"providerShare": {
+ "modelAccess": {
+ "title": "リモート利用を許可するモデル",
+ "description": "リモート利用のみを制限し、ローカル利用には影響しません。保存後、タスクの作成、モデルの変更、次のメッセージの送信時に適用されます。",
+ "all": "すべてのモデル",
+ "selected": "{{count}} 個のモデルを許可",
+ "choose": "モデルを選択",
+ "memberTitle": "利用可能なモデル",
+ "memberDescription": "{{name}} が使えるモデルを、リモート公開範囲内で選択します。この人を経由した再共有にも適用されます。",
+ "inherit": "リモート公開範囲に従う",
+ "allFuture": "今後追加されるものも含めすべて許可",
+ "search": "モデルを検索",
+ "notOpen": "リモート未公開",
+ "empty": "一致するモデルがありません",
+ "none": "モデルが選択されていないため、リモート利用はできません。",
+ "loading": "モデルの利用範囲を読み込み中…",
+ "loadFailed": "モデルの利用範囲を読み込めませんでした。設定を開き直してください。",
+ "saveFailed": "モデルの利用範囲を保存できませんでした。再試行してください。",
+ "needsUpdate": "供給元のコンピューターの Cindy を更新してください。"
+ },
"entry": {
"label": "リモートと共有",
"pending_other": "未処理の共有申請 {{count}} 件",
@@ -12039,7 +12058,7 @@
"REMOTE_AGENT_BUSY": "相手のパソコンで実行中のセッションが多すぎます。いくつか終了してからもう一度お試しください。",
"REMOTE_AGENT_UNSUPPORTED": "相手のパソコンではこの Agent を使えません。そのパソコンでインストールまたはサインインするか、別の Agent を選んでください。",
"REMOTE_AGENT_INVALID": "Agent を実行しているパソコンとの通信でエラーが発生しました。もう一度お試しください。続く場合は両方のパソコンの Cindy を最新版に更新してください。",
- "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "そのパソコンでは、このプロバイダーのリモート利用が許可されていません。そのパソコンの「設定 → モデルプロバイダー」で「リモート利用を許可」をオンにするか、別のモデルを選んでください。",
+ "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "そのパソコンでは、このプロバイダーまたは選択したモデルのリモート利用が許可されていません。提供者に「リモートと共有」で利用範囲を変更してもらうか、別のモデルを選んでください。",
"REMOTE_AGENT_SHARE_PAUSED": "共有した人があなたへの共有を一時停止したため、再開されるまでこれらのモデルは使えません。別のモデルに切り替えて続けられます。",
"REMOTE_AGENT_SHARE_REMOVED": "この共有は利用できなくなりました(共有した人が削除したか、あなたが退出しました)。別のモデルに切り替えて続けられます。",
"REMOTE_AGENT_SHARE_UNAVAILABLE": "共有されたプロバイダーは一時的に利用できません。共有した人のパソコンがオフラインか、共有が一時的にオフになっている可能性があります。後でもう一度試すか、別のモデルに切り替えて続けられます。",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index b1f49a3c89..3e87ac6391 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -228,6 +228,25 @@
"closeAllDescription": "모든 게스트의 접근이 차단됩니다. 작업 기록은 유지됩니다."
},
"providerShare": {
+ "modelAccess": {
+ "title": "원격 호출을 허용할 모델",
+ "description": "원격 사용만 제한하며 로컬 사용에는 영향이 없습니다. 저장 후 작업 생성, 모델 변경, 다음 메시지 전송 시 적용됩니다.",
+ "all": "모든 모델",
+ "selected": "모델 {{count}}개 허용",
+ "choose": "모델 선택",
+ "memberTitle": "사용 가능한 모델",
+ "memberDescription": "원격으로 공개된 모델 중 {{name}} 님이 사용할 모델을 선택합니다. 이 사람을 통한 재공유에도 적용됩니다.",
+ "inherit": "원격 공개 범위 따르기",
+ "allFuture": "추가되는 모델을 포함해 모두 허용",
+ "search": "모델 검색",
+ "notOpen": "원격 미공개",
+ "empty": "일치하는 모델 없음",
+ "none": "선택한 모델이 없어 원격 호출이 차단됩니다.",
+ "loading": "모델 허용 범위를 불러오는 중…",
+ "loadFailed": "모델 허용 범위를 불러오지 못했습니다. 설정을 다시 열어 주세요.",
+ "saveFailed": "모델 허용 범위를 저장하지 못했습니다. 다시 시도해 주세요.",
+ "needsUpdate": "제공자의 컴퓨터에서 Cindy를 업데이트해 주세요."
+ },
"entry": {
"label": "원격 및 공유",
"pending_other": "대기 중인 공유 요청 {{count}}개",
@@ -12039,7 +12058,7 @@
"REMOTE_AGENT_BUSY": "상대 컴퓨터에서 실행 중인 세션이 너무 많습니다. 일부를 종료한 뒤 다시 시도하세요.",
"REMOTE_AGENT_UNSUPPORTED": "상대 컴퓨터에서는 이 Agent를 사용할 수 없습니다. 그 컴퓨터에서 설치하거나 로그인한 뒤 다시 시도하거나, 다른 Agent를 선택하세요.",
"REMOTE_AGENT_INVALID": "Agent를 실행하는 컴퓨터와 통신하는 중 오류가 발생했습니다. 다시 시도하고, 계속되면 두 컴퓨터의 Cindy를 모두 최신 버전으로 업데이트하세요.",
- "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "그 컴퓨터에서 이 제공자의 원격 사용을 허용하지 않았습니다. 그 컴퓨터의 설정 → 모델 제공자에서 원격 사용 허용을 켜거나 다른 모델을 선택하세요.",
+ "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "그 컴퓨터에서 이 제공자 또는 선택한 모델의 원격 사용을 허용하지 않았습니다. 제공자에게 원격 및 공유에서 사용 범위를 조정해 달라고 요청하거나 다른 모델을 선택하세요.",
"REMOTE_AGENT_SHARE_PAUSED": "공유한 사람이 나에 대한 공유를 일시 중지해서 재개될 때까지 이 모델을 사용할 수 없습니다. 다른 모델로 바꿔 계속할 수 있습니다.",
"REMOTE_AGENT_SHARE_REMOVED": "이 공유는 더 이상 사용할 수 없습니다(공유한 사람이 삭제했거나 내가 나갔습니다). 다른 모델로 바꿔 계속할 수 있습니다.",
"REMOTE_AGENT_SHARE_UNAVAILABLE": "공유된 제공자를 일시적으로 사용할 수 없습니다. 공유한 사람의 컴퓨터가 오프라인이거나 공유가 잠시 꺼져 있을 수 있습니다. 나중에 다시 시도하거나 다른 모델로 바꿔 계속할 수 있습니다.",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index c3ff85d548..30b8935327 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -228,6 +228,25 @@
"closeAllDescription": "所有访客将无法继续访问,任务记录保留。"
},
"providerShare": {
+ "modelAccess": {
+ "title": "允许远程调用的模型",
+ "description": "只限制远程调用,本机使用不受影响。保存后,创建任务、切换模型和发送下一轮消息时生效。",
+ "all": "全部模型",
+ "selected": "已开放 {{count}} 个模型",
+ "choose": "选择模型",
+ "memberTitle": "可用模型",
+ "memberDescription": "设置 {{name}} 可以使用的模型,只能选择远程已开放的模型。也适用于经此人转分享的调用。",
+ "inherit": "跟随远程开放范围",
+ "allFuture": "允许全部模型(含之后新增)",
+ "search": "搜索模型",
+ "notOpen": "远程未开放",
+ "empty": "没有匹配的模型",
+ "none": "未选择模型,将无法远程调用。",
+ "loading": "正在读取模型范围…",
+ "loadFailed": "未能读取模型范围,请重新打开此设置。",
+ "saveFailed": "未能保存模型范围,请重试。",
+ "needsUpdate": "请更新供应商所在电脑的 Cindy 后再设置模型范围。"
+ },
"entry": {
"label": "远程与分享",
"pending_other": "{{count}} 个分享申请待处理",
@@ -12039,7 +12058,7 @@
"REMOTE_AGENT_BUSY": "那台电脑上同时运行的任务太多。先结束一些任务后再试。",
"REMOTE_AGENT_UNSUPPORTED": "那台电脑上这个 Agent 不可用。在那台电脑上安装或登录后再试,或换一个 Agent。",
"REMOTE_AGENT_INVALID": "和运行 Agent 的电脑通信出错。请重试;如果一直出现,请把两台电脑上的 Cindy 都更新到最新版。",
- "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那台电脑没有允许远程调用这个供应商。请在那台电脑的「设置 → 模型供应商」里打开「允许被远程调用」,或换一个模型。",
+ "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那台电脑未向你开放这个供应商或所选模型。请让电脑主人在「远程与分享」中调整开放范围,或换一个模型。",
"REMOTE_AGENT_SHARE_PAUSED": "对方已暂停对你的分享,恢复前不能使用这些模型。可以换成其他模型继续。",
"REMOTE_AGENT_SHARE_REMOVED": "这个分享已不可用(对方删除了分享或你已退出)。可以换成其他模型继续。",
"REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供应商暂时不可用:对方电脑可能不在线,或对方暂时关闭了分享。可以稍后再试,或换成其他模型继续。",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 1548a1dc84..f044c03e61 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -228,6 +228,25 @@
"closeAllDescription": "所有訪客將無法繼續存取,任務記錄保留。"
},
"providerShare": {
+ "modelAccess": {
+ "title": "允許遠端呼叫的模型",
+ "description": "僅限制遠端呼叫,不影響本機使用。儲存後,建立任務、切換模型及傳送下一輪訊息時生效。",
+ "all": "全部模型",
+ "selected": "已開放 {{count}} 個模型",
+ "choose": "選擇模型",
+ "memberTitle": "可用模型",
+ "memberDescription": "設定 {{name}} 可以使用的模型,僅能選擇遠端已開放的模型。也適用於經此人轉分享的呼叫。",
+ "inherit": "跟隨遠端開放範圍",
+ "allFuture": "允許全部模型(含之後新增)",
+ "search": "搜尋模型",
+ "notOpen": "遠端未開放",
+ "empty": "沒有相符的模型",
+ "none": "未選擇模型,將無法遠端呼叫。",
+ "loading": "正在讀取模型範圍…",
+ "loadFailed": "無法讀取模型範圍,請重新開啟此設定。",
+ "saveFailed": "無法儲存模型範圍,請重試。",
+ "needsUpdate": "請更新供應商所在電腦的 Cindy 後再設定模型範圍。"
+ },
"entry": {
"label": "遠端與分享",
"pending_other": "{{count}} 個分享申請待處理",
@@ -12038,7 +12057,7 @@
"REMOTE_AGENT_BUSY": "那臺電腦上同時執行的任務太多。先結束一些任務後再試。",
"REMOTE_AGENT_UNSUPPORTED": "那臺電腦上這個 Agent 無法使用。在那臺電腦上安裝或登入後再試,或換一個 Agent。",
"REMOTE_AGENT_INVALID": "與執行 Agent 的電腦通訊時出錯。請重試;如果持續出現,請把兩臺電腦上的 Cindy 都更新到最新版。",
- "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那臺電腦沒有允許遠端呼叫這個供應商。請在那臺電腦的「設定 → 模型供應商」裡開啟「允許遠端呼叫」,或換一個模型。",
+ "REMOTE_AGENT_PROVIDER_NOT_ALLOWED": "那臺電腦未向你開放這個供應商或所選模型。請讓電腦主人在「遠端與分享」中調整開放範圍,或換一個模型。",
"REMOTE_AGENT_SHARE_PAUSED": "對方已暫停對你的分享,恢復前不能使用這些模型。可以換成其他模型繼續。",
"REMOTE_AGENT_SHARE_REMOVED": "這個分享已無法使用(對方刪除了分享或你已退出)。可以換成其他模型繼續。",
"REMOTE_AGENT_SHARE_UNAVAILABLE": "分享的供應商暫時無法使用:對方電腦可能不在線,或對方暫時關閉了分享。可以稍後再試,或換成其他模型繼續。",
diff --git a/apps/desktop/src/renderer/lib/remoteCatalogSnapshot.ts b/apps/desktop/src/renderer/lib/remoteCatalogSnapshot.ts
index 8d7909babd..0e15a2bed8 100644
--- a/apps/desktop/src/renderer/lib/remoteCatalogSnapshot.ts
+++ b/apps/desktop/src/renderer/lib/remoteCatalogSnapshot.ts
@@ -2,8 +2,9 @@
* Existing device generations remain the authority for disconnect/owner changes.
*/
import { createCoalescedRefresh } from '@/lib/coalescedRefresh';
-import { evictDeviceCapabilities, prefetchDeviceCapabilities } from '@/hooks/useAgentCapabilities';
+import { evictAllRemoteCapabilities, evictDeviceCapabilities, prefetchDeviceCapabilities } from '@/hooks/useAgentCapabilities';
import {
+ evictAllDeviceProviders,
evictDeviceProviders,
isDeviceProvidersGenerationCurrent,
prefetchDeviceProviders,
@@ -17,9 +18,16 @@ const refreshes = new Map<
}
>();
+/** 分享 ID 跨账号相同;切换账号时不能复用目录,也不能接收旧账号的在途结果。 */
+export function invalidateRemoteCatalogSnapshots(): void {
+ evictAllDeviceProviders();
+ evictAllRemoteCapabilities();
+ refreshes.clear();
+}
+
export async function refreshRemoteCatalogSnapshot(deviceId: string): Promise<void> {
const generation = evictDeviceProviders(deviceId, { retainDisplaySnapshot: true });
- evictDeviceCapabilities(deviceId);
+ evictDeviceCapabilities(deviceId, { retainDisplaySnapshot: true });
const previous = refreshes.get(deviceId);
const refresh = {
// An intervening eviction belongs to disconnect/ownership handling. Its new
diff --git a/apps/desktop/src/shared/providerManagement.ts b/apps/desktop/src/shared/providerManagement.ts
index 07178caed7..66a5a8a766 100644
--- a/apps/desktop/src/shared/providerManagement.ts
+++ b/apps/desktop/src/shared/providerManagement.ts
@@ -12,7 +12,7 @@ export type ProviderGroupManagementCommand = Extract<
export type ProviderShareManagementCommand = Extract<
ProviderShareCommand,
- { action: 'owned' | 'own-usage' | 'usage-history' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'set-member-note' | 'reshare-decide' | 'get-run-limits' | 'set-run-limits' | 'reset-run-limits' | 'get-visibility' | 'set-visibility' | 'quota-account' }
+ { action: 'owned' | 'own-usage' | 'usage-history' | 'create-link' | 'approve' | 'reject' | 'set-member' | 'set-member-note' | 'reshare-decide' | 'get-run-limits' | 'set-run-limits' | 'reset-run-limits' | 'get-visibility' | 'set-visibility' | 'quota-account' | 'get-model-access' | 'set-model-access' }
>;
export type ProviderManagementRequest =
diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.ts
index b1b054c155..86f92ca00a 100644
--- a/apps/desktop/src/shared/providerShare.ts
+++ b/apps/desktop/src/shared/providerShare.ts
@@ -4,6 +4,7 @@
*/
import type { RemoteAgentIdleRelease, RemoteAgentIdleReleaseView } from './remoteAgentIdleRelease';
import type { RemoteAgentLimits, RemoteAgentLimitsView } from './remoteAgentLimits';
+import type { RemoteModelAccessView, RemoteModelSelection } from './remoteModelAccess';
import type {
ProviderShareLinkPreview,
@@ -191,7 +192,10 @@ export interface ProviderShareSettledEvent {
preview: ProviderShareLinkPreview | null;
}
+
export type ProviderShareCommand =
+ | { action: 'get-model-access'; providerId: string; memberId?: string }
+ | { action: 'set-model-access'; providerId: string; memberId?: string; models: RemoteModelSelection }
| { action: 'get-visibility'; providerId: string }
| { action: 'set-visibility'; providerId: string; visibility: Partial<ProviderShareVisibility> }
| { action: 'quota-account'; providerId: string }
@@ -231,6 +235,8 @@ export interface ProviderShareCredentialConsentView {
}
export interface ProviderShareCommandResult {
+ 'get-model-access': RemoteModelAccessView;
+ 'set-model-access': RemoteModelAccessView;
'get-visibility': ProviderShareVisibility;
'set-visibility': ProviderShareVisibility;
'quota-account': ProviderShareQuotaAccount;
diff --git a/apps/desktop/src/shared/remoteModelAccess.ts b/apps/desktop/src/shared/remoteModelAccess.ts
new file mode 100644
index 0000000000..fdefbef1c6
--- /dev/null
+++ b/apps/desktop/src/shared/remoteModelAccess.ts
@@ -0,0 +1,15 @@
+/** null follows all currently offered models; [] deliberately grants none. IDs are exact catalog IDs. */
+export type RemoteModelSelection = string[] | null;
+
+export interface RemoteModelAccessView {
+ version: 1;
+ models: RemoteModelSelection;
+ providerModels: RemoteModelSelection;
+ availableModels: Array<{ id: string; name: string }>;
+}
+
+export function isRemoteModelSelection(value: unknown): value is RemoteModelSelection {
+ return value === null || (Array.isArray(value) && value.length <= 4096
+ && value.every((id) => typeof id === 'string' && id.length > 0 && id.length <= 512 && id.trim() === id)
+ && new Set(value).size === value.length);
+}
diff --git a/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts b/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts
index 7ff07a5f48..502928be70 100644
--- a/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts
+++ b/apps/mobile/src/__tests__/remoteAgentCatalogs.test.ts
@@ -74,6 +74,17 @@ describe('remote Agent catalogs', () => {
expect(remoteAgentProviders(providers).map((provider) => provider.id)).toEqual(['allowed']);
});
+ // Remote-only policy must narrow the picker without mutating the catalog used by same-account remote control.
+ it('applies model grants only to remote Agent choices and keeps old hosts compatible', () => {
+ const localModels = [{ id: 'small' }, { id: 'large' }];
+ const provider = { id: 'allowed', remoteInvocationEnabled: true, models: { codex: localModels } } as unknown as ProviderView;
+ expect(remoteAgentProviders([provider])[0]).toBe(provider);
+ const restricted = { ...provider, remoteModelIds: ['small'] };
+ expect(remoteAgentProviders([restricted])[0].models.codex).toEqual([{ id: 'small' }]);
+ expect(restricted.models.codex).toBe(localModels);
+ expect(remoteAgentProviders([{ ...restricted, remoteModelIds: [] }])[0].models.codex).toEqual([]);
+ });
+
it('groups source choices into one block per computer', () => {
type Filter = { id: string; remote?: { deviceId: string; deviceName: string } };
const remote = (deviceId: string, deviceName: string, providerId: string): Filter => ({
diff --git a/apps/mobile/src/session/remoteAgentCatalogs.ts b/apps/mobile/src/session/remoteAgentCatalogs.ts
index 486a2976dc..63a3d45d9a 100644
--- a/apps/mobile/src/session/remoteAgentCatalogs.ts
+++ b/apps/mobile/src/session/remoteAgentCatalogs.ts
@@ -7,6 +7,7 @@
*/
import type { DeviceView } from '@cindy/device-link';
import type { ProviderView } from '@cindy/model-providers/registry';
+import { remoteInvocationModels } from '@cindy/model-providers';
import type { NewSessionRemoteAgentPick } from './newSession';
import { matchesEntry, mobileUnifiedEntries } from './unifiedMobileModels';
@@ -31,7 +32,7 @@ export interface RemoteAgentCatalog {
export function remoteAgentProviders(providers: readonly ProviderView[]): ProviderView[] {
return providers.filter(
(provider) => (provider as { remoteInvocationEnabled?: unknown }).remoteInvocationEnabled === true,
- );
+ ).map(remoteInvocationModels);
}
/**
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 9e588e7827..b6e1da3a88 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -2763,6 +2763,17 @@ view. This is a local desktop trial, not a new plugin or device-link capability.
Older URL-based reader tabs remain valid. Draft edits, deletion and delayed send
still use the same host-owned mail workflow as the chat card.
+## 远程供应商的模型范围
+
+既有供应商管理通道新增 `get-model-access` / `set-model-access` action,返回 `version: 1`、
+`models`、`providerModels` 与 `availableModels`;仅提供方主人可管理,`memberId` 必须属于该供应商的分享。
+`null` 表示全部/继承,空数组表示不开放。新界面连接不认识此 action 的旧电脑时提示更新,不回退成只改控制端偏好。
+
+同账号 `maker:provider:list` 的 `ProviderView` 可追加 `remoteModelIds`,省略保留原有全部开放语义。
+仅远程 Agent 选择入口按此字段过滤;同账号远控和本机列表仍保留完整 `models`。跨账号分享目录直接按成员权限过滤模型。
+旧控制端忽略新增字段仍由提供方执行调用权限检查;现有错误码 `REMOTE_AGENT_PROVIDER_NOT_ALLOWED` 也覆盖模型未开放。
+权限保存于客户端按账号隔离的配置,不改服务端 schema、数据库或 Mobile 原生指纹。
+
## 伙伴导入的消息机器人分类
`companion-import` Remote Resource 的 client primitives 可追加 `companion-import-bots-v1`。只有声明它的控制端
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index d24d21f91f..dd54799020 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -568,11 +568,23 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
也被 A 拒绝);A 同意后下一次分配起可用,撤回后 C 正在 A 电脑上的任务立即停止;A 同意 C 不代表同意 B 分享的其他人。A 删除对
B 的分享后,A 的电脑从 B 的组里移出,B 与 C 都用不到;A 只是暂停时保留。A 的 Cindy 较旧时 C 的任务不分给 A 的电脑(§4.3)。
-## 12. 后续可选
+## 12. 远程模型范围
+
+「远程与分享」为每个供应商提供「允许远程调用的模型」,可选择全部模型(包括以后新增的模型)或明确勾选模型。
+此范围只约束远程 Agent,包括同账号其他电脑、分享受邀者与经供应商组转来的调用;本机使用与同账号远控下的本机模型配置保持独立。
+
+分享管理页中,每个人的行尾菜单提供「可用模型」。默认跟随供应商范围,也可指定个人子集;实际权限始终取供应商范围与个人范围的交集。
+取消全部模型表示不开放任何模型,不能解释为恢复默认。个人转分享的调用继续受该个人范围约束。
+
+模型范围存于提供方电脑,按账号隔离。旧配置默认跟随全部模型;读取损坏配置时拒绝调用,不能恢复为全部开放。
+远程目录只提供可用模型;提供方还必须在创建、切换模型、发送下一轮消息及供应商组转发时校验权限,不能信任控制端传来的目录或模型 id。
+已开始的一轮不因修改勾选主动中断,下一轮或切换模型时按最新范围校验;受邀者经本机代理发出的后续模型请求也会重新校验个人范围。
+
+## 13. 后续可选
以下不在首版范围,需要时另行裁决:
- 在手机上审批申请与管理分享;
-- 按人设置用量上限或可用模型子集;
+- 按人设置用量上限;
- 分享有效期;
- 按人定制额度与用量可见范围(当前按供应商对全部受邀者统一开放,见 §7.5)。
diff --git a/packages/model-providers/src/index.ts b/packages/model-providers/src/index.ts
index 5a4a578cfd..1dcc02c8fa 100644
--- a/packages/model-providers/src/index.ts
+++ b/packages/model-providers/src/index.ts
@@ -1,4 +1,5 @@
export { parseModelDisplayPricing, type ModelDisplayPricing } from './modelDisplayPricing.js';
+export { remoteInvocationModels } from './remoteModels.js';
/**
* @cindy/model-providers — 模型供应商目录 + 路由抽象(纯逻辑,零 Electron / maker-core 运行时依赖)。
*
diff --git a/packages/model-providers/src/registry.ts b/packages/model-providers/src/registry.ts
index 1ee093378f..f2017571cb 100644
--- a/packages/model-providers/src/registry.ts
+++ b/packages/model-providers/src/registry.ts
@@ -97,6 +97,8 @@ export type ModelDiscoveryFailureState = Partial<
export interface ProviderView extends Provider {
/** 本机是否允许同账号另一台电脑调用该供应商;缺省等同关闭。 */
remoteInvocationEnabled?: boolean;
+ /** Exact model IDs offered to remote Agents. Absent preserves the legacy unrestricted scope. */
+ remoteModelIds?: string[];
/** Definition remains available for adding a removed local connection again. */
removed?: boolean;
subscriptionAccount?: { source: 'local' | 'oauth' | 'unknown'; identity?: string; reconnectRequired?: boolean };
diff --git a/packages/model-providers/src/remoteModels.ts b/packages/model-providers/src/remoteModels.ts
new file mode 100644
index 0000000000..fdbcfb014e
--- /dev/null
+++ b/packages/model-providers/src/remoteModels.ts
@@ -0,0 +1,11 @@
+import type { ProviderView } from './registry.js';
+
+/** Remote Agent selection only. A remote-control view of the computer itself retains its full catalog. */
+export function remoteInvocationModels(provider: ProviderView): ProviderView {
+ if (provider.remoteModelIds === undefined) return provider;
+ const ids = provider.remoteModelIds;
+ const allowed = new Set(Array.isArray(ids) && ids.every((id) => typeof id === 'string') ? ids : []);
+ return { ...provider, models: Object.fromEntries(Object.entries(provider.models ?? {}).map(([agent, models]) => [
+ agent, models?.filter((model) => allowed.has(model.id)),
+ ])) };
+}