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(desktop): 删除任务级凭证授权时收回已恢复到执行器的授权

fmfsaisai32c7a59918e2
diff --git a/apps/desktop/src/main/remote-agent/controller/startRemote.ts b/apps/desktop/src/main/remote-agent/controller/startRemote.ts
index 21a66d6243..fe141159d9 100644
--- a/apps/desktop/src/main/remote-agent/controller/startRemote.ts
+++ b/apps/desktop/src/main/remote-agent/controller/startRemote.ts
@@ -250,7 +250,13 @@ export async function startRemoteAgentSession(
controller?.confirm(credentialConfirmation(action, credentialConsent.description)) ?? false,
gitCredentials: sharedGitCredentials,
...(grant
- ? { credentialGrant: { remember: () => grant.remember(grantPermission()), forget: () => grant.forget() } }
+ ? {
+ credentialGrant: {
+ remember: () => grant.remember(grantPermission()),
+ forget: () => grant.forget(),
+ watch: (revoke: () => void) => grant.watch(revoke),
+ },
+ }
: {}),
}
: {}),
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.ts
index fa8222b06f..84d781f92c 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
@@ -6,6 +6,7 @@ import path from 'node:path';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { handleExecMcpRequest } from '../ccMcp';
+import { credentialGrantFor, forgetCredentialGrants } from '../credentialGrants';
import { RemoteExecutor, type ExecutorConfirmation, type RemoteExecutorOptions } from '../executor';
import { EXECUTOR_APPROVAL_TTL_MS, ExecutorGate, executorGateModeFor, type ExecutorAction } from '../gate';
import type { PdfTextExtractor } from '../files';
@@ -615,6 +616,41 @@ describe('shared provider credentials', () => {
return { executor, gate, workspace };
}
+ it('revokes a restored task grant when it is cleared before the rebuilt agent is published', async () => {
+ const sessionId = `revoke-${Date.now()}-${Math.random()}`;
+ const record = credentialGrantFor(sessionId, 'share:a');
+ record.remember('mode');
+ const unwatched = vi.fn();
+ const credentialGrant = {
+ remember: () => record.remember('mode'),
+ forget: () => record.forget(),
+ watch: (revoke: () => void) => {
+ const stop = record.watch(revoke);
+ return () => { unwatched(); stop(); };
+ },
+ };
+ const asked = vi.fn(async (): Promise<ExecutorConfirmation> => false);
+ const { executor, gate } = sharedExecutor('full', asked, undefined, credentialGrant);
+ const env: ExecutorAction = { kind: 'exec', command: 'cat .env', cwd: project };
+ try {
+ // Agent 重建:新执行器恢复了授权,此时任务还没对外可见。
+ expect(record.restore('mode')).toBe(true);
+ gate.allowCredentialsForSession();
+ expect(gate.needsCredentialConsent(env)).toBe(false);
+ // 改权限档的入口只看到没有运行实例,删除记录:已恢复到执行器内存的授权也要收回。
+ forgetCredentialGrants(sessionId);
+ expect(gate.needsCredentialConsent(env)).toBe(true);
+ expect(await executor.confirm(env)).toBe(false);
+ expect(asked).toHaveBeenCalledTimes(1);
+ expect(record.restore('mode')).toBe(false);
+ } finally {
+ await executor.close();
+ }
+ // 关闭后注销,之后再删除不会碰到已关闭的执行器。
+ expect(unwatched).toHaveBeenCalledTimes(1);
+ expect(() => forgetCredentialGrants(sessionId)).not.toThrow();
+ });
+
it('records only an explicit task-level grant and clears it when the permission mode changes', async () => {
const env: ExecutorAction = { kind: 'exec', command: 'cat .env', cwd: project };
for (const answer of [true, false, 'session'] as const) {
diff --git a/apps/desktop/src/main/remote-agent/executor/credentialGrants.ts b/apps/desktop/src/main/remote-agent/executor/credentialGrants.ts
index 3abee2045a..97368a9265 100644
--- a/apps/desktop/src/main/remote-agent/executor/credentialGrants.ts
+++ b/apps/desktop/src/main/remote-agent/executor/credentialGrants.ts
@@ -7,7 +7,9 @@
* (含计划模式):
* - 重建时原始权限档与授权时一致才恢复,不一致即作废(任何入口改的权限档都能认出来);
* - 运行中切换权限档由执行器删除;没有运行实例时,用户改权限档的入口调用 forgetCredentialGrants,
- * 认出「切走又切回」。
+ * 认出「切走又切回」;
+ * - 删除记录时同时撤销这个任务所有存活执行器已恢复到内存的授权:Agent 重建期间任务还没对外可见,
+ * 改权限档的入口只能删记录,正在启动的执行器靠这里收回已复制的授权。
* 删除只会让用户多确认一次,不会少确认。不落盘,退出应用即失效。
*/
@@ -18,10 +20,18 @@ export interface CredentialGrantRecord {
remember(permission: string): void;
/** 权限档变化:授权失效。 */
forget(): void;
+ /** 执行器登记撤销回调,这个任务的授权被删除时调用;返回注销函数,执行器关闭时调用。 */
+ watch(revoke: () => void): () => void;
}
/** 任务 → 分享(Agent 所在的 `share:` 设备) → 授权时的原始权限档。 */
const grants = new Map<string, Map<string, string>>();
+/** 任务 → 存活执行器的撤销回调。 */
+const revokers = new Map<string, Set<() => void>>();
+
+function revokeLive(sessionId: string): void {
+ for (const revoke of [...(revokers.get(sessionId) ?? [])]) revoke();
+}
/** 原始权限档与计划模式合成比较用的值;不归并(`default` 与 `ask` 也算不同)。 */
export function credentialGrantPermission(permissionMode: string | null | undefined, planMode: boolean): string {
@@ -32,9 +42,11 @@ export function credentialGrantPermission(permissionMode: string | null | undefi
export function credentialGrantFor(sessionId: string, deviceId: string): CredentialGrantRecord {
const forget = () => {
const byDevice = grants.get(sessionId);
- if (!byDevice) return;
- byDevice.delete(deviceId);
- if (byDevice.size === 0) grants.delete(sessionId);
+ if (byDevice) {
+ byDevice.delete(deviceId);
+ if (byDevice.size === 0) grants.delete(sessionId);
+ }
+ revokeLive(sessionId);
};
return {
restore(permission) {
@@ -51,10 +63,28 @@ export function credentialGrantFor(sessionId: string, deviceId: string): Credent
byDevice.set(deviceId, permission);
},
forget,
+ watch(revoke) {
+ let live = revokers.get(sessionId);
+ if (!live) {
+ live = new Set();
+ revokers.set(sessionId, live);
+ }
+ live.add(revoke);
+ return () => {
+ const current = revokers.get(sessionId);
+ if (!current) return;
+ current.delete(revoke);
+ if (current.size === 0) revokers.delete(sessionId);
+ };
+ },
};
}
-/** 任务的权限档或计划模式被用户修改(包括没有运行实例时):作废这个任务在所有分享上的授权。 */
+/**
+ * 任务的权限档或计划模式被用户修改(包括没有运行实例时):作废这个任务在所有分享上的授权,
+ * 并撤销正在启动或运行的执行器已恢复的授权。
+ */
export function forgetCredentialGrants(sessionId: string): void {
grants.delete(sessionId);
+ revokeLive(sessionId);
}
diff --git a/apps/desktop/src/main/remote-agent/executor/executor.ts b/apps/desktop/src/main/remote-agent/executor/executor.ts
index 8dd059e5f9..0d027bc64f 100644
--- a/apps/desktop/src/main/remote-agent/executor/executor.ts
+++ b/apps/desktop/src/main/remote-agent/executor/executor.ts
@@ -72,7 +72,7 @@ export interface RemoteExecutorOptions {
* 「本任务总是允许」的任务级记录(credentialGrants.ts,由启动方按当前原始权限档写入):Agent 实例被系统
* 回收重建后据此恢复;缺省时只在本执行器内有效。
*/
- credentialGrant?: { remember(): void; forget(): void };
+ credentialGrant?: { remember(): void; forget(): void; watch?(revoke: () => void): () => void };
}
export class ExecutorRequestError extends Error {
@@ -126,8 +126,11 @@ export class RemoteExecutor {
private closed = false;
private permissionGeneration = 0;
private credentialConfirmationTail?: Promise<void>;
+ private readonly unwatchCredentialGrant?: () => void;
constructor(private readonly opts: RemoteExecutorOptions) {
+ // 任务级授权在别处被删除(如 Agent 重建期间用户改了权限档):收回本执行器已恢复的授权。
+ this.unwatchCredentialGrant = opts.credentialGrant?.watch?.(() => this.revokeCredentialGrant());
this.workspace = opts.workspace;
this.gate = opts.gate;
this.rg = createRipgrepRunner(opts.rgPath);
@@ -150,6 +153,12 @@ export class RemoteExecutor {
this.opts.credentialGrant?.forget();
}
+ /** 撤销分享凭证的任务授权:与权限档变化一样清掉授权,并作废等待中的确认。 */
+ private revokeCredentialGrant(): void {
+ this.permissionGeneration += 1;
+ this.gate.setMode(this.gate.getMode());
+ }
+
/** 本机用户在确认卡上允许了一个操作。 */
recordApproval(action: ExecutorAction): void {
this.gate.recordApproval(action);
@@ -237,6 +246,7 @@ export class RemoteExecutor {
async close(): Promise<void> {
if (this.closed) return;
this.closed = true;
+ this.unwatchCredentialGrant?.();
await this.shell.close();
}
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 51cdaaffa0..979b801272 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -285,7 +285,8 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
主进程内存里(2026-10-13 用户裁决):Agent 实例被系统回收后重建(如 Orca Worker 一轮结束后释放进程)
时,原始权限档与计划模式都和授权时相同才沿用(不按归并后的档位比,`default` 改 `ask` 也算变化);
切换权限档或计划模式、退出应用后恢复确认,不扩展到其他任务或供应商分享。回收期间在 Desktop / 手机
- 远控的权限入口切走又切回,同样作废。已知代价:归档后恢复的任务在本次应用运行期间沿用之前的授权;
+ 远控的权限入口切走又切回,同样作废;Agent 正在重建、任务尚未对外可见时改权限档,已恢复到新执行器
+ 的授权也一并收回。已知代价:归档后恢复的任务在本次应用运行期间沿用之前的授权;
回收期间经 IM 切走又切回原档位不会被识别(最终档位与授权时相同)。原权限档的其他限制仍然生效,
启动同步仍排除凭证文件。确认卡说明内容会经过分享者或其安排的电脑,以及这项授权的范围与失效时机。
确认卡与 Agent 的确认走同一通道,手机远控与 IM 也能处理;