Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): 权限档变化后作废分享供应商的任务级凭证授权
fmfsaisai5a3cfed56e34
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 63e2282a1d..4467ceeb9a 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -27,6 +27,7 @@ import { handleListDevices, defaultDeps as deviceDirectoryDeps } from '../deviceimport { getHostSourceDevice, getSelfDeviceId, remoteBackgroundInvoke, remoteInvoke as invokeBotPeer } from '../device-link/index.js';import { readDeviceProviderViews } from '../remote-agent/controller/deviceCatalog.js';import { checkDeviceRoute } from '../remote-agent/controller/deviceRouteCheck.js';+import { forgetCredentialGrants } from '../remote-agent/executor/credentialGrants.js';import { isProviderShareAgentDeviceId } from '../../shared/providerShare.js';import {isProviderGroupReleased,@@ -21504,6 +21505,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)}throw error;}+ // 分享供应商的「本任务总是允许」随权限档变化失效;Agent 实例被回收时执行器收不到这次切换。+ if (row.permissionMode !== mode) forgetCredentialGrants(sessionId);broadcastSessionPatched(sessionId, { permissionMode: mode });if (remote) {const result = {};@@ -21556,6 +21559,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)}throw error;}+ // 计划模式同属权限档:分享供应商的「本任务总是允许」随之失效(同上)。+ if (!!row.planModeEnabled !== enabled) forgetCredentialGrants(sessionId);if (remote) {const result = {};markRemoteSettingPersistedInsideHandler(result);diff --git a/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts b/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.tsindex d472c7de2b..86198a542e 100644--- a/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/roundtrip.test.ts@@ -21,7 +21,7 @@ import { MAIN_OWNED_SEND_CONTEXT } from '@cindy/maker-core';import { afterEach, beforeEach, describe, expect, it } from 'vitest';import { RemoteAgentPoller } from '../controller/poller';-import { credentialGrantFor } from '../executor/credentialGrants';+import { credentialGrantFor, forgetCredentialGrants } from '../executor/credentialGrants';import { startRemoteAgentSession, type StartRemoteAgentDeps } from '../controller/startRemote';import { createRemoteAgentHost, type HostedStartInput } from '../host/runHost';import { PROVIDER_SHARE_CREDENTIAL_SESSION_APPROVAL } from '../../../shared/providerShareCredentialConsent';@@ -279,7 +279,7 @@ describe('remote agent round trip', () => {let localConfirmations = 0;// 打开一次 Agent、跑一轮、关闭(相当于 Orca Worker 一轮结束后被回收)。const openRunClose = async (- opts: typeof full | (Omit<typeof full, 'permissionMode'> & { permissionMode: 'default' }),+ opts: Omit<typeof full, 'permissionMode'> & { permissionMode: 'bypassPermissions' | 'default' | 'ask' },deviceId = 'share:a',between?: (handle: AgentSessionHandle) => Promise<void>,) => {@@ -321,6 +321,19 @@ describe('remote agent round trip', () => {expect(localConfirmations).toBe(4);await openRunClose(full);expect(localConfirmations).toBe(5);+ // 比较原始权限档:default 与 ask 归并后同为 normal,回收期间这样改也要重新确认。+ await openRunClose({ ...full, permissionMode: 'default' });+ expect(localConfirmations).toBe(6);+ await openRunClose({ ...full, permissionMode: 'ask' });+ expect(localConfirmations).toBe(7);+ await openRunClose({ ...full, permissionMode: 'ask' });+ expect(localConfirmations).toBe(7);+ // 回收期间切走又切回(设置入口调用 forgetCredentialGrants):所有分享上的授权都作废。+ forgetCredentialGrants(sessionId);+ await openRunClose({ ...full, permissionMode: 'ask' });+ expect(localConfirmations).toBe(8);+ await openRunClose(full, 'share:b');+ expect(localConfirmations).toBe(9);} finally {host.dispose();}diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.tsindex bd3b7f0eca..001b6a1d66 100644--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts@@ -19,7 +19,7 @@ import {import type { AgentEvent, AgentSessionHandle, StartSessionOptions } from '@cindy/maker-core';import { PROVIDER_SHARE_CREDENTIAL_SESSION_APPROVAL } from '../../../shared/providerShareCredentialConsent';-import type { CredentialGrantRecord } from '../executor/credentialGrants';+import { credentialGrantPermission, type CredentialGrantRecord } from '../executor/credentialGrants';import { RemoteExecutor, type ExecutorCaptureHooks } from '../executor/executor';import type { PdfTextExtractor } from '../executor/files';import { ExecutorGate, executorGateModeFor, type ExecutorAction } from '../executor/gate';@@ -221,12 +221,16 @@ export async function startRemoteAgentSession(let writableDirs = [...new Set(opts.writableDirs ?? [])];const workspace = new ExecutorWorkspace({ workingDir: opts.workingDir, extraDirs: [...extraDirs, ...writableDirs] });const applyDirs = () => workspace.setExtraDirs([...new Set([...extraDirs, ...writableDirs])]);+ let permissionMode = opts.permissionMode;+ let planMode = opts.planMode === true;const credentialConsent = deps.credentialConsent;- const gate = new ExecutorGate(workspace, executorGateModeFor(opts.permissionMode, opts.planMode === true), Date.now, {+ const gate = new ExecutorGate(workspace, executorGateModeFor(permissionMode, planMode), Date.now, {confirmCredentials: credentialConsent !== undefined,});- // 同一任务、同一分享、权限档未变时恢复之前的「本任务总是允许」(Orca Worker 等会在两轮之间被回收重建)。- if (credentialConsent?.grant?.restore(gate.getMode())) gate.allowCredentialsForSession();+ // 同一任务、同一分享、原始权限档未变时恢复之前的「本任务总是允许」(Orca Worker 等会在两轮之间被回收重建)。+ const grant = credentialConsent?.grant;+ const grantPermission = () => credentialGrantPermission(permissionMode, planMode);+ if (grant?.restore(grantPermission())) gate.allowCredentialsForSession();let controller: RemoteAgentHandleController | null = null;const executor = new RemoteExecutor({workspace,@@ -240,12 +244,12 @@ export async function startRemoteAgentSession(? {confirm: async (action: ExecutorAction) =>controller?.confirm(credentialConfirmation(action, credentialConsent.description)) ?? false,- ...(credentialConsent.grant ? { credentialGrant: credentialConsent.grant } : {}),+ ...(grant+ ? { credentialGrant: { remember: () => grant.remember(grantPermission()), forget: () => grant.forget() } }+ : {}),}: {}),});- let permissionMode = opts.permissionMode;- let planMode = opts.planMode === true;const vendorOptions: Record<string, unknown> = { ...(opts.vendorOptions ?? {}) };const mcp = await deps.prepareMcp({ kind, opts, vendorOptions }).catch((error) => {void executor.close();diff --git a/apps/desktop/src/main/remote-agent/executor/__tests__/executor.test.ts b/apps/desktop/src/main/remote-agent/executor/__tests__/executor.test.tsindex e4b1b1b671..4df34ed54c 100644--- a/apps/desktop/src/main/remote-agent/executor/__tests__/executor.test.ts+++ b/apps/desktop/src/main/remote-agent/executor/__tests__/executor.test.ts@@ -603,7 +603,7 @@ describe('shared provider credentials', () => {const { executor } = sharedExecutor('normal', async () => answer, credentialGrant);try {expect(await executor.confirm(env)).toBe(answer !== false);- if (answer === 'session') expect(credentialGrant.remember).toHaveBeenCalledWith('normal');+ if (answer === 'session') expect(credentialGrant.remember).toHaveBeenCalledTimes(1);else expect(credentialGrant.remember).not.toHaveBeenCalled();executor.setGateMode('full');expect(credentialGrant.forget).toHaveBeenCalledTimes(1);diff --git a/apps/desktop/src/main/remote-agent/executor/credentialGrants.ts b/apps/desktop/src/main/remote-agent/executor/credentialGrants.tsindex 9c0c0ba6aa..3abee2045a 100644--- a/apps/desktop/src/main/remote-agent/executor/credentialGrants.ts+++ b/apps/desktop/src/main/remote-agent/executor/credentialGrants.ts@@ -3,37 +3,58 @@* (docs/product-rules/provider-sharing.md §9 第 7 条)。** 执行器随 Agent 实例关闭,而 Agent 实例会被系统回收后重建(如 Orca Worker 一轮结束后释放进程)。- * 只记在执行器里时,这类重建会让用户每轮都要重新确认。这里按「任务 + 分享」记住授权时的权限档:- * 重建时权限档一致才恢复,不一致即作废;权限档变化时由执行器删除。不落盘,退出应用即失效。+ * 只记在执行器里时,这类重建会让用户每轮都要重新确认。这里按「任务 + 分享」记住授权时的原始权限档+ * (含计划模式):+ * - 重建时原始权限档与授权时一致才恢复,不一致即作废(任何入口改的权限档都能认出来);+ * - 运行中切换权限档由执行器删除;没有运行实例时,用户改权限档的入口调用 forgetCredentialGrants,+ * 认出「切走又切回」。+ * 删除只会让用户多确认一次,不会少确认。不落盘,退出应用即失效。*/-import type { ExecutorGateMode } from './gate';export interface CredentialGrantRecord {/** 新执行器启动时调用:之前在同一权限档下授权过就返回 true;权限档不一致时作废记录。 */- restore(mode: ExecutorGateMode): boolean;+ restore(permission: string): boolean;/** 本机用户选择了「本任务总是允许」。 */- remember(mode: ExecutorGateMode): void;+ remember(permission: string): void;/** 权限档变化:授权失效。 */forget(): void;}-const grants = new Map<string, ExecutorGateMode>();+/** 任务 → 分享(Agent 所在的 `share:` 设备) → 授权时的原始权限档。 */+const grants = new Map<string, Map<string, string>>();-/** 某个任务在某个分享(Agent 所在的 `share:` 设备)上的授权记录。 */+/** 原始权限档与计划模式合成比较用的值;不归并(`default` 与 `ask` 也算不同)。 */+export function credentialGrantPermission(permissionMode: string | null | undefined, planMode: boolean): string {+ return JSON.stringify([permissionMode ?? null, planMode]);+}++/** 某个任务在某个分享上的授权记录。 */export function credentialGrantFor(sessionId: string, deviceId: string): CredentialGrantRecord {- const key = JSON.stringify([sessionId, deviceId]);+ const forget = () => {+ const byDevice = grants.get(sessionId);+ if (!byDevice) return;+ byDevice.delete(deviceId);+ if (byDevice.size === 0) grants.delete(sessionId);+ };return {- restore(mode) {- const granted = grants.get(key);- if (granted === mode) return true;- grants.delete(key);+ restore(permission) {+ if (grants.get(sessionId)?.get(deviceId) === permission) return true;+ forget();return false;},- remember(mode) {- grants.set(key, mode);- },- forget() {- grants.delete(key);+ remember(permission) {+ let byDevice = grants.get(sessionId);+ if (!byDevice) {+ byDevice = new Map();+ grants.set(sessionId, byDevice);+ }+ byDevice.set(deviceId, permission);},+ forget,};}++/** 任务的权限档或计划模式被用户修改(包括没有运行实例时):作废这个任务在所有分享上的授权。 */+export function forgetCredentialGrants(sessionId: string): void {+ grants.delete(sessionId);+}diff --git a/apps/desktop/src/main/remote-agent/executor/executor.ts b/apps/desktop/src/main/remote-agent/executor/executor.tsindex 67870406fa..dc0146cd14 100644--- a/apps/desktop/src/main/remote-agent/executor/executor.ts+++ b/apps/desktop/src/main/remote-agent/executor/executor.ts@@ -32,7 +32,6 @@ import {type RipgrepRunner,type ToolResult,} from './files';-import type { CredentialGrantRecord } from './credentialGrants';import type { ExecutorAction, ExecutorGate, ExecutorGateDecision, ExecutorGateMode } from './gate';import { piGrep, type PiGrepInput } from './search';import { resolveExecutorShell, runOnce, ShellSession } from './shell';@@ -66,8 +65,11 @@ export interface RemoteExecutorOptions {* 默认只放行这一个操作;用户明确选择会话级允许后免除后续的分享凭证确认。缺省时直接拒绝。*/confirm?(action: ExecutorAction): Promise<ExecutorConfirmation>;- /** 「本任务总是允许」的任务级记录:Agent 实例被系统回收重建后据此恢复;缺省时只在本执行器内有效。 */- credentialGrant?: Pick<CredentialGrantRecord, 'remember' | 'forget'>;+ /**+ * 「本任务总是允许」的任务级记录(credentialGrants.ts,由启动方按当前原始权限档写入):Agent 实例被系统+ * 回收重建后据此恢复;缺省时只在本执行器内有效。+ */+ credentialGrant?: { remember(): void; forget(): void };}export class ExecutorRequestError extends Error {@@ -189,7 +191,7 @@ export class RemoteExecutor {|| permissionGeneration !== this.permissionGeneration) return false;if (allowed === 'session') {this.gate.allowCredentialsForSession();- this.opts.credentialGrant?.remember(this.gate.getMode());+ this.opts.credentialGrant?.remember();if (this.gate.getMode() === 'full') return true;}this.gate.recordApproval(action);diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex ad39eadd68..0236d4b7bf 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -283,8 +283,10 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):允许,默认只放行这一次。确认卡同时提供「本任务总是允许」(2026-10-12 用户确认):受邀者明确选择后,当前任务不再额外确认凭证操作,Pi 的搜索结果也可包含凭证内容。授权按「任务 + 分享」只记在本机主进程内存里(2026-10-13 用户裁决):Agent 实例被系统回收后重建(如 Orca Worker 一轮结束后释放进程)- 时,权限档未变就沿用;切换权限档(含回收期间改了权限档)或退出应用后恢复确认,不扩展到其他任务或- 供应商分享。已知代价:归档后恢复的任务在本次应用运行期间沿用之前的授权。原权限档的其他限制仍然生效,+ 时,原始权限档与计划模式都和授权时相同才沿用(不按归并后的档位比,`default` 改 `ask` 也算变化);+ 切换权限档或计划模式、退出应用后恢复确认,不扩展到其他任务或供应商分享。回收期间在 Desktop / 手机+ 远控的权限入口切走又切回,同样作废。已知代价:归档后恢复的任务在本次应用运行期间沿用之前的授权;+ 回收期间经 IM 切走又切回原档位不会被识别(最终档位与授权时相同)。原权限档的其他限制仍然生效,启动同步仍排除凭证文件。确认卡说明内容会经过分享者或其安排的电脑,以及这项授权的范围与失效时机。确认卡与 Agent 的确认走同一通道,手机远控与 IM 也能处理;- 命令只能按命令文本识别(脚本里读的、编码后再解开的认不出来),是防误发,不是防恶意。