Skip to content

Commit d95eba1

Browse files
committed
sync: update 4 file(s) in core/
- .gaai/core/scripts/daemon-start.sh - .gaai/core/scripts/delivery-daemon.sh - .gaai/core/scripts/tests/daemon-operator-state-reporoot.test.sh - CHANGELOG.md GAAI-Source-Commit: adc0db93e6167dd986d2338d4d7aafcc1609620c
1 parent 7152dbe commit d95eba1

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

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

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

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
# Regression test: daemon operator-facing state (logs/locks/retry/drift) + the per-story
33
# worktree-base anchor (REPO_ROOT) resolve to the operator's REAL checkout (GAAI_REPO_ROOT),
4-
# NOT the GAAI_DAEMON_HOME the daemon binary runs from (DEC-162 / E1003S04 monitor regression).
4+
# NOT the GAAI_DAEMON_HOME the daemon binary runs from (the dedicated daemon home worktree).
55
#
66
# Guards two invariants the flip broke:
77
# 1. delivery-daemon.sh LOG_FILE/LOG_DIR/LOCK_DIR follow GAAI_REPO_ROOT (else the monitor,

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
## [Unreleased]
1111

1212
### Changed
13+
- fix: anchor operator state + worktree base to the real checkout, not the home
1314
- fix: operator state (logs/locks) + worktree base anchor to REPO_ROOT, not the home
1415
- fix: stop auto-merge failure commit loop
1516
- fix: stop auto-merge failure commit loop

0 commit comments

Comments
 (0)