Merge pull request #579 from Fr-e-d/contrib/sync-1782340282

sync: update 4 file(s) in core/

Author: Fr-e-d

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

@@ -44,7 +44,7 @@ CORE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 GAAI_DIR="$(cd "$CORE_DIR/.." && pwd)"
 PROJECT_ROOT="$(cd "$GAAI_DIR/.." && pwd)"
 # The operator's real repo checkout. Exported so the daemon — even when its binary runs from
-# GAAI_DAEMON_HOME (DEC-162 / E1003S04) — anchors BOTH the per-story worktree base
+# GAAI_DAEMON_HOME (the dedicated daemon home worktree) — anchors BOTH the per-story worktree base
 # (delivery-daemon.sh REPO_ROOT, else it falls back to PROJECT_DIR=home and nests) AND its
 # operator-facing state (logs/locks/retry/drift), so the monitor + `--logs` keep working.
 export GAAI_REPO_ROOT="$PROJECT_ROOT"

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

@@ -170,7 +170,7 @@ BACKLOG_FILE="$BACKLOG"   # alias for daemon-dispatch.sh library (E134S02)
 SCHEDULER="$SCRIPT_DIR/backlog-scheduler.sh"
 # Operator-facing daemon state (logs / locks / retry / drift markers) resolves to the
 # operator's REAL checkout (GAAI_REPO_ROOT), NOT the GAAI_DAEMON_HOME the daemon binary
-# may run from (DEC-162 / E1003S04). This keeps the monitor + `--logs` working (they read
+# may run from (the dedicated daemon home worktree). This keeps the monitor + `--logs` working (they read
 # the operator checkout) and the state surviving the home's per-cycle reset --hard.
 # Falls back to GAAI_PROJECT_DIR when GAAI_REPO_ROOT is unset (no-home / direct run) — no
 # behavior change in that case. Note: BACKLOG (above) deliberately stays on PROJECT_DIR

.gaai/core/scripts/tests/daemon-operator-state-reporoot.test.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # Regression test: daemon operator-facing state (logs/locks/retry/drift) + the per-story
 # worktree-base anchor (REPO_ROOT) resolve to the operator's REAL checkout (GAAI_REPO_ROOT),
-# NOT the GAAI_DAEMON_HOME the daemon binary runs from (DEC-162 / E1003S04 monitor regression).
+# NOT the GAAI_DAEMON_HOME the daemon binary runs from (the dedicated daemon home worktree).
 #
 # Guards two invariants the flip broke:
 #   1. delivery-daemon.sh LOG_FILE/LOG_DIR/LOCK_DIR follow GAAI_REPO_ROOT (else the monitor,

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Changed
+- fix: anchor operator state + worktree base to the real checkout, not the home
 - fix: operator state (logs/locks) + worktree base anchor to REPO_ROOT, not the home
 - fix: stop auto-merge failure commit loop
 - fix: stop auto-merge failure commit loop