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;只清理 Cindy 分配的对话目录

Dash2dc1f46752b7
diff --git a/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.ts b/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.ts
index 559766782b..439c37c18e 100644
--- a/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.ts
+++ b/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.ts
@@ -25,7 +25,7 @@ describe('writable directory grant wiring', () => {
it('uses the reserved local draft task id for picker scope and persisted session creation', () => {
const draft = read('renderer/features/cc-agent/NewMakerDraftRoute.tsx');
// An unsent task already opened from this draft keeps its id when the user comes back.
- expect(draft).toContain('const localDraftSessionIdRef = useRef(provisionalDraftTaskId() ?? makeDraftSessionId())');
+ expect(draft).toContain('const localDraftSessionIdRef = useRef(provisionalDraftTaskIdForCurrentOwner() ?? makeDraftSessionId())');
expect(draft).toContain('writableGrantScope={localDraftSessionIdRef.current}');
expect(draft).toContain('const sessionId = localDraftSessionIdRef.current');
expect(draft).toContain('goalSessionId = localDraftSessionIdRef.current');
diff --git a/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts b/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts
index 4b1c6c3f88..c9f869ed44 100644
--- a/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts
+++ b/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts
@@ -71,21 +71,27 @@ describe('provisional sessions', () => {
it('remembers unsent tasks across a restart and deletes the ones that were never sent', async () => {
configureProvisionalSessions(userData);
- markProvisionalSession('unsent', 1_000);
+ const dialogueDir = path.join(userData, 'dialogues', 'unsent');
+ markProvisionalSession('unsent', 1_000, dialogueDir);
markProvisionalSession('sent-later', 1_000);
+ // Opened with a caller-chosen folder: the row goes, the folder is never Cindy's to remove.
+ markProvisionalSession('explicit', 1_000);
expect(isProvisionalSession('unsent')).toBe(true);
// Next launch: the in-memory registry is gone, the file is not.
resetProvisionalSessionsForTest();
const db = openDb();
- const dialogueDir = path.join(userData, 'dialogues', 'unsent');
fs.mkdirSync(dialogueDir, { recursive: true });
db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('unsent', 'dialogue', dialogueDir, null);
db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('sent-later', 'project', '/repo', 2_000);
+ const explicitDir = path.join(userData, 'elsewhere', 'explicit');
+ fs.mkdirSync(explicitDir, { recursive: true });
+ db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('explicit', 'dialogue', explicitDir, null);
configureProvisionalSessions(userData);
// Until swept, a leftover still counts as unsent (hidden from controllers).
expect(isProvisionalSession('unsent')).toBe(true);
- await expect(sweepLeftoverProvisionalSessions(5_000)).resolves.toEqual(['unsent']);
+ await expect(sweepLeftoverProvisionalSessions(5_000)).resolves.toEqual(['unsent', 'explicit']);
+ expect(fs.existsSync(explicitDir)).toBe(true);
expect(isProvisionalSession('unsent')).toBe(false);
expect(rowExists(db, 'unsent')).toBe(false);
diff --git a/apps/desktop/src/main/localDb/ipc/sessions.ts b/apps/desktop/src/main/localDb/ipc/sessions.ts
index e6f079672d..8a375f5766 100644
--- a/apps/desktop/src/main/localDb/ipc/sessions.ts
+++ b/apps/desktop/src/main/localDb/ipc/sessions.ts
@@ -6,6 +6,7 @@ import {
forgetProvisionalSession,
isProvisionalSession,
markProvisionalSession,
+ provisionalManagedDir,
removeEmptyDialogueDir,
sweepLeftoverProvisionalSessions,
} from '../provisionalSessions.js';
@@ -1130,13 +1131,14 @@ export async function commitProvisionalSession(sessionId: string): Promise<boole
*/
export async function discardProvisionalSessionRow(sessionId: string): Promise<boolean> {
if (claimOwnedProvisionalSession(sessionId) !== 'owned') return false;
+ const managedDir = provisionalManagedDir(sessionId);
const deleted = await deleteUnsentSessionRow(sessionId);
if (!deleted) {
// Already sent (or gone): it is an ordinary task now.
forgetProvisionalSession(sessionId);
return false;
}
- if (deleted.workspaceKind === 'dialogue') removeEmptyDialogueDir(sessionId, deleted.workingDir);
+ removeEmptyDialogueDir(sessionId, managedDir);
forgetProvisionalSession(sessionId);
// Other local windows re-read their lists; the row is gone, so it drops out. No status
// patch: the same id may be opened again when the user types again.
@@ -1628,7 +1630,11 @@ export function registerSessionIpc(
}
// 未发送任务在写入之前就登记:行一出现,任务列表 / 控制端 / IM / hook 的过滤就已生效。
const markedProvisional = provisional && !isProvisionalSession(id);
- if (markedProvisional) markProvisionalSession(id, now);
+ if (markedProvisional) {
+ // Only a dialogue folder allocated here is ours to tidy up if the task is discarded.
+ const managedDir = workspaceKind === 'dialogue' && !explicitWorkingDir ? workingDir : undefined;
+ markProvisionalSession(id, now, managedDir);
+ }
let insertRow: Awaited<ReturnType<typeof openSession>>['row'];
let row: typeof sessions.$inferSelect | undefined;
try {
diff --git a/apps/desktop/src/main/localDb/provisionalSessions.ts b/apps/desktop/src/main/localDb/provisionalSessions.ts
index 49eadbf851..9f610b5f93 100644
--- a/apps/desktop/src/main/localDb/provisionalSessions.ts
+++ b/apps/desktop/src/main/localDb/provisionalSessions.ts
@@ -28,6 +28,8 @@ const FOREIGN_ENTRY_TTL_MS = 7 * 24 * 60 * 60_000;
interface Entry {
id: string;
createdAt: number;
+ /** 建任务时 Cindy 为它分配的对话目录;只清理这种目录,不碰调用方指定的路径。 */
+ managedDir?: string;
}
let resolveFileDir: (() => string) | null = null;
@@ -69,7 +71,11 @@ function loadLeftovers(): Entry[] {
for (const item of parsed.entries) {
const entry = item as Partial<Entry>;
if (typeof entry.id === 'string' && entry.id && typeof entry.createdAt === 'number') {
- leftovers.push({ id: entry.id, createdAt: entry.createdAt });
+ leftovers.push({
+ id: entry.id,
+ createdAt: entry.createdAt,
+ ...(typeof entry.managedDir === 'string' ? { managedDir: entry.managedDir } : {}),
+ });
}
}
}
@@ -88,7 +94,11 @@ function persist(): void {
if (!file) return;
const entries = [
...loadLeftovers(),
- ...[...live.values()].map(({ id, createdAt }) => ({ id, createdAt })),
+ ...[...live.values()].map(({ id, createdAt, managedDir }) => ({
+ id,
+ createdAt,
+ ...(managedDir ? { managedDir } : {}),
+ })),
];
try {
if (entries.length === 0) {
@@ -105,12 +115,26 @@ function persist(): void {
}
}
-export function markProvisionalSession(sessionId: string, now = Date.now()): void {
+export function markProvisionalSession(
+ sessionId: string,
+ now = Date.now(),
+ managedDir?: string,
+): void {
loadLeftovers();
- live.set(sessionId, { id: sessionId, createdAt: now, owner: getCurrentDbClientSnapshot() });
+ live.set(sessionId, {
+ id: sessionId,
+ createdAt: now,
+ owner: getCurrentDbClientSnapshot(),
+ ...(managedDir ? { managedDir } : {}),
+ });
persist();
}
+/** 建这条未发送任务时 Cindy 分配的对话目录(没有则 undefined)。 */
+export function provisionalManagedDir(sessionId: string): string | undefined {
+ return live.get(sessionId)?.managedDir;
+}
+
/** 未发送任务(含还没清理掉的残留):只在本机可见,不推给控制端。 */
export function isProvisionalSession(sessionId: string): boolean {
return live.has(sessionId) || loadLeftovers().some((entry) => entry.id === sessionId);
@@ -125,7 +149,11 @@ export function claimOwnedProvisionalSession(sessionId: string): 'owned' | 'fore
if (!entry) return 'none';
if (entry.owner === getCurrentDbClientSnapshot()) return 'owned';
live.delete(sessionId);
- loadLeftovers().push({ id: entry.id, createdAt: entry.createdAt });
+ loadLeftovers().push({
+ id: entry.id,
+ createdAt: entry.createdAt,
+ ...(entry.managedDir ? { managedDir: entry.managedDir } : {}),
+ });
persist();
return 'foreign';
}
@@ -164,9 +192,13 @@ export async function deleteUnsentSessionRow(
return { workspaceKind: row.workspaceKind ?? null, workingDir: row.workingDir ?? null };
}
-/** Remove the managed dialogue folder created for this task when nothing was written into it. */
-export function removeEmptyDialogueDir(sessionId: string, workingDir: string | null): void {
- if (!workingDir || path.basename(workingDir) !== sessionId) return;
+/**
+ * Remove the dialogue folder Cindy allocated for this task when nothing was written into it.
+ * Only the folder recorded at creation is eligible — never a caller-chosen path.
+ */
+export function removeEmptyDialogueDir(sessionId: string, managedDir: string | undefined): void {
+ if (!managedDir || path.basename(managedDir) !== sessionId) return;
+ const workingDir = managedDir;
try {
fs.rmdirSync(workingDir);
} catch {
@@ -212,8 +244,8 @@ async function sweepOwner(now: number): Promise<string[]> {
if (deleted) {
removed.push(entry.id);
onLeftoverSwept?.(entry.id);
+ removeEmptyDialogueDir(entry.id, entry.managedDir);
}
- if (deleted?.workspaceKind === 'dialogue') removeEmptyDialogueDir(entry.id, deleted.workingDir);
log.info('provisional session leftover swept', { sessionId: entry.id, deleted: !!deleted });
} catch (error) {
keep.push(entry);
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index 672181313a..5892123e28 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -149,6 +149,7 @@ import {
provisionalDraftArgsKey,
provisionalDraftTaskGeneration,
provisionalDraftTaskId,
+ provisionalDraftTaskIdForCurrentOwner,
takeProvisionalDraftTask,
type ProvisionalDraftCreateArgs,
} from './provisionalDraftTask';
@@ -724,7 +725,7 @@ export function NewMakerDraftRoute() {
// Writable picker evidence is Main-owned and bound to the actual local task id.
// Reserve that id for the lifetime of this draft instead of generating it after selection.
// 已有未发送任务(用户离开新建页又回来)时沿用它的 id,回来继续输入接着用同一条任务。
- const localDraftSessionIdRef = useRef(provisionalDraftTaskId() ?? makeDraftSessionId());
+ const localDraftSessionIdRef = useRef(provisionalDraftTaskIdForCurrentOwner() ?? makeDraftSessionId());
// 首参 914=内容封顶宽(→ inputWidth 封顶 934):大屏留出左右呼吸空间,不再顶满全宽;
// 与进行中对话页(CCAgentSessionView 同传 914)一致,发送首条消息时输入框宽度不跳变。
// minWidth=640:小屏兜一个体面下限(与对话页对称);窄于下限时 hook 自动回落成
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 66fdd1efd5..1c5eb6ea3e 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
@@ -31,6 +31,7 @@ import {
previewProvisionalDraftTitle,
ProvisionalDraftTaskBusyError,
provisionalDraftTaskId,
+ provisionalDraftTaskIdForCurrentOwner,
resetProvisionalDraftTaskForTest,
takeProvisionalDraftTask,
type ProvisionalDraftCreateArgs,
@@ -159,6 +160,8 @@ describe('provisional draft task', () => {
setDataOwnerGeneration('account-a', 1);
await ensureProvisionalDraftTask(args());
setDataOwnerGeneration('account-b', 2);
+ // A new-task page opened in the new account mints its own id instead of reusing this one.
+ expect(provisionalDraftTaskIdForCurrentOwner()).toBeNull();
await expect(takeProvisionalDraftTask(args())).resolves.toBeNull();
expect(mocks.commit).not.toHaveBeenCalled();
// Not deleted from the new account's database either.
diff --git a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
index a8bcfddbaa..fc3e236279 100644
--- a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
@@ -107,6 +107,12 @@ export function canOpenProvisionalDraftTask(args: ProvisionalDraftCreateArgs): b
}
export const provisionalDraftTaskId = getProvisionalDraftTaskId;
+
+/** 当前账号的未发送任务 id:新建页打开时据此沿用;上一个账号留下的不算,先放手。 */
+export function provisionalDraftTaskIdForCurrentOwner(): string | null {
+ releaseForeignCurrent();
+ return current?.id ?? null;
+}
export const subscribeProvisionalDraftTask = subscribeProvisionalDraftTaskId;
/** 当前未发送任务是第几次建出来的;调用方据此只为新建出来的那一次做初始化。 */