@seanyao/roll 2026.514.3 → 2026.514.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2026.514.5
+
+- **Fixed**: 上版 `claude/*` 临时分支清理意外失效 — 现已恢复 `[loop]`
+- **Fixed**: loop session 结束后本地 worktree 不再积累，`git worktree list` 保持干净 `[loop]`
+- **Fixed**: 发版脚本不再维护独立的 agent 检测逻辑，配置变更时两处不再悄悄漂移
+
 ## v2026.514.3
 
 ### 约定与导航

package/README.md

@@ -62,6 +62,7 @@ roll loop on        # optional: let the agent work unattended
 | Loop (autonomous executor) | [guide/en/loop.md](docs/guide/en/loop.md) | [guide/zh/loop.md](docs/guide/zh/loop.md) |
 | Dream (nightly health scan) | [guide/en/dream.md](docs/guide/en/dream.md) | [guide/zh/dream.md](docs/guide/zh/dream.md) |
 | Peer (cross-agent review) | [guide/en/peer.md](docs/guide/en/peer.md) | [guide/zh/peer.md](docs/guide/zh/peer.md) |
+| Configuration (env vars) | [guide/en/configuration.md](docs/guide/en/configuration.md) | [guide/zh/configuration.md](docs/guide/zh/configuration.md) |
 | Skill selection guide | [guide/en/skills.md](docs/guide/en/skills.md) | [guide/zh/skills.md](docs/guide/zh/skills.md) |
 | Domain model (DDD) | [domain/context-map.md](docs/domain/context-map.md) | — |
 | Engineering common sense | [practices/engineering-common-sense.md](docs/practices/engineering-common-sense.md) | — |

package/bin/roll

@@ -4,7 +4,7 @@ set -euo pipefail
 # Roll — AI Agent Convention Manager
 # Single source of truth for how all AI coding agents behave.
 
-VERSION="2026.514.3"
+VERSION="2026.514.5"
 ROLL_HOME="${ROLL_HOME:-${HOME}/.roll}"
 ROLL_CONFIG="${ROLL_HOME}/config.yaml"
 ROLL_GLOBAL="${ROLL_HOME}/conventions/global"
