knowledge: fact supersession + photo-date valid_from

Two Phase-2 followups in one commit since they're coupled at the
write path:

* Agent populates valid_from from the source photo's date_taken
  when calling store_fact. Loose semantics — date_taken is *evidence
  at that date*, not strictly when the fact started being true — but
  gives the curator a calendar anchor and pairs with supersession to
  close intervals cleanly. valid_until stays NULL (a single photo
  can't tell us when something stopped). Honours the existing
  upsert_fact dedup (corroborated facts keep their first-recorded
  valid_from).

* Supersession: new column entity_facts.superseded_by INTEGER
  (migration 2026-05-10-000200), new status value 'superseded',
  new DAO method supersede_fact, new HTTP endpoint
  POST /knowledge/facts/{id}/supersede.

  Marking an old fact as replaced by a new one atomically: flips
  status to 'superseded', sets superseded_by, and stamps
  valid_until from the new fact's valid_from (when not already
  set). delete_fact clears dangling supersession pointers in the
  same transaction so the column never points at a missing row —
  no FK because SQLite can't ALTER ADD with REFERENCES, but the
  DAO maintains the invariant.

Pairs with conflict detection from the previous slice: once the
old fact's valid_until is closed, its interval no longer overlaps
the new fact's, so they stop flagging — the supersede action
resolves the conflict.

Two tests pin the contract: supersede stamps valid_until from
new.valid_from while respecting an existing valid_until, and
deleting the supersedeR clears the dangling pointer while leaving
the old fact's 'superseded' status in place for history.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Cameron Cordes
2026-05-10 19:47:06 -04:00
parent 01f5ad7527
commit 85f3716379
7 changed files with 307 additions and 9 deletions

View File

@@ -0,0 +1,2 @@
DROP INDEX IF EXISTS idx_entity_facts_superseded_by;
ALTER TABLE entity_facts DROP COLUMN superseded_by;

View File

@@ -0,0 +1,31 @@
-- Add a supersession pointer to entity_facts.
--
-- Status alone is a one-way trapdoor: 'rejected' loses the link
-- between the rejected fact and the one that replaced it. For
-- evolving facts (Cameron's relationship, employer, address) the
-- curator wants to *replace* a stale fact with a new one and keep
-- the history readable: "from 2018 until 2022 this was true, then
-- it became this other thing".
--
-- A nullable INTEGER column pointing at another entity_facts.id —
-- no FK constraint because SQLite can't ALTER ADD COLUMN with REFs;
-- the DAO's delete_fact clears dangling pointers in the same
-- transaction as the parent delete to keep the column honest.
--
-- A status of 'superseded' on the old fact (alongside the existing
-- active / reviewed / rejected) signals "replaced by a newer
-- claim". Read paths already filter 'rejected' out of the active
-- view; the curation UI will treat 'superseded' the same way for
-- conflict detection so they don't keep flagging.
--
-- Pairs with the valid-time columns from 2026-05-10-000100: the
-- supersede action auto-stamps the old fact's `valid_until` from
-- the new fact's `valid_from`, closing the interval cleanly.
ALTER TABLE entity_facts ADD COLUMN superseded_by INTEGER;
-- Helpful index for "show me what superseded this fact" walks
-- (rare today; cheap to add now while the table is small).
CREATE INDEX idx_entity_facts_superseded_by
ON entity_facts(superseded_by)
WHERE superseded_by IS NOT NULL;

View File

@@ -2672,6 +2672,19 @@ Return ONLY the summary, nothing else."#,
file_path file_path
); );
// Anchor the fact in valid-time using the source photo's
// `date_taken` (Apollo's naive-as-UTC convention is fine
// here — we only care about calendar ordering, not absolute
// UTC). The semantic stretch: a photo *evidences* the fact at
// that date — the fact may have started earlier — so this is
// best read as "no later than this it started being true",
// not a strict lower bound. Still useful: gives the curator a
// calendar anchor and lets supersession (next slice) close
// intervals cleanly when a newer fact arrives. valid_until
// stays NULL — a single photo can't tell us when something
// *stopped* being true.
let valid_from = self.fetch_exif(file_path).and_then(|e| e.date_taken);
let fact = InsertEntityFact { let fact = InsertEntityFact {
subject_entity_id, subject_entity_id,
predicate, predicate,
@@ -2684,11 +2697,9 @@ Return ONLY the summary, nothing else."#,
created_at: chrono::Utc::now().timestamp(), created_at: chrono::Utc::now().timestamp(),
persona_id: persona_id.to_string(), persona_id: persona_id.to_string(),
user_id, user_id,
// The agentic loop doesn't yet derive valid-time from the valid_from,
// photo's date_taken. Left NULL for now; Phase 2's
// supersession + a future agent tool will populate these.
valid_from: None,
valid_until: None, valid_until: None,
superseded_by: None,
}; };
let mut kdao = self let mut kdao = self

