diff --git a/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot.sql b/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot.sql
index bb079ef25c..8a36f19368 100644
--- a/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot.sql
+++ b/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot.sql
@@ -1 +1 @@
-SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM {s}.branch b LEFT JOIN {s}.layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN {s}.layer l ON l.layer_id = b.base_layer_id LEFT JOIN {s}."commit" c ON c.commit_id = b.head_commit_id WHERE b.branch_id = $1;
+SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM {s}.branch b LEFT JOIN {s}.layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN {s}.layer l ON l.layer_id = b.base_layer_id LEFT JOIN {s}."commit" c ON c.commit_id = b.head_commit_id WHERE b.branch_id = $1 AND NOT EXISTS (SELECT 1 FROM {s}.branch_retired r WHERE r.branch_id = b.branch_id) AND NOT EXISTS (SELECT 1 FROM {s}.layer_stack_retired d WHERE d.layer_stack_id = b.layer_stack_id);
diff --git a/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot_named.sql b/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot_named.sql
index 8ff1a3808b..715134482e 100644
--- a/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot_named.sql
+++ b/engine/crates/layerfs-persistence/sql/postgresql/queries/history/branch_snapshot_named.sql
@@ -1 +1 @@
-SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM {s}.layer_stack p LEFT JOIN {s}.branch b ON p.name = $1 AND b.layer_stack_id = p.layer_stack_id AND b.name = $2 LEFT JOIN {s}.layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN {s}.layer l ON l.layer_id = b.base_layer_id LEFT JOIN {s}."commit" c ON c.commit_id = b.head_commit_id WHERE p.name = $1;
+SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM {s}.layer_stack p LEFT JOIN {s}.branch b ON p.name = $1 AND b.layer_stack_id = p.layer_stack_id AND b.name = $2 AND NOT EXISTS (SELECT 1 FROM {s}.branch_retired r WHERE r.branch_id = b.branch_id) LEFT JOIN {s}.layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN {s}.layer l ON l.layer_id = b.base_layer_id LEFT JOIN {s}."commit" c ON c.commit_id = b.head_commit_id WHERE p.name = $1 AND NOT EXISTS (SELECT 1 FROM {s}.layer_stack_retired d WHERE d.layer_stack_id = p.layer_stack_id);
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_id.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_id.sql
index 8bb8c308fd..1f9cc22f93 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_id.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_id.sql
@@ -1 +1 @@
-SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE branch_id = $1;
+SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE branch_id = $1 AND NOT EXISTS (SELECT 1 FROM branch_retired r WHERE r.branch_id = branch.branch_id) AND NOT EXISTS (SELECT 1 FROM layer_stack_retired s WHERE s.layer_stack_id = branch.layer_stack_id);
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_id_any.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_id_any.sql
new file mode 100644
index 0000000000..8bb8c308fd
--- /dev/null
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_id_any.sql
@@ -0,0 +1 @@
+SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE branch_id = $1;
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_name.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_name.sql
index f32a794a16..0eadc60e31 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_name.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_by_name.sql
@@ -1 +1 @@
-SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE layer_stack_id = $1 AND name = $2;
+SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE layer_stack_id = $1 AND name = $2 AND NOT EXISTS (SELECT 1 FROM branch_retired r WHERE r.branch_id = branch.branch_id) AND NOT EXISTS (SELECT 1 FROM layer_stack_retired s WHERE s.layer_stack_id = branch.layer_stack_id);
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_first_page.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_first_page.sql
index b31a7ac3cb..948b07f14a 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_first_page.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_first_page.sql
@@ -1 +1 @@
-SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE layer_stack_id = $1 ORDER BY name LIMIT $2;
+SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE layer_stack_id = $1 AND NOT EXISTS (SELECT 1 FROM branch_retired r WHERE r.branch_id = branch.branch_id) AND NOT EXISTS (SELECT 1 FROM layer_stack_retired s WHERE s.layer_stack_id = branch.layer_stack_id) ORDER BY name LIMIT $2;
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_name_taken.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_name_taken.sql
index 66493a918d..e0f54d1707 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_name_taken.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_name_taken.sql
@@ -1 +1 @@
-SELECT 1 FROM branch WHERE layer_stack_id = $1 AND name = $2;
+SELECT b.name, CASE WHEN r.branch_id IS NULL THEN 0 ELSE 1 END FROM branch b LEFT JOIN branch_retired r ON r.branch_id = b.branch_id WHERE b.layer_stack_id = $1 AND b.name = $2;
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_next_page.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_next_page.sql
index 9530b4f910..c37d2b136e 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_next_page.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_branch_next_page.sql
@@ -1 +1 @@
-SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE layer_stack_id = $1 AND name > $2 ORDER BY name LIMIT $3;
+SELECT branch_id, layer_stack_id, name, base_layer_id, head_commit_id, forked_from_id FROM branch WHERE layer_stack_id = $1 AND name > $2 AND NOT EXISTS (SELECT 1 FROM branch_retired r WHERE r.branch_id = branch.branch_id) AND NOT EXISTS (SELECT 1 FROM layer_stack_retired s WHERE s.layer_stack_id = branch.layer_stack_id) ORDER BY name LIMIT $3;
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_retire_insert.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_retire_insert.sql
new file mode 100644
index 0000000000..700f5dd810
--- /dev/null
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_retire_insert.sql
@@ -0,0 +1 @@
+INSERT INTO branch_retired (branch_id, removed_ms) VALUES ($1, $2) ON CONFLICT(branch_id) DO NOTHING RETURNING branch_id;
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot.sql
index 146b8b8c6a..08db9eb02a 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot.sql
@@ -1 +1 @@
-SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM branch b LEFT JOIN layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN layer l ON l.layer_id = b.base_layer_id LEFT JOIN "commit" c ON c.commit_id = b.head_commit_id WHERE b.branch_id = $1;
+SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM branch b LEFT JOIN layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN layer l ON l.layer_id = b.base_layer_id LEFT JOIN "commit" c ON c.commit_id = b.head_commit_id WHERE b.branch_id = $1 AND NOT EXISTS (SELECT 1 FROM branch_retired r WHERE r.branch_id = b.branch_id) AND NOT EXISTS (SELECT 1 FROM layer_stack_retired d WHERE d.layer_stack_id = b.layer_stack_id);
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot_named.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot_named.sql
index d44de96eba..beb7aa52ee 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot_named.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/branch_snapshot_named.sql
@@ -1 +1 @@
-SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM layer_stack p LEFT JOIN branch b ON p.name = $1 AND b.layer_stack_id = p.layer_stack_id AND b.name = $2 LEFT JOIN layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN layer l ON l.layer_id = b.base_layer_id LEFT JOIN "commit" c ON c.commit_id = b.head_commit_id WHERE p.name = $1;
+SELECT b.branch_id, b.layer_stack_id, b.name, b.base_layer_id, b.head_commit_id, b.forked_from_id, s.layer_stack_id, s.name, s.scope_id, s.profile_id, s.head_layer_id, l.root_id, c.commit_id, c.layer_stack_id, c.root_id, c.parent_commit_id, c.base_layer_id, c.second_parent_id, c.branch_id, c.via, c.message, c.merged_from_id, c.created_ms, c.logical, c.new_canonical, c.new_stored, c.new_metadata, c.lww, c.displaced_id FROM layer_stack p LEFT JOIN branch b ON p.name = $1 AND b.layer_stack_id = p.layer_stack_id AND b.name = $2 AND NOT EXISTS (SELECT 1 FROM branch_retired r WHERE r.branch_id = b.branch_id) LEFT JOIN layer_stack s ON s.layer_stack_id = b.layer_stack_id LEFT JOIN layer l ON l.layer_id = b.base_layer_id LEFT JOIN "commit" c ON c.commit_id = b.head_commit_id WHERE p.name = $1 AND NOT EXISTS (SELECT 1 FROM layer_stack_retired d WHERE d.layer_stack_id = p.layer_stack_id);
diff --git a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/layerstack_stack_name_taken.sql b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/layerstack_stack_name_taken.sql
index 875ddc4086..b1e577c213 100644
--- a/engine/crates/layerfs-persistence/sql/sqlite/queries/history/layerstack_stack_name_taken.sql
+++ b/engine/crates/layerfs-persistence/sql/sqlite/queries/history/layerstack_stack_name_taken.sql
@@ -1 +1 @@
-SELECT 1 FROM layer_stack WHERE name = $1;
+SELECT s.name, CASE WHEN r.layer_stack_id IS NULL THEN 0 ELSE 1 END FROM layer_stack s LEFT JOIN layer_stack_retired r ON r.layer_stack_id = s.layer_stack_id WHERE s.name = $1;
diff --git a/engine/crates/layerfs-persistence/src/backend/sqlite/session/query.rs b/engine/crates/layerfs-persistence/src/backend/sqlite/session/query.rs
index 345873410b..f82a0e5f91 100644
--- a/engine/crates/layerfs-persistence/src/backend/sqlite/session/query.rs
+++ b/engine/crates/layerfs-persistence/src/backend/sqlite/session/query.rs
@@ -45,6 +45,12 @@ pub(crate) fn history(key: &str) -> Result<&'static str, BackendError> {
"branch_branch_by_id" => Ok(include_str!(
"../../../../sql/sqlite/queries/history/branch_branch_by_id.sql"
)),
+ "branch_branch_by_id_any" => Ok(include_str!(
+ "../../../../sql/sqlite/queries/history/branch_branch_by_id_any.sql"
+ )),
+ "branch_retire_insert" => Ok(include_str!(
+ "../../../../sql/sqlite/queries/history/branch_retire_insert.sql"
+ )),
"branch_branch_by_name" => Ok(include_str!(
"../../../../sql/sqlite/queries/history/branch_branch_by_name.sql"
)),
diff --git a/engine/crates/layerfs-persistence/src/diagnostic/history.rs b/engine/crates/layerfs-persistence/src/diagnostic/history.rs
index f15d464906..efa0a74541 100644
--- a/engine/crates/layerfs-persistence/src/diagnostic/history.rs
+++ b/engine/crates/layerfs-persistence/src/diagnostic/history.rs
@@ -32,7 +32,7 @@ fn inspect(
options: Options,
observer: &mut dyn FnMut(Observation),
) -> Result<(), BackendError> {
- scratch.0.execute_batch("CREATE TABLE nodes(id BLOB PRIMARY KEY,kind INTEGER NOT NULL,stack BLOB NOT NULL,root BLOB NOT NULL,parent BLOB,base BLOB,second BLOB,source BLOB,source_branch BLOB,done INTEGER NOT NULL DEFAULT 0,height INTEGER,depth INTEGER,newest INTEGER,run BLOB,overwrote INTEGER NOT NULL DEFAULT 0) WITHOUT ROWID; CREATE TABLE edges(child BLOB NOT NULL,parent BLOB NOT NULL,PRIMARY KEY(child,parent)) WITHOUT ROWID; CREATE INDEX parent_edges ON edges(parent,child); CREATE TABLE stacks(id BLOB PRIMARY KEY,scope BLOB NOT NULL,profile BLOB NOT NULL,head BLOB NOT NULL) WITHOUT ROWID; CREATE TABLE branches(id BLOB PRIMARY KEY,stack BLOB NOT NULL,base BLOB NOT NULL,head BLOB,fork BLOB) WITHOUT ROWID; CREATE TABLE contexts(root BLOB,scope BLOB,profile BLOB,PRIMARY KEY(root,scope,profile)) WITHOUT ROWID;").map_err(sql)?;
+ scratch.0.execute_batch("CREATE TABLE nodes(id BLOB PRIMARY KEY,kind INTEGER NOT NULL,stack BLOB NOT NULL,root BLOB NOT NULL,parent BLOB,base BLOB,second BLOB,source BLOB,source_branch BLOB,done INTEGER NOT NULL DEFAULT 0,height INTEGER,depth INTEGER,newest INTEGER,run BLOB,overwrote INTEGER NOT NULL DEFAULT 0,branch BLOB) WITHOUT ROWID; CREATE TABLE edges(child BLOB NOT NULL,parent BLOB NOT NULL,PRIMARY KEY(child,parent)) WITHOUT ROWID; CREATE INDEX parent_edges ON edges(parent,child); CREATE TABLE stacks(id BLOB PRIMARY KEY,scope BLOB NOT NULL,profile BLOB NOT NULL,head BLOB NOT NULL) WITHOUT ROWID; CREATE TABLE branches(id BLOB PRIMARY KEY,stack BLOB NOT NULL,base BLOB NOT NULL,head BLOB,fork BLOB) WITHOUT ROWID; CREATE TABLE contexts(root BLOB,scope BLOB,profile BLOB,PRIMARY KEY(root,scope,profile)) WITHOUT ROWID;").map_err(sql)?;
super::facts::run(view, options, observer)?;
let mut failures = 0u64;
inventory(view, scratch, options, observer, &mut failures)?;
@@ -43,6 +43,7 @@ fn inspect(
("store.history.branches","SELECT b.id,b.base FROM branches b LEFT JOIN nodes n ON n.id=b.base LEFT JOIN stacks s ON s.id=b.stack WHERE n.id IS NULL OR n.kind!=2 OR n.stack!=b.stack OR s.id IS NULL","branch base/stack invalid"),
("store.history.branches","SELECT b.id,b.head FROM branches b LEFT JOIN nodes n ON n.id=b.head WHERE b.head IS NOT NULL AND (n.id IS NULL OR n.kind!=1 OR n.stack!=b.stack)","branch head invalid"),
("store.history.branches","SELECT b.id,b.fork FROM branches b LEFT JOIN nodes n ON n.id=b.fork WHERE b.fork IS NOT NULL AND (n.id IS NULL OR n.stack!=b.stack)","branch fork provenance invalid"),
+ ("store.history.branches","SELECT n.id,n.branch FROM nodes n LEFT JOIN branches b ON b.id=n.branch WHERE n.kind=1 AND n.branch IS NOT NULL AND (b.id IS NULL OR b.stack!=n.stack)","Commit names absent or cross-stack Branch"),
("store.history.provenance","SELECT n.id,n.source FROM nodes n LEFT JOIN nodes c ON c.id=n.source LEFT JOIN branches b ON b.id=n.source_branch WHERE n.kind=2 AND n.parent IS NOT NULL AND (c.id IS NULL OR c.kind!=1 OR c.stack!=n.stack OR c.root!=n.root OR b.id IS NULL OR b.stack!=n.stack)","Layer source Commit/Branch/root mismatch"),
]{
let mut stmt=scratch.0.prepare(query).map_err(sql)?;
@@ -142,7 +143,7 @@ fn inventory(
0=>{let s=crate::history::diagnostic_stack(&row).map_err(|e|e.to_string())?;scratch.0.execute("INSERT INTO stacks(id,scope,profile,head) VALUES(?1,?2,?3,?4)",params![s.id.as_slice(),s.scope.as_bytes().as_slice(),s.profile.as_bytes().as_slice(),s.head_layer.as_slice()]).map_err(|_|"diagnostic scratch".to_owned())?;},
3=>{let b=crate::history::diagnostic_branch(&row).map_err(|e|e.to_string())?;scratch.0.execute("INSERT INTO branches(id,stack,base,head,fork) VALUES(?1,?2,?3,?4,?5)",params![b.id.as_slice(),b.stack.as_slice(),b.base_layer.as_slice(),b.head_commit.map(|v|v.as_slice().to_vec()),b.forked_from.map(|v|v.as_slice().to_vec())]).map_err(|_|"diagnostic scratch".to_owned())?;},
2=>{let l=crate::history::diagnostic_layer(&row).map_err(|e|e.to_string())?;scratch.0.execute("INSERT INTO nodes(id,kind,stack,root,parent,source,source_branch,overwrote) VALUES(?1,2,?2,?3,?4,?5,?6,?7)",params![l.id.as_slice(),l.stack.as_slice(),l.root.as_bytes().as_slice(),l.parent.map(|v|v.as_slice().to_vec()),l.source_commit.map(|v|v.as_slice().to_vec()),l.source_branch.map(|v|v.as_slice().to_vec()),i64::try_from(l.overwrote_count).map_err(|_|"Layer overwrite count".to_owned())?]).map_err(|_|"diagnostic scratch".to_owned())?;if LayerId::derive(l.stack,l.parent,l.root)!=l.id{return Err("Layer identity mismatch".to_owned());}},
- _=>{let c=crate::history::diagnostic_commit_graph(&row).map_err(|e|e.to_string())?;scratch.0.execute("INSERT INTO nodes(id,kind,stack,root,parent,base,second) VALUES(?1,1,?2,?3,?4,?5,?6)",params![c.id.as_slice(),c.stack.as_slice(),c.root.as_bytes().as_slice(),c.parent.map(|v|v.as_slice().to_vec()),c.base_layer.as_slice(),c.second_parent.map(|v|v.as_slice().to_vec())]).map_err(|_|"diagnostic scratch".to_owned())?;
+ _=>{let c=crate::history::diagnostic_commit_graph(&row).map_err(|e|e.to_string())?;scratch.0.execute("INSERT INTO nodes(id,kind,stack,root,parent,base,second,branch) VALUES(?1,1,?2,?3,?4,?5,?6,?7)",params![c.id.as_slice(),c.stack.as_slice(),c.root.as_bytes().as_slice(),c.parent.map(|v|v.as_slice().to_vec()),c.base_layer.as_slice(),c.second_parent.map(|v|v.as_slice().to_vec()),c.meta.branch.map(|v|v.as_slice().to_vec())]).map_err(|_|"diagnostic scratch".to_owned())?;
for edge in [c.meta.merged_from,c.meta.displaced.map(layerfs_history::NodeId::Commit)].into_iter().flatten(){scratch.0.execute("INSERT OR IGNORE INTO edges VALUES(?1,?2)",params![c.id.as_slice(),edge.as_slice()]).map_err(|_|"diagnostic scratch".to_owned())?;}
if CommitId::derive(c.root,c.parent,c.base_layer,c.second_parent,&c.meta)!=c.id{return Err("Commit v3 identity mismatch".to_owned());}
}
diff --git a/engine/crates/layerfs-persistence/src/history/branch.rs b/engine/crates/layerfs-persistence/src/history/branch.rs
index e174b8cdf2..9f0d64dd17 100644
--- a/engine/crates/layerfs-persistence/src/history/branch.rs
+++ b/engine/crates/layerfs-persistence/src/history/branch.rs
@@ -7,7 +7,10 @@
use super::params;
use super::transaction::Transaction;
-use layerfs_history::error::{HistoryError, HistoryResult, Missing};
+use layerfs_history::error::{
+ HistoryError, HistoryResult, HolderKind, HolderState, Missing, NameHolder, NameSource,
+ NameTakenState,
+};
use layerfs_history::identity::{BranchId, CatalogId, HistoryName, LayerStackId};
use layerfs_history::records::{
BranchRecord, BranchSnapshot, ForkRequest, ForkSource, Page, PageResult,
@@ -15,13 +18,17 @@ use layerfs_history::records::{
use layerfs_history::NamedSnapshot;
use super::query::{self, Context, Cursor, Range};
-use super::rows::{branch_row, commit_row, many, one, sql, stack_row};
+use super::rows::{branch_row, cell, commit_row, many, one, sql, stack_row};
use crate::backend::records::{Record as Row, Value};
use layerfs_content::ObjectId;
use layerfs_history::records::{CommitRecord, LayerStackRecord};
const BRANCH_BY_ID: &str = "branch_branch_by_id";
+/// The same row without the visibility filter: fork provenance and rendering
+/// keep a retired Branch's name and stack without resolving it for a caller.
+const BRANCH_BY_ID_ANY: &str = "branch_branch_by_id_any";
+
const BRANCH_BY_NAME: &str = "branch_branch_by_name";
const BRANCH_FIRST_PAGE: &str = "branch_branch_first_page";
@@ -37,6 +44,55 @@ pub(crate) fn branch(tx: &Transaction<'_>, id: BranchId) -> HistoryResult