@imdeadpool/guardex 6.0.0 → 6.1.0

package/bin/multiagent-safety.js

@@ -54,6 +54,7 @@ const TEMPLATE_FILES = [
   'githooks/pre-commit',
   'githooks/pre-push',
   'githooks/post-merge',
+  'githooks/post-checkout',
   'codex/skills/guardex/SKILL.md',
   'codex/skills/guardex-merge-skills-to-dev/SKILL.md',
   'claude/commands/guardex.md',
@@ -97,6 +98,7 @@ const EXECUTABLE_RELATIVE_PATHS = new Set([
   '.githooks/pre-commit',
   '.githooks/pre-push',
   '.githooks/post-merge',
+  '.githooks/post-checkout',
 ]);
 
 const CRITICAL_GUARDRAIL_PATHS = new Set([
@@ -104,6 +106,7 @@ const CRITICAL_GUARDRAIL_PATHS = new Set([
   '.githooks/pre-commit',
   '.githooks/pre-push',
   '.githooks/post-merge',
+  '.githooks/post-checkout',
   'scripts/agent-branch-start.sh',
   'scripts/agent-branch-finish.sh',
   'scripts/agent-worktree-prune.sh',
@@ -131,6 +134,7 @@ const MANAGED_GITIGNORE_PATHS = [
   '.githooks/pre-commit',
   '.githooks/pre-push',
   '.githooks/post-merge',
+  '.githooks/post-checkout',
   'oh-my-codex/',
   '.codex/skills/guardex/SKILL.md',
   '.codex/skills/guardex-merge-skills-to-dev/SKILL.md',
@@ -203,6 +207,15 @@ const CLI_COMMAND_DESCRIPTIONS = [
   ['help', 'Show this help output'],
   ['version', 'Print GuardeX version'],
 ];
+const CORE_COMMAND_NAMES = new Set([
+  'setup',
+  'doctor',
+  'status',
+  'finish',
+  'cleanup',
+  'sync',
+  'scan',
+]);
 const AGENT_BOT_DESCRIPTIONS = [
   ['review', 'Start PR monitor + codex-agent review flow (default interval: 30s)'],
   ['agents', 'Start/stop both review and cleanup bots for this repo'],
@@ -351,12 +364,15 @@ function statusDot(status) {
   return colorize('●', '33'); // yellow for degraded/unknown
 }
 
-function commandCatalogLines(indent = '  ') {
-  const maxCommandLength = CLI_COMMAND_DESCRIPTIONS.reduce(
+function commandCatalogLines(indent = '  ', { coreOnly = false } = {}) {
+  const entries = coreOnly
+    ? CLI_COMMAND_DESCRIPTIONS.filter(([name]) => CORE_COMMAND_NAMES.has(name))
+    : CLI_COMMAND_DESCRIPTIONS;
+  const maxCommandLength = entries.reduce(
     (max, [command]) => Math.max(max, command.length),
     0,
   );
-  return CLI_COMMAND_DESCRIPTIONS.map(
+  return entries.map(
     ([command, description]) => `${indent}${command.padEnd(maxCommandLength + 2)}${description}`,
   );
 }
@@ -373,7 +389,7 @@ function agentBotCatalogLines(indent = '  ') {
 
 function printToolLogsSummary() {
   const usageLine = `    $ ${SHORT_TOOL_NAME} <command> [options]`;
-  const commandDetails = commandCatalogLines('    ');
+  const commandDetails = commandCatalogLines('    ', { coreOnly: true });
   const agentBotDetails = agentBotCatalogLines('    ');
 
   if (!supportsAnsiColors()) {
@@ -418,7 +434,7 @@ function printToolLogsSummary() {
     }
     console.log(`  ${pipe}${line.slice(2)}`);
   }
-  console.log(`  ${corner}─ ${colorize(`Try '${TOOL_NAME} doctor' for one-step repair + verification.`, '2')}`);
+  console.log(`  ${corner}─ ${colorize(`Try '${SHORT_TOOL_NAME} doctor' to repair drift, or '${SHORT_TOOL_NAME} help' for the full command list.`, '2')}`);
 }
 
 function usage(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imdeadpool/guardex",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "GuardeX: the Guardian T-Rex for your repo, with hardened multi-agent git guardrails.",
   "license": "MIT",
   "preferGlobal": true,
@@ -10,6 +10,8 @@
     "multiagent-safety": "bin/multiagent-safety.js"
   },
   "scripts": {
+    "prepack": "node pack-helpers/dereference-templates.mjs",
+    "postpack": "git checkout -- templates",
     "test": "node --test test/*.test.js",
     "agent:codex": "bash ./scripts/codex-agent.sh",
     "agent:branch:start": "bash ./scripts/agent-branch-start.sh",

package/templates/AGENTS.multiagent-safety.md

@@ -11,6 +11,7 @@
 - If ownership is unclear or overlaps, stop that edit, post a blocker comment, and let the leader/integrator reassign scope.
 - For git isolation, each agent must start on a dedicated branch via `scripts/agent-branch-start.sh "<task-or-plan>" "<agent-name>"`.
 - In-place branch mode is disallowed: never switch the active local/base checkout to an agent branch.
+- Primary-checkout immutability: agents MUST NOT run `git checkout <branch>` on any repo's primary working tree, including nested repos inside the parent workspace (e.g. tool repos nested under the product repo). Keep each repo's primary checkout on its base/protected branch; use `git worktree add` for feature work. The `.githooks/post-checkout` hook auto-reverts primary-checkout branch switches when an agent session is detected; bypass only with `GUARDEX_ALLOW_PRIMARY_BRANCH_SWITCH=1` when truly intentional.
 - Treat the base branch (`main` or the user's current local base branch) as read-only while the agent branch is active.
 - Agent completion defaults to `scripts/codex-agent.sh`, which auto-finishes the branch (auto-commit changed files, push/create PR, attempt merge, and pull the local base branch after merge).
 - OMX completion policy: when a task is done, the agent must commit the task changes, push the agent branch, and create/update a PR for those changes (via `codex-agent` or `agent-branch-finish`).

package/templates/githooks/post-checkout

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# post-checkout <prev_head> <new_head> <branch_checkout_flag>
+branch_checkout="${3:-0}"
+[[ "$branch_checkout" == "1" ]] || exit 0
+
+if [[ "${GUARDEX_ALLOW_PRIMARY_BRANCH_SWITCH:-0}" == "1" ]]; then
+  exit 0
+fi
+
+# Skip in secondary worktrees — only the primary checkout is guarded.
+git_dir_abs="$(cd "$(git rev-parse --git-dir)" && pwd -P)"
+common_dir_abs="$(cd "$(git rev-parse --git-common-dir)" && pwd -P)"
+if [[ "$git_dir_abs" != "$common_dir_abs" ]]; then
+  exit 0
+fi
+
+new_branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
+# Parse the latest reflog entry; post-checkout writes "checkout: moving from <prev> to <new>".
+prev_branch="$(git reflog -1 HEAD 2>/dev/null | sed -n 's/.*checkout: moving from \([^ ]*\) to .*/\1/p' || true)"
+
+[[ -n "$prev_branch" && -n "$new_branch" && "$prev_branch" != "$new_branch" ]] || exit 0
+
+protected_raw="${GUARDEX_PROTECTED_BRANCHES:-$(git config --get multiagent.protectedBranches || true)}"
+[[ -n "$protected_raw" ]] || protected_raw="dev main master"
+protected_raw="${protected_raw//,/ }"
+
+is_protected() {
+  local branch="$1"
+  for p in $protected_raw; do
+    [[ "$branch" == "$p" ]] && return 0
+  done
+  return 1
+}
+
+# Only guard when moving AWAY from a protected primary branch.
+is_protected "$prev_branch" || exit 0
+
+is_agent=0
+if [[ -n "${CLAUDECODE:-}" \
+   || -n "${CLAUDE_CODE_SESSION_ID:-}" \
+   || -n "${CODEX_THREAD_ID:-}" \
+   || -n "${OMX_SESSION_ID:-}" \
+   || "${CODEX_CI:-0}" == "1" ]]; then
+  is_agent=1
+fi
+
+echo "" >&2
+echo "[agent-primary-branch-guard] Primary checkout switched branches." >&2
+echo "[agent-primary-branch-guard]   from: $prev_branch (protected)" >&2
+echo "[agent-primary-branch-guard]   to:   $new_branch" >&2
+echo "[agent-primary-branch-guard] The primary working tree must stay on its base/protected branch." >&2
+echo "[agent-primary-branch-guard] Use 'git worktree add' (or scripts/agent-branch-start.sh) for feature work." >&2
+
+if [[ "$is_agent" == "1" ]]; then
+  echo "[agent-primary-branch-guard] Agent session detected — reverting to '$prev_branch'." >&2
+  echo "[agent-primary-branch-guard] Bypass with GUARDEX_ALLOW_PRIMARY_BRANCH_SWITCH=1 if truly intentional." >&2
+  if git diff --quiet && git diff --cached --quiet; then
+    GUARDEX_ALLOW_PRIMARY_BRANCH_SWITCH=1 git checkout "$prev_branch" >/dev/null 2>&1 || true
+    echo "[agent-primary-branch-guard] Reverted to '$prev_branch'." >&2
+  else
+    echo "[agent-primary-branch-guard] Working tree dirty — auto-revert skipped." >&2
+    echo "[agent-primary-branch-guard] Fix manually: git stash && git checkout $prev_branch" >&2
+  fi
+else
+  echo "[agent-primary-branch-guard] Bypass with GUARDEX_ALLOW_PRIMARY_BRANCH_SWITCH=1 if intentional." >&2
+fi

package/templates/githooks/post-merge

@@ -1,43 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-if [[ "${GUARDEX_DISABLE_POST_MERGE_CLEANUP:-0}" == "1" ]]; then
-  exit 0
+# Auto-sync agent worktrees when the base branch is updated in this worktree.
+if [[ -x "scripts/agent-sync-on-base-update.sh" ]]; then
+  bash scripts/agent-sync-on-base-update.sh --quiet || true
 fi
-
-repo_root="$(git rev-parse --show-toplevel 2>/dev/null || true)"
-if [[ -z "$repo_root" ]]; then
-  exit 0
-fi
-
-branch="$(git -C "$repo_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
-if [[ -z "$branch" || "$branch" == "HEAD" ]]; then
-  exit 0
-fi
-
-base_branch="${GUARDEX_BASE_BRANCH:-$(git -C "$repo_root" config --get multiagent.baseBranch || true)}"
-if [[ -z "$base_branch" ]]; then
-  base_branch="dev"
-fi
-
-if [[ "$branch" != "$base_branch" ]]; then
-  exit 0
-fi
-
-cli_path="$repo_root/bin/multiagent-safety.js"
-if [[ ! -f "$cli_path" ]]; then
-  exit 0
-fi
-
-node_bin="${GUARDEX_NODE_BIN:-node}"
-if ! command -v "$node_bin" >/dev/null 2>&1; then
-  exit 0
-fi
-
-"$node_bin" "$cli_path" cleanup \
-  --target "$repo_root" \
-  --base "$base_branch" \
-  --include-pr-merged \
-  --keep-clean-worktrees >/dev/null 2>&1 || true
-
-exit 0

package/templates/githooks/pre-commit

@@ -9,6 +9,12 @@ if [[ -z "$branch" ]]; then
   exit 0
 fi
 
+git_dir="$(git rev-parse --git-dir 2>/dev/null || true)"
+is_linked_worktree=0
+if [[ -n "$git_dir" && "$git_dir" == *"/worktrees/"* ]]; then
+  is_linked_worktree=1
+fi
+
 if [[ "${ALLOW_COMMIT_ON_PROTECTED_BRANCH:-0}" == "1" ]]; then
   exit 0
 fi
@@ -24,7 +30,7 @@ if [[ -n "${CODEX_THREAD_ID:-}" || -n "${OMX_SESSION_ID:-}" || "${CODEX_CI:-0}"
 fi
 
 is_vscode_git_context=0
-if [[ -n "${VSCODE_GIT_IPC_HANDLE:-}" || -n "${VSCODE_GIT_ASKPASS_NODE:-}" || -n "${VSCODE_IPC_HOOK_CLI:-}" ]]; then
+if [[ -n "${VSCODE_GIT_IPC_HANDLE:-}" || -n "${VSCODE_GIT_ASKPASS_NODE:-}" || -n "${VSCODE_IPC_HOOK_CLI:-}" || "${TERM_PROGRAM:-}" == "vscode" ]]; then
   is_vscode_git_context=1
 fi
 
@@ -68,6 +74,163 @@ case "$codex_require_agent_branch" in
   *) should_require_codex_agent_branch=1 ;;
 esac
 
+sanitize_slug() {
+  local raw="$1"
+  local fallback="${2:-task}"
+  local slug
+  slug="$(printf '%s' "$raw" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+//; s/-+$//; s/-{2,}/-/g')"
+  if [[ -z "$slug" ]]; then
+    slug="$fallback"
+  fi
+  printf '%s' "$slug"
+}
+
+resolve_agent_branch_base() {
+  local branch_name="$1"
+  git config --get "branch.${branch_name}.guardexBase" || true
+}
+
+is_helper_agent_branch() {
+  local branch_name="$1"
+  local base_branch=""
+  base_branch="$(resolve_agent_branch_base "$branch_name")"
+  [[ "$base_branch" == agent/* ]]
+}
+
+ensure_agent_branch_openspec_workspace() {
+  local branch_name="$1"
+  local change_slug change_dir specs_dir capability_slug branch_base
+  local missing_workspace=0
+  local openspec_script="scripts/openspec/init-change-workspace.sh"
+
+  branch_base="$(git config --get "branch.${branch_name}.guardexBase" || true)"
+  if [[ "$branch_base" == agent/* ]]; then
+    echo "[agent-openspec-guard] Skipping OpenSpec change workspace bootstrap for helper branch '${branch_name}' (base '${branch_base}')."
+    return 0
+  fi
+
+  change_slug="$(sanitize_slug "${branch_name//\//-}" "change")"
+  change_dir="openspec/changes/${change_slug}"
+  specs_dir="${change_dir}/specs"
+
+  if [[ ! -f "${change_dir}/.openspec.yaml" || ! -f "${change_dir}/proposal.md" || ! -f "${change_dir}/tasks.md" ]]; then
+    missing_workspace=1
+  elif [[ ! -d "$specs_dir" ]] || ! find "$specs_dir" -mindepth 2 -maxdepth 2 -type f -name spec.md | grep -q .; then
+    missing_workspace=1
+  fi
+
+  if [[ "$missing_workspace" -ne 1 ]]; then
+    return 0
+  fi
+
+  if [[ ! -f "$openspec_script" ]]; then
+    cat >&2 <<MSG
+[agent-openspec-guard] Missing OpenSpec change workspace for '${branch_name}'.
+Expected path:
+  ${change_dir}
+Cannot auto-initialize because '${openspec_script}' is missing.
+Run:
+  gx setup --target "$(git rev-parse --show-toplevel)"
+  bash scripts/openspec/init-change-workspace.sh "${change_slug}" "<capability-slug>"
+MSG
+    exit 1
+  fi
+
+  if [[ ! -x "$openspec_script" ]]; then
+    chmod +x "$openspec_script" 2>/dev/null || true
+  fi
+
+  capability_slug="$(sanitize_slug "${branch_name##*/}" "general-behavior")"
+  init_output=""
+  if ! init_output="$(bash "$openspec_script" "$change_slug" "$capability_slug" 2>&1)"; then
+    printf '%s\n' "$init_output" >&2
+    cat >&2 <<MSG
+[agent-openspec-guard] OpenSpec auto-init failed for '${branch_name}'.
+Run manually:
+  bash scripts/openspec/init-change-workspace.sh "${change_slug}" "${capability_slug}"
+MSG
+    exit 1
+  fi
+
+  if [[ -n "$init_output" ]]; then
+    printf '%s\n' "$init_output"
+  fi
+
+  git add "$change_dir"
+
+  if [[ -x scripts/agent-file-locks.py ]]; then
+    staged_openspec="$(git diff --cached --name-only -- "$change_dir" | sed '/^$/d' || true)"
+    if [[ -n "$staged_openspec" ]]; then
+      mapfile -t openspec_files < <(printf '%s\n' "$staged_openspec")
+      python3 scripts/agent-file-locks.py claim --branch "$branch_name" "${openspec_files[@]}" >/dev/null 2>&1 || true
+    fi
+  fi
+
+  echo "[agent-openspec-guard] Bootstrapped OpenSpec change workspace: ${change_dir}"
+}
+
+should_auto_reroute_protected_branch() {
+  local raw="${GUARDEX_AUTO_REROUTE_PROTECTED_BRANCH:-$(git config --get multiagent.autoRerouteProtectedBranch || true)}"
+  local lowered=""
+  if [[ -z "$raw" ]]; then
+    raw="true"
+  fi
+  lowered="$(printf '%s' "$raw" | tr '[:upper:]' '[:lower:]')"
+  case "$lowered" in
+    1|true|yes|on) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+auto_reroute_protected_branch_commit() {
+  local branch_name="$1"
+  local starter_script="scripts/agent-branch-start.sh"
+  local task_name="${GUARDEX_AUTO_REROUTE_TASK_NAME:-protected-branch-commit-reroute}"
+  local agent_name="${GUARDEX_AUTO_REROUTE_AGENT_NAME:-auto-reroute}"
+  local changed_paths=""
+  local start_output=""
+  local start_status=0
+  local new_branch=""
+  local worktree_path=""
+
+  changed_paths="$({
+    git diff --name-only
+    git diff --cached --name-only
+    git ls-files --others --exclude-standard
+  } | sed '/^$/d' | sort -u)"
+
+  if [[ -z "$changed_paths" ]]; then
+    return 1
+  fi
+
+  if [[ ! -x "$starter_script" ]]; then
+    return 1
+  fi
+
+  set +e
+  start_output="$(bash "$starter_script" "$task_name" "$agent_name" "$branch_name" 2>&1)"
+  start_status=$?
+  set -e
+
+  if [[ "$start_status" -ne 0 ]]; then
+    printf '%s\n' "$start_output" >&2
+    return 1
+  fi
+
+  new_branch="$(printf '%s\n' "$start_output" | sed -n 's/^\[agent-branch-start\] Created branch: //p' | tail -n 1)"
+  worktree_path="$(printf '%s\n' "$start_output" | sed -n 's/^\[agent-branch-start\] Worktree: //p' | tail -n 1)"
+
+  printf '%s\n' "$start_output" >&2
+  cat >&2 <<MSG
+[agent-branch-guard] Protected-branch commit rerouted automatically.
+Changes from '${branch_name}' were moved to:
+  branch: ${new_branch:-<see output>}
+  worktree: ${worktree_path:-<see output>}
+Continue work and commit from that agent worktree.
+MSG
+  return 0
+}
+
 is_codex_managed_only_commit_on_protected=0
 if [[ "$is_codex_session" == "1" && "$is_protected_branch" == "1" ]]; then
   deleted_paths="$(git diff --cached --name-only --diff-filter=D)"
@@ -123,17 +286,32 @@ MSG
   fi
 fi
 
-if [[ "$is_protected_branch" == "1" ]]; then
-  if [[ "$is_codex_session" != "1" && "$is_vscode_git_context" == "1" ]]; then
-    if [[ "$allow_vscode_protected_branch_writes" == "1" ]]; then
-      exit 0
-    fi
+if [[ "$is_codex_session" == "1" && "$branch" == agent/* ]]; then
+  if [[ "$is_linked_worktree" != "1" && "${GUARDEX_ALLOW_CODEX_ON_PRIMARY_WORKTREE:-0}" != "1" ]]; then
+    cat >&2 <<'MSG'
+[codex-worktree-guard] Codex agent commits are blocked from the primary checkout.
+Use a linked agent worktree for agent/* branches:
+  bash scripts/agent-branch-start.sh "<task-or-plan>" "<agent-name>"
+Then commit from the printed worktree path.
+
+Temporary bypass (not recommended):
+  GUARDEX_ALLOW_CODEX_ON_PRIMARY_WORKTREE=1 git commit ...
+MSG
+    exit 1
   fi
+fi
 
-  if [[ "$is_unborn_branch" == "1" && "$is_codex_session" != "1" ]]; then
+if [[ "$is_protected_branch" == "1" ]]; then
+  if [[ "$is_codex_session" != "1" && "$is_vscode_git_context" == "1" && "$allow_vscode_protected_branch_writes" == "1" ]]; then
     exit 0
   fi
 
+  if should_auto_reroute_protected_branch; then
+    if auto_reroute_protected_branch_commit "$branch"; then
+      exit 1
+    fi
+  fi
+
   git_dir="$(git rev-parse --git-dir)"
   if [[ -f "$git_dir/MERGE_HEAD" ]]; then
     exit 0
@@ -145,8 +323,10 @@ Use an agent branch first:
   bash scripts/agent-branch-start.sh "<task-or-plan>" "<agent-name>"
 After finishing work:
   bash scripts/agent-branch-finish.sh
+Auto-reroute can be disabled (not recommended):
+  GUARDEX_AUTO_REROUTE_PROTECTED_BRANCH=0 git commit ...
 
-Optional repo opt-in for VS Code protected-branch commits:
+Optional repo override for manual VS Code protected-branch commits:
   git config multiagent.allowVscodeProtectedBranchWrites true
 
 Temporary bypass (not recommended):
@@ -155,26 +335,12 @@ MSG
   exit 1
 fi
 
-if [[ "$is_agent_context" == "1" && "$branch" != agent/* ]]; then
-  cat >&2 <<'MSG'
-[agent-branch-guard] Agent commits must run on dedicated agent/* branches.
-Start an agent branch first:
-  bash scripts/agent-branch-start.sh "<task-or-plan>" "<agent-name>"
-Then commit on that branch.
-
-Temporary bypass (not recommended):
-  ALLOW_COMMIT_ON_PROTECTED_BRANCH=1 git commit ...
-MSG
-  exit 1
-fi
-
 if [[ "$branch" == agent/* ]]; then
-  if [[ "${GUARDEX_AUTOCLAIM_STAGED_LOCKS:-1}" == "1" ]]; then
-    while IFS= read -r staged_file; do
-      [[ -z "$staged_file" ]] && continue
-      [[ "$staged_file" == ".omx/state/agent-file-locks.json" ]] && continue
-      python3 scripts/agent-file-locks.py claim --branch "$branch" "$staged_file" >/dev/null 2>&1 || true
-    done < <(git diff --cached --name-only --diff-filter=ACMRDTUXB)
+  if is_helper_agent_branch "$branch"; then
+    helper_base="$(resolve_agent_branch_base "$branch")"
+    echo "[agent-openspec-guard] Skipping OpenSpec change workspace bootstrap for helper branch '${branch}' (base '${helper_base}')."
+  else
+    ensure_agent_branch_openspec_workspace "$branch"
   fi
 
   if ! python3 scripts/agent-file-locks.py validate --branch "$branch" --staged; then