View File

@@ -226,6 +226,21 @@ pub trait KnowledgeDao: Sync + Send {
fn delete_fact(&mut self, cx: &opentelemetry::Context, id: i32) -> Result<(), DbError>; fn delete_fact(&mut self, cx: &opentelemetry::Context, id: i32) -> Result<(), DbError>;
/// Mark an old fact as superseded by a new one. Atomically:
/// - reads the new fact's valid_from
/// - sets old.superseded_by = new_id
/// - sets old.status = 'superseded'
/// - stamps old.valid_until = new.valid_from (if not already
/// set; otherwise leaves it)
///
/// Returns the updated old fact. Errors if either id is missing.
fn supersede_fact(
&mut self,
cx: &opentelemetry::Context,
old_id: i32,
new_id: i32,
) -> Result<Option<EntityFact>, DbError>;
// --- Photo links --- // --- Photo links ---
fn upsert_photo_link( fn upsert_photo_link(
&mut self, &mut self,
@@ -1131,12 +1146,96 @@ impl KnowledgeDao for SqliteKnowledgeDao {
trace_db_call(cx, "delete", "delete_fact", |_span| { trace_db_call(cx, "delete", "delete_fact", |_span| {
use schema::entity_facts::dsl::*; use schema::entity_facts::dsl::*;
let mut conn = self.connection.lock().expect("KnowledgeDao lock"); let mut conn = self.connection.lock().expect("KnowledgeDao lock");
diesel::delete(entity_facts.filter(id.eq(fact_id))) // Clear dangling supersession pointers from any fact this
.execute(conn.deref_mut()) // one had retired — there's no FK on superseded_by (SQLite
.map(|_| ()) // can't ALTER ADD with REFERENCES) so we do it manually.
// Sibling rows lose the pointer but stay 'superseded' —
// the user's historical correction survives the cleanup.
conn.transaction::<(), diesel::result::Error, _>(|conn| {
diesel::update(entity_facts.filter(superseded_by.eq(fact_id)))
.set(superseded_by.eq::<Option<i32>>(None))
.execute(conn)?;
diesel::delete(entity_facts.filter(id.eq(fact_id))).execute(conn)?;
Ok(())
})
.map_err(|e| anyhow::anyhow!("Delete error: {}", e)) .map_err(|e| anyhow::anyhow!("Delete error: {}", e))
}) })
.map_err(|_| DbError::new(DbErrorKind::QueryError)) .map_err(|e| {
log::warn!("delete_fact({}) failed: {}", fact_id, e);
DbError::new(DbErrorKind::QueryError)
})
}
fn supersede_fact(
&mut self,
cx: &opentelemetry::Context,
old_id: i32,
new_id: i32,
) -> Result<Option<EntityFact>, DbError> {
trace_db_call(cx, "update", "supersede_fact", |_span| {
use schema::entity_facts::dsl::*;
let mut conn = self.connection.lock().expect("KnowledgeDao lock");
if old_id == new_id {
return Err(anyhow::anyhow!(
"supersede_fact: old_id and new_id must differ"
));
}
conn.transaction::<Option<EntityFact>, diesel::result::Error, _>(
|conn| {
// Pull the new fact's valid_from so we can close
// the old fact's interval at the same point.
let new_fact: Option<EntityFact> = entity_facts
.filter(id.eq(new_id))
.first::<EntityFact>(conn)
.optional()?;
let Some(new_fact) = new_fact else {
return Ok(None);
};
// Verify the old fact exists before touching it —
// returning None lets the handler 404 cleanly.
let old_fact: Option<EntityFact> = entity_facts
.filter(id.eq(old_id))
.first::<EntityFact>(conn)
.optional()?;
if old_fact.is_none() {
return Ok(None);
}
// Only stamp valid_until if the user hasn't
// already set it — respecting hand-curated bounds.
let target_valid_until = old_fact
.as_ref()
.and_then(|f| f.valid_until)
.or(new_fact.valid_from);
diesel::update(entity_facts.filter(id.eq(old_id)))
.set((
status.eq("superseded"),
superseded_by.eq(Some(new_id)),
valid_until.eq(target_valid_until),
))
.execute(conn)?;
entity_facts
.filter(id.eq(old_id))
.first::<EntityFact>(conn)
.optional()
},
)
.map_err(|e| anyhow::anyhow!("Supersede error: {}", e))
})
.map_err(|e| {
log::warn!(
"supersede_fact(old={}, new={}) failed: {}",
old_id,
new_id,
e
);
DbError::new(DbErrorKind::UpdateError)
})
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
@@ -1370,6 +1469,7 @@ mod tests {
user_id, user_id,
valid_from: None, valid_from: None,
valid_until: None, valid_until: None,
superseded_by: None,
}, },
) )
.unwrap(); .unwrap();
@@ -1590,6 +1690,7 @@ mod tests {
user_id: alice, user_id: alice,
valid_from: None, valid_from: None,
valid_until: None, valid_until: None,
superseded_by: None,
}, },
); );
assert!( assert!(
@@ -1598,6 +1699,112 @@ mod tests {
); );
} }
#[test]
fn supersede_fact_links_and_stamps_valid_until() {
// Supersession: marking an old fact as replaced by a new one
// flips its status to 'superseded', points superseded_by at
// the new fact, and stamps valid_until from the new fact's
// valid_from (when not already set). Pre-existing valid_until
// on the old fact is respected.
let cx = opentelemetry::Context::new();
let conn = connection_with_fks_on();
let alice = create_user(&conn, "alice");
create_persona_row(&conn, alice, "default");
let mut dao = SqliteKnowledgeDao::from_connection(conn.clone());
let cameron = make_entity(&mut dao, "Cameron");
let old = add_fact(
&mut dao,
cameron.id,
"is_in_relationship_with",
"X",
alice,
"default",
);
// The new fact carries a valid_from we expect to be stamped
// onto the old fact's valid_until.
let new = add_fact(
&mut dao,
cameron.id,
"is_in_relationship_with",
"Y",
alice,
"default",
);
dao.update_fact(
&cx,
new.id,
FactPatch {
predicate: None,
object_value: None,
status: None,
confidence: None,
valid_from: Some(Some(1640995200)), // 2022-01-01
valid_until: None,
},
)
.unwrap();
let updated = dao
.supersede_fact(&cx, old.id, new.id)
.unwrap()
.expect("supersede returned None");
assert_eq!(updated.status, "superseded");
assert_eq!(updated.superseded_by, Some(new.id));
assert_eq!(updated.valid_until, Some(1640995200));
}
#[test]
fn delete_fact_clears_dangling_supersession_pointers() {
// Deleting the newer fact (the supersedeR) leaves the older
// fact's superseded_by dangling — the DAO clears it back to
// NULL in the same transaction so the column never points at
// a missing row. The old fact's status stays 'superseded'
// because the historical correction is still meaningful.
let cx = opentelemetry::Context::new();
let conn = connection_with_fks_on();
let alice = create_user(&conn, "alice");
create_persona_row(&conn, alice, "default");
let mut dao = SqliteKnowledgeDao::from_connection(conn.clone());
let cameron = make_entity(&mut dao, "Cameron");
let old = add_fact(&mut dao, cameron.id, "lives_in", "NYC", alice, "default");
let new = add_fact(&mut dao, cameron.id, "lives_in", "SF", alice, "default");
dao.supersede_fact(&cx, old.id, new.id).unwrap().unwrap();
dao.delete_fact(&cx, new.id).unwrap();
let rehydrated = dao
.list_facts(
&cx,
FactFilter {
entity_id: Some(cameron.id),
// "all" — the old fact is 'superseded' now, so the
// default 'active' scope would skip it.
status: Some("all".to_string()),
predicate: None,
persona: PersonaFilter::Single {
user_id: alice,
persona_id: "default".to_string(),
},
limit: 10,
offset: 0,
},
)
.unwrap()
.0;
let old_row = rehydrated.iter().find(|f| f.id == old.id).unwrap();
assert_eq!(
old_row.superseded_by, None,
"dangling supersession pointer should be cleared"
);
assert_eq!(
old_row.status, "superseded",
"historical status should survive the supersederr delete"
);
}
#[test] #[test]
fn update_fact_can_set_and_clear_valid_time() { fn update_fact_can_set_and_clear_valid_time() {
// FactPatch.valid_from / valid_until are Option<Option<i64>> // FactPatch.valid_from / valid_until are Option<Option<i64>>
@@ -1715,6 +1922,7 @@ mod tests {
user_id: alice, user_id: alice,
valid_from: None, valid_from: None,
valid_until: None, valid_until: None,
superseded_by: None,
}, },
) )
.unwrap(); .unwrap();

