Skip to content

World's first open-source enterprise world model.

Same-name peers follow the recording axis (#675)

Roycee02e59d6a03a
diff --git a/crates/utopia-server/src/api/graph_routes.rs b/crates/utopia-server/src/api/graph_routes.rs
index 4f6489b0..016df93e 100644
--- a/crates/utopia-server/src/api/graph_routes.rs
+++ b/crates/utopia-server/src/api/graph_routes.rs
@@ -182,7 +182,8 @@ pub async fn entity_detail(
// 从前它只随 `update_entity` 的响应回来,于是「把同名的合并进来」这个动作
// 只有先改一次名才够得着——而两个张伟并存是「宁分勿合」的正当产物,不是
// 改名改出来的。合并入口该长在能看见同名的地方。
- let same_name = utopia_store::graph::same_name_peers(&state.pool, kb_id, entity_id).await?;
+ let same_name =
+ utopia_store::graph::same_name_peers(&state.pool, kb_id, entity_id, as_of).await?;
// 没落地的派生(0017 §3)也单独一个键:它们连 `derived_facts` 都不在
let blocked =
utopia_store::reasoning::blocked_for_entity(&state.pool, kb_id, entity_id, as_of).await?;
@@ -256,7 +257,9 @@ pub async fn update_entity(
.await;
}
- let peers = utopia_store::graph::same_name_peers(&state.pool, kb_id, entity_id).await?;
+ // 写完之后立刻返回的同名列:这一次问的是当下,不是回放里——传 None 让它
+ // 走「今天」那条路,与面板上没在回放时一致
+ let peers = utopia_store::graph::same_name_peers(&state.pool, kb_id, entity_id, None).await?;
state.emit_review(kb_id);
Ok(Json(json!({ "entity": after, "same_name": peers })))
}
diff --git a/crates/utopia-store/src/graph.rs b/crates/utopia-store/src/graph.rs
index dfff67ed..25bf4896 100644
--- a/crates/utopia-store/src/graph.rs
+++ b/crates/utopia-store/src/graph.rs
@@ -1315,19 +1315,32 @@ pub async fn update_entity(
/// 与给定实体同名(不区分大小写)的其他存活实体——用于改名后提示"是否合并"。
/// 只报告,不阻断:判定它们是否真是同一个,是人的事。
+/// 同名的那一栏要跟着面板上的滑杆走(0019 / #307)。
+///
+/// 不传时间时退回到今天:合并掉的实体不算、昨天及之前的边都数,与现状一致。
+/// 传一个时间:把 `entity_visible_at` 挂上去,三月并掉的「张伟」在二月又会
+/// 重新出现在同名列——而这正是面板想告诉人的事
pub async fn same_name_peers(
pool: &PgPool,
kb_id: Uuid,
entity_id: Uuid,
+ as_of: Option<chrono::DateTime<chrono::Utc>>,
) -> AppResult<Vec<GraphNode>> {
+ let visible = match as_of {
+ Some(_) => crate::record_axis::entity_visible_at("e", 3),
+ None => "e.merged_into IS NULL".to_string(),
+ };
sqlx::query_as(&format!(
- "{} WHERE e.kb_id = $1 AND e.merged_into IS NULL AND e.id <> $2
+ "{} WHERE e.kb_id = $1 AND {visible} AND e.id <> $2
AND lower(e.canonical_name) = (SELECT lower(canonical_name) FROM entities WHERE id = $2)
ORDER BY degree DESC LIMIT 10",
- node_sql(None, None)
+ // 度数也倒回当时谁持有事实:合并把事实搬到了目标身上,只按记录轴过滤、
+ // 不倒回主宾,被并的那个在合并之前也显示 0(与画布、面板不一致)
+ node_sql(as_of.map(|_| 3), as_of.map(|_| 3)),
))
.bind(kb_id)
.bind(entity_id)
+ .bind(as_of)
.fetch_all(pool)
.await
.map_err(Into::into)
diff --git a/crates/utopia-store/tests/same_name_peers_respects_as_of.rs b/crates/utopia-store/tests/same_name_peers_respects_as_of.rs
new file mode 100644
index 00000000..037b9050
--- /dev/null
+++ b/crates/utopia-store/tests/same_name_peers_respects_as_of.rs
@@ -0,0 +1,341 @@
+//! 同名列按记录轴回放(#307 / 0019)。
+//!
+//! 之前 `same_name_peers` 写死 `e.merged_into IS NULL`:三月并掉的「张伟」
+//! 在任何回放时刻都消失,而面板想告诉人的恰恰是「三月并掉之前它叫什么、
+//! 与谁同名」——把同一性的歧义藏在时间之外,会让人把两个独立实体当成
+//! 同一个去合并。
+//!
+//! 两个方向都要钉:
+//!
+//! - **三月并掉的实体**在 `as_of` 早于三月时重新出现(`entity_visible_at`
+//! 的回放语义)
+//! - **当下还活着的实体**在所有时刻都出现
+//! - **当下被作废的事实**不入度数量,而三月那条还活的事实要数
+//!
+//! 没有 `UTOPIA_DATABASE_URL` 时跳过而不是失败。自建自拆,绝不碰已有的库。
+
+use sqlx::PgPool;
+use uuid::Uuid;
+
+fn t(s: &str) -> chrono::DateTime<chrono::Utc> {
+ s.parse().unwrap()
+}
+
+#[tokio::test]
+async fn same_name_peers_respects_as_of() -> anyhow::Result<()> {
+ let Some(url) = utopia_store::test_db::url() else {
+ return Ok(());
+ };
+ let pool = PgPool::connect(&url).await?;
+ let (org, ws, kb, user, person_type) = (
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ );
+ // 张伟 a:1 月记「works_at project_entity」,没作废;3 月与张伟 b 合并
+ let zhang_wei_a = Uuid::now_v7();
+ // 张伟 b:1 月记「works_at other_entity」,没作废——它就是目标,从不消失
+ let zhang_wei_b = Uuid::now_v7();
+ // 张伟 c:5 月记「works_at other_entity」,没作废——从未被合并
+ let zhang_wei_c = Uuid::now_v7();
+ let project_entity = Uuid::now_v7();
+ let other_entity = Uuid::now_v7();
+ let works_at = Uuid::now_v7();
+ let merge_id = Uuid::now_v7();
+ // 张伟 a 上的事实:1 月记下,3 月作废
+ let f_a_old = Uuid::now_v7();
+ // 张伟 b 上的事实:1 月记下
+ let f_b = Uuid::now_v7();
+ // 张伟 c 上的事实:5 月记下(晚于合并)
+ let f_c_new = Uuid::now_v7();
+
+ sqlx::query("INSERT INTO organizations (id, name) VALUES ($1, 'as-of-peers-test')")
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ sqlx::query("INSERT INTO workspaces (id, org_id, name) VALUES ($1, $2, 'as-of-peers-test')")
+ .bind(ws)
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ sqlx::query(
+ "INSERT INTO knowledge_bases (id, workspace_id, name) VALUES ($1, $2, 'as-of-peers-test')",
+ )
+ .bind(kb)
+ .bind(ws)
+ .execute(&pool)
+ .await?;
+ sqlx::query(
+ "INSERT INTO users (id, org_id, email, display_name, password_hash)
+ VALUES ($1, $2, $3, 'Peers Tester', 'x')",
+ )
+ .bind(user)
+ .bind(org)
+ .bind(format!("peers-{}@test.local", user.simple()))
+ .execute(&pool)
+ .await?;
+ sqlx::query(
+ "INSERT INTO entity_types (id, kb_id, key, label) VALUES ($1, $2, 'person', 'Person')",
+ )
+ .bind(person_type)
+ .bind(kb)
+ .execute(&pool)
+ .await?;
+ for (id, name) in [
+ (zhang_wei_a, "Zhang Wei"),
+ (zhang_wei_b, "Zhang Wei"),
+ (zhang_wei_c, "Zhang Wei"),
+ ] {
+ sqlx::query(
+ "INSERT INTO entities (id, kb_id, type_id, canonical_name, created_at)
+ VALUES ($1, $2, $3, $4, $5)",
+ )
+ .bind(id)
+ .bind(kb)
+ .bind(person_type)
+ .bind(name)
+ .bind(t("2026-01-01T00:00:00Z"))
+ .execute(&pool)
+ .await?;
+ }
+ for (id, name) in [
+ (project_entity, "Project Phoenix"),
+ (other_entity, "Other Co"),
+ ] {
+ sqlx::query(
+ "INSERT INTO entities (id, kb_id, canonical_name, created_at)
+ VALUES ($1, $2, $3, $4)",
+ )
+ .bind(id)
+ .bind(kb)
+ .bind(name)
+ .bind(t("2026-01-01T00:00:00Z"))
+ .execute(&pool)
+ .await?;
+ }
+ sqlx::query(
+ "INSERT INTO relation_types (id, kb_id, key, label) VALUES ($1, $2, 'works_at', 'works at')",
+ )
+ .bind(works_at)
+ .bind(kb)
+ .execute(&pool)
+ .await?;
+ for (fid, subject, object, recorded) in [
+ (f_a_old, zhang_wei_a, project_entity, "2026-01-15T00:00:00Z"),
+ (f_b, zhang_wei_b, other_entity, "2026-01-20T00:00:00Z"),
+ (f_c_new, zhang_wei_c, other_entity, "2026-05-10T00:00:00Z"),
+ ] {
+ sqlx::query(
+ "INSERT INTO facts (id, kb_id, subject_id, predicate_id, object_id,
+ confidence, recorded_at)
+ VALUES ($1, $2, $3, $4, $5, 0.9, $6)",
+ )
+ .bind(fid)
+ .bind(kb)
+ .bind(subject)
+ .bind(works_at)
+ .bind(object)
+ .bind(t(recorded))
+ .execute(&pool)
+ .await?;
+ }
+ // 张伟 a 上 1 月记下那条事实在 3 月作废(之后被合并覆盖之前先收掉)
+ sqlx::query("UPDATE facts SET invalidated_at = $2 WHERE id = $1 AND invalidated_at IS NULL")
+ .bind(f_a_old)
+ .bind(t("2026-03-10T00:00:00Z"))
+ .execute(&pool)
+ .await?;
+ // 3 月合并 a → b(直接写 merged_into;本来这一步由 resolution::merge_entities
+ // 内部做,但这里是测同名列的可见性,没必要把整条合并路径走一遍)
+ sqlx::query(
+ "INSERT INTO entity_merges (id, kb_id, source_id, target_id, merged_by, reason, created_at)
+ VALUES ($1, $2, $3, $4, $5, 'duplicate person', $6)",
+ )
+ .bind(merge_id)
+ .bind(kb)
+ .bind(zhang_wei_a)
+ .bind(zhang_wei_b)
+ .bind(user)
+ .bind(t("2026-03-15T00:00:00Z"))
+ .execute(&pool)
+ .await?;
+ sqlx::query("UPDATE entities SET merged_into = $2 WHERE id = $1")
+ .bind(zhang_wei_a)
+ .bind(zhang_wei_b)
+ .execute(&pool)
+ .await?;
+
+ let peers_at = |when: Option<chrono::DateTime<chrono::Utc>>| {
+ let pool = pool.clone();
+ async move { utopia_store::graph::same_name_peers(&pool, kb, zhang_wei_b, when).await }
+ };
+ let names = |rows: Vec<utopia_core::models::GraphNode>| -> Vec<String> {
+ let mut v: Vec<String> = rows.into_iter().map(|n| n.name).collect();
+ v.sort();
+ v
+ };
+
+ // 当下:a 已被合并,只剩 b 和 c
+ let now = peers_at(None).await?;
+ assert_eq!(
+ names(now),
+ vec!["Zhang Wei".to_string()],
+ "当下只剩独立的 Zhang Wei"
+ );
+
+ // 2 月:a 还在活跃,c 已创建 → a、c 都与 b 同名
+ let feb = peers_at(Some(t("2026-02-01T00:00:00Z"))).await?;
+ assert_eq!(
+ names(feb),
+ vec!["Zhang Wei".to_string(), "Zhang Wei".to_string()],
+ "2 月:合并之前,a 与 b 同名"
+ );
+
+ // 4 月:a 已合并,c 已创建 → 只有 c
+ let apr = peers_at(Some(t("2026-04-01T00:00:00Z"))).await?;
+ assert_eq!(
+ names(apr),
+ vec!["Zhang Wei".to_string()],
+ "4 月:a 已合并,只剩 c"
+ );
+
+ // 6 月:合并之后,c 已是唯一独立同名实体
+ let jun = peers_at(Some(t("2026-06-01T00:00:00Z"))).await?;
+ assert_eq!(
+ names(jun),
+ vec!["Zhang Wei".to_string()],
+ "6 月:a 已合并,c 已创建"
+ );
+
+ // 拆夹具:合并记录的 merged_by 指着 user,先删它和 user,再删 organization(级联到库)
+ sqlx::query("DELETE FROM entity_merges WHERE id = $1")
+ .bind(merge_id)
+ .execute(&pool)
+ .await?;
+ sqlx::query("DELETE FROM users WHERE id = $1")
+ .bind(user)
+ .execute(&pool)
+ .await?;
+ sqlx::query("DELETE FROM organizations WHERE id = $1")
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ Ok(())
+}
+
+/// 走真的合并路径:`merge_entities` 把被并实体的事实搬到目标身上。回放到合并之前,
+/// 被并的那个在同名列里的度数要按**当时**谁持有事实来数——与画布、实体面板一致。
+/// 只按记录轴过滤事实、不倒回主语,它在合并之前的时刻也会显示 0
+#[tokio::test]
+async fn a_merged_peer_keeps_its_degree_before_the_merge() -> anyhow::Result<()> {
+ let Some(url) = utopia_store::test_db::url() else {
+ return Ok(());
+ };
+ let pool = PgPool::connect(&url).await?;
+ let (org, ws, kb, person, works_at) = (
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ );
+ let (a, b, acme, other) = (
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ Uuid::now_v7(),
+ );
+ sqlx::query("INSERT INTO organizations (id, name) VALUES ($1, 'as-of-peers-merge')")
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ sqlx::query("INSERT INTO workspaces (id, org_id, name) VALUES ($1, $2, 'as-of-peers-merge')")
+ .bind(ws)
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ sqlx::query(
+ "INSERT INTO knowledge_bases (id, workspace_id, name) VALUES ($1, $2, 'as-of-peers-merge')",
+ )
+ .bind(kb)
+ .bind(ws)
+ .execute(&pool)
+ .await?;
+ let run = async {
+ sqlx::query(
+ "INSERT INTO entity_types (id, kb_id, key, label) VALUES ($1, $2, 'person', 'Person')",
+ )
+ .bind(person)
+ .bind(kb)
+ .execute(&pool)
+ .await?;
+ sqlx::query(
+ "INSERT INTO relation_types (id, kb_id, key, label) VALUES ($1, $2, 'works_at', 'works at')",
+ )
+ .bind(works_at)
+ .bind(kb)
+ .execute(&pool)
+ .await?;
+ for (id, name, typed) in [
+ (a, "Zhang Wei", true),
+ (b, "Zhang Wei", true),
+ (acme, "Acme", false),
+ (other, "Other Co", false),
+ ] {
+ sqlx::query(
+ "INSERT INTO entities (id, kb_id, type_id, canonical_name, created_at)
+ VALUES ($1, $2, $3, $4, $5)",
+ )
+ .bind(id)
+ .bind(kb)
+ .bind(typed.then_some(person))
+ .bind(name)
+ .bind(t("2026-01-01T00:00:00Z"))
+ .execute(&pool)
+ .await?;
+ }
+ for (subject, object) in [(a, acme), (b, other)] {
+ sqlx::query(
+ "INSERT INTO facts (id, kb_id, subject_id, predicate_id, object_id, confidence, recorded_at)
+ VALUES ($1, $2, $3, $4, $5, 0.9, $6)",
+ )
+ .bind(Uuid::now_v7())
+ .bind(kb)
+ .bind(subject)
+ .bind(works_at)
+ .bind(object)
+ .bind(t("2026-01-10T00:00:00Z"))
+ .execute(&pool)
+ .await?;
+ }
+ utopia_store::resolution::merge_entities(&pool, kb, a, b, None, "test").await?;
+ sqlx::query("UPDATE entity_merges SET created_at = $2 WHERE source_id = $1")
+ .bind(a)
+ .bind(t("2026-04-01T00:00:00Z"))
+ .execute(&pool)
+ .await?;
+
+ let feb = Some(t("2026-02-01T00:00:00Z"));
+ let peers = utopia_store::graph::same_name_peers(&pool, kb, b, feb).await?;
+ let merged = peers
+ .iter()
+ .find(|n| n.id == a)
+ .expect("合并之前 a 在同名列里");
+ let (_, panel) = utopia_store::graph::entity_detail(&pool, kb, a, None, feb).await?;
+ assert_eq!(panel.len(), 1, "面板上二月的 a 有一条事实");
+ assert_eq!(merged.degree, 1, "同名列里的度数与面板一致");
+ anyhow::Ok(())
+ }
+ .await;
+ sqlx::query("DELETE FROM knowledge_bases WHERE id = $1")
+ .bind(kb)
+ .execute(&pool)
+ .await?;
+ sqlx::query("DELETE FROM organizations WHERE id = $1")
+ .bind(org)
+ .execute(&pool)
+ .await?;
+ run
+}