Skip to content

Commit b89869d

Browse files
authored
Merge pull request #206 from Fr-e-d/contrib/sync-1776818255
sync: update 2 file(s) in core/
2 parents 38fb537 + b182bac commit b89869d

2 files changed

Lines changed: 13 additions & 2 deletions

File tree

.gaai/core/workflows/delivery-loop.workflow.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ git remote get-url origin 2>/dev/null || {
8383

8484
# Resolve worktree path ONCE as absolute — all subsequent operations use $WORKTREE_PATH
8585
REPO_ROOT="$(git rev-parse --show-toplevel)"
86-
WORKTREE_PATH="${GAAI_WORKTREE_BASE:-${REPO_ROOT}/..}/${id}-workspace"
86+
REPO_NAME="$(basename "$REPO_ROOT")"
87+
WORKTREE_PATH="${GAAI_WORKTREE_BASE:-${REPO_ROOT}/../.gaai/${REPO_NAME}/worktrees}/${id}-workspace"
88+
mkdir -p "$(dirname "$WORKTREE_PATH")"
8789

8890
# Step 0a: Sync with latest staging (under flock if concurrent)
8991
flock .gaai/project/contexts/backlog/.delivery-locks/.staging.lock bash -c '
@@ -116,7 +118,7 @@ fi
116118

117119
All sub-agents operate exclusively inside `$WORKTREE_PATH`. The main working directory stays on `staging` and is never switched. If two Stories run in parallel, each has its own worktree — zero filesystem conflicts. Worktree isolation is **unconditional** regardless of story tier.
118120

119-
Override the default worktree location by setting `GAAI_WORKTREE_BASE` (e.g., `export GAAI_WORKTREE_BASE=/tmp/gaai-worktrees` for cloud-synced repos).
121+
Default worktree location is `<parent-of-repo>/.gaai/<repo-name>/worktrees/<story-id>-workspace` — this keeps all GAAI worktrees grouped under a single `.gaai/` folder at the parent level, avoiding pollution of the parent directory when multiple projects share it. Override by setting `GAAI_WORKTREE_BASE` (e.g., `export GAAI_WORKTREE_BASE=/tmp/gaai-worktrees` for cloud-synced repos).
120122

121123
### 1. Select Next Story
122124

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
---
99

10+
## [2.19.0] - 2026-04-22
11+
12+
### Changed
13+
- chore(framework): group delivery worktrees under <parent>/.gaai/<repo>/worktrees/
14+
- feat(impl-routing): DEC-72 — env-driven default (secondary when configured)
15+
- chore: bump local VERSION to v2.19.0 [sync]
16+
- feat(delivery-loop): §7c unify non-.gaai deletions into sub-agent reviewer
17+
18+
1019
## [2.19.0] - 2026-04-20
1120

1221
### Changed

0 commit comments

Comments
 (0)