@@ -465,7 +465,9 @@ _link_skills() {
         local current_target
         current_target="$(readlink "$skill_link")"
         if [[ "$current_target" != "$skill_dir" ]]; then
-          ln -sf "$skill_dir" "$skill_link"
+          # macOS ln -sf follows symlinks-to-dirs and creates inside instead of
+          # replacing — explicitly remove first to guarantee replacement.
+          rm -f "$skill_link" && ln -s "$skill_dir" "$skill_link"
           repaired=$((repaired + 1))
         fi
         # correct symlink: skip silently
@@ -2123,6 +2125,9 @@ WT="\$(_worktree_path "${slug}" "cycle-\${CYCLE_ID}")"
 BRANCH="loop/cycle-\${CYCLE_ID}"
 _USE_WORKTREE=0
 cd "${project_path}" 2>/dev/null || true
+# US-AUTO-038: snapshot orphan claude/* branches before claude runs so the
+# post-claude cleanup can diff and delete only this session's additions.
+CLAUDE_BRANCH_SNAPSHOT="\$(_claude_remote_snapshot "${project_path}")"
 if _worktree_fetch_origin main \\
    && _worktree_create "\$WT" "\$BRANCH" "origin/main"; then
   _USE_WORKTREE=1
@@ -2148,6 +2153,14 @@ for _attempt in 1 2 3; do
   fi
 done
 
+# US-AUTO-038: diff snapshot vs current and delete any claude/* branches this
+# session pushed to origin. Runs regardless of claude's exit code (cleanup is
+# orthogonal to success/failure) and is silent on non-GitHub / unreachable.
+_claude_cleanup_new_branches "\$CLAUDE_BRANCH_SNAPSHOT" "${project_path}" || true
+# REFACTOR-011: also prune local .claude/worktrees/ entries whose branch has
+# been merged to main (remote-branch cleanup above doesn't touch local worktrees).
+_claude_cleanup_stale_worktrees "${project_path}" || true
+
 # Post-claude: publish cycle branch. Doc-only changes (BACKLOG/docs) merge
 # immediately via --admin; code changes use auto-merge (CI gate required).
 # When \`gh\` is unavailable, fall back to the legacy ff-merge path.
@@ -3633,6 +3646,75 @@ _worktree_merge_back() {
   return 0
 }
 
+# _claude_remote_snapshot [repo]
+#   Echo the current set of remote `claude/*` branch names (sans
+#   refs/heads/), one per line, sorted. Silent on remote unreachable / no
+#   remote / no matches — empty stdout, exit 0.
+_claude_remote_snapshot() {
+  local repo="${1:-.}"
+  git -C "$repo" ls-remote --heads origin 'refs/heads/claude/*' 2>/dev/null \
+    | awk '{print $2}' \
+    | sed 's|^refs/heads/||' \
+    | sort
+}
+
+# _claude_cleanup_new_branches <prior> [repo]
+#   Delete remote `claude/*` branches present now but absent from <prior>
+#   (newline-separated list, as emitted by _claude_remote_snapshot). Skips
+#   silently when origin is not a GitHub remote. Each successful delete logs
+#   one INFO line; failures are silently ignored so the loop's main flow is
+#   never derailed.
+_claude_cleanup_new_branches() {
+  local prior="$1"
+  local repo="${2:-.}"
+  local url; url=$(git -C "$repo" remote get-url origin 2>/dev/null)
+  [[ "$url" == *github.com* ]] || return 0
+  local current; current=$(_claude_remote_snapshot "$repo")
+  [ -z "$current" ] && return 0
+  local prior_sorted; prior_sorted=$(printf '%s\n' "$prior" | sort -u)
+  local new_branches
+  new_branches=$(comm -13 <(printf '%s\n' "$prior_sorted") <(printf '%s\n' "$current"))
+  [ -z "$new_branches" ] && return 0
+  while IFS= read -r branch; do
+    [ -z "$branch" ] && continue
+    if git -C "$repo" push origin --delete "$branch" 2>/dev/null; then
+      echo "[loop] deleted stale claude branch: $branch"
+    fi
+  done <<< "$new_branches"
+  return 0
+}
+
+# _claude_cleanup_stale_worktrees [project_path]
+#   Remove local worktrees under <project_path>/.claude/worktrees/ whose
+#   branch has been fully merged into main (merge-base --is-ancestor). Active
+#   worktrees (branch ahead of main) are preserved. Runs `git worktree prune`
+#   afterwards to clear stale metadata. Silent on missing directory or any
+#   individual failure so the loop's main flow is never derailed.
+_claude_cleanup_stale_worktrees() {
+  local project_path="${1:-.}"
+  local wt_dir="${project_path}/.claude/worktrees"
+  [ -d "$wt_dir" ] || return 0
+  local entry branch
+  for entry in "$wt_dir"/*/; do
+    [ -d "$entry" ] || continue
+    branch=$(git -C "$project_path" worktree list --porcelain 2>/dev/null \
+      | awk -v p="${entry%/}" '
+          /^worktree / { cur=$2; flag=(cur==p) }
+          /^branch /   && flag { sub(/^refs\/heads\//, "", $2); print $2; flag=0 }
+        ')
+    [ -z "$branch" ] && branch=$(git -C "$entry" symbolic-ref --short HEAD 2>/dev/null)
+    [ -z "$branch" ] && continue
+    if git -C "$project_path" merge-base --is-ancestor "$branch" main 2>/dev/null; then
+      git -C "$project_path" worktree remove --force "$entry" 2>/dev/null || true
+      rm -rf "$entry" 2>/dev/null || true
+      git -C "$project_path" branch -D "$branch" 2>/dev/null || true
+      echo "[loop] removed stale worktree: $branch"
+    fi
+  done
+  git -C "$project_path" worktree prune 2>/dev/null || true
+  return 0
+}
+
 # US-AUTO-033: publish a loop cycle branch as a GitHub PR with auto-merge.
 #
 # _loop_publish_pr <branch> [title]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seanyao/roll",
-  "version": "2026.514.3",
+  "version": "2026.514.5",
   "description": "Roll — Roll out features with AI agents",
   "scripts": {
     "test": "bash tests/run.sh"