View File

@@ -258,6 +258,10 @@ pub struct InsertEntityFact {
/// 2026-05-10-000100. /// 2026-05-10-000100.
pub valid_from: Option<i64>, pub valid_from: Option<i64>,
pub valid_until: Option<i64>, pub valid_until: Option<i64>,
/// Points at the entity_facts.id that replaced this one. Set by
/// the supersede endpoint; status flips to 'superseded' in the
/// same transaction. See migration 2026-05-10-000200.
pub superseded_by: Option<i32>,
} }
#[derive(Serialize, Queryable, Clone, Debug)] #[derive(Serialize, Queryable, Clone, Debug)]
@@ -276,6 +280,7 @@ pub struct EntityFact {
pub user_id: i32, pub user_id: i32,
pub valid_from: Option<i64>, pub valid_from: Option<i64>,
pub valid_until: Option<i64>, pub valid_until: Option<i64>,
pub superseded_by: Option<i32>,
} }
#[derive(Insertable)] #[derive(Insertable)]

View File

@@ -61,6 +61,7 @@ diesel::table! {
user_id -> Integer, user_id -> Integer,
valid_from -> Nullable<BigInt>, valid_from -> Nullable<BigInt>,
valid_until -> Nullable<BigInt>, valid_until -> Nullable<BigInt>,
superseded_by -> Nullable<Integer>,
} }
} }

