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 upstream/main into fix/orca-focus-async-resume(解冲突:resume 唤醒合入调度器,取消检查与共用发送锁都保留)

Zhang Yunjinfbdeb067413f
diff --cc apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
index 9b4d970cca,94f49061e6..b716a83d52
--- a/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/orcaTeamService.test.ts
@@@ -164,9 -150,8 +164,10 @@@ describe('model Orca cleanup authority'
recycleSessionWorktreeForStatusChange: vi.fn(), captureSessionRecycleScope: vi.fn(),
cleanupPendingInteractionsForSession: vi.fn(), forgetKnownOrcaWorkerSession: vi.fn(),
markTeamEnded: vi.fn(), markWorkersStatusByTeam: vi.fn(), archiveWorkersByTeam: archive,
+ // 关闭协同会先取消未落地的后台预热(review P1)。
+ orcaWorkerResumeScheduler: { cancel: vi.fn() },
broadcastToAllWindows: vi.fn(), MAKER_PUSH: { ORCA_WORKER_CHANGED: 'changed' }, log: { info: vi.fn(), warn: vi.fn() },
+ orcaRemoteWorkers: { releaseEnded: vi.fn(async () => undefined) },
};
const api = compile(bindings, `${disable}\nreturn { api: {${callbacks}}, disableOrcaInternal };`);
const result = phase === 'user' ? await api.disableOrcaInternal('lead-1') : await api.api.endTeam({ leadSessionId: 'lead-1' });
diff --cc apps/desktop/src/main/maker-ipc/register.ts
index 88addfb586,6bc8889d4f..e35afe9932
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@@ -7844,23 -8659,27 +8660,26 @@@ export function registerMakerIpc(maker
}
// switchFocus 和 sendToWorker 都可能唤醒 idle worker;统一走这里才能保留 extraDirs。
- async function resumeOrcaWorkerSessionIfMissing(target: {
- id: string;
- teamId: string;
- leadSessionId: string;
- sessionId: string;
- }, assertCurrent?: () => Promise<void>): Promise<boolean> {
- if (maker.getSession(target.sessionId)) return false;
- // 与发送、供应商组换电脑同一把会话锁:换电脑时会先关掉 Worker 再按新位置启动,不能在这段空档里按
- // 旧的任务记录在原来那台上把它拉起来。拿到锁后再看一次是否已经在运行。
- return withSendToSessionLock(target.sessionId, async () => {
- if (maker.getSession(target.sessionId)) return false;
- return resumeOrcaWorkerSessionLocked(target, assertCurrent);
- });
- }
+ // assertCurrent:插件能力权威校验,冷启动前 / bootstrap 后各一次。
+ // isCancelled:关闭协同 / 归档 / 显式 idle 会取消尚未落地的唤醒;冷启动前与
+ // bootstrap 返回后都要检查,已经拉起的 runtime 要自己关掉(review P1)。
++ // 与发送 / 供应商组换电脑共用同一把会话锁这件事由 orcaWorkerResumeScheduler
++ // (下方 withSessionLock = withSendToSessionLock)保证:锁内再查一次 live,
++ // 换电脑空档不会按旧任务记录把它拉起来。
+ async function resumeOrcaWorkerSessionIfMissing(
+ target: {
+ id: string;
+ teamId: string;
+ leadSessionId: string;
+ sessionId: string;
+ },
+ assertCurrent?: () => Promise<void>,
+ isCancelled?: () => boolean,
+ ): Promise<boolean> {
+ const live = maker.getSession(target.sessionId);
+ if (live) return false;
+ if (isCancelled?.()) return false;
- async function resumeOrcaWorkerSessionLocked(target: {
- id: string;
- teamId: string;
- leadSessionId: string;
- sessionId: string;
- }, assertCurrent?: () => Promise<void>): Promise<boolean> {
const db = getDbClient().drizzle;
const [row] = await db
.select()