Defame1297
807caf22ee
Why: the docs said to discard a refreshed apm.lock.yaml on a feature branch because the refresh records main's commit, but the branch's own lock records a (older) main commit too, and the SessionStart notice gave the same "commit or discard" advice on every branch. Implementation Notes: - check-apm-current.sh picks fixed advice by branch: commit or discard deliberately on the default branch (origin/HEAD, else main), discard and reinstall on a feature branch; the branch name is never interpolated. - README, AGENTS.md and ADR-0019 give the real reasons (no lock churn in the branch diff, deployed tree matches the committed lock), the cost (the session runs the older main) and that the next session start refreshes again. - ADR-0019's check-clean and stale-server claims restated to match apm's source. ADR: 0019 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
78 lines
4.1 KiB
Bash
Executable File
78 lines
4.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# SessionStart: keep an apm-consumed install level with its remote.
|
|
#
|
|
# Packages declared as unpinned git refs resolve against the remote default
|
|
# branch, so the deployed .claude/skills/ and .claude/agents/ go stale the
|
|
# moment anyone merges. The staleness bites when a session loads skills, which
|
|
# is why this runs at SessionStart rather than off a git hook — a pull is
|
|
# neither necessary nor sufficient for the install to have drifted.
|
|
#
|
|
# Refreshes in place and asks the host to re-scan, so the running session picks
|
|
# the new content up without a restart.
|
|
#
|
|
# Inert in any project that does not consume packages through apm.
|
|
set -uo pipefail
|
|
|
|
# Anchor on the project root, not the session's cwd. Claude Code exports
|
|
# CLAUDE_PROJECT_DIR for SessionStart hooks; a session opened in a subdirectory
|
|
# would otherwise miss the lockfile, no-op silently, and — worse — run the apm
|
|
# calls below against that wrong directory. Fall back to the cwd when the
|
|
# variable is absent, which keeps the hook inert-but-harmless under a host that
|
|
# does not set it.
|
|
project_dir="${CLAUDE_PROJECT_DIR:-$PWD}"
|
|
|
|
# No lockfile means nothing was installed through apm here — e.g. a host that
|
|
# installed this plugin natively. Say nothing and cost nothing.
|
|
[[ -f "$project_dir/apm.lock.yaml" ]] || exit 0
|
|
command -v apm > /dev/null 2>&1 || exit 0
|
|
|
|
# Every apm call below must see the same directory the guard just checked —
|
|
# `apm outdated` and `apm update` both resolve the lockfile from the cwd.
|
|
cd "$project_dir" || exit 0
|
|
|
|
# `apm outdated` exits 0 whether or not anything is stale, so the answer has to
|
|
# come from its output. ~0.7s against six remote refs; a hung remote must not
|
|
# hold the session open.
|
|
#
|
|
# There is no --json/machine-readable flag on `apm outdated` (verified against
|
|
# apm 0.28.0), so the phrase match is forced rather than chosen. Note the
|
|
# singular: apm prints "1 outdated dependency found" when exactly one package is
|
|
# behind, so matching only "dependencies" would silently miss a one-package
|
|
# drift. tests/test-apm-current-hook.sh pins both spellings against the real apm.
|
|
outdated_output="$(timeout 60 apm outdated 2>&1)" || exit 0
|
|
grep -qE 'outdated dependenc(y|ies) found' <<< "$outdated_output" || exit 0
|
|
|
|
stale_count="$(grep -oE '[0-9]+ outdated dependenc(y|ies) found' <<< "$outdated_output" | grep -oE '^[0-9]+' || true)"
|
|
[[ "$stale_count" =~ ^[0-9]+$ ]] || stale_count="some"
|
|
|
|
# Only ever emit fixed text plus a digit-checked count — never interpolate
|
|
# command output into the JSON, which would need escaping this cannot do safely.
|
|
emit() {
|
|
printf '{"hookSpecificOutput":{"hookEventName":"SessionStart","reloadSkills":%s,"additionalContext":"%s"}}\n' "$1" "$2"
|
|
}
|
|
|
|
# What to do with the rewritten lock depends on the branch (ADR-0019): on the
|
|
# default branch it is a real update to commit or discard; on a feature branch it
|
|
# is churn unrelated to the branch and should be discarded. The branch name only
|
|
# selects between fixed strings and is never interpolated. Outside a git checkout,
|
|
# or on a detached HEAD, the neutral advice stands.
|
|
lock_advice="commit it or discard it deliberately."
|
|
current_branch="$(git symbolic-ref --short -q HEAD 2> /dev/null || true)"
|
|
if [[ -n "$current_branch" ]]; then
|
|
default_branch="$(git symbolic-ref --short -q refs/remotes/origin/HEAD 2> /dev/null || true)"
|
|
default_branch="${default_branch#origin/}"
|
|
if [[ "$current_branch" == "${default_branch:-main}" ]]; then
|
|
lock_advice="this is the default branch, so commit it or discard it deliberately."
|
|
else
|
|
lock_advice="this is a feature branch, so discard it: git checkout -- apm.lock.yaml && apm install"
|
|
fi
|
|
fi
|
|
|
|
if timeout 300 apm update --yes > /dev/null 2>&1; then
|
|
emit true "apm install was ${stale_count} package(s) behind the remote default branch and has been refreshed automatically; skills and agents were redeployed and re-scanned. apm.lock.yaml has been rewritten and is now a modified file in the working tree - ${lock_advice}"
|
|
else
|
|
emit false "apm install is ${stale_count} package(s) behind the remote default branch and the automatic refresh failed. Deployed skills and agents may be stale. Run: apm update --yes"
|
|
fi
|
|
|
|
exit 0
|