修复: aichat上下文管理与信息组织P1批
逐件(证据:深查-aichat质量/信息UX-2026-10-17): - 恢复链套娃:RECOVERY_ARTIFACT_PREFIX双侧过滤+单点拦截(E1) - message_repo全量重写保留原created_at(E11,治1750条时间线污染) - search_files/grep 0命中附阴性存疑提示(E6,共享negative_hit_hint) - 项目清单三源活跃度排序+system prompt指纹对齐(E4跑题) - 会话列表活跃/归档offset分页+侧栏加载更多(F4-1,治50硬上限) - inject消息source标记(轮次分桶不误计发起,V52同源) - 提示词回复风格条款中英双语(反口水话,含测试断言) - i18n补键:复制/折叠量/发送title/历史定位提示(F1-1/F2-1/F6-1) 验收:cargo test --workspace 2281 passed 0 failed;vue-tsc EXIT 0
This commit is contained in:
@@ -265,6 +265,12 @@ impl AiMessageRepo {
|
||||
/// 全量重写语义——以入参 records 为该对话的**唯一真相**,先删该 conv 全部旧行再批量插。
|
||||
/// 单事务保证「删 + 插」原子,无中间空窗(reload 不会读到半删半插的中间态)。
|
||||
///
|
||||
/// created_at 保出生时间(2026-10-17 修复批量污染):created_at 语义 = 消息首次入库时间,
|
||||
/// 全量重写只该变内容不变出生时间。调用方(save_conversation)对整批 records 统一盖
|
||||
/// 对话级 created_at(老对话 None 时 now 兜底),直插会把全对话消息 created_at 抹成同一秒。
|
||||
/// 故 DELETE 前先取存量 `id → created_at` 映射,重插时同 id 行回填原值;新 id(真新消息)
|
||||
/// 保留入参值。ai_messages 表无 updated_at 列,内容变更无单独时间戳(不在此列语义内)。
|
||||
///
|
||||
/// 设计权衡(非 dirty 增量,留 P2.1 优化):
|
||||
/// - 内存 ContextManager 是运行时真相源,save 是同步点,每轮 save 全量回写简单可靠;
|
||||
/// - INSERT OR IGNORE 幂等:records 内 id 重复或与残留行(理论不应有,事务已 DELETE)冲突跳过;
|
||||
@@ -274,7 +280,7 @@ impl AiMessageRepo {
|
||||
pub async fn replace_conversation(
|
||||
&self,
|
||||
conv_id: &str,
|
||||
records: Vec<AiMessageRecord>,
|
||||
mut records: Vec<AiMessageRecord>,
|
||||
) -> Result<()> {
|
||||
let conn = self.conn.clone();
|
||||
let conv_id = conv_id.to_owned();
|
||||
@@ -282,7 +288,29 @@ impl AiMessageRepo {
|
||||
let mut guard = conn.blocking_lock();
|
||||
let tx = guard.transaction().map_err(storage_err)?;
|
||||
{
|
||||
// 先删该 conv 全部旧行(全量重写语义)
|
||||
// 先取存量 id → created_at 映射(DELETE 前留证,重插回填保出生时间)
|
||||
{
|
||||
let mut stmt = tx
|
||||
.prepare("SELECT id, created_at FROM ai_messages WHERE conversation_id = ?1")
|
||||
.map_err(storage_err)?;
|
||||
let rows = stmt
|
||||
.query_map(params![conv_id], |r| {
|
||||
Ok((r.get::<_, String>("id")?, r.get::<_, String>("created_at")?))
|
||||
})
|
||||
.map_err(storage_err)?;
|
||||
let mut original: std::collections::HashMap<String, String> =
|
||||
std::collections::HashMap::new();
|
||||
for r in rows {
|
||||
let (id, created_at) = r.map_err(storage_err)?;
|
||||
original.insert(id, created_at);
|
||||
}
|
||||
for rec in &mut records {
|
||||
if let Some(orig) = original.get(&rec.id) {
|
||||
rec.created_at = orig.clone();
|
||||
}
|
||||
}
|
||||
}
|
||||
// 再删该 conv 全部旧行(全量重写语义)
|
||||
tx.execute(
|
||||
"DELETE FROM ai_messages WHERE conversation_id = ?1",
|
||||
params![conv_id],
|
||||
@@ -693,6 +721,62 @@ mod tests {
|
||||
assert_eq!(got.len(), 1, "重复 replace 不应叠加");
|
||||
}
|
||||
|
||||
/// replace_conversation 保 created_at 出生时间(2026-10-17 批量污染回归):
|
||||
/// 调用方对整批统一盖一个 created_at(如对话级时间或 now),重写后既有 id 行
|
||||
/// 的 created_at 必须逐行保留原入库值,不得被统一时间抹平;新 id 行保留入参值。
|
||||
#[tokio::test]
|
||||
async fn replace_conversation_preserves_created_at() {
|
||||
let db = Database::open_in_memory().await.expect("open_in_memory");
|
||||
let repo = AiMessageRepo::new(&db);
|
||||
|
||||
// 预置两行,created_at 各异(模拟真实逐条入库的出生时间)
|
||||
let mut m0 = mk_msg("m0", "c", 0, "user", "v1");
|
||||
m0.created_at = "2026-10-01T10:00:00.000".into();
|
||||
let mut m1 = mk_msg("m1", "c", 1, "assistant", "v1");
|
||||
m1.created_at = "2026-10-02T11:30:00.000".into();
|
||||
repo.insert_batch(vec![m0, m1]).await.expect("insert");
|
||||
|
||||
// 重写:既有 id 内容变了、created_at 被调用方统一盖成同一时间;
|
||||
// 另带一条新 id 消息(真新消息,该保留入参时间)。
|
||||
let uniform_ts = "2026-10-17T21:25:01.000";
|
||||
let rewrite = |id: &str, seq: i64, role: &str, content: &str| {
|
||||
let mut m = mk_msg(id, "c", seq, role, content);
|
||||
m.created_at = uniform_ts.into();
|
||||
m
|
||||
};
|
||||
repo.replace_conversation(
|
||||
"c",
|
||||
vec![
|
||||
rewrite("m0", 0, "user", "v2-改写内容"),
|
||||
rewrite("m1", 1, "assistant", "v2-改写内容"),
|
||||
rewrite("m2_new", 2, "user", "新消息"),
|
||||
],
|
||||
)
|
||||
.await
|
||||
.expect("replace");
|
||||
|
||||
let got = repo.list_by_conversation("c").await.expect("list");
|
||||
assert_eq!(got.len(), 3);
|
||||
// 逐行断言:既有 id 的 created_at 保持原值,内容确实变了
|
||||
assert_eq!(got[0].id, "m0");
|
||||
assert_eq!(got[0].created_at, "2026-10-01T10:00:00.000", "既有行 created_at 不得被重写抹平");
|
||||
assert_eq!(got[0].content, "v2-改写内容");
|
||||
assert_eq!(got[1].id, "m1");
|
||||
assert_eq!(got[1].created_at, "2026-10-02T11:30:00.000", "既有行 created_at 不得被重写抹平");
|
||||
assert_eq!(got[1].content, "v2-改写内容");
|
||||
// 新 id(首次入库)保留入参 created_at
|
||||
assert_eq!(got[2].id, "m2_new");
|
||||
assert_eq!(got[2].created_at, uniform_ts, "新消息保留入参 created_at");
|
||||
|
||||
// 二次重写再验:出生时间已固化,连续重写不漂移
|
||||
repo.replace_conversation("c", vec![rewrite("m0", 0, "user", "v3")])
|
||||
.await
|
||||
.expect("replace again");
|
||||
let got = repo.list_by_conversation("c").await.expect("list");
|
||||
assert_eq!(got.len(), 1);
|
||||
assert_eq!(got[0].created_at, "2026-10-01T10:00:00.000", "连续重写 created_at 不漂移");
|
||||
}
|
||||
|
||||
/// limit=0 契约:返空集(直传 SQLite LIMIT 0),不再旧版 max(1) 钳成 1 条。
|
||||
/// 锁死语义防回归:请求 0 条却回 1 条会让调用方误判页内有数据。
|
||||
#[tokio::test]
|
||||
|
||||
@@ -87,9 +87,9 @@ fn build_order_clause(order_by: Option<&str>) -> Result<String> {
|
||||
|
||||
/// 带「最近活跃时间」的项目记录(list_active_with_activity 专用返回结构)。
|
||||
///
|
||||
/// `last_active_at` = COALESCE(project_events 最新事件 created_at, projects.updated_at):
|
||||
/// 反映业务活跃(任务/灵感/状态推进等事件),无事件项目回退 updated_at。供前端「最近活跃排序」
|
||||
/// 展示,语义比 projects.updated_at(随元信息修改如改 description 也会刷新)更准确。
|
||||
/// `last_active_at` = MAX(tasks.updated_at 最新值, project_events 最新 created_at,
|
||||
/// projects.updated_at):任务活跃为主信号(任务面是真实工作发生地),事件表已停写仅保留维度,
|
||||
/// updated_at 兜底。供前端「最近活跃排序」展示与 system prompt 项目清单排序。
|
||||
///
|
||||
/// Serialize 供 IPC 层直接序列化回前端(serde 字段名 snake_case,对齐 ProjectRecord)。
|
||||
#[derive(Debug, Clone, serde::Serialize)]
|
||||
@@ -243,29 +243,35 @@ impl ProjectRepo {
|
||||
.map_err(storage_err)?
|
||||
}
|
||||
|
||||
/// 列出未删除项目,**按「最近活跃」排序**(LEFT JOIN project_events 取最新事件时间,
|
||||
/// COALESCE 回退 updated_at)。
|
||||
/// 列出未删除项目,**按「最近活跃」排序**(三源取大:任务活跃为主信号)。
|
||||
///
|
||||
/// 业务语义:项目「最近活跃」应反映业务事件(任务/灵感/状态推进),而非 projects.updated_at
|
||||
/// (后者随元信息修改如改 description/path 也会刷新,不反映真实业务活跃)。本方法通过子查询
|
||||
/// 取每个项目 project_events 最新 created_at,无事件项目回退 updated_at,排序列统一可比。
|
||||
/// 业务语义:last_active_at = MAX(tasks.updated_at 最新值, project_events 最新 created_at,
|
||||
/// projects.updated_at)。**任务活跃为主信号**——ai-chat 会话/任务面是真实工作发生地,
|
||||
/// 任务停更即项目停更;project_events 已停写(现网空表,保留维度向后兼容);
|
||||
/// projects.updated_at 仅元信息修改(改 description/path 也会刷新,不反映真实业务活跃),
|
||||
/// 仅作兜底。无任务无事件的项目回退 updated_at,排序列统一可比。
|
||||
///
|
||||
/// 子查询而非 JOIN:project_events 每项目可能 0..N 条,JOIN 会展开需 DISTINCT,子查询
|
||||
/// `(SELECT MAX(created_at) FROM project_events WHERE project_id = projects.id)` 每行一次
|
||||
/// 聚合,语义清晰无笛卡尔积风险。单用户桌面应用项目数小,无性能压力。
|
||||
/// 子查询而非 JOIN:tasks/project_events 每项目可能 0..N 条,JOIN 会展开需 DISTINCT,
|
||||
/// 标量子查询每行一次聚合,语义清晰无笛卡尔积风险(SQLite 多参 MAX 为标量取大,
|
||||
/// IFNULL 兜空子查询 NULL)。单用户桌面应用项目数小,无性能压力。
|
||||
///
|
||||
/// 返回 `ProjectActivityRecord`(ProjectRecord + last_active_at 字段),供前端排序展示。
|
||||
/// 返回 `ProjectActivityRecord`(ProjectRecord + last_active_at 字段),供前端排序展示
|
||||
/// 与 system prompt「当前项目」清单(build_context_lists)按活跃度排序。
|
||||
pub async fn list_active_with_activity(&self) -> Result<Vec<ProjectActivityRecord>> {
|
||||
let conn = self.conn.clone();
|
||||
tokio::task::spawn_blocking(move || {
|
||||
let guard = conn.blocking_lock();
|
||||
// COALESCE(子查询最新事件, projects.updated_at):无事件项目回退 updated_at,
|
||||
// 保证所有项目有可比活跃时间。ORDER BY 该列 DESC,同时间 created_at DESC 兜底稳定。
|
||||
// 三源取大(SQLite 多参 MAX=标量取大,IFNULL 兜空子查询):任务活跃为主信号,
|
||||
// 事件表已停写仅保留维度,updated_at 兜底。ORDER BY 该列 DESC,同时间 created_at DESC
|
||||
// 兜底稳定。
|
||||
let mut stmt = guard
|
||||
.prepare(
|
||||
"SELECT id, name, description, status, idea_id, path, stack, archived, created_at, updated_at, \
|
||||
COALESCE((SELECT MAX(created_at) FROM project_events WHERE project_id = projects.id), \
|
||||
updated_at) AS last_active_at \
|
||||
MAX(\
|
||||
IFNULL((SELECT MAX(updated_at) FROM tasks WHERE project_id = projects.id AND deleted_at IS NULL), 0), \
|
||||
IFNULL((SELECT MAX(created_at) FROM project_events WHERE project_id = projects.id), 0), \
|
||||
updated_at\
|
||||
) AS last_active_at \
|
||||
FROM projects WHERE deleted_at IS NULL AND archived = 0 \
|
||||
ORDER BY last_active_at DESC, created_at DESC",
|
||||
)
|
||||
@@ -840,4 +846,62 @@ mod tests {
|
||||
assert_eq!(after.name, "原项目", "回收站项目内容不应被改写");
|
||||
assert_eq!(after.updated_at, current.updated_at, "updated_at 不应抖动");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn list_active_with_activity_orders_by_task_activity_over_created_at() {
|
||||
// 回归(事故形状):项目 A created_at 较晚(创建序排前)但无任务/停更;项目 B
|
||||
// created_at 较早但有一条 tasks.updated_at 最新 → 活跃序 B 排 A 前
|
||||
// (任务活跃为主信号,治创建序误导 AI 把停摆项目当最高优先锚点)。
|
||||
use crate::crud::task_repo::TaskRepo;
|
||||
use crate::models::TaskRecord;
|
||||
use df_types::types::TaskStatus;
|
||||
|
||||
let db = Database::open_in_memory().await.expect("open_in_memory");
|
||||
let projects = ProjectRepo::new(&db);
|
||||
let tasks = TaskRepo::new(&db);
|
||||
|
||||
// B 先建(早),A 后建(晚)——创建序会排 A 前
|
||||
let mut early = prec("pb", "早建但活跃");
|
||||
early.created_at = "1700000000000".to_string();
|
||||
early.updated_at = "1700000000000".to_string();
|
||||
let mut late = prec("pa", "晚建但停更");
|
||||
late.created_at = "1700000010000".to_string();
|
||||
late.updated_at = "1700000010000".to_string();
|
||||
projects.insert(early).await.unwrap();
|
||||
projects.insert(late).await.unwrap();
|
||||
|
||||
// B 挂一条最新任务;A 无任务 → B 活跃时间取任务 updated_at,A 回退自身 updated_at
|
||||
let task = TaskRecord {
|
||||
id: "tb".to_string(),
|
||||
project_id: "pb".to_string(),
|
||||
title: "B 的任务".to_string(),
|
||||
description: String::new(),
|
||||
status: TaskStatus::InProgress,
|
||||
priority: 0,
|
||||
branch_name: None,
|
||||
assignee: None,
|
||||
workflow_def_id: None,
|
||||
base_branch: None,
|
||||
review_rounds: 0,
|
||||
output_json: None,
|
||||
idea_id: None,
|
||||
queue: "todo".to_string(),
|
||||
parent_id: None,
|
||||
content_json: None,
|
||||
module_id: None,
|
||||
archived: false,
|
||||
created_at: "1700000000000".to_string(),
|
||||
updated_at: "1790000000000".to_string(),
|
||||
};
|
||||
tasks.insert(task).await.unwrap();
|
||||
|
||||
let listed = projects.list_active_with_activity().await.unwrap();
|
||||
assert_eq!(listed.len(), 2);
|
||||
assert_eq!(listed[0].record.id, "pb", "任务活跃最新的早建项目应排前");
|
||||
assert_eq!(listed[1].record.id, "pa", "无任务的晚建项目应排后");
|
||||
assert_eq!(
|
||||
listed[0].last_active_at, "1790000000000",
|
||||
"活跃时间应取该项目任务 updated_at 最新值"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user