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。

Merge pull request #6005 from zqchris/fix-permission-repeat-prompts

Lizi514d550550a9
diff --cc apps/desktop/src/main/maker-ipc/__tests__/makerSendTransaction.test.ts
index 82c42f5bb1,ff80d049ba..6dc1eafc6a
--- a/apps/desktop/src/main/maker-ipc/__tests__/makerSendTransaction.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/makerSendTransaction.test.ts
@@@ -14,9 -14,8 +14,9 @@@ import
import { CODEX_RESUME_NOT_READY_WIRE_MESSAGE } from '@cindy/maker-shared/agent-input-projection';
import { formatQuotesForSend, stripChatQuoteMarkerLines } from '@cindy/maker-shared/chat-quotes';
import type { AgentInputQueuedMessage } from '../../../shared/agentInputQueue';
+import { parseOrcaRemoteLead } from '../../../shared/orcaRemoteWorker';
import { describe, expect, it, vi } from 'vitest';
- import { AUTO_REVIEW_DELEGATED_CONTINUATION } from '../autoReviewUserIntent.js';
+ import { AUTO_REVIEW_DELEGATED_CONTINUATION, type AutoReviewHistoryMessage } from '../autoReviewUserIntent.js';
import {
createMakerSendTransaction,
restoreTrustedDesktopQueuedOrigin,
diff --cc apps/desktop/src/renderer/__tests__/sessionAgentSwitchRemoteRouting.test.ts
index bddd7f0cc9,cb53c01274..9602081566
--- a/apps/desktop/src/renderer/__tests__/sessionAgentSwitchRemoteRouting.test.ts
+++ b/apps/desktop/src/renderer/__tests__/sessionAgentSwitchRemoteRouting.test.ts
@@@ -905,45 -904,15 +905,47 @@@ describe('ChatInput 的入口门控与�
const body = hostSource.slice(start, end);
expect(body).toContain('effort: sessions.effort,');
expect(body).toContain('fastMode: sessions.fastMode,');
+ expect(body).toContain('permissionMode: sessions.permissionMode,');
expect(body).toContain("co.effort = (row.effort ?? undefined) as CreateOpts['effort'];");
expect(body).toContain('co.fastMode = !!row.fastMode;');
+ expect(body).toContain('co.permissionMode = permissionModeOrAsk(row.permissionMode);');
});
- it('Orca 与角色未加载会话都 fail-closed:只有完整元数据确认非协同后开放入口', () => {
- expect(source).toContain('sessionOrcaRole === null &&');
- // 会话视图必须保留 undefined 未知态,不能在完整 session 回流前冒充「非协同」。
+ it('Orca 会话复用切换入口,角色未加载仍保留未知态', () => {
+ expect(source).not.toContain('sessionOrcaRole === null &&');
+ const expression = source.match(/const sessionAgentSwitchSupported =\s*([\s\S]*?);/)?.[1];
+ expect(expression).toBeDefined();
+ const supported = new Function('sessionOrcaRole', 'runtimeAgentKind', 'deviceLinkDeviceId',
+ 'ccSupportsSessionAgentSwitch', 'codexSupportsSessionAgentSwitch', `return ${expression};`);
+ for (const role of [null, 'lead', 'worker']) {
+ expect(supported(role, 'codex', null, false, false)).toBe(true);
+ expect(supported(role, undefined, null, true, true)).toBe(false);
+ expect(supported(role, 'codex', 'host', false, false)).toBe(false);
+ expect(supported(role, 'codex', 'host', false, true)).toBe(true);
+ }
+ expect(supported(undefined, 'codex', null, true, true)).toBe(false);
+ const remoteOptions = source.slice(source.indexOf('const sessionRemoteAgentOptions ='),
+ source.indexOf('// composer pill 尾部引擎小标'));
+ expect(remoteOptions).toContain(' sessionOrcaRole,');
+ expect(remoteOptions).toContain(' sessionOrcaRemoteWorker,');
+ const relocationGuard = remoteOptions.match(/if \(([\s\S]*?)\) return undefined;/)?.[1];
+ expect(relocationGuard).toBeDefined();
+ const hidden = new Function('sessionOrcaRole', 'sessionOrcaRemoteWorker', 'deviceLinkDeviceId',
+ `const sessionId = 's1', agentLocationAware = true, remoteHostId = null, sessionEngineFilter = {};
+ return !!(${relocationGuard});`);
+ // 本机的 Lead / Worker 与普通任务一样可换 Agent 所在电脑。
+ for (const role of [null, 'lead', 'worker']) {
+ expect(hidden(role, false, null)).toBe(false);
+ }
+ // 被控电脑上的协同任务先不开放(旧版被控端会拒绝);普通被控任务不受影响。
+ expect(hidden('lead', false, 'host')).toBe(true);
+ expect(hidden('worker', false, 'host')).toBe(true);
+ expect(hidden(null, false, 'host')).toBe(false);
+ for (const role of [null, 'lead', 'worker', undefined]) {
+ expect(hidden(role, true, null)).toBe(true);
+ }
+ expect(hidden(undefined, false, null)).toBe(true);
+ // 会话视图必须保留 undefined 未知态,避免在完整 session 回流前冒充具体身份。
const viewSource = readFileSync(
resolve(process.cwd(), 'src/renderer/features/cc-agent/CCAgentSessionView.tsx'),
'utf8',