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(orca): 授权复核失败也关闭刚拉起的 worker session

Zhang Yunjinde22e05b8bc7
diff --git a/apps/desktop/src/main/__tests__/makerSendToSessionOrdering.test.ts b/apps/desktop/src/main/__tests__/makerSendToSessionOrdering.test.ts
index 077131da1b..d4dba5a97f 100644
--- a/apps/desktop/src/main/__tests__/makerSendToSessionOrdering.test.ts
+++ b/apps/desktop/src/main/__tests__/makerSendToSessionOrdering.test.ts
@@ -791,6 +791,19 @@ describe('sendToSession ordering', () => {
// 返回后关掉刚拉起的 session(review P1:不得把已归档 worker 留在运行态)。
expect(resumeBranch).toContain('if (isCancelled?.()) return false;');
expect(resumeBranch).toContain('await maker.closeSession(resumedSession.id).catch((err) => {');
+ // bootstrap 之后 runtime 已存在,授权复核失败也必须先清理再抛(Security review)。
+ expect(resumeBranch).toContain("await closeResumedSession('assert-current-after-bootstrap');");
+ expect(resumeBranch).toContain('throw err;');
+ expectOrder(
+ resumeBranch,
+ 'const { session: resumedSession } = await bootstrapSession(opts);',
+ "await closeResumedSession('assert-current-after-bootstrap');",
+ );
+ expectOrder(
+ resumeBranch,
+ "await closeResumedSession('assert-current-after-bootstrap');",
+ 'await markOrcaRoleIfNeeded(resumedSession.id,',
+ );
expect(serviceDepsBlock).toContain(
'cancelWorkerResume: (sessionId) => orcaWorkerResumeScheduler.cancel(sessionId),',
);
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 7a946c0c08..991e47d0ed 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -7560,16 +7560,26 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
await assertCurrent?.();
if (isCancelled?.()) return false;
const { session: resumedSession } = await bootstrapSession(opts);
- await assertCurrent?.();
- // 关闭协同 / 归档 / 显式 idle 可能和冷启动交错:bootstrap 返回后必须重新确认这次
- // 唤醒仍然有效,否则关掉刚拉起的 runtime,不能把已归档 worker 留在运行态。
- if (isCancelled?.() || !(await isOrcaWorkerSessionResumable(target.sessionId))) {
+ // bootstrap 之后 runtime 已经存在:从这里开始的任何失败(授权失效 / 账号切换 /
+ // 关闭协同 / 归档 / 显式 idle)都必须先关掉刚拉起的 session 再返回或抛错,
+ // 否则已归档 worker 会留在运行态(review P1 + Security)。
+ const closeResumedSession = async (reason: string) => {
await maker.closeSession(resumedSession.id).catch((err) => {
- log.warn('orcaWorkerResume: cancelled after bootstrap, close failed', {
+ log.warn('orcaWorkerResume: close resumed session failed', {
sessionId: resumedSession.id,
+ reason,
err: err instanceof Error ? err.message : String(err),
});
});
+ };
+ try {
+ await assertCurrent?.();
+ } catch (err) {
+ await closeResumedSession('assert-current-after-bootstrap');
+ throw err;
+ }
+ if (isCancelled?.() || !(await isOrcaWorkerSessionResumable(target.sessionId))) {
+ await closeResumedSession('resume-invalid-after-bootstrap');
return false;
}
await markOrcaRoleIfNeeded(resumedSession.id, 'worker');