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。

fix(providers): 补齐媒体授权并隔离成员模型权限

DavidShenafa1c50ba324
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 680ad01d56..68ee4be3d5 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareManagement.test.ts
@@ -368,6 +368,25 @@ describe('remote model access management', () => {
expect(result).toMatchObject({ version: 1, availableModels: [{ id: 'small', name: 'Small' }, { id: 'large', name: 'Large' }] });
expect(api.setMember).not.toHaveBeenCalled();
});
+ // Unit regression for review 4326867264: the management command must offer every
+ // enabled media model; the old fixture only covered chat models. Media-only providers
+ // and duplicated ids must yield a usable, deduplicated authorization selection too.
+ it.each([false, true])('offers media models alongside chat models or on their own: mediaOnly=%s', async (mediaOnly) => {
+ listProviders.mockResolvedValue([{
+ id: 'anthropic',
+ models: mediaOnly ? {} : { codex: [{ id: 'chat', name: 'Chat' }], pi: [{ id: 'chat', name: 'Chat' }] },
+ imageModels: [{ id: 'image', name: 'Image' }, { id: 'disabled-image', disabled: true }],
+ videoModels: [{ id: 'video', name: 'Video' }],
+ audioModels: [{ id: 'audio', name: 'Audio' }],
+ embeddingModels: [{ id: 'embedding' }, { id: 'image', name: 'Image' }],
+ }]);
+ const result = await executeProviderShareManagementCommand({ action: 'get-model-access', providerId: 'anthropic', memberId: 'm1' });
+ expect(result).toMatchObject({ availableModels: [
+ ...(mediaOnly ? [] : [{ id: 'chat', name: 'Chat' }]),
+ { id: 'image', name: 'Image' }, { id: 'video', name: 'Video' },
+ { id: 'audio', name: 'Audio' }, { id: 'embedding', name: 'embedding' },
+ ] });
+ });
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');
diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.ts
index dd9c20cf47..bbd88f2ee5 100644
--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts
+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts
@@ -8,6 +8,7 @@ import { readRemoteAgentIdleReleaseState, saveRemoteAgentIdleRelease } from '../
* Renderer 的命令通道。账号操作只接受本机应用窗口,不能经设备互联从别的电脑调用。
*/
import { app, BrowserWindow, ipcMain, Notification } from 'electron';
+import { PROVIDER_MEDIA_FIELDS } from '@cindy/model-providers';
import {
PROVIDER_SHARE_LINK_TTL_MS,
@@ -755,7 +756,7 @@ async function execute(command: ProviderShareCommand, assertCurrent: () => void
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 ?? []) {
+ for (const entries of [...Object.values(provider.models), ...PROVIDER_MEDIA_FIELDS.map(field => provider[field])]) 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),
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 3c48fdead9..33a65e6728 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyGuestRoute.test.ts
@@ -104,7 +104,7 @@ describe('Codex proxy guard for shared-provider guests', () => {
let allowed = true;
registerGuestProviderRoute('guest-session', providerId, candidate => allowed && candidate === model, () => true);
registerReviewerRouteContext('guest-session', 'guest-thread', model);
- const guard = createCodexGuestRoutingGuard(providerId, providerId === 'openai' ? 'oauth-bearer' : 'env-key');
+ const guard = createCodexGuestRoutingGuard(providerId, providerId === 'openai' ? 'oauth-bearer' : 'env-key', 'guest-session');
const body = { model: 'codex-auto-review' };
const request = () => guard(body, ctx(path, {
'thread-id': 'guardian-child',
diff --git a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
index 1aaf21b835..cce57c78c4 100644
--- a/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/codexProxyHost.test.ts
@@ -3923,6 +3923,60 @@ describe('codex proxy host', () => {
expect(secondDispose).toHaveBeenCalledOnce();
});
+ // Unit regression for review 4326867248: a headerless custom request must use
+ // its proxy's guest binding. Existing proxy tests had no simultaneous members;
+ // one restricted member must not deny an unrestricted member or lend its identity.
+ it('binds headerless custom requests to the scoped guest and checks live model grants', async () => {
+ const host = await freshCodexProxyHost();
+ const { buildUserProvider } = await import('@cindy/model-providers');
+ const { setCustomProviders, getActiveCatalog } = await import('../active-catalog.js');
+ const { setCustomProviderKeyReader } = await import('../provider-route.js');
+ const { deriveCodexCustomProviderRoutes } = await import('../codex-custom-provider-route.js');
+ const { registerGuestProviderRoute, resetGuestProviderRoutesForTest } = await import('../guest-provider-route-store.js');
+ const providerId = 'guest-scope-provider';
+ setCustomProviders([buildUserProvider({ id: providerId, name: 'Shared', runtimes: { codex: {
+ baseUrl: 'https://guest-scope.example/v1', wireProtocol: 'openai-responses', supportsImageGeneration: true,
+ models: [{ id: 'allowed', name: 'Allowed' }, { id: 'private', name: 'Private' }],
+ } } })]);
+ const routes = deriveCodexCustomProviderRoutes(getActiveCatalog()).filter(route => route.providerId === providerId);
+ const first = registerGuestProviderRoute('member-a-session', providerId, model => model === 'allowed', () => true);
+ let secondAllowed = true;
+ const second = registerGuestProviderRoute('member-b-session', providerId, () => secondAllowed, () => false);
+ host.registerComposed('member-b-session', 'member-b-thread', 'prompt');
+ setCustomProviderKeyReader(() => 'shared-provider-key');
+ mockState.createAnthropicCompatProxy
+ .mockResolvedValueOnce({ url: 'http://127.0.0.1:41001', dispose: vi.fn(async () => undefined) })
+ .mockResolvedValueOnce({ url: 'http://127.0.0.1:41002', dispose: vi.fn(async () => undefined) });
+ try {
+ await host.ensureCodexCustomContextProxyReady('member-a-proxy', 'env-key', routes, providerId, 'member-a-session');
+ await host.ensureCodexCustomContextProxyReady('member-b-proxy', 'env-key', routes, providerId, 'member-b-session');
+ const request = async (index: number, model: string, headers: Record<string, string> = {}) => {
+ const decision = await mockState.createAnthropicCompatProxy.mock.calls[index]![0].routingTransform({ model }, {
+ reqId: 1, method: 'POST', url: `/_cindy/custom-provider/${routes[0]!.routeId}/responses`, headers,
+ });
+ return decision?.localHandler ? (await runLocalRefusal(decision)).status : decision?.upstreamOverride;
+ };
+ expect(await request(1, 'private')).toBe('https://guest-scope.example/v1');
+ expect(await request(0, 'allowed')).toBe('https://guest-scope.example/v1');
+ expect(await request(0, 'private')).toBe(403);
+ expect(await request(0, 'private', { 'thread-id': 'member-b-thread' })).toBe(403);
+ secondAllowed = false;
+ expect(await request(1, 'private')).toBe(403);
+ expect(await request(0, 'allowed')).toBe('https://guest-scope.example/v1');
+ secondAllowed = true;
+ second.release();
+ expect(await request(1, 'private')).toBe(403);
+ } finally {
+ await host.releaseCodexCustomContextProxy('member-a-proxy');
+ await host.releaseCodexCustomContextProxy('member-b-proxy');
+ first.release(); second.release();
+ host.unregister('member-b-session');
+ resetGuestProviderRoutesForTest();
+ setCustomProviders([]);
+ setCustomProviderKeyReader(() => null);
+ }
+ });
+
it('keeps Gateway provider search tools out of Guardian review requests', async () => {
const host = await freshCodexProxyHost();
const { setSessionProvider, clearSessionProvider } = await import('../session-provider-store.js');
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 1d729f4948..3e898f8411 100644
--- a/apps/desktop/src/main/maker-host/codex-proxy-host.ts
+++ b/apps/desktop/src/main/maker-host/codex-proxy-host.ts
@@ -2535,11 +2535,18 @@ function codexGuestRouteRefusal(): RoutingDecision {
export function createCodexGuestRoutingGuard(
providerId: string,
frozenAuthInjection?: CodexProxyAuthInjection,
+ guestSessionId?: string,
): (body: unknown, ctx: RequestTransformCtx) => RoutingDecision | null | undefined {
return (body, ctx) => {
const requestModel = isPlainObject(body) && typeof body.model === 'string' ? body.model : '';
if (!requestModel) return undefined;
- const sessionId = sessionIdFromHeaders(ctx.headers);
+ const requestSessionId = sessionIdFromHeaders(ctx.headers);
+ // This proxy belongs to one guest. Headerless calls use that binding, and
+ // headers cannot borrow another guest's grants, even on the same provider.
+ if (guestSessionId && ((requestSessionId && requestSessionId !== guestSessionId)
+ || guestProviderRouteForSession(guestSessionId)?.providerId !== providerId
+ || getSessionProvider(guestSessionId) !== providerId)) return codexGuestRouteRefusal();
+ const sessionId = requestSessionId ?? guestSessionId;
// Guardian's internal marker is not a catalog model. Authorize its registered
// parent model, including when native OpenAI keeps the marker on the wire.
const reviewerModel = requestModel === CODEX_AUTO_REVIEW_MODEL && guardianParentThreadIdFromHeaders(ctx.headers) && sessionId
@@ -2553,12 +2560,12 @@ export function createCodexGuestRoutingGuard(
if (effectiveModel !== requestModel && !guestProviderModelAllowed(providerId, effectiveModel, sessionId)) return codexGuestRouteRefusal();
const offered = effectiveModel === CODEX_AUTO_REVIEW_MODEL
? isOpenAiSubscriptionProviderId(providerId)
- : guestProviderOffersModel(providerId, 'codex', effectiveModel, sessionIdFromHeaders(ctx.headers) ?? undefined);
+ : guestProviderOffersModel(providerId, 'codex', effectiveModel, sessionId ?? undefined);
if (!offered) return codexGuestRouteRefusal();
}
- if (sessionId) {
- return guestProviderRouteForSession(sessionId)?.providerId === providerId
- && getSessionProvider(sessionId) === providerId
+ if (requestSessionId) {
+ return guestProviderRouteForSession(requestSessionId)?.providerId === providerId
+ && getSessionProvider(requestSessionId) === providerId
? undefined
: codexGuestRouteRefusal();
}
@@ -3362,6 +3369,7 @@ async function createCodexProxyHandle(
frozenAuthInjection?: CodexProxyAuthInjection,
frozenCustomProviderRoutes?: readonly CodexCustomProviderRoute[],
guestProviderId?: string,
+ guestSessionId?: string,
): Promise<ProxyHandle> {
const execAdapter = createCodexResponsesCompatibilityAdapter();
let alive = true;
@@ -3373,7 +3381,7 @@ async function createCodexProxyHandle(
const modelRoute = createModelRoutingTransform(frozenAuthInjection, frozenCustomProviderRoutes, () => alive,
ctx => { crossProviderRequests.add(ctx.headers); });
// 供应商分享受邀者的任务:先过受邀者守门,只经分享的那一个供应商出站。
- const guestGuard = guestProviderId ? createCodexGuestRoutingGuard(guestProviderId, frozenAuthInjection) : undefined;
+ const guestGuard = guestProviderId ? createCodexGuestRoutingGuard(guestProviderId, frozenAuthInjection, guestSessionId) : undefined;
const route: RoutingTransform = guestGuard
? (body, ctx) => {
const guarded = guestGuard(body, ctx);
@@ -3641,11 +3649,13 @@ export async function ensureCodexCustomContextProxyReady(
routes: readonly CodexCustomProviderRoute[],
/** 供应商分享受邀者的任务:proxy 只经这个供应商出站(见 createCodexGuestRoutingGuard)。 */
guestProviderId?: string,
+ guestSessionId?: string,
): Promise<void> {
const key = scopeKey.trim();
if (!key) throw new Error('custom-context Codex proxy requires a scope key');
+ if (guestProviderId && !guestSessionId?.trim()) throw new Error('shared-provider Codex proxy requires a guest session');
const routeSignature = codexCustomProviderRoutesSignature(routes)
- + (guestProviderId ? `\u0000guest:${guestProviderId}` : '');
+ + (guestProviderId ? `\u0000guest:${guestProviderId}\u0000session:${guestSessionId}` : '');
const current = _customContextHandles.get(key);
if (
current?.authInjection === authInjection
@@ -3663,7 +3673,7 @@ export async function ensureCodexCustomContextProxyReady(
let promise!: Promise<void>;
promise = (async () => {
try {
- const handle = await createCodexProxyHandle(authInjection, [...routes], guestProviderId);
+ const handle = await createCodexProxyHandle(authInjection, [...routes], guestProviderId, guestSessionId);
if (
disposeGeneration !== _disposeGeneration
|| scopeGeneration !== (_customContextGenerations.get(key) ?? 0)
diff --git a/apps/desktop/src/main/maker-host/index.ts b/apps/desktop/src/main/maker-host/index.ts
index b4125dbfcb..5f48a8c7eb 100644
--- a/apps/desktop/src/main/maker-host/index.ts
+++ b/apps/desktop/src/main/maker-host/index.ts
@@ -1853,8 +1853,9 @@ export function getMaker(): Maker {
// 供应商分享受邀者的任务:独占的 proxy 只登记分享的那个供应商的路由并过受邀者守门,
// 不开智能子代理调配。没有独占 proxy 就不能安全地收窄,直接失败。
const guestProviderId = ctx.deviceHostedGuestProviderId?.trim() || undefined;
- if (ctx.deviceHostedGuestProviderId !== undefined && (!guestProviderId || !usesScopedProxy)) {
- const error = new Error('shared-provider Codex host requires its own scoped proxy');
+ const guestSessionId = ctx.deviceHostedGuestSessionId?.trim() || undefined;
+ if (ctx.deviceHostedGuestProviderId !== undefined && (!guestProviderId || !guestSessionId || !usesScopedProxy)) {
+ const error = new Error('shared-provider Codex host requires its own session-bound scoped proxy');
(error as { codexSpawnConfigFatal?: boolean }).codexSpawnConfigFatal = true;
throw error;
}
@@ -1943,6 +1944,7 @@ export function getMaker(): Maker {
authInjection,
customContextProviderRoutes,
guestProviderId,
+ guestSessionId,
);
// 受邀者不走「proxy 不可用时直连网关」的退路:那条路不经受邀者守门。
if (guestProviderId && !isCodexCustomContextProxyHandleReady(scopedProxyKey)) {
diff --git a/packages/maker-core/src/agents/base-agent.ts b/packages/maker-core/src/agents/base-agent.ts
index 94c731fc14..762d31491a 100644
--- a/packages/maker-core/src/agents/base-agent.ts
+++ b/packages/maker-core/src/agents/base-agent.ts
@@ -1074,6 +1074,8 @@ export interface AgentDeps {
* 调配、不暴露 spawn 的模型覆写,自定义供应商路由与按模型分流也只保留这个供应商。
*/
deviceHostedGuestProviderId?: string;
+ /** Owning guest session for model authorization on requests without thread headers. */
+ deviceHostedGuestSessionId?: string;
},
) => Promise<CodexExtraSpawnConfig>;
diff --git a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts
index 5b50468920..1e6196540f 100644
--- a/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts
+++ b/packages/maker-core/src/agents/codex/__tests__/device-hosted-guest.test.ts
@@ -479,6 +479,7 @@ describe('Codex device-hosted guest sessions', () => {
expect(String(options?.keyOverride)).toMatch(/^local-guest:hosted-session/);
// 独占的 app-server 带上分享的供应商:host 据此只留这个供应商的路由,不开智能子代理调配。
expect(options?.deviceHostedGuestProviderId).toBe('xd');
+ expect(options?.deviceHostedGuestSessionId).toBe('hosted-session');
// 不按 id 到本机用户的 Codex 历史里查找,不把本机托管技能投影进来,也不登记线程位置。
expect(fixture.prepareCodexResumeSession).not.toHaveBeenCalled();
expect(fixture.resolveCodexThreadStorage).not.toHaveBeenCalled();
@@ -492,6 +493,7 @@ describe('Codex device-hosted guest sessions', () => {
const handle = await fixture.started;
expect(fixture.getHost.mock.calls.some(([, , opts]) => opts?.historyHome)).toBe(false);
expect(fixture.getHost.mock.calls.some(([, , opts]) => opts && 'deviceHostedGuestProviderId' in opts)).toBe(false);
+ expect(fixture.getHost.mock.calls.some(([, , opts]) => opts && 'deviceHostedGuestSessionId' in opts)).toBe(false);
expect(fixture.prepareCodexResumeSession).toHaveBeenCalled();
expect(fixture.resolveCodexThreadStorage).toHaveBeenCalled();
expect(fixture.prepareCodexSkills).toHaveBeenCalled();
diff --git a/packages/maker-core/src/agents/codex/index.ts b/packages/maker-core/src/agents/codex/index.ts
index e562fb90c0..8bf8f0e3a9 100644
--- a/packages/maker-core/src/agents/codex/index.ts
+++ b/packages/maker-core/src/agents/codex/index.ts
@@ -2574,6 +2574,7 @@ export class CodexAgent extends BaseAgent {
historyHome?: string;
/** 受邀者任务的 app-server:值是分享给它的供应商(见 prepareCodexExtraSpawnConfig)。 */
deviceHostedGuestProviderId?: string;
+ deviceHostedGuestSessionId?: string;
} = {},
): Promise<AppServerHost> {
const key = opts.keyOverride ?? (opts.providerId ? `local-account:${opts.providerId}` : hostKey(remoteHostId));
@@ -2802,6 +2803,7 @@ assertRouteCurrent();
opts.routeIsCurrent,
opts.deviceHostedGuestProviderId,
opts.nativeStorageOnly,
+ opts.deviceHostedGuestSessionId,
).finally(() => {
// 成功: this.hosts 已赋值, 后续走快路径; 失败: 清掉 promise 让下次调用能重试
const current = this.hostPromises.get(key);
@@ -3051,6 +3053,7 @@ assertRouteCurrent();
routeIsCurrent?: () => boolean,
deviceHostedGuestProviderId?: string,
nativeStorageOnly?: boolean,
+ deviceHostedGuestSessionId?: string,
): Promise<AppServerHost> {
const seq = (this.createHostSeqByKey.get(key) ?? 0) + 1;
this.createHostSeqByKey.set(key, seq);
@@ -3195,7 +3198,7 @@ assertRouteCurrent();
customContextHostKey: `${key}:${generation}`,
}
: {}),
- ...(deviceHostedGuestProviderId ? { deviceHostedGuestProviderId } : {}),
+ ...(deviceHostedGuestProviderId ? { deviceHostedGuestProviderId, deviceHostedGuestSessionId } : {}),
},
);
hostRetirementCleanup = cfg.onHostRetired;
@@ -5151,7 +5154,7 @@ assertRouteCurrent();
? { keyOverride: currentHostKey }
: {}),
...(localAuthPolicy === 'isolated' ? { localAuthPolicy } : {}),
- ...(guestCodexHome && guestProviderId ? { deviceHostedGuestProviderId: guestProviderId } : {}),
+ ...(guestCodexHome && guestProviderId ? { deviceHostedGuestProviderId: guestProviderId, deviceHostedGuestSessionId: sid } : {}),
...(reviewMode
? { hostPurpose: 'review' as const }
: usesCustomContextHost