View File

@@ -115,6 +115,10 @@ pub struct FactDetail {
/// recorded it). See migration 2026-05-10-000100. /// recorded it). See migration 2026-05-10-000100.
pub valid_from: Option<i64>, pub valid_from: Option<i64>,
pub valid_until: Option<i64>, pub valid_until: Option<i64>,
/// Points at the entity_facts.id that replaced this one (Phase 2
/// supersession, migration 2026-05-10-000200). Only set when
/// status == 'superseded'.
pub superseded_by: Option<i32>,
/// Set when another active fact has the same subject+predicate, /// Set when another active fact has the same subject+predicate,
/// a different object, AND their valid-time intervals overlap. /// a different object, AND their valid-time intervals overlap.
/// Detected at read time by the get_entity handler grouping /// Detected at read time by the get_entity handler grouping
@@ -228,6 +232,12 @@ pub struct FactPatchRequest {
pub valid_until: Option<Option<i64>>, pub valid_until: Option<Option<i64>>,
} }
#[derive(Deserialize)]
pub struct SupersedeRequest {
/// The id of the new fact that replaces the path-params one.
pub by_fact_id: i32,
}
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct FactCreateRequest { pub struct FactCreateRequest {
pub subject_entity_id: i32, pub subject_entity_id: i32,
@@ -296,6 +306,10 @@ where
.route(web::patch().to(patch_fact::<D>)) .route(web::patch().to(patch_fact::<D>))
.route(web::delete().to(delete_fact::<D>)), .route(web::delete().to(delete_fact::<D>)),
) )
.service(
web::resource("/facts/{id}/supersede")
.route(web::post().to(supersede_fact::<D>)),
)
.service(web::resource("/recent").route(web::get().to(get_recent::<D>))), .service(web::resource("/recent").route(web::get().to(get_recent::<D>))),
) )
} }
@@ -417,6 +431,7 @@ async fn get_entity<D: KnowledgeDao + 'static>(
created_at: f.created_at, created_at: f.created_at,
valid_from: f.valid_from, valid_from: f.valid_from,
valid_until: f.valid_until, valid_until: f.valid_until,
superseded_by: f.superseded_by,
in_conflict: false, in_conflict: false,
}); });
} }
@@ -752,6 +767,7 @@ async fn create_fact<D: KnowledgeDao + 'static>(
user_id, user_id,
valid_from: body.valid_from, valid_from: body.valid_from,
valid_until: body.valid_until, valid_until: body.valid_until,
superseded_by: None,
}; };
match dao.upsert_fact(&cx, insert) { match dao.upsert_fact(&cx, insert) {
@@ -815,6 +831,30 @@ async fn delete_fact<D: KnowledgeDao + 'static>(
} }
} }
async fn supersede_fact<D: KnowledgeDao + 'static>(
_claims: Claims,
id: web::Path<i32>,
body: web::Json<SupersedeRequest>,
dao: web::Data<Mutex<D>>,
) -> impl Responder {
let cx = opentelemetry::Context::current();
let old_id = id.into_inner();
if old_id == body.by_fact_id {
return HttpResponse::BadRequest()
.json(serde_json::json!({"error": "old_id and by_fact_id must differ"}));
}
let mut dao = dao.lock().expect("Unable to lock KnowledgeDao");
match dao.supersede_fact(&cx, old_id, body.by_fact_id) {
Ok(Some(fact)) => HttpResponse::Ok().json(fact),
Ok(None) => HttpResponse::NotFound()
.json(serde_json::json!({"error": "Old or new fact not found"})),
Err(e) => {
log::error!("supersede_fact error: {:?}", e);
HttpResponse::InternalServerError().json(serde_json::json!({"error": "Database error"}))
}
}
}
async fn get_recent<D: KnowledgeDao + 'static>( async fn get_recent<D: KnowledgeDao + 'static>(
req: HttpRequest, req: HttpRequest,
claims: Claims, claims: Claims,