Skip to content

Auto-update session branch to remote tip and origin/main #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexkroman merged 3 commits into from
Jun 11, 2026
Merged

Auto-update session branch to remote tip and origin/main #78

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62582af
Auto-update the session branch in the SessionStart hook
claude Jun 11, 2026
d86d3c6
Merge remote-tracking branch 'origin/main' into claude/admiring-gates…
claude Jun 11, 2026
7fc4f04
Merge branch 'main' into claude/admiring-gates-044zq5
alexkroman Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .claude/hooks/session-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,39 @@ fi
log "syncing uv environment (locked dev group)"
uv sync

# 4. Keep the session branch current. Resumed web containers hold a clone frozen
# at creation time, so two things can go stale: the branch's own remote tip
# (pushes from another session/machine) and origin/main (which the diff-scoped
# gates — diff-cover, mutation — compare against). Fast-forward to the remote
# tip if it advanced, then merge origin/main if behind (the same semantics as
# GitHub's "Update branch" button). Never force anything: a dirty tree skips
# the update and a conflicting merge is aborted with a note, leaving the
# resolution to the session.
branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "HEAD")
if [ "$branch" != "HEAD" ] && [ "$branch" != "main" ]; then
if [ -n "$(git status --porcelain)" ]; then
log "working tree is dirty; skipping branch auto-update"
elif git fetch origin main "$branch" 2>/dev/null || git fetch origin main 2>/dev/null; then
if git rev-parse --verify --quiet "origin/$branch" >/dev/null; then
if git merge-base --is-ancestor "HEAD" "origin/$branch" && [ "$(git rev-parse HEAD)" != "$(git rev-parse "origin/$branch")" ]; then
git merge --ff-only "origin/$branch"
log "fast-forwarded $branch to its remote tip"
fi
fi
behind=$(git rev-list --count "HEAD..origin/main" 2>/dev/null || echo 0)
if [ "$behind" -gt 0 ]; then
if git merge --no-edit origin/main; then
log "merged origin/main into $branch (was $behind commit(s) behind)"
else
git merge --abort 2>/dev/null || true
log "WARNING: origin/main conflicts with $branch; left unmerged — resolve with 'git merge origin/main'"
fi
else
log "$branch is up to date with origin/main"
fi
else
log "could not fetch origin; skipping branch auto-update"
fi
fi

log "provisioning complete"
Loading