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): 未发送任务按账号隔离、删除失败保留重试、启动残留先清再列

Dashb9db1c39f4af
diff --git a/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts b/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts
index 28840f3c93..4b1c6c3f88 100644
--- a/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts
+++ b/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts
@@ -9,6 +9,7 @@ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import type { DbClient } from '../client/DbClient.js';
import { clearCurrentDbClient, setCurrentDbClient } from '../client/current.js';
import {
+ claimOwnedProvisionalSession,
configureProvisionalSessions,
deleteUnsentSessionRow,
isProvisionalSession,
@@ -82,8 +83,10 @@ describe('provisional sessions', () => {
db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('unsent', 'dialogue', dialogueDir, null);
db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('sent-later', 'project', '/repo', 2_000);
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']);
expect(isProvisionalSession('unsent')).toBe(false);
- await sweepLeftoverProvisionalSessions(5_000);
expect(rowExists(db, 'unsent')).toBe(false);
expect(fs.existsSync(dialogueDir)).toBe(false);
@@ -103,6 +106,19 @@ describe('provisional sessions', () => {
expect(saved.entries.map((entry: { id: string }) => entry.id)).toEqual(['other-account']);
});
+ it('after an account switch, leaves the old account\'s unsent task for that account to clean up', async () => {
+ configureProvisionalSessions(userData);
+ openDb();
+ markProvisionalSession('from-a', 1_000);
+ detach?.();
+ openDb(); // account B
+ expect(claimOwnedProvisionalSession('from-a')).toBe('foreign');
+ // Still hidden from controllers, and kept on disk for account A's next sweep.
+ expect(isProvisionalSession('from-a')).toBe(true);
+ const saved = JSON.parse(fs.readFileSync(path.join(userData, 'provisional-sessions.json'), 'utf8'));
+ expect(saved.entries.map((entry: { id: string }) => entry.id)).toEqual(['from-a']);
+ });
+
it('only hard-deletes a task that is still unsent and has no messages', async () => {
const db = openDb();
db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('empty', 'project', '/repo', null);
diff --git a/apps/desktop/src/main/localDb/ipc/sessions.ts b/apps/desktop/src/main/localDb/ipc/sessions.ts
index 0cd12d8717..31ac51e1e3 100644
--- a/apps/desktop/src/main/localDb/ipc/sessions.ts
+++ b/apps/desktop/src/main/localDb/ipc/sessions.ts
@@ -1,5 +1,6 @@
import { ensureOpenedProjectGit, openSession } from '../sessionOpening.js';
import {
+ claimOwnedProvisionalSession,
configureProvisionalSessions,
deleteUnsentSessionRow,
forgetProvisionalSession,
@@ -1092,7 +1093,8 @@ export async function touchUserSendInDb(id: string, atMs?: number): Promise<void
* 不是未发送任务时什么都不做。最近项目由随后的 touchUserSend 照常记录。
*/
export async function commitProvisionalSession(sessionId: string): Promise<boolean> {
- if (!forgetProvisionalSession(sessionId)) return false;
+ if (claimOwnedProvisionalSession(sessionId) !== 'owned') return false;
+ forgetProvisionalSession(sessionId);
const [row] = await getDbClient()
.drizzle.select({
workingDir: sessions.workingDir,
@@ -1127,7 +1129,7 @@ export async function commitProvisionalSession(sessionId: string): Promise<boole
* 顺带删掉为它新建、仍为空的对话目录,并通知本机窗口移除。调用方负责先关掉它的 Agent。
*/
export async function discardProvisionalSessionRow(sessionId: string): Promise<boolean> {
- if (!isProvisionalSession(sessionId)) return false;
+ if (claimOwnedProvisionalSession(sessionId) !== 'owned') return false;
const deleted = await deleteUnsentSessionRow(sessionId);
if (!deleted) {
// Already sent (or gone): it is an ordinary task now.
@@ -1356,7 +1358,10 @@ export function registerSessionIpc(
opts: RegisterSessionIpcOpts = {},
): void {
registeredSessionIpcOpts = opts;
- configureProvisionalSessions(() => app.getPath('userData'));
+ configureProvisionalSessions(() => app.getPath('userData'), {
+ // Windows that listed before the sweep finished drop the deleted leftover.
+ onSwept: (sessionId) => emitSessionListChangedLocally(sessionId),
+ });
// interrupted-turn-resume 假阳性修复:每次 last_turn_ended_at 真正落库(正常收尾 /
// barrier 版收尾 / ack)都广播 lastTurnEndedAt patch —— renderer 的 session 快照可能
// 是在 turn 飞行中或「done → ended 落库」空窗里取的(startedAt > endedAt),此前
@@ -1391,8 +1396,9 @@ export function registerSessionIpc(
void import('../../sessionTaskSummary.js').then((m) => m.backfillPinnedSessionSummaries());
// 首次 list 即账号库就绪:预热插件后台任务索引,灵动岛/通知的同步判定从此可用。
void ensureHiddenSessionRegistryLoaded();
- // 同一时机清掉上次运行没来得及删的未发送任务。
- void sweepLeftoverProvisionalSessions().catch(() => {});
+ // 同一时机清掉上次运行没来得及删的未发送任务;先等它清完再读列表,残留不会被列出来。
+ // 每个账号库只真正清理一次,之后直接返回同一个结果。
+ await sweepLeftoverProvisionalSessions().catch(() => undefined);
const cap = clampLimit(limit, 20);
const includePinned = shouldIncludePinnedSessions(options);
const fresh = shouldBypassSessionListSingleFlight(options);
diff --git a/apps/desktop/src/main/localDb/provisionalSessions.ts b/apps/desktop/src/main/localDb/provisionalSessions.ts
index e93cc41d1c..49eadbf851 100644
--- a/apps/desktop/src/main/localDb/provisionalSessions.ts
+++ b/apps/desktop/src/main/localDb/provisionalSessions.ts
@@ -31,14 +31,23 @@ interface Entry {
}
let resolveFileDir: (() => string) | null = null;
-const live = new Map<string, Entry>();
-/** 上次运行留下、尚未清理的登记(按账号库逐个清理)。 */
+let onLeftoverSwept: ((sessionId: string) => void) | null = null;
+/** 本次运行建出的未发送任务,记下所属账号库(切换账号后不拿它去碰另一个账号的库)。 */
+const live = new Map<string, Entry & { owner: object | null }>();
+/** 上次运行(或其它账号)留下、尚未清理的登记(按账号库逐个清理)。 */
let leftovers: Entry[] | null = null;
-const sweptOwners = new WeakSet<object>();
+const sweeps = new WeakMap<object, Promise<string[]>>();
-/** Host 启动时注入 userData 目录(用到时才解析);未注入时只用内存登记。 */
-export function configureProvisionalSessions(userDataDir: string | (() => string)): void {
+/**
+ * Host 启动时注入 userData 目录(用到时才解析);未注入时只用内存登记。
+ * `onSwept`:残留被删掉后通知一次(让本机窗口刷新任务列表)。
+ */
+export function configureProvisionalSessions(
+ userDataDir: string | (() => string),
+ opts: { onSwept?: (sessionId: string) => void } = {},
+): void {
resolveFileDir = typeof userDataDir === 'string' ? () => userDataDir : userDataDir;
+ onLeftoverSwept = opts.onSwept ?? null;
}
function filePath(): string | null {
@@ -77,7 +86,10 @@ function loadLeftovers(): Entry[] {
function persist(): void {
const file = filePath();
if (!file) return;
- const entries = [...loadLeftovers(), ...live.values()];
+ const entries = [
+ ...loadLeftovers(),
+ ...[...live.values()].map(({ id, createdAt }) => ({ id, createdAt })),
+ ];
try {
if (entries.length === 0) {
fs.rmSync(file, { force: true });
@@ -95,12 +107,27 @@ function persist(): void {
export function markProvisionalSession(sessionId: string, now = Date.now()): void {
loadLeftovers();
- live.set(sessionId, { id: sessionId, createdAt: now });
+ live.set(sessionId, { id: sessionId, createdAt: now, owner: getCurrentDbClientSnapshot() });
persist();
}
+/** 未发送任务(含还没清理掉的残留):只在本机可见,不推给控制端。 */
export function isProvisionalSession(sessionId: string): boolean {
- return live.has(sessionId);
+ return live.has(sessionId) || loadLeftovers().some((entry) => entry.id === sessionId);
+}
+
+/**
+ * 转正 / 删除前确认这条未发送任务属于当前账号库。属于其它账号(中途切换了账号)时
+ * 不碰当前库,把它留作残留,等那个账号下次就绪时清理。
+ */
+export function claimOwnedProvisionalSession(sessionId: string): 'owned' | 'foreign' | 'none' {
+ const entry = live.get(sessionId);
+ if (!entry) return 'none';
+ if (entry.owner === getCurrentDbClientSnapshot()) return 'owned';
+ live.delete(sessionId);
+ loadLeftovers().push({ id: entry.id, createdAt: entry.createdAt });
+ persist();
+ return 'foreign';
}
/** Forget the provisional mark (the task was sent, or was deleted). True when it was provisional. */
@@ -149,16 +176,27 @@ export function removeEmptyDialogueDir(sessionId: string, workingDir: string | n
/**
* Account database is ready: delete the unsent tasks a previous run left behind in it.
- * Runs once per database owner; entries from other accounts wait for that account.
+ * Runs once per database owner (callers share the same run and can await it before
+ * listing tasks); entries from other accounts wait for that account. Resolves to the
+ * ids that were deleted.
*/
-export async function sweepLeftoverProvisionalSessions(now = Date.now()): Promise<void> {
+export async function sweepLeftoverProvisionalSessions(now = Date.now()): Promise<string[]> {
const owner = getCurrentDbClientSnapshot();
- if (!owner || sweptOwners.has(owner)) return;
- sweptOwners.add(owner);
- const pending = loadLeftovers();
- if (pending.length === 0) return;
+ if (!owner) return [];
+ let run = sweeps.get(owner);
+ if (!run) {
+ run = sweepOwner(now);
+ sweeps.set(owner, run);
+ }
+ return run;
+}
+
+async function sweepOwner(now: number): Promise<string[]> {
+ const pending = [...loadLeftovers()];
+ if (pending.length === 0) return [];
const db = getDbClient().drizzle;
const keep: Entry[] = [];
+ const removed: string[] = [];
for (const entry of pending) {
try {
const [row] = await db
@@ -171,6 +209,10 @@ export async function sweepLeftoverProvisionalSessions(now = Date.now()): Promis
continue;
}
const deleted = await deleteUnsentSessionRow(entry.id);
+ if (deleted) {
+ removed.push(entry.id);
+ onLeftoverSwept?.(entry.id);
+ }
if (deleted?.workspaceKind === 'dialogue') removeEmptyDialogueDir(entry.id, deleted.workingDir);
log.info('provisional session leftover swept', { sessionId: entry.id, deleted: !!deleted });
} catch (error) {
@@ -181,13 +223,17 @@ export async function sweepLeftoverProvisionalSessions(now = Date.now()): Promis
});
}
}
- leftovers = keep;
+ // Entries parked while this sweep ran (account switched mid-way) stay as leftovers too.
+ const parked = loadLeftovers().filter((entry) => !pending.includes(entry));
+ leftovers = [...keep, ...parked];
persist();
+ return removed;
}
/** Test-only reset. */
export function resetProvisionalSessionsForTest(): void {
resolveFileDir = null;
+ onLeftoverSwept = null;
live.clear();
leftovers = null;
}
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.ts
index 1fe975674c..8ae5c5ab0f 100644
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@ -18063,11 +18063,11 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
ipcMain.handle(
MAKER_INVOKE.SESSION_DISCARD_PROVISIONAL,
- async (event, sessionId: unknown): Promise<{ discarded: boolean }> => {
+ async (event, sessionId: unknown): Promise<{ discarded: boolean; remaining: boolean }> => {
const sid = requireSessionId(sessionId);
// Local renderer only: not on the device-link allowlist, and the sender must be the app window.
assertTrustedAppRendererEvent(event);
- if (!isProvisionalSession(sid)) return { discarded: false };
+ if (!isProvisionalSession(sid)) return { discarded: false, remaining: false };
// Under the send lock: a prewarm that is still starting finishes first, and one queued
// behind us finds no row and does nothing.
const discarded = await withSendToSessionLock(sid, async () => {
@@ -18080,7 +18080,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)
if (maker.getSession(sid)) return false;
return discardProvisionalSessionRow(sid);
});
- return { discarded };
+ // remaining: the unsent task still exists (its runtime could not be closed), so the
+ // renderer keeps tracking it and retries instead of reopening the same id.
+ return { discarded, remaining: !discarded && isProvisionalSession(sid) };
},
);
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index ff8d16d938..94f03c9100 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -7246,7 +7246,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
prewarmSession: (sessionId: string, createOpts: unknown): Promise<{ accepted: boolean }> =>
ipcRenderer.invoke('maker:session:prewarm', sessionId, createOpts),
// 新建页的未发送任务:清空输入时删除 / 第一次发送前转为普通任务(仅本机)。
- discardProvisionalSession: (sessionId: string): Promise<{ discarded: boolean }> =>
+ discardProvisionalSession: (sessionId: string): Promise<{ discarded: boolean; remaining?: boolean }> =>
ipcRenderer.invoke('maker:session:discard-provisional', sessionId),
commitProvisionalSession: (sessionId: string): Promise<{ committed: boolean }> =>
ipcRenderer.invoke('maker:session:commit-provisional', sessionId),
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionRoute.tsx
deleted file mode 100644
index 9d7e943d4e..0000000000
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionRoute.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { useSyncExternalStore } from 'react';
-import { Navigate, useParams } from 'react-router-dom';
-
-import { CCAgentSessionView } from './CCAgentSessionView';
-import { provisionalDraftTaskId, subscribeProvisionalDraftTask } from './provisionalDraftTask';
-
-/**
- * `/cc-agent/:sessionId`:新建页里还没发送的任务从任何入口打开(侧栏、搜索、深链)都回到
- * 新建页继续编辑——工作区、协同等草稿选项只在新建页上有。
- */
-export function CCAgentSessionRoute() {
- const { sessionId } = useParams();
- const provisionalId = useSyncExternalStore(subscribeProvisionalDraftTask, provisionalDraftTaskId);
- if (sessionId && sessionId === provisionalId) return <Navigate to="/cc-agent/new" replace />;
- return <CCAgentSessionView />;
-}
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
index 77b5f49fb7..2dae14fa8a 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
@@ -27,9 +27,14 @@ import {
useMemo,
useRef,
useState,
+ useSyncExternalStore,
} from 'react';
import type { CSSProperties, ReactNode } from 'react';
import { Navigate, useLocation, useNavigate, useOutletContext, useParams } from 'react-router-dom';
+import {
+ getProvisionalDraftTaskId,
+ subscribeProvisionalDraftTaskId,
+} from './lib/provisionalDraftTaskId';
import { CINDY_MAKE_ENABLED, isCindyMakeSource } from '@cindy/maker-shared/cindy-make-feature';
import { CindyMakeSessionGate } from './CindyMakeSessionGate';
import { SessionRouteOriginGate } from './SessionRouteOriginGate';
@@ -788,6 +793,12 @@ export function createWritableDirRemovalQueue() {
export function CCAgentSessionView(props: CCAgentSessionViewProps) {
const { sessionId } = useParams<{ sessionId: string }>();
+ const provisionalDraftId = useSyncExternalStore(subscribeProvisionalDraftTaskId, getProvisionalDraftTaskId);
+ // 新建页里还没发送的任务从任何入口(侧栏、搜索、深链)打开都回到新建页继续编辑:
+ // 工作区、协同等草稿选项只在新建页上有。
+ if (!props.sessionIdProp && sessionId && sessionId === provisionalDraftId) {
+ return <Navigate to="/cc-agent/new" replace />;
+ }
return (
<SessionRouteOriginGate sessionId={props.sessionIdProp ?? sessionId}
ownsWindowRoute={!props.navigationMode || props.navigationMode === 'route-owner'}>
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 ffac9d3374..43df68f7f2 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
@@ -21,6 +21,8 @@ vi.mock('@/lib/sessionsBus', () => ({
emitAutoTitlePreviewCleared: mocks.previewCleared,
}));
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+
import {
canOpenProvisionalDraftTask,
composerDocPlainText,
@@ -128,6 +130,33 @@ describe('provisional draft task', () => {
expect(mocks.commit).toHaveBeenCalledWith('draft-1');
});
+ it('keeps tracking the task when it could not be deleted, instead of reopening the same id', async () => {
+ await ensureProvisionalDraftTask(args());
+ mocks.discard
+ .mockResolvedValueOnce({ discarded: false, remaining: true } as never)
+ .mockResolvedValueOnce({ discarded: false, remaining: true } as never);
+ await discardProvisionalDraftTask();
+ expect(provisionalDraftTaskId()).toBe('draft-1');
+ expect(mocks.removeLocal).not.toHaveBeenCalled();
+ // A settings change cannot reopen over the still-existing row; the next attempt retries the delete.
+ await expect(ensureProvisionalDraftTask(args({ model: 'model-b' }))).resolves.toBeNull();
+ expect(mocks.create).toHaveBeenCalledTimes(1);
+ await ensureProvisionalDraftTask(args({ model: 'model-b' }));
+ expect(mocks.create).toHaveBeenCalledTimes(2);
+ });
+
+ it('never hands another account\'s unsent task to a send after an account switch', async () => {
+ setDataOwnerGeneration('account-a', 1);
+ await ensureProvisionalDraftTask(args());
+ setDataOwnerGeneration('account-b', 2);
+ await expect(takeProvisionalDraftTask(args())).resolves.toBeNull();
+ expect(mocks.commit).not.toHaveBeenCalled();
+ // Not deleted from the new account's database either.
+ expect(mocks.discard).not.toHaveBeenCalled();
+ expect(provisionalDraftTaskId()).toBeNull();
+ setDataOwnerGeneration(null, 0);
+ });
+
it('does not open tasks for drafts that run elsewhere or need writable folders', () => {
expect(canOpenProvisionalDraftTask(args())).toBe(true);
expect(canOpenProvisionalDraftTask(args({ workspaceKind: 'dialogue', workingDir: undefined }))).toBe(true);
diff --git a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
index e59b09dfe1..6ce77d71d5 100644
--- a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts
@@ -13,6 +13,11 @@
import type { JSONContent } from '@tiptap/core';
+import {
+ getDataOwnerGeneration,
+ isDataOwnerIdCurrent,
+ type DataOwnerGeneration,
+} from '@/contexts/dataOwnerGeneration';
import type { Session } from '@/lib/ccAgent.types';
import { createLogger } from '@/lib/logger';
import { makerChatStore } from '@/lib/makerChatStore';
@@ -51,6 +56,8 @@ interface Current {
key: string;
session: Session;
title: string | null;
+ /** 建它时的账号:切换账号后它属于另一个账号的库,不能再接着用。 */
+ owner: DataOwnerGeneration;
}
let current: Current | null = null;
@@ -107,20 +114,38 @@ export function provisionalDraftTaskGeneration(): number {
return generation;
}
-async function discardCurrent(): Promise<void> {
- const target = current;
- if (!target) return;
+/**
+ * 切换账号后旧账号的未发送任务不再归这里管:只放手,不去当前账号的库里删
+ * (任务所在电脑会把它留作残留,等那个账号下次就绪时清理)。
+ */
+function releaseForeignCurrent(): void {
+ if (!current || isDataOwnerIdCurrent(current.owner)) return;
current = null;
notify();
- if (target.title) emitAutoTitlePreviewCleared(target.id);
+}
+
+/** 删掉当前未发送任务。删不掉(Agent 关不掉等)时保留它,之后再试,不复用同一个 id 重建。 */
+async function discardCurrent(): Promise<boolean> {
+ releaseForeignCurrent();
+ const target = current;
+ if (!target) return true;
+ let removed = false;
try {
- await window.electronAPI.maker.discardProvisionalSession?.(target.id);
+ const result = await window.electronAPI.maker.discardProvisionalSession?.(target.id);
+ removed = !result?.remaining;
} catch (error) {
log.warn('discard provisional task failed', error);
}
+ if (!removed) return false;
+ if (current === target) {
+ current = null;
+ notify();
+ }
+ if (target.title) emitAutoTitlePreviewCleared(target.id);
// Removed outright (not marked deleted): the same id may be opened again if the user types again.
sessionsStore.removeLocal(target.id);
- makerChatStore.purgeSession?.(target.id);
+ makerChatStore.purgeSession(target.id);
+ return true;
}
/**
@@ -131,10 +156,12 @@ export function ensureProvisionalDraftTask(
args: ProvisionalDraftCreateArgs,
): Promise<Session | null> {
return serial(async () => {
+ releaseForeignCurrent();
const key = provisionalDraftArgsKey(args);
if (current && current.id === args.id && current.key === key) return current.session;
- await discardCurrent();
+ if (!(await discardCurrent())) return null;
if (!canOpenProvisionalDraftTask(args)) return null;
+ const owner = getDataOwnerGeneration();
let session: Session;
try {
session = await sessionService.create({ ...args, provisional: true });
@@ -142,7 +169,9 @@ export function ensureProvisionalDraftTask(
log.info('provisional task not opened', error);
return null;
}
- current = { id: session.id, key, session, title: null };
+ // The account changed while the task was being created: it belongs to the old account.
+ if (!isDataOwnerIdCurrent(owner)) return null;
+ current = { id: session.id, key, session, title: null, owner };
generation += 1;
// Register the id before the row enters the list, so grouping already sees it as unsent.
notify();
@@ -153,7 +182,9 @@ export function ensureProvisionalDraftTask(
/** 输入清空 / 草稿不再适合提前建任务:删掉未发送任务。 */
export function discardProvisionalDraftTask(): Promise<void> {
- return serial(discardCurrent);
+ return serial(async () => {
+ await discardCurrent();
+ });
}
/**
@@ -164,6 +195,7 @@ export function takeProvisionalDraftTask(
args: ProvisionalDraftCreateArgs,
): Promise<Session | null> {
return serial(async () => {
+ releaseForeignCurrent();
if (!current) return null;
if (current.id !== args.id || current.key !== provisionalDraftArgsKey(args)) {
await discardCurrent();
diff --git a/apps/desktop/src/renderer/router.tsx b/apps/desktop/src/renderer/router.tsx
index fe884067dc..8efc2f14f9 100644
--- a/apps/desktop/src/renderer/router.tsx
+++ b/apps/desktop/src/renderer/router.tsx
@@ -14,7 +14,7 @@ import { LocalDbGate } from '@/components/auth/LocalDbGate';
import { CCAgentFeatureLayout } from '@/features/cc-agent/CCAgentFeatureLayout';
import { CCAgentIndexRedirect } from '@/features/cc-agent/CCAgentIndexRedirect';
import { SecondaryWindowBootGate } from '@/features/cc-agent/SecondaryWindowBootGate';
-import { CCAgentSessionRoute } from '@/features/cc-agent/CCAgentSessionRoute';
+import { CCAgentSessionView } from '@/features/cc-agent/CCAgentSessionView';
import { NewMakerDraftRoute } from '@/features/cc-agent/NewMakerDraftRoute';
import { OrcaWorkflowRoute } from '@/features/cc-agent/OrcaWorkflowRoute';
import { WorkdirBrowseRoute } from '@/features/cc-agent/workdir-browse/WorkdirBrowseRoute';
@@ -114,7 +114,7 @@ export const router = createHashRouter([
{ path: 'files/:sessionId', element: <WorkdirBrowseRoute /> },
{ path: 'orca/new', element: <Navigate to="/cc-agent/new" replace /> },
{ path: 'orca/:sessionId', element: <OrcaWorkflowRoute /> },
- { path: ':sessionId', element: <CCAgentSessionRoute /> },
+ { path: ':sessionId', element: <CCAgentSessionView /> },
],
},
{
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index a050ade523..1be5e5fef1 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -6485,7 +6485,7 @@ interface ElectronAPI {
/** 输入框开始打字时提前启动 Agent;尽力而为。 */
prewarmSession?: (sessionId: string, createOpts: unknown) => Promise<{ accepted: boolean }>;
/** 新建页的未发送任务:清空输入时删除 / 第一次发送前转为普通任务(仅本机)。 */
- discardProvisionalSession?: (sessionId: string) => Promise<{ discarded: boolean }>;
+ discardProvisionalSession?: (sessionId: string) => Promise<{ discarded: boolean; remaining?: boolean }>;
commitProvisionalSession?: (sessionId: string) => Promise<{ committed: boolean }>;
setPermissionMode: (sessionId: string, mode: string) => Promise<void>;
getPluginWriteAccessRecovery: (sessionId: string) => Promise<{available: boolean}>;