From b4b18e351b6b9c89f9ed37b0cdc1c53d59603653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com> Date: Sun, 11 Oct 2026 08:50:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=BD=AE=E6=AC=A1?= =?UTF-8?q?=E6=8C=89=E5=8F=91=E8=B5=B7=E8=BE=B9=E7=95=8C=E5=88=86=E6=A1=B6?= =?UTF-8?q?=E4=B8=8E=E7=A8=B3=E5=AE=9A=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 轮号=用户发起消息计数(单一真值来源), 单消息桶不吞号, 编号不再漂移 - 补充注入标 source=inject, 归属当前轮不开新轮(961 轮次语义) - 压缩摘要/错误气泡归属当前轮, 压缩后不再另起新轮次 - reload 消息透传 source 字段, 轮次导航条自动同口径 --- src-tauri/src/commands/ai/commands/chat.rs | 10 +++++++- src/api/types.ts | 5 ++++ src/components/ai/MessageList.vue | 27 +++++++++++++++------- src/composables/ai/useAiConversations.ts | 2 ++ 4 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src-tauri/src/commands/ai/commands/chat.rs b/src-tauri/src/commands/ai/commands/chat.rs index 78f126a..8d5611f 100644 --- a/src-tauri/src/commands/ai/commands/chat.rs +++ b/src-tauri/src/commands/ai/commands/chat.rs @@ -1174,7 +1174,15 @@ pub(crate) async fn inject_runtime_message( if !cs.is_active() { return Err(format!("conv {conv_id} 非活跃态({cs:?}),不走注入")); } - let msg = ChatMessage::user(&format!("[补充指令] {message}")); + let mut msg = ChatMessage::user(&format!("[补充指令] {message}")); + // 961② 轮次归属标记:注入=对当前轮的补充,不开新轮。前端轮次分桶按此判据 + // (source.channel=="inject" 不递增轮号),与发起消息(桌面直发/飞书入站)区分 + msg.source = Some(df_ai::provider::MessageSource { + channel: "inject".into(), + message_id: msg.id.clone().unwrap_or_default(), + chat_id: None, + sender: None, + }); let mut session = state.ai_session.lock().await; if session.conv_read(conv_id).is_none() { return Ok(false); diff --git a/src/api/types.ts b/src/api/types.ts index 080859d..75099ed 100644 --- a/src/api/types.ts +++ b/src/api/types.ts @@ -565,6 +565,11 @@ export interface AiMessage { id: MessageId role: 'user' | 'assistant' | 'tool' | 'system' content: string + /** + * 消息来源(958 溯源/961 轮次归属):undefined=null=桌面本端发起;'inject'=运行中 + * 补充注入(961② 轮次分桶判据,归属当前轮不开新轮);'feishu'=飞书入站发起。 + */ + source?: { channel: string; message_id: string; chat_id?: string; sender?: string } | null /** * 推理过程文本(DeepSeek reasoning_content / Anthropic thinking 同通道,后端落库 * ai_messages.reasoning_content)。undefined=该轮无思考内容。历史消息 reload 时 diff --git a/src/components/ai/MessageList.vue b/src/components/ai/MessageList.vue index 315649a..17f62d5 100644 --- a/src/components/ai/MessageList.vue +++ b/src/components/ai/MessageList.vue @@ -1012,7 +1012,7 @@ function traceHoverTitle(startTs: number, endTs: number): string { /** * 执行中实时步骤摘要:「第 N 轮 · ✓ N 次调用完成 · 失败 N · 正在 {工具} · ⏳ N 项待审批」。 - * 轮次号与轨迹卡同源(flushBucket 的 traceCount,执行中=将成为的轨迹序号); + * 轮次号与轨迹卡同源(flushBucket 的 currentRound,发起计数口径见 renderItems); * 失败/拒绝/待审批段仅非零时显示;全部无数据回退「过程记录」。 */ function stepText(s: TurnCallStats, round: number): string { @@ -1030,7 +1030,7 @@ type RenderItem = | { kind: 'msg'; key: string; msg: AiMessage; final?: boolean } | { kind: 'sep'; key: string; seg: MessageSegment & { key: string } } // A 过程压缩:完成轮次的执行轨迹卡(traceMsgs 为折叠在内的过程消息)与执行中的实时步骤摘要; - // round=轨迹序号(卡头「第 N 轮」,与执行中步骤行、轮次导航条同一计数来源) + // round=会话轮号(卡头「第 N 轮」,961③ 发起计数口径,导航条/步骤行同源) | { kind: 'trace'; key: string; round: number; stats: TurnCallStats; startTs: number; endTs: number; tokens: number; traceMsgs: AiMessage[]; expanded: boolean } | { kind: 'step'; key: string; round: number; stats: TurnCallStats; traceMsgs: AiMessage[]; expanded: boolean } // UX 密度改造:相邻消息间隔 ≥30 分钟或跨天的居中时间分隔线(替代 per-block 相对时间) @@ -1198,9 +1198,12 @@ const renderItems = computed(() => { const items: RenderItem[] = [] let bucket: AiMessage[] = [] let lastTs = 0 - // 轨迹序号计数:轨迹卡头「第 N 轮」与执行中步骤行同一来源(computed 重算从 0 起, - // 计数即轨迹卡出现顺序,与轮次导航条序号一致) - let traceCount = 0 + // 961②③ 轮次号=「用户发起」计数(单一真值来源,数据派生天然稳定): + // 发起=user 且非补充注入(source.channel!='inject',老数据无 source 视为发起); + // 补充注入/压缩摘要/错误气泡均归属当前轮不递增——修复旧口径两漂移根源: + // ①旧 traceCount=轨迹卡出现顺序,单消息桶不计数致编号随桶形态漂移; + // ②压缩摘要切桶即开新号(用户表象「压缩后就是新轮次」)。 + let currentRound = 0 const pushSep = (ts: number) => { if (needsTimeSep(ts, lastTs)) { @@ -1215,9 +1218,8 @@ const renderItems = computed(() => { if (msgs.length === 0) return const lastStoreId = store.state.messages[store.state.messages.length - 1]?.id const executing = isViewingGenerating.value && msgs[msgs.length - 1].id === lastStoreId - // 轨迹/步骤项产生时轮号自增(仅 msgs.length>1 会产出 step/trace;轮号计入桶签名, - // 前序桶变化致轮号位移时该桶正确重算) - const round = msgs.length > 1 ? ++traceCount : traceCount + // 961③: 轮号=当前发起计数(与轨迹卡是否产出解耦,单消息桶不吞号) + const round = currentRound const built = buildBucket(msgs, round, executing, lastTs) for (const it of built.items) items.push(it) lastTs = built.endTs @@ -1237,6 +1239,15 @@ const renderItems = computed(() => { continue } const m = seg.msg + // 961②: 发起边界=user 且非补充注入——flush 当前轮并递增轮号;补充注入归属 + // 当前轮原样渲染不递增。压缩摘要/错误气泡也不递增(压缩后仍是同轮过程) + if (m.role === 'user') { + flushBucket() + if (m.source?.channel !== 'inject') currentRound++ + pushSep(m.timestamp) + items.push({ kind: 'msg', key: 'm-' + m.id, msg: m }) + continue + } // assistant 非错误非压缩进轮次桶(compressed 用户诉求不折叠,原样展开) if (m.role === 'assistant' && !m.isError && m.status !== 'compressed') { bucket.push(m) diff --git a/src/composables/ai/useAiConversations.ts b/src/composables/ai/useAiConversations.ts index 16945df..f8f41da 100644 --- a/src/composables/ai/useAiConversations.ts +++ b/src/composables/ai/useAiConversations.ts @@ -224,6 +224,8 @@ function parseConvMessages(rawMsgs: any[], fallbackPrefix: string, convGeneratin content: m.content || '', // 推理过程透传(DeepSeek/Anthropic thinking 同通道落库字段),undefined 保持缺省 reasoning_content: m.reasoning_content || undefined, + // 消息来源透传(961② 轮次归属:inject 补充不开新轮);老数据无字段为 undefined + source: m.source ?? undefined, model: m.model, // 用后端持久化的真实时间;老数据无 timestamp 字段回退 Date.now() timestamp: typeof m.timestamp === 'number' ? m.timestamp : Date.now(),