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(device-link): 远程新建任务首条直接发送,避免空任务与侧栏跳动 (#5484)

Dashbcf8fe635cc9
diff --git a/apps/desktop/src/renderer/__tests__/chatInputSessionFocus.test.ts b/apps/desktop/src/renderer/__tests__/chatInputSessionFocus.test.ts
index a599c250f1..fc896e355a 100644
--- a/apps/desktop/src/renderer/__tests__/chatInputSessionFocus.test.ts
+++ b/apps/desktop/src/renderer/__tests__/chatInputSessionFocus.test.ts
@@ -217,7 +217,8 @@ expect(capabilitySelectionBlock).toContain('!ghost?.enabled');
expect(chatInputSource).toContain('findGhostByCommand(eligibleGhosts, ghostCommandWord)');
expect(chatInputSource).toContain('onAccepted: markRecentPluginUsage');
expect(successfulSendBlock).toContain('markRecentPluginUsage();');
- expect(newMakerDraftRouteSource.match(/opts\?\.onAccepted\?\.\(\);/g)).toHaveLength(3);
+ // 本机首条 / worktree 首条 / 远程普通首条直接发送 / 远程视图交接 四处受理点。
+ expect(newMakerDraftRouteSource.match(/opts\?\.onAccepted\?\.\(\);/g)).toHaveLength(4);
expect(worktreeSendBlock).toContain('if (accepted) {');
expect(worktreeSendBlock).toContain('opts?.onAccepted?.();');
expect(worktreeSendBlock).toContain(
diff --git a/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.ts b/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.ts
index dc5939a75f..418f7380c6 100644
--- a/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.ts
+++ b/apps/desktop/src/renderer/__tests__/deviceLinkCreateArgs.test.ts
@@ -284,14 +284,14 @@ describe('buildProvisionalRemoteSession', () => {
expect(row.title).toBe('New Maker');
});
- it('userSendAt 置为当下:用户此刻正在发第一条,侧边栏该立刻浮到顶部(与本机路径同口径)', () => {
+ it('userSendAt 与被控端新行一致为空:「正在发第一条」交给投影层的首条发送叠加层', () => {
const row = buildProvisionalRemoteSession({
sessionId: 's-4',
workDir: '/w',
args: dialogue,
nowIso: NOW,
});
- expect(row.userSendAt).toBe(NOW);
+ expect(row.userSendAt).toBeNull();
expect(row.createdAt).toBe(NOW);
expect(row.updatedAt).toBe(NOW);
});
diff --git a/apps/desktop/src/renderer/__tests__/newMakerLocalFirstMessageSend.test.ts b/apps/desktop/src/renderer/__tests__/newMakerLocalFirstMessageSend.test.ts
index 3092143a18..c4b6dd4470 100644
--- a/apps/desktop/src/renderer/__tests__/newMakerLocalFirstMessageSend.test.ts
+++ b/apps/desktop/src/renderer/__tests__/newMakerLocalFirstMessageSend.test.ts
@@ -116,6 +116,6 @@ describe('NewMakerDraftRoute local first-message send', () => {
expect(sessionViewSource).toContain('const pending = consumePending(sessionId);');
expect(sessionViewSource).toContain('maybeDispatchDesktopSlashCommand');
expect(sessionViewSource).toContain('leadingSlashInvocation(message)');
- expect(sessionViewSource).toContain('本机普通文本已在草稿路由发出');
+ expect(sessionViewSource).toContain('本机与远程的普通文本已在草稿路由发出');
});
});
diff --git a/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts b/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts
index a15e537f3a..f125f39fd1 100644
--- a/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts
+++ b/apps/desktop/src/renderer/__tests__/newMakerProjectPicker.test.ts
@@ -1173,11 +1173,15 @@ describe('Shared create project picker', () => {
expect(remoteSessionHandoffSource).not.toContain('await refreshRemoteDeviceSessions(');
// 两处调用点都不得 await 它 —— await 一个同步函数不报错,但会把「不要等」这个意图悄悄改回去。
expect(newMakerDraftRouteSource).not.toContain('await commitRemoteSessionHandoff(');
- // 而 setPending / setPendingGoal 必须在各自的 handoff 之后仍然发生(交接本体没被搬走)。
+ // 而首条交接必须在各自的 handoff 之后仍然发生(交接本体没被搬走):发送路径先把普通首条
+ // 直接交给 store 发件队列再导航;协同 / 斜杠命令 / 未受理时退回 setPending 再导航。
const sendPart = newMakerDraftRouteSource.slice(
newMakerDraftRouteSource.indexOf("logTag: 'draft send'"),
);
- expect(sendPart.slice(0, sendPart.indexOf('navigate('))).toContain(
+ const directNavigate = sendPart.indexOf('navigate(');
+ expect(sendPart.slice(0, directNavigate)).toContain('makerChatStore.sendMessage(');
+ const fallbackNavigate = sendPart.indexOf('navigate(', directNavigate + 1);
+ expect(sendPart.slice(directNavigate, fallbackNavigate)).toContain(
'setPending(remoteSessionId',
);
const goalPart = newMakerDraftRouteSource.slice(
diff --git a/apps/desktop/src/renderer/__tests__/newMakerRemoteFirstMessageSend.test.ts b/apps/desktop/src/renderer/__tests__/newMakerRemoteFirstMessageSend.test.ts
new file mode 100644
index 0000000000..85c41438a6
--- /dev/null
+++ b/apps/desktop/src/renderer/__tests__/newMakerRemoteFirstMessageSend.test.ts
@@ -0,0 +1,116 @@
+import { readFileSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+import { describe, expect, it } from 'vitest';
+
+// Windows CI 以 CRLF 检出源码;下面的锚点含换行,统一成 LF 再匹配。
+const source = readFileSync(
+ resolve(__dirname, '..', 'features', 'cc-agent', 'NewMakerDraftRoute.tsx'),
+ 'utf8',
+).replace(/\r\n/g, '\n');
+
+const handoffSource = readFileSync(
+ resolve(__dirname, '..', 'features', 'cc-agent', 'remoteSessionHandoff.ts'),
+ 'utf8',
+).replace(/\r\n/g, '\n');
+
+/**
+ * 远程普通首条不能再依赖 SessionView 挂载来补发:用户发送后马上切走,60s 内存 pending
+ * 过期,首条丢失,被控端只剩一个空的「未命名任务」。
+ */
+describe('NewMakerDraftRoute remote first-message send', () => {
+ const remoteFence = source.indexOf(
+ '远程普通首条在草稿路由直接交给 makerChatStore 的远程发件队列',
+ );
+ const remoteSend = source.indexOf(
+ 'makerChatStore.sendMessage(\n remoteSessionId,',
+ remoteFence,
+ );
+ const remotePending = source.indexOf('setPending(remoteSessionId, {', remoteFence);
+ const remoteNavigate = source.indexOf('navigate(`/cc-agent/${remoteSessionId}`', remoteFence);
+
+ it('hands ordinary remote text to the store outbox before navigating, not to SessionView', () => {
+ expect(remoteFence).toBeGreaterThan(-1);
+ expect(remoteSend).toBeGreaterThan(remoteFence);
+ expect(remoteNavigate).toBeGreaterThan(remoteSend);
+ // 视图交接只剩退路:排在直接发送之后。
+ expect(remotePending).toBeGreaterThan(remoteSend);
+ expect(source.slice(remoteFence, remoteSend)).toContain(
+ 'deliverRecoverableHandoff(remoteSessionId',
+ );
+ });
+
+ it('keeps collaboration and slash-command first messages on the SessionView handoff', () => {
+ const gate = source.slice(remoteFence, remoteSend);
+ expect(gate).toContain('!shouldEnableCollab && !remoteSlashFirst && !!remoteSendWorkingDir');
+ // 空白前缀命令不分 agent 一律交给视图:草稿路由的 Skill 别名改写读本机命令目录,远程不能用。
+ expect(gate).toContain('|| !!leadingSlashInvocation(message);');
+ expect(gate).not.toContain("capabilityAgentKind === 'pi' && !!leadingSlashInvocation(message)");
+ expect(gate).not.toContain('await rewritePiSkillMessageForSend(');
+ expect(gate).toContain('if (remoteDirectSend && remoteSendWorkingDir) {');
+ });
+
+ it('seeds the chat runtime from the submitted args before the pre-hydration send', () => {
+ const seed = source.indexOf('makerChatStore.setSessionRuntime(remoteSessionId, {', remoteFence);
+ expect(seed).toBeGreaterThan(remoteFence);
+ expect(seed).toBeLessThan(remoteSend);
+ const seedBlock = source.slice(seed, source.indexOf('});', seed));
+ expect(seedBlock).toContain('agentKind: createArgs.agentKind');
+ expect(seedBlock).toContain('sessionProviderId: createArgs.providerId ?? null');
+ });
+
+ it('registers the session topic subscription in the outbox preflight, not before navigate', () => {
+ const preflight = source.indexOf('beforeEnqueue: async () => {', remoteSend);
+ const subscribe = source.indexOf(
+ 'await window.electronAPI.deviceLink.subscribe(deviceId, [',
+ preflight,
+ );
+ expect(preflight).toBeGreaterThan(remoteSend);
+ expect(preflight).toBeLessThan(remoteNavigate);
+ expect(subscribe).toBeGreaterThan(preflight);
+ expect(source.slice(subscribe, subscribe + 160)).toContain('`session:${remoteSessionId}`');
+ // 订阅不得挡在 navigate 前面以 await 的形式出现在发送调用之外。
+ expect(source.slice(remoteFence, remoteSend)).not.toContain('deviceLink.subscribe(');
+ });
+
+ it('restores an undelivered first message and withdraws both sidebar overlays', () => {
+ const failure = source.indexOf('onRemoteOptimisticFailure: (clientId) => {', remoteSend);
+ const block = source.slice(failure, remotePending);
+ expect(failure).toBeGreaterThan(remoteSend);
+ expect(block).toContain('restoreRemoteOptimisticDraft(remoteSessionId, {');
+ expect(block).toContain('remoteProjectsStore.clearPendingTitlePreview(remoteSessionId)');
+ expect(block).toContain('remoteProjectsStore.clearPendingFirstSend(remoteSessionId)');
+ });
+
+ it('marks the first send only for the direct path, before the provisional row and refresh land', () => {
+ const mark = handoffSource.indexOf(
+ 'if (p.markFirstSend) remoteProjectsStore.setPendingFirstSend(p.remoteSessionId, p.nowIso);',
+ );
+ const provisional = handoffSource.indexOf('buildProvisionalRemoteSession({', mark);
+ const refresh = handoffSource.indexOf('void refreshRemoteDeviceSessions(', mark);
+ expect(mark).toBeGreaterThan(-1);
+ expect(provisional).toBeGreaterThan(mark);
+ expect(refresh).toBeGreaterThan(mark);
+
+ // 发送路径按直接发送判据登记;目标路径交给 SessionView,失败分支不在草稿路由手里,不登记。
+ const sendCommit = source.slice(
+ source.indexOf('commitRemoteSessionHandoff({', remoteFence),
+ source.indexOf("logTag: 'draft send'", remoteFence) + 120,
+ );
+ expect(sendCommit).toContain('markFirstSend: remoteDirectSend');
+ const goalCommit = source.slice(
+ source.indexOf("logTag: 'draft goal'") - 400,
+ source.indexOf("logTag: 'draft goal'") + 40,
+ );
+ expect(goalCommit).not.toContain('markFirstSend');
+ });
+
+ it('withdraws the first-send mark before falling back to the SessionView handoff', () => {
+ const fallback = source.indexOf(
+ 'remoteProjectsStore.clearPendingFirstSend(remoteSessionId);\n }',
+ remoteSend,
+ );
+ expect(fallback).toBeGreaterThan(remoteNavigate);
+ expect(fallback).toBeLessThan(remotePending);
+ });
+});
diff --git a/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.ts b/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.ts
index 76e390b576..9ecdaf331e 100644
--- a/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.ts
+++ b/apps/desktop/src/renderer/__tests__/remoteProjectsStore.test.ts
@@ -884,3 +884,60 @@ describe('remote session title index', () => {
expect(remoteProjectsStore.getSessionTitle('a')).toBeNull();
});
});
+
+/**
+ * 首条发送叠加层:远程建会话后、被控端收下首条前,列表回流里的 userSendAt 仍为空。
+ * 叠加层让会话一直留在项目里,不先掉进项目外的草稿区再跳回来。
+ */
+describe('remoteProjectsStore pending first send', () => {
+ const SENT_AT = '2026-10-05T03:41:49.000Z';
+ const unsent = (id: string): Session => ({ ...mk(id, { title: 'New Maker' }), userSendAt: null });
+
+ beforeEach(() => {
+ setRemoteReseedImpl(null);
+ remoteProjectsStore.clear();
+ remoteProjectsStore.__resetPendingTitlePreviewForTest();
+ });
+
+ it('keeps the send time across a list refresh that still reports the host row as unsent', () => {
+ remoteProjectsStore.setPendingFirstSend('s1', SENT_AT);
+ remoteProjectsStore.mergeDeviceSessions('dev-B', 'B', [unsent('s1')]);
+ expect(remoteProjectsStore.getMergedRemoteSessions()[0]?.userSendAt).toBe(SENT_AT);
+
+ // 权威快照再来一次(host 仍未收下首条)—— 叠加层继续顶着。
+ remoteProjectsStore.setDeviceSessions('dev-B', 'B', [unsent('s1')]);
+ expect(remoteProjectsStore.getMergedRemoteSessions()[0]?.userSendAt).toBe(SENT_AT);
+ // 分片本身没有被改写 —— 纯镜像不变量。
+ expect(remoteProjectsStore.getDeviceSessions('dev-B')[0]?.userSendAt).toBeNull();
+ });
+
+ it('yields to the host value and retires once the host records the first send', () => {
+ remoteProjectsStore.setPendingFirstSend('s1', SENT_AT);
+ remoteProjectsStore.setDeviceSessions('dev-B', 'B', [unsent('s1')]);
+
+ const hostSentAt = '2026-10-05T03:41:50.123Z';
+ remoteProjectsStore.applyPatch('dev-B', 's1', { userSendAt: hostSentAt });
+ expect(remoteProjectsStore.getMergedRemoteSessions()[0]?.userSendAt).toBe(hostSentAt);
+
+ // 已回收:之后即使有一份陈旧快照把它报回空,也不会再被叠加层补上。
+ remoteProjectsStore.setDeviceSessions('dev-B', 'B', [unsent('s1')]);
+ expect(remoteProjectsStore.getMergedRemoteSessions()[0]?.userSendAt).toBeNull();
+ });
+
+ it('lets an undelivered first message fall back to the honest empty state', () => {
+ remoteProjectsStore.setPendingFirstSend('s1', SENT_AT);
+ remoteProjectsStore.setDeviceSessions('dev-B', 'B', [unsent('s1')]);
+
+ remoteProjectsStore.clearPendingFirstSend('s1');
+ expect(remoteProjectsStore.getMergedRemoteSessions()[0]?.userSendAt).toBeNull();
+ });
+
+ it('drops the overlay when the session leaves the mirror', () => {
+ remoteProjectsStore.setPendingFirstSend('s1', SENT_AT);
+ remoteProjectsStore.setDeviceSessions('dev-B', 'B', [unsent('s1')]);
+ remoteProjectsStore.applyPatch('dev-B', 's1', { status: 'deleted' });
+
+ remoteProjectsStore.setDeviceSessions('dev-B', 'B', [unsent('s1')]);
+ expect(remoteProjectsStore.getMergedRemoteSessions()[0]?.userSendAt).toBeNull();
+ });
+});
diff --git a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
index c2a9a3f28f..f2912829f6 100644
--- a/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/CCAgentSessionView.tsx
@@ -4351,9 +4351,9 @@ export function CCAgentSessionView({
[sessionId, t],
);
- // delayed-create:device-link / 远程草稿,以及本机斜杠命令首条(含 Pi 空白前缀),把内容登记在
- // pending 里,等 session 完全 hydrate 后再由 maybeDispatchDesktopSlashCommand /
- // sendMessage 消费。本机普通文本已在草稿路由发出。一次性消费 + ref guard,防
+ // delayed-create:device-link 远程草稿的协同 / 斜杠命令首条,以及本机斜杠命令首条(含 Pi 空白
+ // 前缀),把内容登记在 pending 里,等 session 完全 hydrate 后再由 maybeDispatchDesktopSlashCommand /
+ // sendMessage 消费。本机与远程的普通文本已在草稿路由发出。一次性消费 + ref guard,防
// StrictMode 双 mount / 重渲染时重复发送。
const pendingConsumedRef = useRef(false);
useEffect(() => {
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index 337d9d1149..304acc9638 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -117,6 +117,7 @@ import {
useProviderModelMemoryVersion,
} from '@/state/providerModelMemory';
import {
+ deliverRecoverableHandoff,
rememberRecoverableHandoff,
setPending,
setPendingGoal,
@@ -3696,6 +3697,23 @@ export function NewMakerDraftRoute() {
// commitRemoteSessionHandoff 里;它同步返回且不抛,所以这里既不 await 也不需要 try ——
// **回流不能挡在 setPending 前面**:那段退避重试最长约 6.75 秒,应用在窗口内被关掉就会
// 丢掉用户的首条消息,而对端会话已经建好了(第 33 轮 P1)。
+ //
+ // 远程普通首条在草稿路由直接交给 makerChatStore 的远程发件队列,不再绑在
+ // SessionView hydrate 上:队列由 store 驱动、不随视图卸载停止,发送后立刻切走
+ // 也会送达(手机端 newSessionCreation 同口径)。旧做法把首条放进 60s 的内存
+ // pending 等视图来取,用户切走超过 60s 首条就丢了,对端只剩一个空的未命名任务。
+ // 仍交给 SessionView 的只有两类(识别窗口与本机分支一致):
+ // · 开了协同 —— 首轮必须排在被控端起 Worker 之后,等待与输入锁都在视图里;
+ // · 斜杠命令首条(含任意 agent 的空白前缀命令)—— 需要 SessionView 的完整命令分派;
+ // 草稿路由的 rewritePiSkillMessageForSend 读的是本机命令目录,不能用在远程会话上。
+ // 侧栏「首条已发出」标记只给直接发送这一条:它的每个终态(受理 / 未受理 / 投递
+ // 失败 / 抛错)都在本函数内可见并能撤回;视图交接的失败分支散在 SessionView 里,
+ // 不登记就不会留下撤不回的标记。
+ const remoteSendWorkingDir = created?.workDir ?? remoteWorkingDir;
+ const remoteSlashFirst =
+ /^\/(\S+)(?:\s+(.*))?$/s.test(message) || !!leadingSlashInvocation(message);
+ const remoteDirectSend =
+ !shouldEnableCollab && !remoteSlashFirst && !!remoteSendWorkingDir;
commitRemoteSessionHandoff({
deviceId,
deviceName,
@@ -3704,6 +3722,7 @@ export function NewMakerDraftRoute() {
createArgs,
nowIso: new Date().toISOString(),
logTag: 'draft send',
+ markFirstSend: remoteDirectSend,
});
markedStartingSessionId = remoteSessionId;
// 草稿里选中的那条收藏跟着会话走(见 carryDraftFavoriteAnchorToSession)。锚点是
@@ -3735,6 +3754,93 @@ export function NewMakerDraftRoute() {
if (!isCurrentDataOwner()) {
throw new RemotePrecreatedWorktreeOwnerChangedError();
}
+ // 远程普通首条直接发送(判据与理由见上方 remoteDirectSend)。
+ if (remoteDirectSend && remoteSendWorkingDir) {
+ // 视图还没 hydrate 被控端的行:createOpts 读 store 里的运行时,先按刚提交的
+ // args 确定性 seed(本机首条同款)。
+ makerChatStore.setSessionRuntime(remoteSessionId, {
+ agentKind: createArgs.agentKind,
+ fastMode: createArgs.fastMode,
+ sessionProviderId: createArgs.providerId ?? null,
+ });
+ const preNavDraft = getComposerDraft(NEW_MAKER_DRAFT_KEY);
+ const preNavDraftDoc = opts?.recoveryDraftDoc ?? preNavDraft?.text ?? null;
+ const preNavBrowserComments = rewriteBrowserCommentsFromRehomedFiles(
+ preNavDraft?.browserComments,
+ rehydratedFiles,
+ );
+ // 远程发送受理即返回 true(只登记发件队列,不等隧道),所以这里 await 不会卡住
+ // 新建页;受理后副本即可丢弃 —— 之后的投递失败由下面的回调把正文放回输入框。
+ // 已过提交点:抛错也只退回视图交接,不能落到外层「创建失败」提示。
+ const accepted = await deliverRecoverableHandoff(remoteSessionId, () =>
+ makerChatStore.sendMessage(
+ remoteSessionId,
+ message,
+ createArgs.model,
+ createArgs.effort,
+ createArgs.permissionMode,
+ remoteSendWorkingDir,
+ rehydratedFiles,
+ mentions,
+ {
+ ...(opts?.quotesEncoded ? { quotesEncoded: true } : {}),
+ ...(opts?.agentReferences?.length
+ ? { agentReferences: opts.agentReferences }
+ : {}),
+ ...(opts?.pastedTextRanges?.length
+ ? { pastedTextRanges: opts.pastedTextRanges }
+ : {}),
+ ...(opts?.slashCommandRanges !== undefined
+ ? { slashCommandRanges: opts.slashCommandRanges }
+ : {}),
+ // 订阅屏障:首轮的 maker:event / status / input push 必须有订阅者。视图引擎
+ // 的订阅随 SessionView mount 才建立,首条又不再等视图,所以在发件队列的
+ // preflight 里先显式 await 一次 session:<id> 订阅的注册 ack(新建目标交接
+ // 同款;同窗口重复 subscribe 幂等,生命周期仍归视图引擎)。放在 preflight
+ // 而非 navigate 之前:隧道往返不挡新建页,首条也已在队列里,切走不丢。
+ // 订阅失败不拦首条:最坏退回到视图挂载后按历史补齐。
+ beforeEnqueue: async () => {
+ try {
+ await window.electronAPI.deviceLink.subscribe(deviceId, [
+ `session:${remoteSessionId}`,
+ ]);
+ } catch (err) {
+ log.warn('[draft send] subscribe before remote first send failed', err);
+ }
+ return true;
+ },
+ onRemoteOptimisticFailure: (clientId) => {
+ // FIFO 插回没送达的首条,不覆盖用户之后在该任务输入框里写的内容;
+ // 撤回两层叠加层,空会话照实回到草稿区、标题回落到权威值。
+ restoreRemoteOptimisticDraft(remoteSessionId, {
+ clientId,
+ text: preNavDraftDoc ?? plainTextToTiptapDoc(message),
+ attachments: excludeCommentScreenshots(
+ rehydratedFiles,
+ preNavBrowserComments,
+ ),
+ browserComments: preNavBrowserComments,
+ });
+ remoteProjectsStore.clearPendingTitlePreview(remoteSessionId);
+ remoteProjectsStore.clearPendingFirstSend(remoteSessionId);
+ },
+ },
+ ),
+ ).catch((err: unknown) => {
+ log.warn('[draft send] remote first send threw; handing off to SessionView', err);
+ return false;
+ });
+ if (accepted) {
+ opts?.onAccepted?.();
+ clearComposerDraftAndNotify(NEW_MAKER_DRAFT_KEY);
+ attachmentState.clearFiles();
+ resetDraftWorkspaceAfterSend();
+ navigate(`/cc-agent/${remoteSessionId}`, { replace: true });
+ return;
+ }
+ // 没受理(归属切换 / 会话已删等):撤回首条标记,退回下面的视图交接,与改动前行为一致。
+ remoteProjectsStore.clearPendingFirstSend(remoteSessionId);
+ }
setPending(remoteSessionId, {
text: message,
files: rehydratedFiles,
@@ -4310,7 +4416,11 @@ export function NewMakerDraftRoute() {
if (remoteOptimisticTitleSessionId) {
remoteProjectsStore.clearPendingTitlePreview(remoteOptimisticTitleSessionId);
}
- if (markedStartingSessionId) clearSessionStarting(markedStartingSessionId);
+ if (markedStartingSessionId) {
+ clearSessionStarting(markedStartingSessionId);
+ // 远程交接没完成:首条发送叠加层同样撤回(本机会话不在叠加层里,调用为空操作)。
+ remoteProjectsStore.clearPendingFirstSend(markedStartingSessionId);
+ }
if (isRemotePrecreatedWorktreeOwnerChangedError(err)) return;
log.error('[draft send]', err);
toast.error(
diff --git a/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.ts b/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.ts
index e3067e8add..f2a35741b3 100644
--- a/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/deviceLinkCreateArgs.ts
@@ -217,9 +217,10 @@ export function buildProvisionalRemoteSession(p: ProvisionalRemoteSessionParams)
fastMode: p.args.fastMode,
clearedAt: null,
pinnedAt: null,
- // 用户此刻正在发第一条消息 —— 与本机路径建完会话就写 userSendAt 同口径,
- // 侧边栏按这条时间轴排序,新会话该立刻浮到顶部。
- userSendAt: p.nowIso,
+ // 与被控端刚建出的行一致:首条还没被收下,userSendAt 为空。「用户正在发第一条」由
+ // remoteProjectsStore 的首条发送叠加层在投影层补上 —— 写进分片的话,随后任何一次列表
+ // 回流都会把它冲回 null,会话就先掉进项目外的草稿区、首条落地后再跳回项目。
+ userSendAt: null,
status: 'active',
// Session.agentKind 是本机形态('cc' | 'codex' | 'pi'),args 里是 maker-core 形态,这里转回来。
agentKind: p.args.agentKind === 'claude-code' ? 'cc' : p.args.agentKind,
diff --git a/apps/desktop/src/renderer/features/cc-agent/remoteSessionHandoff.ts b/apps/desktop/src/renderer/features/cc-agent/remoteSessionHandoff.ts
index 8a3b68bb2c..f0c30680e1 100644
--- a/apps/desktop/src/renderer/features/cc-agent/remoteSessionHandoff.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/remoteSessionHandoff.ts
@@ -50,6 +50,12 @@ export interface RemoteSessionHandoffParams {
nowIso: string;
/** 日志前缀,用于区分是哪条创建路径(如 'draft send' / 'draft goal')。 */
logTag: string;
+ /**
+ * 首条会由调用方直接交给发件队列、且调用方负责在未受理 / 投递失败时撤回
+ * (remoteProjectsStore.clearPendingFirstSend)。只有这时才登记侧栏「首条已发出」标记;
+ * 交给 SessionView 的交接(协同 / 斜杠命令 / 新建目标)失败分支不在调用方手里,不登记。
+ */
+ markFirstSend?: boolean;
}
/**
@@ -70,6 +76,9 @@ export function commitRemoteSessionHandoff(p: RemoteSessionHandoffParams): void
remoteProjectsStore.pinSessionOrigin(p.deviceId, p.remoteSessionId);
// 刚提交的远程任务在对端 isRunning 回流前先按运行中排序,避免先沉底再跳顶。
markSessionStarting(p.remoteSessionId);
+ // 首条已进入发送链路:被控端收下之前的列表回流里 userSendAt 仍为空,不能让会话先掉进
+ // 项目外的草稿区再跳回项目。必须先于临时行与回流登记。
+ if (p.markFirstSend) remoteProjectsStore.setPendingFirstSend(p.remoteSessionId, p.nowIso);
// ② 临时行:让 SessionView 的 delayed-create 交接不必等权威快照。
if (p.workDir) {
remoteProjectsStore.mergeDeviceSessions(p.deviceId, p.deviceName, [
diff --git a/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.ts b/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.ts
index 57d6967541..74ed3cea77 100644
--- a/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.ts
+++ b/apps/desktop/src/renderer/features/device-link/remoteProjectsStore.ts
@@ -17,9 +17,10 @@ import { normalizeTaskTags, reconcileTaskTags } from '@cindy/maker-shared';
* · 增量(`applyPatch`):收到被控端 `local-db:sessions:patched` push 时就地幂等合并;
* status=deleted → 移出分片;active/archived → 在状态桶间迁移。
* · 新建(`requestRemoteReseed`):`sessions:created` push 无 row 数据 → 触发该设备重拉。
- * 唯一例外是**投影层**的标题预览(`setPendingTitlePreview`):它不写分片、只在权威
- * 标题仍是系统占位(默认名 / fork 占位 / 本端登记过的合成占位)时顶替显示,被控端
- * 写下真正的标题一到就自动让位。分片数据仍是纯镜像。
+ * 唯一例外是**投影层**的两个叠加层:标题预览(`setPendingTitlePreview`)只在权威
+ * 标题仍是系统占位(默认名 / fork 占位 / 本端登记过的合成占位)时顶替显示;首条发送
+ * 时刻(`setPendingFirstSend`)只在权威 userSendAt 仍为空时补上。被控端写下真实值
+ * 一到就自动让位。分片数据仍是纯镜像。
* - **复用本地渲染管线**:每条 session 注入 `deviceLinkDeviceId/Name/ConnectionStatus`
* 后喂给 `groupSessions`。
* - **origin 注册表**:`sessionId → deviceId`(`getSessionDeviceId`),供传输层 / SessionView 用。
@@ -331,6 +332,34 @@ function withPendingTitle(session: Session): Session {
return { ...session, title: preview };
}
+/**
+ * 「首条已发出」叠加层 —— 与标题预览同一性质的投影层覆盖,**不写分片**。
+ *
+ * 远程建会话到被控端收下首条之间,权威行的 userSendAt 仍是 null。这段时间里任何一次列表
+ * 回流(建会话后的 refresh / sessions:created 重拉)都会把临时行带的 userSendAt 冲掉,
+ * projectGrouping 随即按「未发送 + 0 条消息」把它挪进项目外的草稿区,首条落地后再跳回项目。
+ *
+ * 发送瞬间登记;投影时只在权威 userSendAt 仍为空时补上,被控端写下真实值即让位并回收。
+ * 首条最终没交出去时由发送方撤回,空会话照实回到草稿区。重启后叠加层不存在,以权威值为准。
+ */
+const pendingFirstSendAt = new Map<string, string>();
+
+function withPendingFirstSend(session: Session): Session {
+ const sentAt = pendingFirstSendAt.get(session.id);
+ if (!sentAt) return session;
+ if (session.userSendAt != null) {
+ pendingFirstSendAt.delete(session.id);
+ return session;
+ }
+ return { ...session, userSendAt: sentAt };
+}
+
+/** 会话离场(删除 / 归档 / 快照里消失 / 设备移除)时回收全部投影叠加层。 */
+function dropSessionOverlays(sessionId: string): void {
+ dropTitleOverlay(sessionId);
+ pendingFirstSendAt.delete(sessionId);
+}
+
/** 重算扁平快照 + origin 注册表,然后通知订阅者。所有 mutation 走这里。 */
function recompute(): void {
recomputeScheduleIndex();
@@ -345,7 +374,7 @@ function recompute(): void {
const flat: Session[] = [];
for (const shard of shards.values()) {
for (const s of shard.sessions) {
- const projected = withPendingTitle(s);
+ const projected = withPendingFirstSend(withPendingTitle(s));
flat.push(projected);
sessionDeviceIndex.set(s.id, shard.deviceId);
if (projected.title) sessionTitleIndex.set(s.id, projected.title);
@@ -519,7 +548,7 @@ const actions = {
if (existing) {
const kept = new Set(nextSessions.map((session) => session.id));
for (const session of existing.sessions) {
- if (!kept.has(session.id)) dropTitleOverlay(session.id);
+ if (!kept.has(session.id)) dropSessionOverlays(session.id);
}
}
const loadedStatuses = new Set(existing?.loadedStatuses ?? []);
@@ -693,7 +722,7 @@ const actions = {
// 叠加层随会话一起离场:留着的话 removeDevice 也回收不到(它只遍历分片里还在的
// 会话),之后 unarchive / reseed 会把边界前的旧预览顶回一个仍是系统占位的
// 会话上(PR #510 review)。
- dropTitleOverlay(sessionId);
+ dropSessionOverlays(sessionId);
// 消息冷缓存已在函数开头清掉(那里能覆盖"会话不在分片里"的情形)。
shard.sessions = shard.sessions.filter((s) => s.id !== sessionId);
recompute();
@@ -701,7 +730,7 @@ const actions = {
}
if (status === 'archived') {
// 归档后仍保留完整行,供已归档 / 全部筛选直接展示;标题即时预览不跨归档边界。
- dropTitleOverlay(sessionId);
+ dropSessionOverlays(sessionId);
}
const wasPinned = shard.sessions[idx]?.pinnedAt != null;
const unpinned =
@@ -818,7 +847,7 @@ const actions = {
// 标题叠加层随分片一起丢弃:撤销授权 / 关闭控制后该设备的会话已不在视图里,
// 留着会在下次重新接入时把边界前的旧预览顶回一个仍是系统占位的会话上。
for (const session of shards.get(deviceId)?.sessions ?? []) {
- dropTitleOverlay(session.id);
+ dropSessionOverlays(session.id);
}
const shardDeleted = shards.delete(deviceId);
const bootstrapStateCleared = setBootstrapState(deviceId, 'idle');
@@ -841,6 +870,7 @@ const actions = {
pendingTitlePreview.clear();
landedSystemTitles.clear();
synthesizedPreviewSessions.clear();
+ pendingFirstSendAt.clear();
const bootstrapStateChanged =
bootstrapLoadingDeviceIds.size > 0 ||
archivedLoadingDeviceIds.size > 0 ||
@@ -912,11 +942,29 @@ const actions = {
recompute();
},
- /** 测试专用:清空标题预览叠加层。 */
+ /**
+ * 远程新建会话的首条直接交给发件队列时登记(见 {@link pendingFirstSendAt});登记方负责在未受理 / 投递失败时撤回。
+ * 被控端写下真实 userSendAt 后自动让位。
+ */
+ setPendingFirstSend(sessionId: string, sentAtIso: string): void {
+ if (!sessionId || !sentAtIso || pendingFirstSendAt.get(sessionId) === sentAtIso) return;
+ pendingFirstSendAt.set(sessionId, sentAtIso);
+ recompute();
+ },
+
+ /** 首条最终没交出去时撤回,让空会话照实回到草稿区。 */
+ clearPendingFirstSend(sessionId: string): void {
+ if (!sessionId || !pendingFirstSendAt.has(sessionId)) return;
+ pendingFirstSendAt.delete(sessionId);
+ recompute();
+ },
+
+ /** 测试专用:清空标题预览与首条发送叠加层。 */
__resetPendingTitlePreviewForTest(): void {
pendingTitlePreview.clear();
landedSystemTitles.clear();
synthesizedPreviewSessions.clear();
+ pendingFirstSendAt.clear();
},
/** 测试专用:清空 origin 钉子(生产期刻意不清,见 pinnedOrigins)。 */
diff --git a/apps/desktop/src/renderer/lib/makerChatStore.ts b/apps/desktop/src/renderer/lib/makerChatStore.ts
index 9dfc08a7fd..aef81b2e22 100644
--- a/apps/desktop/src/renderer/lib/makerChatStore.ts
+++ b/apps/desktop/src/renderer/lib/makerChatStore.ts
@@ -17203,6 +17203,8 @@ function setSessionRuntime(
planModeEnabled?: boolean;
/** Seed before SessionView hydrates the DB row; sendMessage reads this for SSH routing. */
remoteHostId?: string | null;
+ /** Seed before hydration so a draft-route first send carries the chosen source in createOpts. */
+ sessionProviderId?: string | null;
/** Disable automatic first-message renaming for product-owned titled sessions. */
autoTitleDisabled?: boolean;
},
@@ -17215,12 +17217,16 @@ function setSessionRuntime(
const nextRemoteHostId = Object.hasOwn(opts, 'remoteHostId')
? (opts.remoteHostId ?? null)
: s.remoteHostId;
+ const nextSessionProviderId = Object.hasOwn(opts, 'sessionProviderId')
+ ? (opts.sessionProviderId ?? null)
+ : s.sessionProviderId;
const nextAutoTitleDisabled = opts.autoTitleDisabled ?? s.autoTitleDisabled;
if (
s.agentKind === nextAgentKind &&
s.fastMode === nextFastMode &&
s.planModeEnabled === nextPlanMode &&
s.remoteHostId === nextRemoteHostId &&
+ s.sessionProviderId === nextSessionProviderId &&
s.autoTitleDisabled === nextAutoTitleDisabled
)
return s;
@@ -17230,6 +17236,7 @@ function setSessionRuntime(
fastMode: nextFastMode,
planModeEnabled: nextPlanMode,
remoteHostId: nextRemoteHostId,
+ sessionProviderId: nextSessionProviderId,
autoTitleDisabled: nextAutoTitleDisabled,
...(s.planModeEnabled !== nextPlanMode ? { planModeRev: s.planModeRev + 1 } : {}),
};
diff --git a/apps/desktop/src/renderer/state/pendingFirstMessage.ts b/apps/desktop/src/renderer/state/pendingFirstMessage.ts
index 8a9aef9884..bfe1d29362 100644
--- a/apps/desktop/src/renderer/state/pendingFirstMessage.ts
+++ b/apps/desktop/src/renderer/state/pendingFirstMessage.ts
@@ -7,10 +7,11 @@
* desktop / Pi 分派必须等 SessionView 挂上(SSH 跳过控制端 skill、远端 /review 拒绝、
* Pi runtime 重试),不能在草稿路由复制一套。
*
- * 仍走这套交接的还有 device-link 远程草稿(含开协同):对端建会话之后,首条必须等
- * SessionView 挂上隧道订阅 / 开协同,不能挡在 navigate 前面。
+ * device-link 远程草稿的普通首条同样不走这里:对端建会话之后,草稿路由直接交给
+ * makerChatStore 的远程发件队列,切走也会送达。仍走这套交接的远程首条只有开了协同
+ * (首轮要排在被控端起 Worker 之后,不能挡在 navigate 前面)与斜杠命令两类:
*
- * NewMakerDraftRoute.handleSend(远程)
+ * NewMakerDraftRoute.handleSend(远程,协同 / 斜杠命令)
* → 对端 create-session 拿到 remoteSessionId
* → setPending(remoteSessionId, { text, files, remoteCollab? })
* → navigate('/cc-agent/' + remoteSessionId)