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): 未发送任务写入前先登记;同 id 删不掉时发送不再新建

Dash68f18472176a
diff --git a/apps/desktop/src/main/localDb/ipc/sessions.ts b/apps/desktop/src/main/localDb/ipc/sessions.ts
index 31ac51e1e3..e6f079672d 100644
--- a/apps/desktop/src/main/localDb/ipc/sessions.ts
+++ b/apps/desktop/src/main/localDb/ipc/sessions.ts
@@ -1626,20 +1626,29 @@ export function registerSessionIpc(
);
}
}
- const { row: insertRow } = await openSession({ id, now,
- body: { ...createBody, workspaceKind, workingDir },
- ...(provisional ? { deferGitInit: true } : {}),
- }, async (prepared, assertCurrent) => {
- const resource = !prepared.remoteHostId && prepared.workingDir
- ? managedWorktreeRoot(prepared.workingDir) : null;
- const insert = async () => { assertCurrent(); await db.insert(sessions).values(prepared); };
- if (resource) await withWorktreeMutation([resource], insert);
- else await insert();
- });
- const [row] = await db.select().from(sessions).where(eq(sessions.id, id));
+ // 未发送任务在写入之前就登记:行一出现,任务列表 / 控制端 / IM / hook 的过滤就已生效。
+ const markedProvisional = provisional && !isProvisionalSession(id);
+ if (markedProvisional) markProvisionalSession(id, now);
+ let insertRow: Awaited<ReturnType<typeof openSession>>['row'];
+ let row: typeof sessions.$inferSelect | undefined;
+ try {
+ ({ row: insertRow } = await openSession({ id, now,
+ body: { ...createBody, workspaceKind, workingDir },
+ ...(provisional ? { deferGitInit: true } : {}),
+ }, async (prepared, assertCurrent) => {
+ const resource = !prepared.remoteHostId && prepared.workingDir
+ ? managedWorktreeRoot(prepared.workingDir) : null;
+ const insert = async () => { assertCurrent(); await db.insert(sessions).values(prepared); };
+ if (resource) await withWorktreeMutation([resource], insert);
+ else await insert();
+ }));
+ [row] = await db.select().from(sessions).where(eq(sessions.id, id));
+ } catch (error) {
+ if (markedProvisional) forgetProvisionalSession(id);
+ throw error;
+ }
if (!row) throwIpcError('NOT_FOUND', 'Session 创建后查询失败');
if (provisional) {
- markProvisionalSession(id, now);
log.info('provisional session opened', { sessionId: id, workspaceKind: insertRow.workspaceKind });
return sessionToCamel({ ...row, messageCount: 0 });
}
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index 9ec4ff8b05..672181313a 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -747,9 +747,16 @@ export function NewMakerDraftRoute() {
* 否则先删掉它(同一个 id 可直接再建),再按原流程新建。
*/
const createSession = useCallback(
- async (args: Parameters<typeof createSessionRow>[0]) =>
- (await takeProvisionalDraftTask({ ...args } as ProvisionalDraftCreateArgs))
- ?? createSessionRow(args),
+ async (args: Parameters<typeof createSessionRow>[0]) => {
+ try {
+ return (await takeProvisionalDraftTask({ ...args } as ProvisionalDraftCreateArgs))
+ ?? createSessionRow(args);
+ } catch (error) {
+ // 旧的未发送任务删不掉:与建任务失败同样处理(提示失败、保留草稿,可再发一次)。
+ log.warn('[draft send] unsent task could not be replaced', error);
+ return null;
+ }
+ },
[createSessionRow],
);
const vendorAuthGate = useVendorAuthGate();
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 43df68f7f2..66fdd1efd5 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
@@ -29,6 +29,7 @@ import {
discardProvisionalDraftTask,
ensureProvisionalDraftTask,
previewProvisionalDraftTitle,
+ ProvisionalDraftTaskBusyError,
provisionalDraftTaskId,
resetProvisionalDraftTaskForTest,
takeProvisionalDraftTask,
@@ -145,6 +146,15 @@ describe('provisional draft task', () => {
expect(mocks.create).toHaveBeenCalledTimes(2);
});
+ it('refuses a send that would recreate the same id while the old unsent task still exists', async () => {
+ await ensureProvisionalDraftTask(args());
+ mocks.discard.mockResolvedValueOnce({ discarded: false, remaining: true } as never);
+ await expect(takeProvisionalDraftTask(args({ effort: 'low' }))).rejects.toBeInstanceOf(
+ ProvisionalDraftTaskBusyError,
+ );
+ expect(provisionalDraftTaskId()).toBe('draft-1');
+ });
+
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 6ce77d71d5..a8bcfddbaa 100644
--- a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
@@ -187,9 +187,17 @@ export function discardProvisionalDraftTask(): Promise<void> {
});
}
+/** 发送时设置与未发送任务不一致、它又删不掉:这次不能用同一个 id 新建,发送应失败并保留草稿。 */
+export class ProvisionalDraftTaskBusyError extends Error {
+ constructor(sessionId: string) {
+ super(`unsent task ${sessionId} could not be removed before creating the task`);
+ this.name = 'ProvisionalDraftTaskBusyError';
+ }
+}
+
/**
* 发送时接管:设置与提前建的一致就转为普通任务并返回它;不一致则先删掉,返回 null,
- * 由调用方按原流程新建(同一个 id 可直接再建)。
+ * 由调用方按原流程新建(同一个 id 可直接再建)。删不掉时抛 {@link ProvisionalDraftTaskBusyError}。
*/
export function takeProvisionalDraftTask(
args: ProvisionalDraftCreateArgs,
@@ -198,7 +206,9 @@ export function takeProvisionalDraftTask(
releaseForeignCurrent();
if (!current) return null;
if (current.id !== args.id || current.key !== provisionalDraftArgsKey(args)) {
- await discardCurrent();
+ const blocked = current.id === args.id ? current.id : null;
+ // A different id can be created regardless; the same id needs the old row gone first.
+ if (!(await discardCurrent()) && blocked) throw new ProvisionalDraftTaskBusyError(blocked);
return null;
}
const taken = current;