lifecycle: seed applied repo at template commit, not main, for first-spawn diff

This commit is contained in:
damocles 2026-05-22 21:27:31 +02:00 committed by Mara
parent 93bf91535f
commit 3f08051bda
2 changed files with 30 additions and 4 deletions

View file

@ -562,9 +562,10 @@ async fn submit_apply_commit(
}
if !applied_dir.join(".git").exists() {
// First deploy: seed the applied repo from proposed so we can plant
// the proposal/<id> tag below. The applied repo starts at the
// template commit (deployed/0); run_apply_commit will fast-forward
// main to the manager's commit on approval and create the container.
// the proposal/<id> tag below. setup_applied seeds at the root
// (template) commit of proposed, not at main, so deployed/0 is the
// template baseline. This makes the diff mara sees on approval
// show the manager's actual changes rather than an empty diff.
lifecycle::setup_applied(&applied_dir, Some(&proposed_dir), agent)
.await
.context("seed applied repo for first spawn")?;