Merge pull request #583 from Fr-e-d/contrib/sync-1782349811

sync: update 2 file(s) in core/

Author: Fr-e-d

.gaai/core/scripts/delivery-daemon.sh

@@ -4060,6 +4060,13 @@ cd "$PROJECT_DIR" || exit 1
 
 # Inherit daemon's env vars critical to dispatch :
 export PROJECT_DIR="$PROJECT_DIR"
+# REPO_ROOT = the operator's REAL checkout. MUST be baked in: dispatch's per-story
+# worktree-base derivation is \${REPO_ROOT:-\$PROJECT_DIR}/.. — and PROJECT_DIR above is the
+# daemon HOME (post home-flip). Without REPO_ROOT the fallback nests worktrees under the home
+# (.gaai-worktrees/<repo>/.gaai-worktrees/__daemon-home/<sid>-workspace). Bake the daemon's
+# (correct) REPO_ROOT so the wrapper derives the canonical non-nested base.
+export REPO_ROOT="$REPO_ROOT"
+export GAAI_REPO_ROOT="$REPO_ROOT"
 export BACKLOG_FILE="$BACKLOG"
 export SCHEDULER="$SCHEDULER"
 export LOCK_DIR="$LOCK_DIR"

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Changed
+- fix: bake REPO_ROOT into the generated delivery wrapper (worktree nesting)
 - fix: forward REPO_ROOT/DAEMON_HOME to the per-story delivery wrapper
 - fix: instruct QA to read the ENTIRE decision incl. amendment/reword blocks
 - fix: anchor operator state + worktree base to the real checkout, not the home