Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(new-task): 新建页边输入边建任务并预热 Agent;粘贴与语音输入也触发预热
Dashea731e5e6929
diff --git a/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.ts b/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.tsindex c2188686fc..559766782b 100644--- a/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.ts+++ b/apps/desktop/src/main/__tests__/writableDirectoryGrantWiring.test.ts@@ -24,7 +24,8 @@ 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');- expect(draft).toContain('const localDraftSessionIdRef = useRef(makeDraftSessionId())');+ // 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('writableGrantScope={localDraftSessionIdRef.current}');expect(draft).toContain('const sessionId = localDraftSessionIdRef.current');expect(draft).toContain('goalSessionId = localDraftSessionIdRef.current');diff --git a/apps/desktop/src/main/hook-control/recentSessions.ts b/apps/desktop/src/main/hook-control/recentSessions.tsindex d092755c44..c6b9579472 100644--- a/apps/desktop/src/main/hook-control/recentSessions.ts+++ b/apps/desktop/src/main/hook-control/recentSessions.ts@@ -7,6 +7,7 @@ import type { QuerySessionEntry } from '@cindy/slack-hook-protocol';import { getDbClient } from '../localDb/client/current.js';import { sessions } from '../localDb/schema.js';+import { isProvisionalSession } from '../localDb/provisionalSessions.js';import { HOOK_CHAT_WORKSPACE_ALIAS } from '../../shared/hookControlIpc.js';import { DESKTOP_TASK_LIST_SESSION_SOURCES } from '../../shared/sessionSource.js';import { isPathWithin } from './paths.js';@@ -84,5 +85,6 @@ export async function listRecentHookSessions(.orderBy(desc(sql`COALESCE(${sessions.userSendAt}, ${sessions.updatedAt})`))// Fetch extra rows because sessions outside the configured workspace allowlist are removed..limit(100);- return minimiseRecentSessions(rows, workspaces);+ // 新建页里还没发送的任务不算最近任务。+ return minimiseRecentSessions(rows.filter((row) => !isProvisionalSession(row.id)), workspaces);}diff --git a/apps/desktop/src/main/im/shared/controlProjects.ts b/apps/desktop/src/main/im/shared/controlProjects.tsindex 2870705ccf..fb530ab5bd 100644--- a/apps/desktop/src/main/im/shared/controlProjects.ts+++ b/apps/desktop/src/main/im/shared/controlProjects.ts@@ -20,6 +20,7 @@ import { and, desc, eq, inArray, isNotNull, isNull, ne, or } from 'drizzle-orm';import { getDbClient } from '../../localDb/client/current';import { sessions } from '../../localDb/schema';+import { isProvisionalSession } from '../../localDb/provisionalSessions';import { DESKTOP_TASK_LIST_SESSION_SOURCES } from '../../../shared/sessionSource.js';import { normalizeWorkingDirForGrouping } from '../../../shared/workingDir.js';@@ -71,6 +72,7 @@ export async function listProjectsForControl(): Promise<ControlProject[]> {const db = getDbClient().drizzle;const rows = await db.select({+ id: sessions.id,title: sessions.title,workingDir: sessions.workingDir,userSendAt: sessions.userSendAt,@@ -91,6 +93,8 @@ export async function listProjectsForControl(): Promise<ControlProject[]> {const latestByDir = new Map<string, number>();const latestTitleByDir = new Map<string, string>();for (const r of rows) {+ // 新建页里还没发送的任务不出现在渠道的项目 / 任务列表里。+ if (isProvisionalSession(r.id)) continue;const dir = normalizeWorkingDir(r.workingDir);if (!dir) continue;const t = r.userSendAt ?? r.updatedAt;@@ -194,6 +198,8 @@ export async function listRecentSessionsForPicker(const out: RecentControlSession[] = [];for (const r of rows) {+ // 新建页里还没发送的任务不出现在渠道的项目 / 任务列表里。+ if (isProvisionalSession(r.id)) continue;const dir = normalizeWorkingDir(r.workingDir);if (!dir) continue;const base = dir.split('/').filter(Boolean).pop() ?? '';@@ -236,6 +242,8 @@ export async function listSessionsForWorkspace(const out: ControlSession[] = [];for (const r of rows) {+ // 新建页里还没发送的任务不出现在渠道的项目 / 任务列表里。+ if (isProvisionalSession(r.id)) continue;if (normalizeWorkingDir(r.workingDir) !== target) continue;out.push({id: r.id,diff --git a/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts b/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.tsnew file mode 100644index 0000000000..28840f3c93--- /dev/null+++ b/apps/desktop/src/main/localDb/__tests__/provisionalSessions.test.ts@@ -0,0 +1,133 @@+import fs from 'node:fs';+import os from 'node:os';+import path from 'node:path';++import Database from 'better-sqlite3';+import { drizzle } from 'drizzle-orm/better-sqlite3';+import { afterEach, beforeEach, describe, expect, it } from 'vitest';++import type { DbClient } from '../client/DbClient.js';+import { clearCurrentDbClient, setCurrentDbClient } from '../client/current.js';+import {+ configureProvisionalSessions,+ deleteUnsentSessionRow,+ isProvisionalSession,+ markProvisionalSession,+ removeEmptyDialogueDir,+ resetProvisionalSessionsForTest,+ sweepLeftoverProvisionalSessions,+} from '../provisionalSessions.js';+import * as schema from '../schema.js';++describe('provisional sessions', () => {+ let rawDb: Database.Database | null = null;+ let detach: (() => void) | null = null;+ let userData = '';++ beforeEach(() => {+ resetProvisionalSessionsForTest();+ userData = fs.mkdtempSync(path.join(os.tmpdir(), 'provisional-sessions-'));+ });++ afterEach(() => {+ detach?.();+ detach = null;+ rawDb?.close();+ rawDb = null;+ fs.rmSync(userData, { recursive: true, force: true });+ });++ function openDb(): Database.Database {+ const db = new Database(':memory:');+ rawDb = db;+ db.exec(`+ CREATE TABLE sessions (+ id TEXT PRIMARY KEY,+ workspace_kind TEXT,+ working_dir TEXT,+ user_send_at INTEGER+ );+ CREATE TABLE messages (id TEXT PRIMARY KEY, session_id TEXT NOT NULL);+ `);+ const client = {+ query: async () => [],+ queryOne: async () => undefined,+ exec: async () => ({ changes: 0 }) as never,+ tx: async () => {+ throw new Error('unused');+ },+ drizzle: drizzle(db, { schema }),+ vecAvailable: false,+ dispose: async () => {},+ } as DbClient;+ setCurrentDbClient(client, 'user-a');+ detach = () => clearCurrentDbClient(client);+ return db;+ }++ const rowExists = (db: Database.Database, id: string) =>+ !!db.prepare('SELECT id FROM sessions WHERE id = ?').get(id);++ it('remembers unsent tasks across a restart and deletes the ones that were never sent', async () => {+ configureProvisionalSessions(userData);+ markProvisionalSession('unsent', 1_000);+ markProvisionalSession('sent-later', 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);+ configureProvisionalSessions(userData);+ expect(isProvisionalSession('unsent')).toBe(false);+ await sweepLeftoverProvisionalSessions(5_000);++ expect(rowExists(db, 'unsent')).toBe(false);+ expect(fs.existsSync(dialogueDir)).toBe(false);+ // Already sent: an ordinary task now, never deleted.+ expect(rowExists(db, 'sent-later')).toBe(true);+ expect(fs.existsSync(path.join(userData, 'provisional-sessions.json'))).toBe(false);+ });++ it('keeps entries of another account until that account sweeps them', async () => {+ configureProvisionalSessions(userData);+ markProvisionalSession('other-account', 1_000);+ resetProvisionalSessionsForTest();+ openDb();+ configureProvisionalSessions(userData);+ await sweepLeftoverProvisionalSessions(2_000);+ const saved = JSON.parse(fs.readFileSync(path.join(userData, 'provisional-sessions.json'), 'utf8'));+ expect(saved.entries.map((entry: { id: string }) => entry.id)).toEqual(['other-account']);+ });++ 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);+ db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('has-message', 'project', '/repo', null);+ db.prepare('INSERT INTO messages VALUES (?, ?)').run('m1', 'has-message');+ db.prepare('INSERT INTO sessions VALUES (?, ?, ?, ?)').run('sent', 'project', '/repo', 10);++ await expect(deleteUnsentSessionRow('empty')).resolves.toMatchObject({ workingDir: '/repo' });+ await expect(deleteUnsentSessionRow('has-message')).resolves.toBeNull();+ await expect(deleteUnsentSessionRow('sent')).resolves.toBeNull();+ expect(rowExists(db, 'empty')).toBe(false);+ expect(rowExists(db, 'has-message')).toBe(true);+ expect(rowExists(db, 'sent')).toBe(true);+ });++ it('leaves a dialogue folder alone once something was written into it', async () => {+ const dir = path.join(userData, 'dialogues', 'task-1');+ fs.mkdirSync(dir, { recursive: true });+ fs.writeFileSync(path.join(dir, 'notes.md'), 'x');+ removeEmptyDialogueDir('task-1', dir);+ expect(fs.existsSync(dir)).toBe(true);+ // Never touches a folder that is not this task's own.+ const shared = path.join(userData, 'shared');+ fs.mkdirSync(shared);+ removeEmptyDialogueDir('task-1', shared);+ expect(fs.existsSync(shared)).toBe(true);+ });+});diff --git a/apps/desktop/src/main/localDb/ipc/sessionCreatedBroadcast.ts b/apps/desktop/src/main/localDb/ipc/sessionCreatedBroadcast.tsindex 99d3771f34..ca2716535c 100644--- a/apps/desktop/src/main/localDb/ipc/sessionCreatedBroadcast.ts+++ b/apps/desktop/src/main/localDb/ipc/sessionCreatedBroadcast.ts@@ -9,9 +9,23 @@import { BrowserWindow } from 'electron';import { tapWindowBroadcast } from '../../device-link/broadcast-tap';+import { isProvisionalSession } from '../provisionalSessions';++/** 本机窗口重拉任务列表(不经 device-link):新建页的未发送任务被删掉时用。 */+export function emitSessionListChangedLocally(sessionId: string): void {+ for (const win of BrowserWindow.getAllWindows()) {+ if (win.isDestroyed()) continue;+ try {+ win.webContents.send('local-db:sessions:created', { sessionId });+ } catch {+ // best-effort UI refresh+ }+ }+}export function emitSessionCreated(sessionId: string): void {- tapWindowBroadcast('local-db:sessions:created', { sessionId });+ // 未发送任务只在本机可见;转正时会再通知一次。+ if (!isProvisionalSession(sessionId)) tapWindowBroadcast('local-db:sessions:created', { sessionId });for (const win of BrowserWindow.getAllWindows()) {if (win.isDestroyed()) continue;try {diff --git a/apps/desktop/src/main/localDb/ipc/sessions.ts b/apps/desktop/src/main/localDb/ipc/sessions.tsindex bffc62fffa..0cd12d8717 100644--- a/apps/desktop/src/main/localDb/ipc/sessions.ts+++ b/apps/desktop/src/main/localDb/ipc/sessions.ts@@ -1,4 +1,14 @@-import { openSession } from '../sessionOpening.js';+import { ensureOpenedProjectGit, openSession } from '../sessionOpening.js';+import {+ configureProvisionalSessions,+ deleteUnsentSessionRow,+ forgetProvisionalSession,+ isProvisionalSession,+ markProvisionalSession,+ removeEmptyDialogueDir,+ sweepLeftoverProvisionalSessions,+} from '../provisionalSessions.js';+import { emitSessionCreated, emitSessionListChangedLocally } from './sessionCreatedBroadcast.js';/*** chat-data-localization F5:Sessions IPC handlers(C6)。*@@ -420,7 +430,10 @@ export function broadcastSessionPatched(const hasCapturedScope = ownerScope !== undefined && ownerScope !== null;const ownerStamp = hasCapturedScope ? ownerScope.ownerStamp : getSafeOwnerPushStamp();try {- if (hasCapturedScope) {+ // 未发送任务只在本机可见,转正前不推给控制端。+ if (isProvisionalSession(sessionId)) {+ // local windows only+ } else if (hasCapturedScope) {broadcastTap.tapWindowBroadcast('local-db:sessions:patched',{ sessionId, patch },@@ -1074,6 +1087,62 @@ export async function touchUserSendInDb(id: string, atMs?: number): Promise<void}}+/**+ * 未发送任务转为普通任务(第一次发送):补做建任务时延后的副作用,并让控制端看到它。+ * 不是未发送任务时什么都不做。最近项目由随后的 touchUserSend 照常记录。+ */+export async function commitProvisionalSession(sessionId: string): Promise<boolean> {+ if (!forgetProvisionalSession(sessionId)) return false;+ const [row] = await getDbClient()+ .drizzle.select({+ workingDir: sessions.workingDir,+ workspaceKind: sessions.workspaceKind,+ remoteHostId: sessions.remoteHostId,+ })+ .from(sessions)+ .where(eq(sessions.id, sessionId))+ .limit(1);+ if (!row) return false;+ await ensureOpenedProjectGit({ id: sessionId, ...row }).catch((error) => {+ log.warn('provisional session git bootstrap failed', {+ sessionId,+ error: error instanceof Error ? error.message : String(error),+ });+ });+ emitSessionCreated(sessionId);+ void import('../../cindy-brain/index.js')+ .then((m) =>+ m.notifyGhostSessionEvent('created', {+ sessionId,+ ...(row.workingDir ? { workdir: row.workingDir } : {}),+ }),+ )+ .catch(() => {});+ log.info('provisional session committed', { sessionId });+ return true;+}++/**+ * 删掉一个未发送任务(用户清空了新建页的输入):仍未发送、没有消息时才真正删除行,+ * 顺带删掉为它新建、仍为空的对话目录,并通知本机窗口移除。调用方负责先关掉它的 Agent。+ */+export async function discardProvisionalSessionRow(sessionId: string): Promise<boolean> {+ if (!isProvisionalSession(sessionId)) return false;+ 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);+ 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.+ emitSessionListChangedLocally(sessionId);+ log.info('provisional session discarded', { sessionId });+ return true;+}+/** fork 出来的会话的占位标题前缀("[Fork] …" / "[Fork·已剥离] …")。 */const FORK_PLACEHOLDER_TITLE_PREFIX = '[Fork';@@ -1287,6 +1356,7 @@ export function registerSessionIpc(opts: RegisterSessionIpcOpts = {},): void {registeredSessionIpcOpts = opts;+ configureProvisionalSessions(() => app.getPath('userData'));// interrupted-turn-resume 假阳性修复:每次 last_turn_ended_at 真正落库(正常收尾 /// barrier 版收尾 / ack)都广播 lastTurnEndedAt patch —— renderer 的 session 快照可能// 是在 turn 飞行中或「done → ended 落库」空窗里取的(startedAt > endedAt),此前@@ -1321,6 +1391,8 @@ export function registerSessionIpc(void import('../../sessionTaskSummary.js').then((m) => m.backfillPinnedSessionSummaries());// 首次 list 即账号库就绪:预热插件后台任务索引,灵动岛/通知的同步判定从此可用。void ensureHiddenSessionRegistryLoaded();+ // 同一时机清掉上次运行没来得及删的未发送任务。+ void sweepLeftoverProvisionalSessions().catch(() => {});const cap = clampLimit(limit, 20);const includePinned = shouldIncludePinnedSessions(options);const fresh = shouldBypassSessionListSingleFlight(options);@@ -1404,7 +1476,7 @@ export function registerSessionIpc(};// key 用同一快照上的 userId + clientEpoch + 归一化参数。// forceRefresh / status 重拉带 fresh,不并入写前那次查询。- const result = usageHistory+ const loaded = usageHistory? await loadUsageHistoryRows(): userId && !fresh && !before && !ids? await runSessionListSingleFlight(@@ -1418,6 +1490,11 @@ export function registerSessionIpc(loadRows,): await loadRows();+ // 未发送任务只出现在本机任务列表里,手机 / 其它电脑在它第一次发送后才看到。+ // 在 single-flight 之外过滤:同一次查询可能同时供本机与控制端使用。+ const result = isDeviceLinkInvoke()+ ? ((loaded as Array<{ id: string }>).filter((row) => !isProvisionalSession(row.id)) as typeof loaded)+ : loaded;const finishedAt = performance.now();const filter = statusFilter ?? 'all';const elapsedMs = Math.round(finishedAt - startedAt);@@ -1450,7 +1527,17 @@ export function registerSessionIpc(const now = Date.now();const bodyObj = body && typeof body === 'object' ? (body as Record<string, unknown>) : {};const id = resolveBusinessSessionId(bodyObj.id);- const createBody = bodyObj as Parameters<typeof sessionCreateToRow>[1];+ // 未发送任务(新建页开始输入时先建出来,见 provisionalSessions.ts):只给本机普通任务,+ // 延后的创建副作用在第一次发送转正时补做。+ const { provisional: provisionalFlag, ...bodyWithoutProvisional } = bodyObj;+ const provisional = provisionalFlag === true;+ if (provisional && (+ bodyObj.remoteHostId || bodyObj.agentDeviceId || bodyObj.orcaRole || bodyObj.source !== undefined+ || (Array.isArray(bodyObj.writableDirs) && bodyObj.writableDirs.length > 0)+ )) {+ throwIpcError('INVALID_PARAMS', 'only ordinary local tasks can be opened before the first send');+ }+ const createBody = bodyWithoutProvisional as Parameters<typeof sessionCreateToRow>[1];// M16: agentKind 白名单校验(防止 renderer 传非法值)const ALLOWED_AGENT_KINDS = new Set<string>(['cc', 'codex', 'pi']);if (bodyObj.agentKind !== undefined && !ALLOWED_AGENT_KINDS.has(bodyObj.agentKind as string)) {@@ -1535,6 +1622,7 @@ 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;@@ -1544,6 +1632,11 @@ export function registerSessionIpc(});const [row] = await db.select().from(sessions).where(eq(sessions.id, id));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 });+ }// recent-workdirs: 项目目录走 sidebar 分组,要进"最近"列表;dialogue 目录是// app-managed 临时 cwd,跟用户选过的项目目录语义不同,不污染最近列表。// 失败仅日志,不阻断创建流程。diff --git a/apps/desktop/src/main/localDb/provisionalSessions.ts b/apps/desktop/src/main/localDb/provisionalSessions.tsnew file mode 100644index 0000000000..e93cc41d1c--- /dev/null+++ b/apps/desktop/src/main/localDb/provisionalSessions.ts@@ -0,0 +1,193 @@+/**+ * 未发送任务(provisional task):用户在新建任务页开始输入时,任务先建出来并出现在本机+ * 任务列表里(可以提前启动 Agent),清空输入就真正删掉;第一次发送时转为普通任务。+ *+ * 只在本机可见:未发送期间不推给手机 / 其它电脑,延后的创建副作用(项目 git 初始化、+ * 最近项目、插件「已创建」事件、device-link 创建通知)在转正时补做。+ *+ * 登记表在内存里同步可查,并写一份到 userData 下的小文件:进程崩溃或退出时没来得及删的+ * 未发送任务,下次打开后在账号库就绪时清掉(输入框内容不跨重启保留,任务留着没有意义)。+ * 不加数据库列,旧版本打开同一个库只会把残留看成一个普通的未发送任务。+ */++import fs from 'node:fs';+import path from 'node:path';++import { and, count, eq, isNull } from 'drizzle-orm';++import { createLogger } from '../logger.js';+import { getCurrentDbClientSnapshot, getDbClient } from './client/current.js';+import { messages, sessions } from './schema.js';++const log = createLogger('provisional-sessions');++const FILE_NAME = 'provisional-sessions.json';+/** 其它账号库里的残留:本账号库查不到时保留一段时间,等那个账号下次登录再清。 */+const FOREIGN_ENTRY_TTL_MS = 7 * 24 * 60 * 60_000;++interface Entry {+ id: string;+ createdAt: number;+}++let resolveFileDir: (() => string) | null = null;+const live = new Map<string, Entry>();+/** 上次运行留下、尚未清理的登记(按账号库逐个清理)。 */+let leftovers: Entry[] | null = null;+const sweptOwners = new WeakSet<object>();++/** Host 启动时注入 userData 目录(用到时才解析);未注入时只用内存登记。 */+export function configureProvisionalSessions(userDataDir: string | (() => string)): void {+ resolveFileDir = typeof userDataDir === 'string' ? () => userDataDir : userDataDir;+}++function filePath(): string | null {+ try {+ return resolveFileDir ? path.join(resolveFileDir(), FILE_NAME) : null;+ } catch {+ return null;+ }+}++function loadLeftovers(): Entry[] {+ if (leftovers) return leftovers;+ leftovers = [];+ const file = filePath();+ if (!file) return leftovers;+ try {+ const parsed = JSON.parse(fs.readFileSync(file, 'utf8')) as { entries?: unknown };+ if (Array.isArray(parsed.entries)) {+ 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 });+ }+ }+ }+ } catch (error) {+ if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {+ log.warn('provisional session file unreadable', {+ error: error instanceof Error ? error.message : String(error),+ });+ }+ }+ return leftovers;+}++function persist(): void {+ const file = filePath();+ if (!file) return;+ const entries = [...loadLeftovers(), ...live.values()];+ try {+ if (entries.length === 0) {+ fs.rmSync(file, { force: true });+ return;+ }+ const tmp = `${file}.${process.pid}.tmp`;+ fs.writeFileSync(tmp, JSON.stringify({ version: 1, entries }));+ fs.renameSync(tmp, file);+ } catch (error) {+ log.warn('provisional session file write failed', {+ error: error instanceof Error ? error.message : String(error),+ });+ }+}++export function markProvisionalSession(sessionId: string, now = Date.now()): void {+ loadLeftovers();+ live.set(sessionId, { id: sessionId, createdAt: now });+ persist();+}++export function isProvisionalSession(sessionId: string): boolean {+ return live.has(sessionId);+}++/** Forget the provisional mark (the task was sent, or was deleted). True when it was provisional. */+export function forgetProvisionalSession(sessionId: string): boolean {+ if (!live.delete(sessionId)) return false;+ persist();+ return true;+}++/**+ * Hard-delete a provisional task row, but only while it is still unsent and has no messages.+ * Returns the deleted row's directory facts so the caller can tidy the managed dialogue folder.+ */+export async function deleteUnsentSessionRow(+ sessionId: string,+): Promise<{ workspaceKind: string | null; workingDir: string | null } | null> {+ const db = getDbClient().drizzle;+ const [row] = await db+ .select({+ workspaceKind: sessions.workspaceKind,+ workingDir: sessions.workingDir,+ userSendAt: sessions.userSendAt,+ })+ .from(sessions)+ .where(eq(sessions.id, sessionId))+ .limit(1);+ if (!row || row.userSendAt != null) return null;+ const [messageCount] = await db+ .select({ n: count() })+ .from(messages)+ .where(eq(messages.sessionId, sessionId));+ if ((messageCount?.n ?? 0) > 0) return null;+ await db.delete(sessions).where(and(eq(sessions.id, sessionId), isNull(sessions.userSendAt)));+ 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;+ try {+ fs.rmdirSync(workingDir);+ } catch {+ // Not empty or already gone: leave it, like any other dialogue folder.+ }+}++/**+ * 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.+ */+export async function sweepLeftoverProvisionalSessions(now = Date.now()): Promise<void> {+ const owner = getCurrentDbClientSnapshot();+ if (!owner || sweptOwners.has(owner)) return;+ sweptOwners.add(owner);+ const pending = loadLeftovers();+ if (pending.length === 0) return;+ const db = getDbClient().drizzle;+ const keep: Entry[] = [];+ for (const entry of pending) {+ try {+ const [row] = await db+ .select({ id: sessions.id })+ .from(sessions)+ .where(eq(sessions.id, entry.id))+ .limit(1);+ if (!row) {+ if (now - entry.createdAt < FOREIGN_ENTRY_TTL_MS) keep.push(entry);+ continue;+ }+ const deleted = await deleteUnsentSessionRow(entry.id);+ 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);+ log.warn('provisional session leftover sweep failed', {+ sessionId: entry.id,+ error: error instanceof Error ? error.message : String(error),+ });+ }+ }+ leftovers = keep;+ persist();+}++/** Test-only reset. */+export function resetProvisionalSessionsForTest(): void {+ resolveFileDir = null;+ live.clear();+ leftovers = null;+}diff --git a/apps/desktop/src/main/localDb/sessionOpening.ts b/apps/desktop/src/main/localDb/sessionOpening.tsindex 06302ee7a8..d5a105b5a3 100644--- a/apps/desktop/src/main/localDb/sessionOpening.ts+++ b/apps/desktop/src/main/localDb/sessionOpening.ts@@ -21,6 +21,20 @@ function agentRunsOnOtherDevice(body: SessionOpenBody): boolean {return typeof body.agentDeviceId === 'string' && body.agentDeviceId.trim().length > 0;}+/** Project git bootstrap of a newly opened task (deferred to the first send for unsent tasks). */+export async function ensureOpenedProjectGit(row: {+ id: string;+ workingDir: string | null | undefined;+ workspaceKind: string | null | undefined;+ remoteHostId: string | null | undefined;+}): Promise<void> {+ const safety = readGitSafetySettings();+ await ensureProjectGitInitialized({ workingDir: row.workingDir, workspaceKind: row.workspaceKind,+ remoteHostId: row.remoteHostId ?? null, sessionId: row.id,+ autoSnapshotEnabled: safety.autoSnapshotEnabled,+ autoInitProjectGit: safety.autoInitProjectGit, source: 'session-open' });+}+/*** Open a normal Cindy Session. No messages are sent and no callback Agent is started.* Entry adapters authorize the caller/directory. A companion may atomically commit@@ -33,6 +47,8 @@ export async function openSession<T = void>(input: {source?: OpenedSessionRow['source'];/** Background task (plugin `agent.hiddenTasks`): committed hidden in the same INSERT. */hiddenAt?: number;+ /** Unsent task opened while the user types: project git bootstrap waits for the first send. */+ deferGitInit?: boolean;assertCurrent?: () => void;/** Sample effective authority after async preparation, directly before committing. */finalize?: () => Pick<SessionOpenBody, 'permissionMode' | 'parentSessionId'>;@@ -59,11 +75,10 @@ export async function openSession<T = void>(input: {const workingDir = workspaceKind === 'dialogue' && !explicitDir? ensureDialogueWorkspaceDir(id, now) : explicitDir;const prepared = { ...selected, workspaceKind, workingDir };- const safety = readGitSafetySettings();- await ensureProjectGitInitialized({ workingDir, workspaceKind, remoteHostId: prepared.remoteHostId ?? null,- sessionId: id, autoSnapshotEnabled: safety.autoSnapshotEnabled,- autoInitProjectGit: safety.autoInitProjectGit, source: 'session-open' });- assertCurrent();+ if (!input.deferGitInit) {+ await ensureOpenedProjectGit({ id, workingDir, workspaceKind, remoteHostId: prepared.remoteHostId ?? null });+ assertCurrent();+ }const mapped = sessionCreateToRow(id, { ...prepared, ...input.finalize?.() }, now);if (!mapped.model) throw new Error('任务模型不可用,请重新选择');const row = { ...mapped, model: mapped.model, ...(input.source ? { source: input.source } : {}),diff --git a/apps/desktop/src/main/maker-ipc/__tests__/agentPrewarm.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/agentPrewarm.test.tsindex edcb7aaa04..8a1c67132a 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/agentPrewarm.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/agentPrewarm.test.ts@@ -12,9 +12,11 @@ function harness(maxWarm = 2) {let nextTimer = 0;const start = vi.fn<AgentPrewarmDeps['start']>(async () => true);const closeIfUnused = vi.fn<AgentPrewarmDeps['closeIfUnused']>(async () => {});+ const closedRuntimes = new Set<string>();const prewarmer = createAgentPrewarmer({start,+ isLive: (sessionId) => !closedRuntimes.has(sessionId),closeIfUnused,setTimer: (fn) => {const id = ++nextTimer;@@ -31,7 +33,7 @@ function harness(maxWarm = 2) {timers.clear();for (const fn of pending) fn();};- return { prewarmer, start, closeIfUnused, fireAll, timers };+ return { prewarmer, start, closeIfUnused, fireAll, timers, closedRuntimes };}describe('Agent prewarm lifecycle', () => {@@ -56,6 +58,20 @@ describe('Agent prewarm lifecycle', () => {expect(prewarmer.warmSessionIds()).toEqual([]);});+ it('starts again when the warm runtime was closed by a settings change, without closing anything', async () => {+ const { prewarmer, start, closeIfUnused, closedRuntimes } = harness();+ await prewarmer.request('a', {});+ // e.g. the user switched model: the runtime switch closed the old runtime.+ closedRuntimes.add('a');+ const next = prewarmer.request('a', { model: 'new' });+ closedRuntimes.delete('a');+ await expect(next).resolves.toBe('started');+ expect(start).toHaveBeenCalledTimes(2);+ expect(start.mock.calls[1]).toEqual(['a', { model: 'new' }]);+ expect(closeIfUnused).not.toHaveBeenCalled();+ expect(prewarmer.warmSessionIds()).toEqual(['a']);+ });+it('does not track a task whose runtime was not started by prewarm', async () => {const { prewarmer, start, timers } = harness();start.mockResolvedValueOnce(false);@@ -103,13 +119,11 @@ describe('Agent prewarm lifecycle', () => {remoteHostId: null,agentDeviceId: null,orcaRole: null,- sdkSessionId: 'native-1',...patch,});- it('prewarms only a task the user has already sent in, so typing alone never runs a directory\'s hooks', () => {+ it('prewarms an ordinary local task whether or not it has been sent in yet', () => {expect(isAgentPrewarmEligible(row())).toBe(true);- expect(isAgentPrewarmEligible(row({ sdkSessionId: null }))).toBe(false);});it.each([diff --git a/apps/desktop/src/main/maker-ipc/agentPrewarm.ts b/apps/desktop/src/main/maker-ipc/agentPrewarm.tsindex c08bad791a..4062929827 100644--- a/apps/desktop/src/main/maker-ipc/agentPrewarm.ts+++ b/apps/desktop/src/main/maker-ipc/agentPrewarm.ts@@ -1,6 +1,6 @@/**- * Agent 预热:用户在任务输入框开始打字时,提前启动这个任务的 Agent 进程,把- * 1–4 秒的冷启动藏进打字时间里。本机任务与远程控制端的任务走同一入口。+ * Agent 预热:用户在任务输入框开始输入(打字、粘贴、开始语音输入)时,提前启动+ * 这个任务的 Agent 进程,把 1–4 秒的冷启动藏进输入时间里。本机任务与远程控制端的任务走同一入口。** 只管理「预热出来、还没被真正发送用过」的进程:* - 同时最多保留 MAX_WARM 个,超出时关掉最早的那个;@@ -25,18 +25,14 @@ export interface AgentPrewarmSessionRow {remoteHostId: string | null;agentDeviceId: string | null;orcaRole: string | null;- sdkSessionId: string | null;}/*** Whether a task's runtime may be started before the user sends.*- * Starting a runtime loads the project's own settings (hooks, MCP servers), which is- * what a send does too — but a send is the user's explicit act. Typing alone is not- * consent to run a directory's code, so only tasks the user has already sent in- * (they have a native session id from a real turn) are prewarmed; a task that was- * never sent, e.g. one pointing at a freshly cloned or imported directory, waits- * for its first real send.+ * Starting a runtime loads the project's own settings (hooks, MCP servers) exactly as+ * the send that follows would, so prewarm only moves that moment earlier; a runtime+ * that is never used is closed by idle reclaim or the cap.*/export function isAgentPrewarmEligible(row: AgentPrewarmSessionRow | undefined): boolean {return (@@ -46,8 +42,7 @@ export function isAgentPrewarmEligible(row: AgentPrewarmSessionRow | undefined):!row.remoteHostId &&!row.agentDeviceId &&!row.orcaRole &&- AGENT_PREWARM_SESSION_SOURCES.has(row.source ?? 'user') &&- !!row.sdkSessionId+ AGENT_PREWARM_SESSION_SOURCES.has(row.source ?? 'user'));}@@ -58,6 +53,8 @@ export type AgentPrewarmOutcome = 'started' | 'warm' | 'skipped';export interface AgentPrewarmDeps {/** Start the runtime if this task has none; true only when a new one was started. */start(sessionId: string, createOpts: unknown): Promise<boolean>;+ /** Whether this task currently has a runtime (settings changes such as a model switch may close it). */+ isLive(sessionId: string): boolean;/** Close an unused prewarmed runtime; must leave a runtime that is doing work alone. */closeIfUnused(sessionId: string, stillUnused: () => boolean): Promise<void>;setTimer(fn: () => void, ms: number): unknown;@@ -123,9 +120,13 @@ export function createAgentPrewarmer(const pending = starting.get(sessionId);if (pending) return pending;if (warm.has(sessionId)) {- // Still typing in the same task: keep its runtime for another full window.- arm(sessionId);- return Promise.resolve('warm');+ if (deps.isLive(sessionId)) {+ // Still typing in the same task: keep its runtime for another full window.+ arm(sessionId);+ return Promise.resolve('warm');+ }+ // Closed since it was warmed (model / engine / directory change): start it again.+ untrack(sessionId);}// Tasks that are still starting count against the cap too, so a burst of// requests can never launch more than `maxWarm` runtimes at once: make roomdiff --git a/apps/desktop/src/main/maker-ipc/channels.ts b/apps/desktop/src/main/maker-ipc/channels.tsindex e7454e0928..6f55f92b38 100644--- a/apps/desktop/src/main/maker-ipc/channels.ts+++ b/apps/desktop/src/main/maker-ipc/channels.ts@@ -38,6 +38,12 @@ export const MAKER_INVOKE = {* 本机 renderer 与 device-link 控制端共用;旧被控端没有该 channel 时控制端静默忽略。*/SESSION_PREWARM: 'maker:session:prewarm',+ /**+ * 新建页的未发送任务(本机 renderer 专用,不进 device-link):清空输入时删除,+ * 第一次发送前转为普通任务。见 localDb/provisionalSessions.ts。+ */+ SESSION_DISCARD_PROVISIONAL: 'maker:session:discard-provisional',+ SESSION_COMMIT_PROVISIONAL: 'maker:session:commit-provisional',CLOSE_SESSION: 'maker:close-session',/*** 单条 user / assistant 消息本地内容删除。保留后续可见消息,但清当前原生diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 05cb88240d..1fe975674c 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -488,6 +488,8 @@ import {getSessionRowSnapshot,getSessionFsSnapshot,getSessionRowSnapshotStrict,+ commitProvisionalSession,+ discardProvisionalSessionRow,persistSessionFields,recycleSessionWorktreeForStatusChange,restoreArchivedSessionForSend,@@ -924,6 +926,7 @@ import {TRUSTED_DESKTOP_QUEUE_ORIGIN,} from './makerSendTransaction.js';import { createAgentPrewarmer, isAgentPrewarmEligible } from './agentPrewarm.js';+import { isProvisionalSession } from '../localDb/provisionalSessions.js';import { findLatestAssistantTranscriptUuid } from './latestAssistantTranscriptUuid.js';import {installDesktopInteractionHandler,@@ -17175,7 +17178,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)log,});- // 输入框开始打字时预热 Agent(本机与 device-link 控制端共用)。只覆盖用户自己的普通+ // 输入框开始输入(打字、粘贴、开始语音输入)时预热 Agent(本机与 device-link 控制端共用)。只覆盖用户自己的普通// 任务、且 Agent 在本机运行;Bot / IM / 定时 / 审查 / 共享 / 协同 / 远程主机等任务的// 启动另有专门的路由与权限检查,仍由真实发送处理。启动走发送路径的同一个懒创建,// 并在同一把会话发送锁里执行,真实发送不会与预热并发重复启动。@@ -17193,7 +17196,6 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)remoteHostId: sessions.remoteHostId,agentDeviceId: sessions.agentDeviceId,orcaRole: sessions.orcaRole,- sdkSessionId: sessions.sdkSessionId,}).from(sessions).where(eq(sessions.id, sessionId))@@ -17204,6 +17206,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)if (co.remoteHostId || co.agentDeviceId) return false;return prewarmSessionRuntime(sessionId, co);}),+ isLive: (sessionId) => maker.getSession(sessionId) !== undefined,// Runs under the send lock: a send that got there first has marked the runtime used// (and its turn is running), one that arrives later waits for the close to finish and// then cold-starts, instead of meeting a runtime that is half closed.@@ -17234,6 +17237,8 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)const [sessionId] = args;if (typeof sessionId !== 'string') return await sendToAgentAcceptedUnlocked(...args);agentPrewarmer.markUsed(sessionId);+ // 新建页的未发送任务第一次发送:renderer 通常已先转正,这里兜底。+ if (isProvisionalSession(sessionId)) await commitProvisionalSession(sessionId);if (cindyMakeManager.isTaskPreparing(sessionId) && (args[3] as Record<PropertyKey, unknown> | undefined)?.[CINDY_MAKE_TASK_DISPATCH] !== true) {throwIpcError('PRECONDITION_FAILED', 'Cindy Make is still preparing this task');}@@ -18056,6 +18061,39 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)},);+ ipcMain.handle(+ MAKER_INVOKE.SESSION_DISCARD_PROVISIONAL,+ async (event, sessionId: unknown): Promise<{ discarded: 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 };+ // 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 () => {+ if (!isProvisionalSession(sid)) return false;+ agentPrewarmer.markUsed(sid);+ const live = maker.getSession(sid);+ if (live?.isTurnRunning()) return false;+ // Same close as idle prewarm reclaim; the row goes away right after.+ if (live) await live.closeIfIdle();+ if (maker.getSession(sid)) return false;+ return discardProvisionalSessionRow(sid);+ });+ return { discarded };+ },+ );++ ipcMain.handle(+ MAKER_INVOKE.SESSION_COMMIT_PROVISIONAL,+ async (event, sessionId: unknown): Promise<{ committed: boolean }> => {+ const sid = requireSessionId(sessionId);+ // Local renderer only: not on the device-link allowlist, and the sender must be the app window.+ assertTrustedAppRendererEvent(event);+ return { committed: await commitProvisionalSession(sid) };+ },+ );+/*** Reconcile the in-memory turn boundary after a vendor abort/close when the* normal terminal event was lost. The vendor Session is authoritative fordiff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.tsindex df811c2a28..ff8d16d938 100644--- a/apps/desktop/src/preload/preload.ts+++ b/apps/desktop/src/preload/preload.ts@@ -7245,6 +7245,11 @@ contextBridge.exposeInMainWorld('electronAPI', {// 输入框开始打字时提前启动 Agent;尽力而为,main 决定是否真的启动。prewarmSession: (sessionId: string, createOpts: unknown): Promise<{ accepted: boolean }> =>ipcRenderer.invoke('maker:session:prewarm', sessionId, createOpts),+ // 新建页的未发送任务:清空输入时删除 / 第一次发送前转为普通任务(仅本机)。+ discardProvisionalSession: (sessionId: string): Promise<{ discarded: boolean }> =>+ ipcRenderer.invoke('maker:session:discard-provisional', sessionId),+ commitProvisionalSession: (sessionId: string): Promise<{ committed: boolean }> =>+ ipcRenderer.invoke('maker:session:commit-provisional', sessionId),setPermissionMode: (sessionId: string, mode: string): Promise<void> =>ipcRenderer.invoke('maker:set-permission-mode', sessionId, mode),getPluginWriteAccessRecovery: (sessionId: string): Promise<{available: boolean}> =>diff --git a/apps/desktop/src/renderer/__tests__/makerChatStorePrewarm.test.ts b/apps/desktop/src/renderer/__tests__/makerChatStorePrewarm.test.tsnew file mode 100644index 0000000000..534f1935e7--- /dev/null+++ b/apps/desktop/src/renderer/__tests__/makerChatStorePrewarm.test.ts@@ -0,0 +1,47 @@+import { beforeEach, describe, expect, it, vi } from 'vitest';++const mocks = vi.hoisted(() => ({+ prewarmSessionFor: vi.fn(async (_sessionId: string, _createOpts: unknown) => ({ accepted: true })),+}));++vi.mock('@/lib/makerTransport', () => ({+ prewarmSessionFor: mocks.prewarmSessionFor,+ isRemoteSession: vi.fn(() => false),+ isRemoteSessionSticky: vi.fn(() => false),+}));++vi.mock('@/lib/userPromptStore', () => ({+ getUserPrompt: () => '',+}));++import { makerChatStore } from '@/lib/makerChatStore';++describe('makerChatStore.prewarmSession', () => {+ beforeEach(() => {+ mocks.prewarmSessionFor.mockClear();+ vi.useFakeTimers();+ vi.setSystemTime(1_000_000);+ });++ it('asks once per window while typing, but again right away after a settings change', () => {+ const sid = `prewarm-${Math.random()}`;+ makerChatStore.prewarmSession(sid, 'model-a', 'high', 'auto', '/repo');+ makerChatStore.prewarmSession(sid, 'model-a', 'high', 'auto', '/repo');+ expect(mocks.prewarmSessionFor).toHaveBeenCalledTimes(1);++ // Switching model may have closed the warm runtime on the task's computer.+ makerChatStore.prewarmSession(sid, 'model-b', 'high', 'auto', '/repo');+ expect(mocks.prewarmSessionFor).toHaveBeenCalledTimes(2);+ expect(mocks.prewarmSessionFor.mock.calls[1]?.[1]).toMatchObject({ model: 'model-b' });++ makerChatStore.prewarmSession(sid, 'model-b', 'low', 'auto', '/repo');+ expect(mocks.prewarmSessionFor).toHaveBeenCalledTimes(3);++ makerChatStore.prewarmSession(sid, 'model-b', 'low', 'auto', '/repo');+ expect(mocks.prewarmSessionFor).toHaveBeenCalledTimes(3);+ vi.advanceTimersByTime(30_000);+ makerChatStore.prewarmSession(sid, 'model-b', 'low', 'auto', '/repo');+ expect(mocks.prewarmSessionFor).toHaveBeenCalledTimes(4);+ vi.useRealTimers();+ });+});diff --git a/apps/desktop/src/renderer/__tests__/projectGrouping.test.ts b/apps/desktop/src/renderer/__tests__/projectGrouping.test.tsindex 8cae419bf5..cc3fd230e3 100644--- a/apps/desktop/src/renderer/__tests__/projectGrouping.test.ts+++ b/apps/desktop/src/renderer/__tests__/projectGrouping.test.ts@@ -28,6 +28,7 @@ import {pinnedSidebarEntryComparisonKey,} from '@/features/cc-agent/lib/pinnedSidebarOrder';import type { Session } from '@/lib/ccAgent.types';+import { setProvisionalDraftTaskId } from '@/features/cc-agent/lib/provisionalDraftTaskId';import { findProjectRepresentativeKey } from '@/features/cc-agent/lib/sidebarProjectVisibility';/* ---------------- helpers ---------------- */@@ -784,6 +785,21 @@ describe('groupSessions', () => {expect(r.projects[0].sessions[0]).toBe(real);});+ // 新建页里正在输入的未发送任务:已选好项目就放在项目下,不进未分类。+ it('places the new-task page\'s unsent task under its chosen project', () => {+ const unsent = s({ workingDir: '/p/foo', userSendAt: null });+ const otherDraft = s({ workingDir: '/p/foo', userSendAt: null });+ setProvisionalDraftTaskId(unsent.id);+ try {+ const r = groupSessions([unsent, otherDraft]);+ expect(r.unclassified).toEqual([otherDraft]);+ expect(r.projects).toHaveLength(1);+ expect(r.projects[0].sessions).toEqual([unsent]);+ } finally {+ setProvisionalDraftTaskId(null);+ }+ });+// SDK echo 失败 / 老数据 backfill 漏掉的孤儿:userSendAt 没写上但 messages// 表里有 row 的 session 不是草稿,应入 Project,避免堆到未分类。it('treats null-userSendAt with messages>0 as non-draft (SDK echo failure fallback)', () => {diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsxindex 497479db67..9a8472fbef 100644--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx@@ -527,8 +527,8 @@ interface ChatInputProps {},) => boolean | void | Promise<boolean | void>;/**- * 用户在已有任务的输入框里输入了内容(不含草稿恢复、语音回填、发送后清空等程序写入)。- * 父组件据此提前启动 Agent;每次按键都会调用,节流由接收方负责。+ * 用户开始往输入框里放内容:键盘 / 输入法输入、粘贴、开始语音输入(不含草稿恢复、+ * 语音回填、发送后清空等程序写入)。父组件据此提前启动 Agent;每次都会调用,节流由接收方负责。*/onComposerTyping?: () => void;/** Session ID for binding workingDir. When absent, folder picker is hidden. */@@ -2375,6 +2375,7 @@ export function ChatInput({},handlePaste(view, event) {if (composerMutationLockedRef.current) return true;+ onComposerTypingRef.current?.();// Intercept clipboard file/folder/image. Three sources to handle,// matching the onDrop logic below:// 1. Folder copied from OS file manager → addFolderPath (@dir chip)@@ -3346,6 +3347,7 @@ export function ChatInput({const handleVoiceInputStart = useCallback((): boolean => {// 同步 claim 录音后立刻返回是否占用;授权确认(beforeStart)与启动提示音// 由 useVoiceInput 的后台启动流程继续处理。+ onComposerTypingRef.current?.();return voiceInput.start({startedAt: performance.now(),beforeStart: onBeforeVoiceInputStart,diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionRoute.tsxnew file mode 100644index 0000000000..9d7e943d4e--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionRoute.tsx@@ -0,0 +1,16 @@+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.tsxindex 73ec756d88..77b5f49fb7 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx@@ -3877,7 +3877,7 @@ function CCAgentSessionContent({[fastMode, insertSystemCard, remoteDeviceId, session, sessionId, t, updateSystemCardData],);- // 开始打字时提前启动 Agent,把冷启动藏进打字时间(本机与远程任务相同)。+ // 开始输入(打字、粘贴、开始语音输入)时提前启动 Agent,把冷启动藏进输入时间(本机与远程任务相同)。const handleComposerTyping = useCallback(() => {if (readOnly || cindyMakeInputLocked || !sessionId || !session?.workingDir) return;makerChatStore.prewarmSession(diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsxindex c44d19ab7f..156afdcfe0 100644--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSidebarUpper.tsx@@ -49,6 +49,7 @@ import { projectDraftSessionTitle } from '@cindy/maker-shared/session-title';import { CINDY_MAKE_ENABLED, isCindyMakeSource } from '@cindy/maker-shared/cindy-make-feature';import { cn } from '@/lib/utils';+import { provisionalDraftTaskId, subscribeProvisionalDraftTask } from './provisionalDraftTask';import { toast } from '@/lib/toast';import { isDataOwnerPushCurrent } from '@/contexts/dataOwnerGeneration';import { useCCSessions } from '@/hooks/useCCSessions';@@ -538,7 +539,11 @@ export function CCAgentSidebarUpper() {const match = useMatch('/cc-agent/:sessionId');const orcaMatch = useMatch('/cc-agent/orca/:sessionId');const filesMatch = useMatch('/cc-agent/files/:sessionId');- const activeSessionId = orcaMatch?.params.sessionId ?? match?.params.sessionId;+ // 新建页上:它的未发送任务在列表里显示为当前项。+ const provisionalDraftId = useSyncExternalStore(subscribeProvisionalDraftTask, provisionalDraftTaskId);+ const routeSessionId = orcaMatch?.params.sessionId ?? match?.params.sessionId;+ const activeSessionId =+ routeSessionId === 'new' && provisionalDraftId ? provisionalDraftId : routeSessionId;const filesSessionId = filesMatch?.params.sessionId;// /bots/* 与任务列表共用本侧栏:正在看的伙伴会话同样算「注视中」,不记未读、不发通知。const viewedBotSessionId = useViewedBotSessionId();diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsxindex 7af2bc1029..9ec4ff8b05 100644--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx@@ -134,10 +134,24 @@ import {import {clearDraftAndNotify as clearComposerDraftAndNotify,getDraft as getComposerDraft,+ getDraftPresence as getComposerDraftPresence,plainTextToTiptapDoc,restoreRemoteOptimisticDraft,saveDraft as saveComposerDraft,+ subscribeDraftContent as subscribeComposerDraftContent,} from '@/lib/composerDraftStore';+import {+ canOpenProvisionalDraftTask,+ composerDocPlainText,+ discardProvisionalDraftTask,+ ensureProvisionalDraftTask,+ previewProvisionalDraftTitle,+ provisionalDraftArgsKey,+ provisionalDraftTaskGeneration,+ provisionalDraftTaskId,+ takeProvisionalDraftTask,+ type ProvisionalDraftCreateArgs,+} from './provisionalDraftTask';import type { JSONContent } from '@tiptap/core';import { base64ToUint8Array } from '@/lib/fileTypeInference';import {@@ -709,7 +723,8 @@ export function NewMakerDraftRoute() {const handledFolderPickerRequestRef = useRef<string | null>(null);// 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.- const localDraftSessionIdRef = useRef(makeDraftSessionId());+ // 已有未发送任务(用户离开新建页又回来)时沿用它的 id,回来继续输入接着用同一条任务。+ const localDraftSessionIdRef = useRef(provisionalDraftTaskId() ?? makeDraftSessionId());// 首参 914=内容封顶宽(→ inputWidth 封顶 934):大屏留出左右呼吸空间,不再顶满全宽;// 与进行中对话页(CCAgentSessionView 同传 914)一致,发送首条消息时输入框宽度不跳变。// minWidth=640:小屏兜一个体面下限(与对话页对称);窄于下限时 hook 自动回落成@@ -726,7 +741,17 @@ export function NewMakerDraftRoute() {// Icon-only mode is reserved for the tighter toolbar state, not merely a// moderately narrow content rail (for example, when attachments are present).const isDraftToolbarNarrow = inputWidthBand <= 1;- const { createSession, error: createSessionError } = useCCSessions();+ const { createSession: createSessionRow, error: createSessionError } = useCCSessions();+ /**+ * 新建页的建任务入口:已有设置一致的未发送任务(见 provisionalDraftTask.ts)就接着用它,+ * 否则先删掉它(同一个 id 可直接再建),再按原流程新建。+ */+ const createSession = useCallback(+ async (args: Parameters<typeof createSessionRow>[0]) =>+ (await takeProvisionalDraftTask({ ...args } as ProvisionalDraftCreateArgs))+ ?? createSessionRow(args),+ [createSessionRow],+ );const vendorAuthGate = useVendorAuthGate();const refreshWorktreeForSession = useRefreshWorktreeForSession();@@ -2037,6 +2062,136 @@ export function NewMakerDraftRoute() {capabilityAgentKind,]);+ // ─── 未发送任务(见 provisionalDraftTask.ts):开始输入就先在本机建出任务并预热 Agent,+ // 清空输入就删掉,发送时直接接着用。只覆盖本机普通项目 / 对话草稿。+ const provisionalDraftArgs = useMemo<ProvisionalDraftCreateArgs | null>(() => {+ if (isDeviceLinkDraft || usesDeviceCatalog) return null;+ if (wtEnabled && wtConfirmedIneligible !== true) return null;+ const workingDir = effectiveWorkingDir?.trim() || undefined;+ return {+ id: localDraftSessionIdRef.current,+ agentKind: persistedAgentKind,+ model: draftInitialModel,+ effort: draftInitialEffort ?? '',+ permissionMode: chatInitialPermissionMode,+ fastMode: effectiveFastMode,+ planModeEnabled: effectivePlanMode,+ workingDir,+ // Same shape the send path creates with: no project folder = a dialogue task.+ workspaceKind: workingDir === undefined ? 'dialogue' : 'project',+ remoteHostId: workingDir === undefined ? undefined : (effectiveRemoteHostId ?? undefined),+ ...(effectiveAgentDeviceId ? { agentDeviceId: effectiveAgentDeviceId } : {}),+ extraDirs: effectiveExtraDirs,+ writableDirs: effectiveWritableDirs,+ providerId: chatInitialProviderId ?? null,+ };+ }, [+ isDeviceLinkDraft,+ usesDeviceCatalog,+ wtEnabled,+ wtConfirmedIneligible,+ effectiveWorkingDir,+ persistedAgentKind,+ draftInitialModel,+ draftInitialEffort,+ chatInitialPermissionMode,+ effectiveFastMode,+ effectivePlanMode,+ effectiveRemoteHostId,+ effectiveAgentDeviceId,+ effectiveExtraDirs,+ effectiveWritableDirs,+ chatInitialProviderId,+ ]);+ const provisionalDraftArgsRef = useRef(provisionalDraftArgs);+ provisionalDraftArgsRef.current = provisionalDraftArgs;+ const provisionalTitleLabelsRef = useRef({ image: '', file: '' });+ provisionalTitleLabelsRef.current = {+ image: t('ccAgent.autoTitle.image'),+ file: t('ccAgent.autoTitle.file'),+ };+ const refreshProvisionalTitle = useCallback(() => {+ const text = composerDocPlainText(getComposerDraft(NEW_MAKER_DRAFT_KEY)?.text);+ previewProvisionalDraftTitle(+ text+ ? optimisticFirstMessageTitle(text, [], [], undefined, provisionalTitleLabelsRef.current)+ : null,+ );+ }, []);+ const provisionalEmptyTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);+ /** 输入一直是空的(清空了,或开始语音后什么都没说)就删掉未发送任务。 */+ const armProvisionalEmptyCheck = useCallback((delayMs: number) => {+ if (provisionalEmptyTimerRef.current) clearTimeout(provisionalEmptyTimerRef.current);+ provisionalEmptyTimerRef.current = setTimeout(() => {+ provisionalEmptyTimerRef.current = null;+ if (!provisionalDraftTaskId() || getComposerDraftPresence(NEW_MAKER_DRAFT_KEY)) return;+ void discardProvisionalDraftTask();+ }, delayMs);+ }, []);+ /** 已为哪一次建出来的未发送任务做过一次性的初始化(按 key 区分重建)。 */+ const provisionalSeededKeyRef = useRef<string | null>(null);+ const openProvisionalDraftTask = useCallback(() => {+ const args = provisionalDraftArgsRef.current;+ if (!args || !canOpenProvisionalDraftTask(args)) return;+ void ensureProvisionalDraftTask(args).then((session) => {+ if (!session || provisionalDraftTaskId() !== session.id) return;+ // 每次输入都会走到这里:建出来后只初始化一次,之后只续预热(接收方节流)。+ const seededKey = `${session.id}:${provisionalDraftTaskGeneration()}`;+ const firstTime = provisionalSeededKeyRef.current !== seededKey;+ provisionalSeededKeyRef.current = seededKey;+ if (firstTime) {+ makerChatStore.setSessionRuntime(session.id, {+ agentKind: dbToMakerAgentKind(args.agentKind),+ fastMode: args.fastMode ?? false,+ planModeEnabled: args.planModeEnabled ?? false,+ remoteHostId: null,+ sessionProviderId: args.providerId ?? null,+ });+ }+ if (session.workingDir) {+ makerChatStore.prewarmSession(+ session.id,+ args.model,+ args.effort,+ args.permissionMode,+ session.workingDir,+ );+ }+ if (!firstTime) return;+ refreshProvisionalTitle();+ // 粘贴图片 / 开始语音时输入框可能还是空的:给语音留出时间,之后仍为空再删掉。+ if (!getComposerDraftPresence(NEW_MAKER_DRAFT_KEY)) armProvisionalEmptyCheck(60_000);+ });+ }, [armProvisionalEmptyCheck, refreshProvisionalTitle]);+ useEffect(() => {+ const unsubscribe = subscribeComposerDraftContent(NEW_MAKER_DRAFT_KEY, () => {+ if (!provisionalDraftTaskId()) return;+ refreshProvisionalTitle();+ if (getComposerDraftPresence(NEW_MAKER_DRAFT_KEY)) {+ if (provisionalEmptyTimerRef.current) clearTimeout(provisionalEmptyTimerRef.current);+ provisionalEmptyTimerRef.current = null;+ } else {+ armProvisionalEmptyCheck(1_000);+ }+ });+ return () => {+ unsubscribe();+ if (provisionalEmptyTimerRef.current) clearTimeout(provisionalEmptyTimerRef.current);+ provisionalEmptyTimerRef.current = null;+ };+ }, [armProvisionalEmptyCheck, refreshProvisionalTitle]);+ // 草稿里影响任务本身的设置变了:按新设置重建(不再适合提前建任务就删掉)。+ const provisionalDraftKey = provisionalDraftArgs ? provisionalDraftArgsKey(provisionalDraftArgs) : null;+ useEffect(() => {+ if (!provisionalDraftTaskId()) return;+ const timer = setTimeout(() => {+ if (!provisionalDraftTaskId() || sendInFlightRef.current) return;+ const args = provisionalDraftArgsRef.current;+ if (!args || !canOpenProvisionalDraftTask(args)) void discardProvisionalDraftTask();+ else openProvisionalDraftTask();+ }, 300);+ return () => clearTimeout(timer);+ }, [provisionalDraftKey, openProvisionalDraftTask]);// 收藏锚点的失效兜底:选中一条收藏后,如果草稿的 (模型, 来源) 又被别的路径改掉(引擎// 不可用 coerce、模型校准、浮层里换来源…),面板会用当前收藏与草稿完整配置比对,// 不一致就回落模型行。深度 / Fast 直接读实时值,不在锚点里复制第二份快照。@@ -5721,6 +5876,7 @@ export function NewMakerDraftRoute() {<div className="w-full"><ChatInputonSend={handleSend}+ onComposerTyping={openProvisionalDraftTask}// 创建在途期间锁住输入框:handleSend 立刻返回、真正的创建在后台跑,远程要经// 几次隧道往返。锁定态即时告诉用户「已发出、处理中」,也免得这段时间补写的// 内容在交接成功清空草稿时被一并丢掉;失败解锁后原文仍在。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.tsnew file mode 100644index 0000000000..ffac9d3374--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/provisionalDraftTask.test.ts@@ -0,0 +1,152 @@+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++const mocks = vi.hoisted(() => ({+ create: vi.fn(),+ prependCreated: vi.fn(),+ removeLocal: vi.fn(),+ purgeSession: vi.fn(),+ preview: vi.fn(),+ previewCleared: vi.fn(),+ discard: vi.fn(async () => ({ discarded: true })),+ commit: vi.fn(async () => ({ committed: true })),+}));++vi.mock('@/lib/sessionService', () => ({ create: mocks.create }));+vi.mock('@/lib/sessionsStore', () => ({+ sessionsStore: { prependCreated: mocks.prependCreated, removeLocal: mocks.removeLocal },+}));+vi.mock('@/lib/makerChatStore', () => ({ makerChatStore: { purgeSession: mocks.purgeSession } }));+vi.mock('@/lib/sessionsBus', () => ({+ emitAutoTitlePreview: mocks.preview,+ emitAutoTitlePreviewCleared: mocks.previewCleared,+}));++import {+ canOpenProvisionalDraftTask,+ composerDocPlainText,+ discardProvisionalDraftTask,+ ensureProvisionalDraftTask,+ previewProvisionalDraftTitle,+ provisionalDraftTaskId,+ resetProvisionalDraftTaskForTest,+ takeProvisionalDraftTask,+ type ProvisionalDraftCreateArgs,+} from '../provisionalDraftTask';++const args = (patch: Partial<ProvisionalDraftCreateArgs> = {}): ProvisionalDraftCreateArgs => ({+ id: 'draft-1',+ agentKind: 'cc',+ model: 'model-a',+ effort: 'high',+ permissionMode: 'auto',+ fastMode: false,+ planModeEnabled: false,+ workingDir: '/repo',+ workspaceKind: 'project',+ extraDirs: [],+ writableDirs: [],+ providerId: null,+ ...patch,+});++describe('provisional draft task', () => {+ beforeEach(() => {+ resetProvisionalDraftTaskForTest();+ vi.clearAllMocks();+ mocks.create.mockImplementation(async (body: { id: string }) => ({ id: body.id, workingDir: '/repo' }));+ (globalThis as { window?: unknown }).window = {+ electronAPI: {+ maker: {+ discardProvisionalSession: mocks.discard,+ commitProvisionalSession: mocks.commit,+ },+ },+ };+ });+ afterEach(() => {+ delete (globalThis as { window?: unknown }).window;+ });++ it('opens one unsent task while typing and reuses it for the same settings', async () => {+ await ensureProvisionalDraftTask(args());+ await ensureProvisionalDraftTask(args());+ expect(mocks.create).toHaveBeenCalledTimes(1);+ expect(mocks.create).toHaveBeenCalledWith(expect.objectContaining({ id: 'draft-1', provisional: true }));+ expect(mocks.prependCreated).toHaveBeenCalledTimes(1);+ expect(provisionalDraftTaskId()).toBe('draft-1');+ });++ it('reopens under the same id when a setting of the task changes', async () => {+ await ensureProvisionalDraftTask(args());+ await ensureProvisionalDraftTask(args({ model: 'model-b' }));+ expect(mocks.discard).toHaveBeenCalledWith('draft-1');+ expect(mocks.removeLocal).toHaveBeenCalledWith('draft-1');+ expect(mocks.create).toHaveBeenCalledTimes(2);+ expect(mocks.create.mock.calls[1]?.[0]).toMatchObject({ id: 'draft-1', model: 'model-b' });+ });++ it('deletes the task when the input is cleared', async () => {+ await ensureProvisionalDraftTask(args());+ previewProvisionalDraftTitle('Fix the login bug');+ await discardProvisionalDraftTask();+ expect(mocks.discard).toHaveBeenCalledWith('draft-1');+ expect(mocks.previewCleared).toHaveBeenCalledWith('draft-1');+ expect(provisionalDraftTaskId()).toBeNull();+ });++ it('hands the task to the send when the settings still match', async () => {+ await ensureProvisionalDraftTask(args());+ const taken = await takeProvisionalDraftTask(args());+ expect(taken?.id).toBe('draft-1');+ expect(mocks.commit).toHaveBeenCalledWith('draft-1');+ expect(mocks.discard).not.toHaveBeenCalled();+ expect(provisionalDraftTaskId()).toBeNull();+ });++ it('deletes it first when the send uses different settings, so the normal create can reuse the id', async () => {+ await ensureProvisionalDraftTask(args());+ await expect(takeProvisionalDraftTask(args({ effort: 'low' }))).resolves.toBeNull();+ expect(mocks.discard).toHaveBeenCalledWith('draft-1');+ expect(mocks.commit).not.toHaveBeenCalled();+ });++ it('runs operations in order, so a send never races a half-open task', async () => {+ let release: () => void = () => {};+ mocks.create.mockImplementationOnce(+ (body: { id: string }) =>+ new Promise((resolve) => {+ release = () => resolve({ id: body.id, workingDir: '/repo' });+ }),+ );+ const opening = ensureProvisionalDraftTask(args());+ const taking = takeProvisionalDraftTask(args());+ await vi.waitFor(() => expect(mocks.create).toHaveBeenCalled());+ expect(mocks.commit).not.toHaveBeenCalled();+ release();+ await opening;+ await expect(taking).resolves.toMatchObject({ id: 'draft-1' });+ expect(mocks.commit).toHaveBeenCalledWith('draft-1');+ });++ 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);+ expect(canOpenProvisionalDraftTask(args({ remoteHostId: 'ssh-1' }))).toBe(false);+ expect(canOpenProvisionalDraftTask(args({ agentDeviceId: 'other' }))).toBe(false);+ expect(canOpenProvisionalDraftTask(args({ writableDirs: ['/out'] }))).toBe(false);+ expect(canOpenProvisionalDraftTask(args({ workingDir: undefined }))).toBe(false);+ });++ it('reads the composer text for the title preview', () => {+ expect(+ composerDocPlainText({+ type: 'doc',+ content: [+ { type: 'paragraph', content: [{ type: 'text', text: 'Fix ' }, { type: 'text', text: 'login' }] },+ { type: 'paragraph', content: [{ type: 'text', text: 'today' }] },+ ],+ }),+ ).toBe('Fix login\ntoday');+ expect(composerDocPlainText(null)).toBe('');+ });+});diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts b/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.tsindex 5d2f81d489..04c8fd734e 100644--- a/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts+++ b/apps/desktop/src/renderer/features/cc-agent/lib/projectGrouping.ts@@ -49,6 +49,7 @@ import {type ProjectScope,} from '../../../../shared/projectKeys';import type { RemoteProjectMachineIdentity } from './remoteProjectIdentity';+import { getProvisionalDraftTaskId } from './provisionalDraftTaskId';export { deviceLinkProjectKey, normalizeProjectKey, projectKeyComparisonKey, projectIdentityKey };@@ -596,7 +597,9 @@ export function groupSessions(const dir = normalizeWorkingDir(s.workingDir);const noPhysicalMessages = (s._count?.messages ?? 0) === 0;const isOrcaLead = isOrcaLeadSession(s);- const isAutoPlacedSession = s.source === 'scheduler' || s.source === 'plugin';+ // 新建页里正在输入、还没发送的任务:已经选好项目,就放在那个项目下。+ const isAutoPlacedSession =+ s.source === 'scheduler' || s.source === 'plugin' || s.id === getProvisionalDraftTaskId();if (dir == null ||(!options.includeDraftsInProjects &&diff --git a/apps/desktop/src/renderer/features/cc-agent/lib/provisionalDraftTaskId.ts b/apps/desktop/src/renderer/features/cc-agent/lib/provisionalDraftTaskId.tsnew file mode 100644index 0000000000..ccd1ee2b10--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/lib/provisionalDraftTaskId.ts@@ -0,0 +1,22 @@+/**+ * 新建页当前未发送任务的 id(无依赖的小登记表)。侧栏分组等纯函数据此把它当成普通任务+ * 放进所选项目,而不是按「从未发送」归到未分类。生命周期由 provisionalDraftTask.ts 管理。+ */++let currentId: string | null = null;+const listeners = new Set<() => void>();++export function getProvisionalDraftTaskId(): string | null {+ return currentId;+}++export function setProvisionalDraftTaskId(id: string | null): void {+ if (currentId === id) return;+ currentId = id;+ for (const listener of listeners) listener();+}++export function subscribeProvisionalDraftTaskId(listener: () => void): () => void {+ listeners.add(listener);+ return () => listeners.delete(listener);+}diff --git a/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.tsnew file mode 100644index 0000000000..e59b09dfe1--- /dev/null+++ b/apps/desktop/src/renderer/features/cc-agent/provisionalDraftTask.ts@@ -0,0 +1,216 @@+/**+ * 新建页的未发送任务(Cursor 式体验):用户在新建页开始输入,本机就先把任务建出来——+ * 它立刻出现在任务列表里、标题随输入变化,Agent 也能像已有任务一样提前启动;输入清空+ * 就真正删掉;第一次发送时直接接着用这条任务,不再新建。+ *+ * 只覆盖本机普通项目与对话草稿:远程电脑 / SSH / Agent 在另一台电脑 / 工作区 / 可写目录+ * 的草稿不提前建任务。草稿里影响任务本身的设置变了就删掉重建(同一个 id:还没发送的任务+ * 是真删,id 可以复用);发送时设置与提前建的不一致,也是先删掉再按原流程新建。+ *+ * 所有操作串行执行,避免「建到一半又删」与「发送接管」交错。Main 侧见+ * main/localDb/provisionalSessions.ts。+ */++import type { JSONContent } from '@tiptap/core';++import type { Session } from '@/lib/ccAgent.types';+import { createLogger } from '@/lib/logger';+import { makerChatStore } from '@/lib/makerChatStore';+import * as sessionService from '@/lib/sessionService';+import { emitAutoTitlePreview, emitAutoTitlePreviewCleared } from '@/lib/sessionsBus';+import { sessionsStore } from '@/lib/sessionsStore';++import {+ getProvisionalDraftTaskId,+ setProvisionalDraftTaskId,+ subscribeProvisionalDraftTaskId,+} from './lib/provisionalDraftTaskId';++const log = createLogger('provisional-draft-task');++/** 建任务的参数:与新建页发送时传给 createSession 的同一组字段。 */+export interface ProvisionalDraftCreateArgs {+ id: string;+ agentKind: 'cc' | 'codex' | 'pi';+ model: string;+ effort: string;+ permissionMode: string;+ fastMode?: boolean | 'ultrafast';+ planModeEnabled?: boolean;+ workingDir?: string;+ workspaceKind: 'project' | 'dialogue';+ extraDirs?: string[];+ writableDirs?: string[];+ remoteHostId?: string;+ agentDeviceId?: string;+ providerId?: string | null;+}++interface Current {+ id: string;+ key: string;+ session: Session;+ title: string | null;+}++let current: Current | null = null;+let chain: Promise<unknown> = Promise.resolve();+/** 每建出一次未发送任务加一(同一个 id 删掉重建也算新的一次)。 */+let generation = 0;++function notify(): void {+ setProvisionalDraftTaskId(current?.id ?? null);+}++function serial<T>(op: () => Promise<T>): Promise<T> {+ const next = chain.then(op, op);+ chain = next.catch(() => undefined);+ return next;+}++/** 比较用的设置指纹:id 不参与;空数组与缺省、空串与缺省视为相同。 */+export function provisionalDraftArgsKey(args: ProvisionalDraftCreateArgs): string {+ const list = (dirs?: string[]) => (dirs && dirs.length > 0 ? [...dirs] : []);+ return JSON.stringify([+ args.agentKind,+ args.model,+ args.effort || '',+ args.permissionMode,+ args.fastMode ?? false,+ args.planModeEnabled ?? false,+ args.workingDir || '',+ args.workspaceKind,+ list(args.extraDirs),+ list(args.writableDirs),+ args.remoteHostId || '',+ args.agentDeviceId || '',+ args.providerId ?? null,+ ]);+}++/** 只有本机普通任务才提前建出来。 */+export function canOpenProvisionalDraftTask(args: ProvisionalDraftCreateArgs): boolean {+ return (+ !!args.model &&+ !args.remoteHostId &&+ !args.agentDeviceId &&+ (args.writableDirs?.length ?? 0) === 0 &&+ (args.workspaceKind === 'dialogue' || !!args.workingDir)+ );+}++export const provisionalDraftTaskId = getProvisionalDraftTaskId;+export const subscribeProvisionalDraftTask = subscribeProvisionalDraftTaskId;++/** 当前未发送任务是第几次建出来的;调用方据此只为新建出来的那一次做初始化。 */+export function provisionalDraftTaskGeneration(): number {+ return generation;+}++async function discardCurrent(): Promise<void> {+ const target = current;+ if (!target) return;+ current = null;+ notify();+ if (target.title) emitAutoTitlePreviewCleared(target.id);+ try {+ await window.electronAPI.maker.discardProvisionalSession?.(target.id);+ } catch (error) {+ log.warn('discard provisional task failed', error);+ }+ // 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);+}++/**+ * 确保存在一条按 `args` 建出来的未发送任务;设置不同就删掉重建。返回任务,建不出来返回 null+ * (例如模型暂不可用——发送时会按原流程报错,这里静默)。+ */+export function ensureProvisionalDraftTask(+ args: ProvisionalDraftCreateArgs,+): Promise<Session | null> {+ return serial(async () => {+ const key = provisionalDraftArgsKey(args);+ if (current && current.id === args.id && current.key === key) return current.session;+ await discardCurrent();+ if (!canOpenProvisionalDraftTask(args)) return null;+ let session: Session;+ try {+ session = await sessionService.create({ ...args, provisional: true });+ } catch (error) {+ log.info('provisional task not opened', error);+ return null;+ }+ current = { id: session.id, key, session, title: null };+ generation += 1;+ // Register the id before the row enters the list, so grouping already sees it as unsent.+ notify();+ sessionsStore.prependCreated(session);+ return session;+ });+}++/** 输入清空 / 草稿不再适合提前建任务:删掉未发送任务。 */+export function discardProvisionalDraftTask(): Promise<void> {+ return serial(discardCurrent);+}++/**+ * 发送时接管:设置与提前建的一致就转为普通任务并返回它;不一致则先删掉,返回 null,+ * 由调用方按原流程新建(同一个 id 可直接再建)。+ */+export function takeProvisionalDraftTask(+ args: ProvisionalDraftCreateArgs,+): Promise<Session | null> {+ return serial(async () => {+ if (!current) return null;+ if (current.id !== args.id || current.key !== provisionalDraftArgsKey(args)) {+ await discardCurrent();+ return null;+ }+ const taken = current;+ current = null;+ notify();+ try {+ await window.electronAPI.maker.commitProvisionalSession?.(taken.id);+ } catch (error) {+ // The first send commits it on the host as well.+ log.warn('commit provisional task failed', error);+ }+ return taken.session;+ });+}++/** 标题随输入变化(本机显示,不写库;发送后由正常的自动起名接手)。 */+export function previewProvisionalDraftTitle(title: string | null): void {+ if (!current || current.title === title) return;+ current.title = title;+ if (title) emitAutoTitlePreview(current.id, title);+ else emitAutoTitlePreviewCleared(current.id);+}++/** 草稿文档的纯文本(标题预览用)。 */+export function composerDocPlainText(doc: JSONContent | null | undefined): string {+ if (!doc) return '';+ const parts: string[] = [];+ const walk = (node: JSONContent) => {+ if (node.type === 'text') parts.push(node.text ?? '');+ else if (node.type === 'hardBreak') parts.push('\n');+ else if (node.attrs && typeof (node.attrs as { label?: unknown }).label === 'string') {+ parts.push((node.attrs as { label: string }).label);+ }+ node.content?.forEach(walk);+ if (node.type === 'paragraph' || node.type === 'heading') parts.push('\n');+ };+ walk(doc);+ return parts.join('').trim();+}++/** Test-only reset. */+export function resetProvisionalDraftTaskForTest(): void {+ current = null;+ chain = Promise.resolve();+ generation = 0;+ setProvisionalDraftTaskId(null);+}diff --git a/apps/desktop/src/renderer/hooks/useCCSessions.ts b/apps/desktop/src/renderer/hooks/useCCSessions.tsindex 8ed70531b3..6637f2d43e 100644--- a/apps/desktop/src/renderer/hooks/useCCSessions.ts+++ b/apps/desktop/src/renderer/hooks/useCCSessions.ts@@ -170,6 +170,8 @@ export function useCCSessions(options?: UseCCSessionsOptions): UseCCSessionsRetu/** per-session 来源(供应商)显式选择; null/undefined = 跟随默认路由。透传到 sessionService.create → mapper 落盘。 */providerId?: string | null;source?: 'cindy-make';+ /** 新建页的未发送任务(见 sessionService.create)。 */+ provisional?: boolean;}): Promise<Session | null> => {try {const newSession = await sessionService.create({diff --git a/apps/desktop/src/renderer/lib/composerDraftStore.ts b/apps/desktop/src/renderer/lib/composerDraftStore.tsindex 307ad77a23..6c3bad962a 100644--- a/apps/desktop/src/renderer/lib/composerDraftStore.ts+++ b/apps/desktop/src/renderer/lib/composerDraftStore.ts@@ -324,8 +324,37 @@ export function draftHasContent(draft: ComposerDraft | undefined): boolean {* (`saveDraft` / `clearDraft` / `clearDraftAndNotify`), independent of the* `silent` flag — `silent` only gates the content `listeners` above.*/+/** Every write to a draft, including silent keystroke saves (the new-task title preview). */+const contentListeners = new Map<string, Set<DraftListener>>();++/** Subscribe to every save / clear of `sessionId`'s draft, including silent keystroke saves. */+export function subscribeDraftContent(sessionId: string, handler: DraftListener): () => void {+ const key = draftKey(sessionId);+ let set = contentListeners.get(key);+ if (!set) {+ set = new Set();+ contentListeners.set(key, set);+ }+ set.add(handler);+ return () => {+ const s = contentListeners.get(key);+ if (!s) return;+ s.delete(handler);+ if (s.size === 0) contentListeners.delete(key);+ };+}+function recomputeDraftPresence(sessionId: string): void {const key = draftKey(sessionId);+ const contentSet = contentListeners.get(key);+ if (contentSet)+ for (const fn of contentSet) {+ try {+ fn();+ } catch (err) {+ log.warn('content listener threw:', err);+ }+ }const next = draftHasContent(drafts.get(key));const prev = presenceCache.get(key) ?? false;if (next === prev) return;diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.tsindex 509d3e9119..194906ab23 100644--- a/apps/desktop/src/renderer/lib/makerChatStore.ts+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts@@ -3658,6 +3658,8 @@ function _purgeSession(sessionId: string): void {invalidateBackgroundTaskReconcile(sessionId);cancelBackgroundTaskReconcile(sessionId);backgroundTaskStaleRetrySessions.delete(sessionId);+ // 同一 id 之后可能重新建出来(新建页的未发送任务),预热提醒要重新开始计时。+ lastPrewarmRequest.delete(sessionId);// 代际递增(bump 而非 delete,原因见 _messagesEpoch 注释):作废 in-flight 翻页,// 避免其提交把旧窗口 merge 进 purge 后重建的空 slice。releaseRemoteHistoryView(sessionId);@@ -14240,12 +14242,28 @@ export function buildCreateOptsForCurrentSession(};}-/** 同一任务连续打字只需偶尔提醒一次;任务所在电脑会在提醒时顺延预热进程的空闲回收。 */+/**+ * 同一任务连续打字只需偶尔提醒一次;任务所在电脑会在提醒时顺延预热进程的空闲回收。+ * 换了模型、深度、权限、引擎或目录时任务所在电脑可能已关掉旧进程,下一次输入立即重新提醒。+ */const PREWARM_REQUEST_INTERVAL_MS = 30_000;-const lastPrewarmRequestAt = new Map<string, number>();+const lastPrewarmRequest = new Map<string, { at: number; settings: string }>();++function prewarmSettingsKey(createOpts: AgentInputCreateOpts): string {+ return JSON.stringify([+ createOpts.agentKind,+ createOpts.workingDir,+ createOpts.model,+ createOpts.providerId ?? null,+ createOpts.effort,+ createOpts.permissionMode,+ createOpts.fastMode ?? null,+ createOpts.planMode ?? null,+ ]);+}/**- * 输入框开始打字:请任务所在电脑(本机或被控电脑)提前启动 Agent。只在任务空闲、+ * 输入框开始输入(打字、粘贴、开始语音输入):请任务所在电脑(本机或被控电脑)提前启动 Agent。只在任务空闲、* 没有排队或在途发送时请求;createOpts 与下一次发送构造的相同,执行字段由任务所在* 电脑按数据库校正。尽力而为,结果不影响发送。*/@@ -14267,10 +14285,6 @@ function prewarmSession() {return;}- const now = Date.now();- const last = lastPrewarmRequestAt.get(sessionId);- if (last !== undefined && now - last < PREWARM_REQUEST_INTERVAL_MS) return;- lastPrewarmRequestAt.set(sessionId, now);const createOpts = buildCreateOptsForCurrentSession(sessionId,model,@@ -14278,6 +14292,11 @@ function prewarmSession(permissionMode,workingDir,);+ const settings = prewarmSettingsKey(createOpts);+ const now = Date.now();+ const last = lastPrewarmRequest.get(sessionId);+ if (last && last.settings === settings && now - last.at < PREWARM_REQUEST_INTERVAL_MS) return;+ lastPrewarmRequest.set(sessionId, { at: now, settings });void prewarmSessionFor(sessionId, createOpts).catch(() => undefined);}diff --git a/apps/desktop/src/renderer/lib/sessionService.ts b/apps/desktop/src/renderer/lib/sessionService.tsindex 811668d0e1..d4379104df 100644--- a/apps/desktop/src/renderer/lib/sessionService.ts+++ b/apps/desktop/src/renderer/lib/sessionService.ts@@ -131,6 +131,11 @@ export async function create(body?: {* checkout; the persisted source later drives the `cindy_make` tool injection.*/source?: 'cindy-make';+ /**+ * 新建页开始输入时先建出来的未发送任务:只在本机列表可见,清空输入就删掉,+ * 第一次发送前转为普通任务(见 main/localDb/provisionalSessions.ts)。+ */+ provisional?: boolean;}): Promise<Session> {return wrap(window.electronAPI.localDb.sessions.create(body));}diff --git a/apps/desktop/src/renderer/lib/sessionsStore.ts b/apps/desktop/src/renderer/lib/sessionsStore.tsindex d06ae02a03..f15c3eba95 100644--- a/apps/desktop/src/renderer/lib/sessionsStore.ts+++ b/apps/desktop/src/renderer/lib/sessionsStore.ts@@ -1147,6 +1147,25 @@ export const sessionsStore = {if (touched) notify();},+ /**+ * 新建页的未发送任务被真正删掉:直接移出缓存,不登记「已删除」状态——同一个 id 之后+ * 还可能重新建出来(继续输入),登记过的删除状态会把重建的任务挡在列表外。+ */+ removeLocal(id: string): void {+ autoTitlePreviews.delete(id);+ sessionTitleOverrides.delete(id);+ sessionSpendOverrides.delete(id);+ sessionStatusOverrides.delete(id);+ let touched = false;+ for (const [filter, list] of cache) {+ const next = list.filter((item) => item.id !== id);+ if (next.length === list.length) continue;+ cache.set(filter, next);+ touched = true;+ }+ if (touched) notify();+ },+/** 仅供测试 / 登出清理。 */reset(): void {cache.clear();@@ -1193,8 +1212,15 @@ if (typeof window !== 'undefined') {// 那个串与这里预览的是同一个(共用 normalizeAutoTitle),所以回流时不跳变。onAutoTitlePreview((sessionId, title) => {const current = sessionsStore.findById(sessionId);- // 已有权威标题(非哨兵)→ 连叠加层都不登记,免得之后顶掉它。- if (current && !isDefaultDraftSessionTitle(current.title)) return;+ // 已有权威标题(非哨兵)→ 连叠加层都不登记,免得之后顶掉它。仍显示着上一次预览时+ // 可以换成新的预览(新建页的未发送任务随输入实时更新标题)。+ if (+ current &&+ !isDefaultDraftSessionTitle(current.title) &&+ current.title !== autoTitlePreviews.get(sessionId)+ ) {+ return;+ }// 乐观写入走专门的门:不登记权威 override、不回收叠加层,顺序无所谓。autoTitlePreviews.set(sessionId, title);if (current) applyOptimisticTitle(sessionId, title);diff --git a/apps/desktop/src/renderer/router.tsx b/apps/desktop/src/renderer/router.tsxindex 8efc2f14f9..fe884067dc 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 { CCAgentSessionView } from '@/features/cc-agent/CCAgentSessionView';+import { CCAgentSessionRoute } from '@/features/cc-agent/CCAgentSessionRoute';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: <CCAgentSessionView /> },+ { path: ':sessionId', element: <CCAgentSessionRoute /> },],},{diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.tsindex 9aef9f4fd1..a050ade523 100644--- a/apps/desktop/src/renderer/vite-env.d.ts+++ b/apps/desktop/src/renderer/vite-env.d.ts@@ -4850,6 +4850,7 @@ interface ElectronAPI {providerId?: string | null;/** Only the Cindy Make purpose may be requested; Main validates the checkout. */source?: 'cindy-make';+ provisional?: boolean;}) => Promise<import('@/lib/ccAgent.types').Session>;get: (id: string) => Promise<import('@/lib/ccAgent.types').Session>;getMany: (ids: string[]) => Promise<import('@/lib/ccAgent.types').Session[]>;@@ -6483,6 +6484,9 @@ interface ElectronAPI {setEffort: (sessionId: string, effort: string) => Promise<void>;/** 输入框开始打字时提前启动 Agent;尽力而为。 */prewarmSession?: (sessionId: string, createOpts: unknown) => Promise<{ accepted: boolean }>;+ /** 新建页的未发送任务:清空输入时删除 / 第一次发送前转为普通任务(仅本机)。 */+ discardProvisionalSession?: (sessionId: string) => Promise<{ discarded: boolean }>;+ commitProvisionalSession?: (sessionId: string) => Promise<{ committed: boolean }>;setPermissionMode: (sessionId: string, mode: string) => Promise<void>;getPluginWriteAccessRecovery: (sessionId: string) => Promise<{available: boolean}>;retryPluginWriteAccess: (sessionId: string) => Promise<{granted: boolean; mode?: 'acceptEdits' | 'auto'}>;diff --git a/apps/mobile/app/sessions/[sessionId].tsx b/apps/mobile/app/sessions/[sessionId].tsxindex 5c4f40a8ed..39bcedd6e7 100644--- a/apps/mobile/app/sessions/[sessionId].tsx+++ b/apps/mobile/app/sessions/[sessionId].tsx@@ -874,7 +874,10 @@ const ENQUEUE_RECONNECT_BACKOFF_MS = 300;* 闪一下、计时还被重置回 0s。真停了推迟这点时间熄灭无感,交接空隙则被吃掉。*/const COMPOSER_ACTIVITY_SETTLE_MS = 600;-/** 打字预热提醒的最短间隔;被控端每次提醒都会顺延预热进程的空闲回收。 */+/**+ * 打字预热提醒的最短间隔;被控端每次提醒都会顺延预热进程的空闲回收。换了模型、深度、+ * 权限、引擎或目录时被控端可能已关掉旧进程,下一次输入立即重新提醒。+ */const MOBILE_AGENT_PREWARM_INTERVAL_MS = 30_000;/** 另一台电脑的目录还没读到时的空供应商列表(稳定引用,不触发下游 memo 重算)。 */const EMPTY_PROVIDER_VIEWS: readonly ProviderView[] = [];@@ -3244,17 +3247,27 @@ function SessionScreenContent() {enqueueUploads, getPendingUploadCount, onError: setAttachmentError,});- // 开始打字时请被控端提前启动 Agent,把冷启动藏进打字时间。同一任务 30 秒最多提醒一次;+ // 开始打字(含粘贴)或开始语音输入时请被控端提前启动 Agent,把冷启动藏进输入时间。同一任务 30 秒最多提醒一次;// 任务在跑、在排队编辑或旧被控端不支持时什么都不做。- const lastAgentPrewarmAtRef = useRef(0);+ const lastAgentPrewarmRef = useRef<{ at: number; settings: string } | null>(null);const prewarmAgentOnTyping = useCallback(() => {if (queueEditingRef.current) return;- const now = Date.now();- if (now - lastAgentPrewarmAtRef.current < MOBILE_AGENT_PREWARM_INTERVAL_MS) return;const session = remoteSessionStore.getSessions().find((item) => item.id === sessionId) ?? currentSession;if (!session?.workingDir || remoteSessionStore.isSessionRunning(sessionId)) return;- lastAgentPrewarmAtRef.current = now;+ const now = Date.now();const { createOpts } = buildQueuedTextMessage(session, '', new Date(now));+ const settings = JSON.stringify([+ createOpts.agentKind,+ createOpts.workingDir,+ createOpts.model,+ createOpts.providerId ?? null,+ createOpts.effort,+ createOpts.permissionMode,+ createOpts.fastMode ?? null,+ ]);+ const last = lastAgentPrewarmRef.current;+ if (last && last.settings === settings && now - last.at < MOBILE_AGENT_PREWARM_INTERVAL_MS) return;+ lastAgentPrewarmRef.current = { at: now, settings };void maker.prewarmSession(sessionId, createOpts).catch(() => undefined);}, [currentSession, maker, sessionId]);const applyTypedComposerChange = useCallback((value: ComposerDocument) => {@@ -5463,6 +5476,8 @@ function SessionScreenContent() {|| voiceState === 'listening'|| voiceIsProcessing) return;+ // 开始语音输入和打字一样,是要发消息的信号。+ prewarmAgentOnTyping();voiceStopAfterStartRef.current = false;setVoiceError(null);setVoiceReleaseToSendActive(false);@@ -5692,7 +5707,7 @@ function SessionScreenContent() {setVoiceState('error');setVoiceError(formatRemoteError(err));}- }, [deviceId, openLink, renderItems, t, voiceIsProcessing, voiceState, writeVoiceDraft]);+ }, [deviceId, openLink, prewarmAgentOnTyping, renderItems, t, voiceIsProcessing, voiceState, writeVoiceDraft]);const cancelVoiceForAppBackground = useCallback(() => {const controller = voiceControllerSessionRef.current;@@ -10831,7 +10846,10 @@ function SessionScreenContent() {composerSendUnavailableReason={canUseComposer ? null : composerDisabledReason}attachmentCount={attachments.length}pendingUploadCount={pendingUploads.length}- onPasteImages={(uris) => void addPastedImageAttachments(uris)}+ onPasteImages={(uris) => {+ prewarmAgentOnTyping();+ void addPastedImageAttachments(uris);+ }}onDragActiveChange={handleComposerDragActiveChange}onInputTopLayout={handleComposerInputTopLayout}composerPullThrough={composerPullThrough}diff --git a/apps/mobile/src/__tests__/composerSpeakerGateStartup.test.ts b/apps/mobile/src/__tests__/composerSpeakerGateStartup.test.tsindex 58bd54e8e5..ef31f28d03 100644--- a/apps/mobile/src/__tests__/composerSpeakerGateStartup.test.ts+++ b/apps/mobile/src/__tests__/composerSpeakerGateStartup.test.ts@@ -60,6 +60,7 @@ describe.each(['new.tsx', '[sessionId].tsx'])('%s speaker gate startup', page =>takeRefinementContextTail: (value: string) => value,buildMobileVoiceSessionRefinementContext: () => ({}), renderItems: [],formatRemoteError: String,+ prewarmAgentOnTyping: () => {},};return { run: start(bindings), createGate, createController, controller, startupSeq, finishGate, prewarmed, setVoiceError };}diff --git a/apps/mobile/src/__tests__/pastedImageAttachment.test.ts b/apps/mobile/src/__tests__/pastedImageAttachment.test.tsindex a46a91b884..56db967de4 100644--- a/apps/mobile/src/__tests__/pastedImageAttachment.test.ts+++ b/apps/mobile/src/__tests__/pastedImageAttachment.test.ts@@ -88,7 +88,8 @@ describe('粘贴接线源码断言(防重构掉线)', () => {const source = read(page);// 粘贴已迁入 useMobileLocalAttachments 乐观管线,页面经 hook 解构别名接线。expect(source, page).toContain('addPastedImages: addPastedImageAttachments');- expect(source, page).toContain('onPasteImages={(uris) => void addPastedImageAttachments(uris)}');+ // 已有任务的页面在粘贴时还会顺带预热 Agent,所以只锁住最终交给 hook 的那一步。+ expect(source, page).toMatch(/onPasteImages=\{\(uris\) => [\s\S]{0,80}?void addPastedImageAttachments\(uris\)/);}});diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex 666f9f620f..84a5551ba8 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -25,14 +25,23 @@ link 转发给订阅了该任务的控制端。新桌面控制端收到该标记新增 invoke `maker:session:prewarm(sessionId, createOpts)`,Desktop 本机 Renderer 与 device-link控制端共用,登记在 `REMOTE_INVOKE_ALLOWLIST` 并归入后台调度档;共享任务访客不在其准入表内。-控制端在已有任务的输入框里开始打字时调用(同一任务 30 秒最多一次),`createOpts` 与下一次发送+控制端在已有任务的输入框里开始输入(打字、粘贴、开始语音输入)时调用(同一任务 30 秒最多一次;模型、深度、权限、引擎、目录等设置变了立即再请求一次),`createOpts` 与下一次发送构造的相同;被控端立即回 `{ accepted }`,在同一把会话发送锁里复用发送路径的懒创建启动 Agent,执行字段(agentKind、model、resume、provider、权限、Agent 所在电脑)照常按数据库校正。只对来源为-user / desktop / plugin / side-chat、状态 active、非协同、Agent 在本机且非 SSH 工作区、且用户已在该任务里真实发送过(有原生会话 ID)的任务生效——启动会加载目录自带的设置与钩子,只打字不构成同意,从未发送过的任务等第一次真实发送;+user / desktop / plugin / side-chat、状态 active、非协同、Agent 在本机且非 SSH 工作区的任务生效(不要求已发送过:启动加载目录自带的设置与钩子与随后的发送相同,预热只是把时间提前);已有运行时、待切换引擎、已有排队输入时不做任何事。预热出来、尚未发送使用的运行时最多 2 个,-10 分钟未发送即关闭;任何真实发送会接管它。旧被控端返回 CHANNEL_NOT_ALLOWED,控制端静默忽略,+10 分钟未发送即关闭;设置变更关掉了它时,下一次请求会重新启动;任何真实发送会接管它。旧被控端返回 CHANNEL_NOT_ALLOWED,控制端静默忽略,下一次发送照常冷启动;旧控制端不调用,行为不变。+Desktop 新建页的未发送任务:本机普通项目 / 对话草稿开始输入时,任务先建出来(`local-db:sessions:create`+带 `provisional: true`,只接受本机普通任务),出现在本机任务列表、标题随输入变化,并按上面的规则预热;+清空输入经本机专用的 `maker:session:discard-provisional` 真正删除(仍未发送且无消息才删),第一次发送前经+`maker:session:commit-provisional` 转为普通任务(发送路径也会兜底转正)。这两个 channel 不进+`REMOTE_INVOKE_ALLOWLIST`。未发送期间不推给控制端:device-link 读任务列表时过滤掉、`sessions:created` /+`sessions:patched` 不经 tap 转发,IM 项目列表与 hook 最近任务也不列出;项目 git 初始化、插件「已创建」事件与+控制端创建通知延后到转正时补做。登记表在内存里,并写一份到 userData 下的 `provisional-sessions.json`,+没删掉的残留在下次启动、账号库就绪时清理;不加数据库列,旧版本只会把残留看成普通的未发送任务。+`maker:input:enqueue` 与 `maker:input:get-projection` 的 wire 不变。Mobile 已从同一被控端的projection 见过 `inputDeliveryVersion: 1`、并从 projection / enqueue 回包得知该任务的`clearBoundaryMs` 时,首次发送跳过发送前的 projection,直接带该边界 enqueue;被控端仍按原规则