Merge pull request #207 from Fr-e-d/contrib/sync-1776818553

sync: update 2 file(s) in core/

Author: Fr-e-d

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

@@ -84,7 +84,7 @@ git remote get-url origin 2>/dev/null || {
 # Resolve worktree path ONCE as absolute — all subsequent operations use $WORKTREE_PATH
 REPO_ROOT="$(git rev-parse --show-toplevel)"
 REPO_NAME="$(basename "$REPO_ROOT")"
-WORKTREE_PATH="${GAAI_WORKTREE_BASE:-${REPO_ROOT}/../.gaai/${REPO_NAME}/worktrees}/${id}-workspace"
+WORKTREE_PATH="${GAAI_WORKTREE_BASE:-${REPO_ROOT}/../.gaai-worktrees/${REPO_NAME}}/${id}-workspace"
 mkdir -p "$(dirname "$WORKTREE_PATH")"
 
 # Step 0a: Sync with latest staging (under flock if concurrent)
@@ -118,7 +118,7 @@ fi
 
 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.
 
-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).
+Default worktree location is `<parent-of-repo>/.gaai-worktrees/<repo-name>/<story-id>-workspace` — this groups all GAAI worktrees under a single dedicated folder at the parent level, avoiding pollution of the parent directory when multiple projects share it. The `.gaai-worktrees/` name avoids collision with the in-project `.gaai/` folder. Override by setting `GAAI_WORKTREE_BASE` (e.g., `export GAAI_WORKTREE_BASE=/tmp/gaai-worktrees` for cloud-synced repos).
 
 ### 1. Select Next Story
 

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
+## [Unreleased]
+
+### Changed
+- fix(framework): use .gaai-worktrees/ naming to avoid in-project .gaai/ collision
+
 ## [2.19.0] - 2026-04-22
 
 ### Changed