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(new-task): 发送途中切换账号时不交出旧账号的未发送任务

Dasha381af6304f0
diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/provisionalDraftTask.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/provisionalDraftTask.test.ts
index 1c5eb6ea3e..51c72268ec 100644
--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/provisionalDraftTask.test.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/provisionalDraftTask.test.ts
@@ -156,6 +156,17 @@ describe('provisional draft task', () => {
expect(provisionalDraftTaskId()).toBe('draft-1');
});
+ it('fails the send instead of handing over a task whose account changed while committing', async () => {
+ setDataOwnerGeneration('account-a', 1);
+ await ensureProvisionalDraftTask(args());
+ mocks.commit.mockImplementationOnce(async () => {
+ setDataOwnerGeneration('account-b', 2);
+ return { committed: false };
+ });
+ await expect(takeProvisionalDraftTask(args())).rejects.toBeInstanceOf(ProvisionalDraftTaskBusyError);
+ setDataOwnerGeneration(null, 0);
+ });
+
it('never hands another account\'s unsent task to a send after an account switch', async () => {
setDataOwnerGeneration('account-a', 1);
await ensureProvisionalDraftTask(args());
diff --git a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
index fc3e236279..4190d07d9c 100644
--- a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
@@ -226,6 +226,9 @@ export function takeProvisionalDraftTask(
// The first send commits it on the host as well.
log.warn('commit provisional task failed', error);
}
+ // The account changed while committing: the task lives in the old account's database,
+ // so this send cannot use it (fails like a failed create; the draft is kept).
+ if (!isDataOwnerIdCurrent(taken.owner)) throw new ProvisionalDraftTaskBusyError(taken.id);
return taken.session;
});
}