Merge pull request 'fix: Extract lib/worktree.sh — create, recover, cleanup (#797)' (#806) from fix/issue-797 into main
This commit is contained in:
johba
commit
37f3c0416d
11 changed files with 187 additions and 88 deletions
|
|
@ -104,6 +104,7 @@ echo "=== 2/2 Function resolution ==="
|
|||
# lib/mirrors.sh — sourced by merge sites (mirror_push)
|
||||
# lib/guard.sh — sourced by all cron entry points (check_active)
|
||||
# lib/issue-lifecycle.sh — sourced by agents for issue claim/release/block/deps
|
||||
# lib/worktree.sh — sourced by agents for worktree create/recover/cleanup/preserve
|
||||
#
|
||||
# Excluded — not sourced inline by agents:
|
||||
# lib/tea-helpers.sh — sourced conditionally by env.sh (tea_file_issue, etc.); checked standalone below
|
||||
|
|
@ -114,7 +115,7 @@ echo "=== 2/2 Function resolution ==="
|
|||
# If a new lib file is added and sourced by agents, add it to LIB_FUNS below
|
||||
# and add a check_script call for it in the lib files section further down.
|
||||
LIB_FUNS=$(
|
||||
for f in lib/agent-session.sh lib/env.sh lib/ci-helpers.sh lib/load-project.sh lib/secret-scan.sh lib/file-action-issue.sh lib/formula-session.sh lib/mirrors.sh lib/guard.sh lib/pr-lifecycle.sh lib/issue-lifecycle.sh; do
|
||||
for f in lib/agent-session.sh lib/env.sh lib/ci-helpers.sh lib/load-project.sh lib/secret-scan.sh lib/file-action-issue.sh lib/formula-session.sh lib/mirrors.sh lib/guard.sh lib/pr-lifecycle.sh lib/issue-lifecycle.sh lib/worktree.sh; do
|
||||
if [ -f "$f" ]; then get_fns "$f"; fi
|
||||
done | sort -u
|
||||
)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ disinto/ (code repo)
|
|||
│ supervisor-poll.sh — legacy bash orchestrator (superseded)
|
||||
├── vault/ vault-poll.sh, vault-agent.sh, vault-fire.sh — action gating + procurement
|
||||
├── action/ action-poll.sh, action-agent.sh — operational task execution
|
||||
├── lib/ env.sh, agent-session.sh, ci-helpers.sh, ci-debug.sh, load-project.sh, parse-deps.sh, guard.sh, mirrors.sh, pr-lifecycle.sh, issue-lifecycle.sh, build-graph.py
|
||||
├── lib/ env.sh, agent-session.sh, ci-helpers.sh, ci-debug.sh, load-project.sh, parse-deps.sh, guard.sh, mirrors.sh, pr-lifecycle.sh, issue-lifecycle.sh, worktree.sh, build-graph.py
|
||||
├── projects/ *.toml.example — templates; *.toml — local per-box config (gitignored)
|
||||
├── formulas/ Issue templates (TOML specs for multi-step agent tasks)
|
||||
└── docs/ Protocol docs (PHASE-PROTOCOL.md, EVIDENCE-ARCHITECTURE.md)
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ FORGE_TOKEN="${FORGE_ACTION_TOKEN:-${FORGE_TOKEN}}"
|
|||
source "$(dirname "$0")/../lib/ci-helpers.sh"
|
||||
source "$(dirname "$0")/../lib/agent-session.sh"
|
||||
source "$(dirname "$0")/../lib/formula-session.sh"
|
||||
source "$(dirname "$0")/../lib/worktree.sh"
|
||||
# shellcheck source=../dev/phase-handler.sh
|
||||
source "$(dirname "$0")/../dev/phase-handler.sh"
|
||||
SESSION_NAME="action-${PROJECT_NAME}-${ISSUE}"
|
||||
|
|
@ -62,13 +63,7 @@ status() {
|
|||
|
||||
# --- Action-specific helpers for phase-handler.sh ---
|
||||
cleanup_worktree() {
|
||||
cd "${PROJECT_REPO_ROOT}" 2>/dev/null || true
|
||||
git worktree remove "$WORKTREE" --force 2>/dev/null || true
|
||||
rm -rf "$WORKTREE"
|
||||
# Clear Claude Code session history for this worktree to prevent hallucinated "already done"
|
||||
local claude_project_dir
|
||||
claude_project_dir="$HOME/.claude/projects/$(echo "$WORKTREE" | sed 's|/|-|g; s|^-||')"
|
||||
rm -rf "$claude_project_dir" 2>/dev/null || true
|
||||
worktree_cleanup "$WORKTREE"
|
||||
log "destroyed worktree: ${WORKTREE}"
|
||||
}
|
||||
cleanup_labels() { :; } # action agent doesn't use in-progress labels
|
||||
|
|
@ -108,7 +103,7 @@ cleanup() {
|
|||
local final_phase=""
|
||||
[ -f "$PHASE_FILE" ] && final_phase=$(head -1 "$PHASE_FILE" 2>/dev/null || true)
|
||||
if [ "${final_phase:-}" = "PHASE:crashed" ] || [ "${_MONITOR_LOOP_EXIT:-}" = "crashed" ] || [ "$exit_code" -ne 0 ]; then
|
||||
log "PRESERVED crashed worktree for debugging: $WORKTREE"
|
||||
worktree_preserve "$WORKTREE" "crashed (exit=$exit_code, phase=${final_phase:-unknown})"
|
||||
else
|
||||
cleanup_worktree
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ source "$(dirname "$0")/../lib/env.sh"
|
|||
source "$(dirname "$0")/../lib/ci-helpers.sh"
|
||||
source "$(dirname "$0")/../lib/agent-session.sh"
|
||||
source "$(dirname "$0")/../lib/formula-session.sh"
|
||||
source "$(dirname "$0")/../lib/worktree.sh"
|
||||
# shellcheck source=./phase-handler.sh
|
||||
source "$(dirname "$0")/phase-handler.sh"
|
||||
|
||||
|
|
@ -98,12 +99,7 @@ PR_NUMBER=""
|
|||
|
||||
# --- Cleanup helpers ---
|
||||
cleanup_worktree() {
|
||||
cd "$REPO_ROOT"
|
||||
git worktree remove "$WORKTREE" --force 2>/dev/null || true
|
||||
rm -rf "$WORKTREE"
|
||||
# Clear Claude Code session history for this worktree to prevent hallucinated "already done"
|
||||
CLAUDE_PROJECT_DIR="$HOME/.claude/projects/$(echo "$WORKTREE" | sed 's|/|-|g; s|^-||')"
|
||||
rm -rf "$CLAUDE_PROJECT_DIR" 2>/dev/null || true
|
||||
worktree_cleanup "$WORKTREE"
|
||||
}
|
||||
|
||||
cleanup_labels() {
|
||||
|
|
@ -449,29 +445,13 @@ export FORGE_REMOTE # used by phase-handler.sh
|
|||
log "forge remote: ${FORGE_REMOTE} (FORGE_URL=${FORGE_URL})"
|
||||
|
||||
if [ "$RECOVERY_MODE" = true ]; then
|
||||
git fetch "${FORGE_REMOTE}" "$BRANCH" 2>/dev/null
|
||||
|
||||
# Reuse existing worktree if on the right branch (preserves session context)
|
||||
REUSE_WORKTREE=false
|
||||
if [ -d "$WORKTREE/.git" ] || [ -f "$WORKTREE/.git" ]; then
|
||||
WT_BRANCH=$(cd "$WORKTREE" && git rev-parse --abbrev-ref HEAD 2>/dev/null || true)
|
||||
if [ "$WT_BRANCH" = "$BRANCH" ]; then
|
||||
log "reusing existing worktree (preserves session)"
|
||||
cd "$WORKTREE"
|
||||
git pull --ff-only "${FORGE_REMOTE}" "$BRANCH" 2>/dev/null || git reset --hard "${FORGE_REMOTE}/${BRANCH}" 2>/dev/null || true
|
||||
REUSE_WORKTREE=true
|
||||
fi
|
||||
if ! worktree_recover "$WORKTREE" "$BRANCH" "$FORGE_REMOTE"; then
|
||||
log "ERROR: worktree recovery failed"
|
||||
cleanup_labels
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$REUSE_WORKTREE" = false ]; then
|
||||
cleanup_worktree
|
||||
git worktree add "$WORKTREE" "${FORGE_REMOTE}/${BRANCH}" -B "$BRANCH" 2>&1 || {
|
||||
log "ERROR: worktree creation failed for recovery"
|
||||
cleanup_labels
|
||||
exit 1
|
||||
}
|
||||
cd "$WORKTREE"
|
||||
git submodule update --init --recursive 2>/dev/null || true
|
||||
if [ "$_WORKTREE_REUSED" = true ]; then
|
||||
log "reusing existing worktree (preserves session)"
|
||||
fi
|
||||
else
|
||||
# Normal mode: create fresh worktree from primary branch
|
||||
|
|
@ -489,16 +469,11 @@ else
|
|||
|
||||
git fetch "${FORGE_REMOTE}" "${PRIMARY_BRANCH}" 2>/dev/null
|
||||
git pull --ff-only "${FORGE_REMOTE}" "${PRIMARY_BRANCH}" 2>/dev/null || true
|
||||
cleanup_worktree
|
||||
git worktree add "$WORKTREE" "${FORGE_REMOTE}/${PRIMARY_BRANCH}" -B "$BRANCH" 2>&1 || {
|
||||
if ! worktree_create "$WORKTREE" "$BRANCH" "${FORGE_REMOTE}/${PRIMARY_BRANCH}"; then
|
||||
log "ERROR: worktree creation failed"
|
||||
git worktree add "$WORKTREE" "${FORGE_REMOTE}/${PRIMARY_BRANCH}" -B "$BRANCH" 2>&1 | while read -r wt_line; do log " $wt_line"; done || true
|
||||
cleanup_labels
|
||||
exit 1
|
||||
}
|
||||
cd "$WORKTREE"
|
||||
git checkout -B "$BRANCH" "${FORGE_REMOTE}/${PRIMARY_BRANCH}" 2>/dev/null
|
||||
git submodule update --init --recursive 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# Symlink lib node_modules from main repo (submodule init doesn't run npm install)
|
||||
for lib_dir in "$REPO_ROOT"/onchain/lib/*/; do
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ FORGE_TOKEN="${FORGE_GARDENER_TOKEN:-${FORGE_TOKEN}}"
|
|||
source "$FACTORY_ROOT/lib/agent-session.sh"
|
||||
# shellcheck source=../lib/formula-session.sh
|
||||
source "$FACTORY_ROOT/lib/formula-session.sh"
|
||||
# shellcheck source=../lib/worktree.sh
|
||||
source "$FACTORY_ROOT/lib/worktree.sh"
|
||||
# shellcheck source=../lib/ci-helpers.sh
|
||||
source "$FACTORY_ROOT/lib/ci-helpers.sh"
|
||||
# shellcheck source=../lib/mirrors.sh
|
||||
|
|
|
|||
|
|
@ -11,13 +11,14 @@ sourced as needed.
|
|||
| `lib/ci-debug.sh` | CLI tool for Woodpecker CI: `list`, `status`, `logs`, `failures` subcommands. Not sourced — run directly. | Humans / dev-agent (tool access) |
|
||||
| `lib/load-project.sh` | Parses a `projects/*.toml` file into env vars (`PROJECT_NAME`, `FORGE_REPO`, `WOODPECKER_REPO_ID`, monitoring toggles, mirror config, etc.). | env.sh (when `PROJECT_TOML` is set), supervisor-poll (per-project iteration) |
|
||||
| `lib/parse-deps.sh` | Extracts dependency issue numbers from an issue body (stdin → stdout, one number per line). Matches `## Dependencies` / `## Depends on` / `## Blocked by` sections and inline `depends on #N` / `blocked by #N` patterns. Inline scan skips fenced code blocks to prevent false positives from code examples in issue bodies. Not sourced — executed via `bash lib/parse-deps.sh`. | dev-poll, supervisor-poll |
|
||||
| `lib/formula-session.sh` | `acquire_cron_lock()`, `check_memory()`, `load_formula()`, `build_context_block()`, `consume_escalation_reply()`, `start_formula_session()`, `formula_phase_callback()`, `build_prompt_footer()`, `build_graph_section()`, `run_formula_and_monitor(AGENT [TIMEOUT] [CALLBACK])` — shared helpers for formula-driven cron agents (lock, memory guard, formula loading, prompt assembly, tmux session, monitor loop, crash recovery). `build_graph_section()` generates the structural-analysis section (runs `lib/build-graph.py`, formats JSON output) — previously duplicated in planner-run.sh and predictor-run.sh, now shared here. `formula_phase_callback()` handles `PHASE:escalate` (unified escalation path — kills the session). `run_formula_and_monitor` accepts an optional CALLBACK (default: `formula_phase_callback`) so callers can install custom merge-through or escalation handlers. | planner-run.sh, predictor-run.sh, gardener-run.sh, supervisor-run.sh, dev-agent.sh, action-agent.sh |
|
||||
| `lib/formula-session.sh` | `acquire_cron_lock()`, `check_memory()`, `load_formula()`, `build_context_block()`, `consume_escalation_reply()`, `start_formula_session()`, `formula_phase_callback()`, `build_prompt_footer()`, `build_graph_section()`, `run_formula_and_monitor(AGENT [TIMEOUT] [CALLBACK])` — shared helpers for formula-driven cron agents (lock, memory guard, formula loading, prompt assembly, tmux session, monitor loop, crash recovery). `build_graph_section()` generates the structural-analysis section (runs `lib/build-graph.py`, formats JSON output) — previously duplicated in planner-run.sh and predictor-run.sh, now shared here. `formula_phase_callback()` handles `PHASE:escalate` (unified escalation path — kills the session). `run_formula_and_monitor` accepts an optional CALLBACK (default: `formula_phase_callback`) so callers can install custom merge-through or escalation handlers. `cleanup_stale_crashed_worktrees()` — thin wrapper around `worktree_cleanup_stale()` from `lib/worktree.sh` (kept for backwards compatibility). | planner-run.sh, predictor-run.sh, gardener-run.sh, supervisor-run.sh, dev-agent.sh, action-agent.sh |
|
||||
| `lib/guard.sh` | `check_active(agent_name)` — reads `$FACTORY_ROOT/state/.{agent_name}-active`; exits 0 (skip) if the file is absent. Factory is off by default — state files must be created to enable each agent. **Logs a message to stderr** when skipping (`[check_active] SKIP: state file not found`), so agent dropout is visible in cron logs. Sourced by dev-poll.sh, review-poll.sh, action-poll.sh, predictor-run.sh, supervisor-run.sh. | cron entry points |
|
||||
| `lib/mirrors.sh` | `mirror_push()` — pushes `$PRIMARY_BRANCH` + tags to all configured mirror remotes (fire-and-forget background pushes). Reads `MIRROR_NAMES` and `MIRROR_*` vars exported by `load-project.sh` from the `[mirrors]` TOML section. Failures are logged but never block the pipeline. Sourced by dev-poll.sh and dev/phase-handler.sh — called after every successful merge. | dev-poll.sh, phase-handler.sh |
|
||||
| `lib/build-graph.py` | Python tool: parses VISION.md, prerequisites.md (from ops repo), AGENTS.md, formulas/*.toml, evidence/ (from ops repo), and forge issues/labels into a NetworkX DiGraph. Runs structural analyses (orphaned objectives, stale prerequisites, thin evidence, circular deps) and outputs a JSON report. Used by `review-pr.sh` (per-PR changed-file analysis) and `predictor-run.sh` (full-project analysis) to provide structural context to Claude. | review-pr.sh, predictor-run.sh |
|
||||
| `lib/secret-scan.sh` | `scan_for_secrets()` — detects potential secrets (API keys, bearer tokens, private keys, URLs with embedded credentials) in text; returns 1 if secrets found. `redact_secrets()` — replaces detected secret patterns with `[REDACTED]`. | file-action-issue.sh, phase-handler.sh |
|
||||
| `lib/file-action-issue.sh` | `file_action_issue()` — dedup check, secret scan, label lookup, and issue creation for formula-driven cron wrappers. Sets `FILED_ISSUE_NUM` on success. Returns 4 if secrets detected in body. | (available for future use) |
|
||||
| `lib/tea-helpers.sh` | `tea_file_issue(title, body, labels...)` — create issue via tea CLI with secret scanning; sets `FILED_ISSUE_NUM`. `tea_relabel(issue_num, labels...)` — replace labels using tea's `edit` subcommand (not `label`). `tea_comment(issue_num, body)` — add comment with secret scanning. `tea_close(issue_num)` — close issue. All use `TEA_LOGIN` and `FORGE_REPO` from env.sh. Labels by name (no ID lookup). Tea binary download verified via sha256 checksum. Sourced by env.sh when `tea` binary is available. | env.sh (conditional) |
|
||||
| `lib/worktree.sh` | Reusable git worktree management: `worktree_create(path, branch, [base_ref])` — create worktree, checkout base, fetch submodules. `worktree_recover(path, branch, [remote])` — detect existing worktree, reuse if on correct branch (sets `_WORKTREE_REUSED`), otherwise clean and recreate. `worktree_cleanup(path)` — `git worktree remove --force`, clear Claude Code project cache (`~/.claude/projects/` matching path). `worktree_cleanup_stale([max_age_hours])` — scan `/tmp` for orphaned worktrees older than threshold, skip preserved and active tmux worktrees, prune. `worktree_preserve(path, reason)` — mark worktree as preserved for debugging (writes `.worktree-preserved` marker, skipped by stale cleanup). | dev-agent.sh, action-agent.sh, supervisor-run.sh, planner-run.sh, predictor-run.sh, gardener-run.sh |
|
||||
| `lib/pr-lifecycle.sh` | Reusable PR lifecycle library: `pr_create()`, `pr_find_by_branch()`, `pr_poll_ci()`, `pr_poll_review()`, `pr_merge()`, `pr_is_merged()`, `pr_walk_to_merge()`, `build_phase_protocol_prompt()`. Requires `lib/ci-helpers.sh`. | dev-agent.sh (future), action-agent.sh (future) |
|
||||
| `lib/issue-lifecycle.sh` | Reusable issue lifecycle library: `issue_claim()` (add in-progress, remove backlog), `issue_release()` (remove in-progress, add backlog), `issue_block()` (post diagnostic comment with secret redaction, add blocked label), `issue_close()`, `issue_check_deps()` (parse deps, check transitive closure; sets `_ISSUE_BLOCKED_BY`, `_ISSUE_SUGGESTION`), `issue_suggest_next()` (find next unblocked backlog issue; sets `_ISSUE_NEXT`), `issue_post_refusal()` (structured refusal comment with dedup). Label IDs cached in globals on first lookup. Sources `lib/secret-scan.sh`. | dev-agent.sh (future), action-agent.sh (future) |
|
||||
| `lib/agent-session.sh` | Shared tmux + Claude session helpers: `create_agent_session()`, `inject_formula()`, `agent_wait_for_claude_ready()`, `agent_inject_into_session()`, `agent_kill_session()`, `monitor_phase_loop()`, `read_phase()`, `write_compact_context()`. `create_agent_session(session, workdir, [phase_file])` optionally installs a PostToolUse hook (matcher `Bash\|Write`) that detects phase file writes in real-time — when Claude writes to the phase file, the hook writes a marker so `monitor_phase_loop` reacts on the next poll instead of waiting for mtime changes. Also installs a StopFailure hook (matcher `rate_limit\|server_error\|authentication_failed\|billing_error`) that writes `PHASE:failed` with an `api_error` reason to the phase file and touches the phase-changed marker, so the orchestrator discovers API errors within one poll cycle instead of waiting for idle timeout. Also installs a SessionStart hook (matcher `compact`) that re-injects phase protocol instructions after context compaction — callers write the context file via `write_compact_context(phase_file, content)`, and the hook (`on-compact-reinject.sh`) outputs the file content to stdout so Claude retains critical instructions. When `phase_file` is set, passes it to the idle stop hook (`on-idle-stop.sh`) so the hook can **nudge Claude** (up to 2 times) if Claude returns to the prompt without writing to the phase file — the hook injects a tmux reminder asking Claude to signal PHASE:done or PHASE:awaiting_ci. The PreToolUse guard hook (`on-pretooluse-guard.sh`) receives the session name as a third argument — formula agents (`gardener-*`, `planner-*`, `predictor-*`, `supervisor-*`) are identified this way and allowed to access `FACTORY_ROOT` from worktrees (they need env.sh, AGENTS.md, formulas/, lib/). **OAuth flock**: when `DISINTO_CONTAINER=1`, Claude CLI is wrapped in `flock -w 300 ~/.claude/session.lock` to queue concurrent token refresh attempts and prevent rotation races across agents sharing the same credentials. `monitor_phase_loop` sets `_MONITOR_LOOP_EXIT` to one of: `done`, `idle_timeout`, `idle_prompt` (Claude returned to `>` for 3 consecutive polls without writing any phase — callback invoked with `PHASE:failed`, session already dead), `crashed`, or `PHASE:escalate` / other `PHASE:*` string. **Unified escalation**: `PHASE:escalate` is the signal that a session needs human input (renamed from `PHASE:needs_human`). **Callers must handle `idle_prompt`** in both their callback and their post-loop exit handler — see [`docs/PHASE-PROTOCOL.md` idle_prompt](docs/PHASE-PROTOCOL.md#idle_prompt-exit-reason) for the full contract. | dev-agent.sh, action-agent.sh |
|
||||
|
|
|
|||
|
|
@ -231,48 +231,11 @@ formula_phase_callback() {
|
|||
# ── Stale crashed worktree cleanup ─────────────────────────────────────────
|
||||
|
||||
# cleanup_stale_crashed_worktrees [MAX_AGE_HOURS]
|
||||
# Removes preserved crashed worktrees older than MAX_AGE_HOURS (default 24).
|
||||
# Scans /tmp for orphaned worktrees matching agent naming patterns.
|
||||
# Safe to call from any agent; intended for supervisor/gardener housekeeping.
|
||||
# Requires globals: PROJECT_REPO_ROOT.
|
||||
# Thin wrapper around worktree_cleanup_stale() from lib/worktree.sh.
|
||||
# Kept for backwards compatibility with existing callers.
|
||||
# Requires: lib/worktree.sh sourced.
|
||||
cleanup_stale_crashed_worktrees() {
|
||||
local max_age_hours="${1:-24}"
|
||||
local max_age_seconds=$((max_age_hours * 3600))
|
||||
local now
|
||||
now=$(date +%s)
|
||||
local cleaned=0
|
||||
|
||||
# Collect active tmux pane working directories for safety check
|
||||
local active_dirs=""
|
||||
active_dirs=$(tmux list-panes -a -F '#{pane_current_path}' 2>/dev/null || true)
|
||||
|
||||
local wt_dir
|
||||
for wt_dir in /tmp/*-worktree-* /tmp/action-*-[0-9]* /tmp/disinto-*; do
|
||||
[ -d "$wt_dir" ] || continue
|
||||
# Must be a git worktree (has .git file or directory)
|
||||
[ -f "$wt_dir/.git" ] || [ -d "$wt_dir/.git" ] || continue
|
||||
|
||||
# Check age (use directory mtime)
|
||||
local dir_mtime
|
||||
dir_mtime=$(stat -c %Y "$wt_dir" 2>/dev/null || echo "$now")
|
||||
local age=$((now - dir_mtime))
|
||||
[ "$age" -lt "$max_age_seconds" ] && continue
|
||||
|
||||
# Skip if an active tmux pane is using this worktree
|
||||
if [ -n "$active_dirs" ] && echo "$active_dirs" | grep -qF "$wt_dir"; then
|
||||
continue
|
||||
fi
|
||||
|
||||
# Remove the worktree
|
||||
git -C "${PROJECT_REPO_ROOT}" worktree remove "$wt_dir" --force 2>/dev/null || rm -rf "$wt_dir"
|
||||
log "cleaned stale crashed worktree: ${wt_dir} (age: $((age / 3600))h)"
|
||||
cleaned=$((cleaned + 1))
|
||||
done
|
||||
|
||||
# Prune any dangling worktree references
|
||||
git -C "${PROJECT_REPO_ROOT}" worktree prune 2>/dev/null || true
|
||||
|
||||
[ "$cleaned" -gt 0 ] && log "cleaned ${cleaned} stale crashed worktree(s)"
|
||||
worktree_cleanup_stale "${1:-24}"
|
||||
}
|
||||
|
||||
# ── Scratch file helpers (compaction survival) ────────────────────────────
|
||||
|
|
@ -407,7 +370,7 @@ run_formula_and_monitor() {
|
|||
|
||||
# Preserve worktree on crash for debugging; clean up on success
|
||||
if [ "${_MONITOR_LOOP_EXIT:-}" = "crashed" ]; then
|
||||
log "PRESERVED crashed worktree for debugging: ${_FORMULA_SESSION_WORKDIR:-}"
|
||||
worktree_preserve "${_FORMULA_SESSION_WORKDIR:-}" "crashed (agent=${agent_name})"
|
||||
else
|
||||
remove_formula_worktree
|
||||
fi
|
||||
|
|
|
|||
156
lib/worktree.sh
Normal file
156
lib/worktree.sh
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
#!/usr/bin/env bash
|
||||
# worktree.sh — Reusable git worktree management for agents
|
||||
#
|
||||
# Functions:
|
||||
# worktree_create PATH BRANCH [BASE_REF] — create worktree, checkout base, fetch submodules
|
||||
# worktree_recover ISSUE_NUMBER PROJECT_NAME — detect existing PR/branch, reuse or recreate worktree
|
||||
# worktree_cleanup PATH — remove worktree + Claude Code project cache
|
||||
# worktree_cleanup_stale [MAX_AGE_HOURS] — prune orphaned /tmp worktrees older than threshold
|
||||
# worktree_preserve PATH REASON — mark worktree as preserved (skip cleanup on exit)
|
||||
#
|
||||
# Requires: lib/env.sh sourced (for FACTORY_ROOT, PROJECT_REPO_ROOT, log()).
|
||||
# Globals set by callers: FORGE_REMOTE (git remote name, default "origin").
|
||||
|
||||
# --- Internal: clear Claude Code project cache for a worktree path ---
|
||||
_worktree_clear_claude_cache() {
|
||||
local wt_path="$1"
|
||||
local claude_project_dir
|
||||
claude_project_dir="$HOME/.claude/projects/$(echo "$wt_path" | sed 's|/|-|g; s|^-||')"
|
||||
rm -rf "$claude_project_dir" 2>/dev/null || true
|
||||
}
|
||||
|
||||
# worktree_create PATH BRANCH [BASE_REF]
|
||||
# Creates a git worktree at PATH on BRANCH, based on BASE_REF (default: FORGE_REMOTE/PRIMARY_BRANCH).
|
||||
# Fetches submodules after creation. Cleans up any stale worktree at PATH first.
|
||||
# Must be called from PROJECT_REPO_ROOT (or a repo directory).
|
||||
# Returns 0 on success, 1 on failure.
|
||||
worktree_create() {
|
||||
local wt_path="$1"
|
||||
local branch="$2"
|
||||
local base_ref="${3:-${FORGE_REMOTE:-origin}/${PRIMARY_BRANCH:-main}}"
|
||||
|
||||
# Clean up any prior worktree at this path
|
||||
worktree_cleanup "$wt_path"
|
||||
|
||||
if ! git worktree add "$wt_path" "$base_ref" -B "$branch" 2>&1; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
cd "$wt_path" || return 1
|
||||
git checkout -B "$branch" "$base_ref" 2>/dev/null || true
|
||||
git submodule update --init --recursive 2>/dev/null || true
|
||||
return 0
|
||||
}
|
||||
|
||||
# worktree_recover WORKTREE_PATH BRANCH FORGE_REMOTE
|
||||
# Detects an existing worktree at WORKTREE_PATH. If it exists and is on the
|
||||
# right BRANCH, reuses it (fast-forward pull). Otherwise, cleans and recreates.
|
||||
# Sets _WORKTREE_REUSED=true if the existing worktree was reused.
|
||||
# Must be called from PROJECT_REPO_ROOT (or a repo directory).
|
||||
# Returns 0 on success, 1 on failure.
|
||||
worktree_recover() {
|
||||
local wt_path="$1"
|
||||
local branch="$2"
|
||||
local remote="${3:-${FORGE_REMOTE:-origin}}"
|
||||
|
||||
_WORKTREE_REUSED=false
|
||||
|
||||
git fetch "$remote" "$branch" 2>/dev/null || true
|
||||
|
||||
# Reuse existing worktree if on the right branch
|
||||
if [ -d "$wt_path/.git" ] || [ -f "$wt_path/.git" ]; then
|
||||
local wt_branch
|
||||
wt_branch=$(cd "$wt_path" && git rev-parse --abbrev-ref HEAD 2>/dev/null) || true
|
||||
if [ "$wt_branch" = "$branch" ]; then
|
||||
cd "$wt_path" || return 1
|
||||
git pull --ff-only "$remote" "$branch" 2>/dev/null || git reset --hard "${remote}/${branch}" 2>/dev/null || true
|
||||
_WORKTREE_REUSED=true
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
# Clean and recreate
|
||||
worktree_cleanup "$wt_path"
|
||||
if ! git worktree add "$wt_path" "${remote}/${branch}" -B "$branch" 2>&1; then
|
||||
return 1
|
||||
fi
|
||||
cd "$wt_path" || return 1
|
||||
git submodule update --init --recursive 2>/dev/null || true
|
||||
return 0
|
||||
}
|
||||
|
||||
# worktree_cleanup PATH
|
||||
# Removes a git worktree and clears the Claude Code project cache for it.
|
||||
# Safe to call multiple times or on non-existent paths.
|
||||
# Requires: PROJECT_REPO_ROOT (falls back to current directory).
|
||||
worktree_cleanup() {
|
||||
local wt_path="$1"
|
||||
local repo_root="${PROJECT_REPO_ROOT:-$(pwd)}"
|
||||
cd "$repo_root" 2>/dev/null || true
|
||||
git worktree remove "$wt_path" --force 2>/dev/null || true
|
||||
rm -rf "$wt_path"
|
||||
_worktree_clear_claude_cache "$wt_path"
|
||||
}
|
||||
|
||||
# worktree_cleanup_stale [MAX_AGE_HOURS]
|
||||
# Scans /tmp for orphaned worktrees older than MAX_AGE_HOURS (default 24).
|
||||
# Skips worktrees that have active tmux panes or are marked as preserved.
|
||||
# Prunes dangling worktree references after cleanup.
|
||||
# Requires: PROJECT_REPO_ROOT.
|
||||
worktree_cleanup_stale() {
|
||||
local max_age_hours="${1:-24}"
|
||||
local max_age_seconds=$((max_age_hours * 3600))
|
||||
local now
|
||||
now=$(date +%s)
|
||||
local cleaned=0
|
||||
|
||||
# Collect active tmux pane working directories for safety check
|
||||
local active_dirs=""
|
||||
active_dirs=$(tmux list-panes -a -F '#{pane_current_path}' 2>/dev/null || true)
|
||||
|
||||
local wt_dir
|
||||
for wt_dir in /tmp/*-worktree-* /tmp/action-*-[0-9]* /tmp/disinto-*; do
|
||||
[ -d "$wt_dir" ] || continue
|
||||
# Must be a git worktree (has .git file or directory)
|
||||
[ -f "$wt_dir/.git" ] || [ -d "$wt_dir/.git" ] || continue
|
||||
|
||||
# Skip preserved worktrees
|
||||
[ -f "$wt_dir/.worktree-preserved" ] && continue
|
||||
|
||||
# Check age (use directory mtime)
|
||||
local dir_mtime
|
||||
dir_mtime=$(stat -c %Y "$wt_dir" 2>/dev/null || echo "$now")
|
||||
local age=$((now - dir_mtime))
|
||||
[ "$age" -lt "$max_age_seconds" ] && continue
|
||||
|
||||
# Skip if an active tmux pane is using this worktree
|
||||
if [ -n "$active_dirs" ] && echo "$active_dirs" | grep -qF "$wt_dir"; then
|
||||
continue
|
||||
fi
|
||||
|
||||
# Remove the worktree and its Claude cache
|
||||
local repo_root="${PROJECT_REPO_ROOT:-$(pwd)}"
|
||||
git -C "$repo_root" worktree remove "$wt_dir" --force 2>/dev/null || rm -rf "$wt_dir"
|
||||
_worktree_clear_claude_cache "$wt_dir"
|
||||
log "cleaned stale worktree: ${wt_dir} (age: $((age / 3600))h)"
|
||||
cleaned=$((cleaned + 1))
|
||||
done
|
||||
|
||||
# Prune any dangling worktree references
|
||||
git -C "${PROJECT_REPO_ROOT:-$(pwd)}" worktree prune 2>/dev/null || true
|
||||
|
||||
[ "$cleaned" -gt 0 ] && log "cleaned ${cleaned} stale worktree(s)"
|
||||
}
|
||||
|
||||
# worktree_preserve PATH REASON
|
||||
# Marks a worktree as preserved for debugging. Preserved worktrees are skipped
|
||||
# by worktree_cleanup_stale. The reason is written to a marker file inside
|
||||
# the worktree directory.
|
||||
worktree_preserve() {
|
||||
local wt_path="$1"
|
||||
local reason="${2:-unspecified}"
|
||||
if [ -d "$wt_path" ]; then
|
||||
printf '%s\n' "$reason" > "$wt_path/.worktree-preserved"
|
||||
log "PRESERVED worktree for debugging: ${wt_path} (reason: ${reason})"
|
||||
fi
|
||||
}
|
||||
|
|
@ -24,6 +24,8 @@ FORGE_TOKEN="${FORGE_PLANNER_TOKEN:-${FORGE_TOKEN}}"
|
|||
source "$FACTORY_ROOT/lib/agent-session.sh"
|
||||
# shellcheck source=../lib/formula-session.sh
|
||||
source "$FACTORY_ROOT/lib/formula-session.sh"
|
||||
# shellcheck source=../lib/worktree.sh
|
||||
source "$FACTORY_ROOT/lib/worktree.sh"
|
||||
# shellcheck source=../lib/guard.sh
|
||||
source "$FACTORY_ROOT/lib/guard.sh"
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,8 @@ FORGE_TOKEN="${FORGE_PREDICTOR_TOKEN:-${FORGE_TOKEN}}"
|
|||
source "$FACTORY_ROOT/lib/agent-session.sh"
|
||||
# shellcheck source=../lib/formula-session.sh
|
||||
source "$FACTORY_ROOT/lib/formula-session.sh"
|
||||
# shellcheck source=../lib/worktree.sh
|
||||
source "$FACTORY_ROOT/lib/worktree.sh"
|
||||
# shellcheck source=../lib/guard.sh
|
||||
source "$FACTORY_ROOT/lib/guard.sh"
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ FORGE_TOKEN="${FORGE_SUPERVISOR_TOKEN:-${FORGE_TOKEN}}"
|
|||
source "$FACTORY_ROOT/lib/agent-session.sh"
|
||||
# shellcheck source=../lib/formula-session.sh
|
||||
source "$FACTORY_ROOT/lib/formula-session.sh"
|
||||
# shellcheck source=../lib/worktree.sh
|
||||
source "$FACTORY_ROOT/lib/worktree.sh"
|
||||
# shellcheck source=../lib/guard.sh
|
||||
source "$FACTORY_ROOT/lib/guard.sh"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue