@imdeadpool/guardex 7.0.23 → 7.0.25

package/templates/scripts/agent-branch-finish.sh

@@ -15,6 +15,7 @@ CLEANUP_AFTER_MERGE_RAW="${GUARDEX_FINISH_CLEANUP:-false}"
 WAIT_FOR_MERGE_RAW="${GUARDEX_FINISH_WAIT_FOR_MERGE:-false}"
 WAIT_TIMEOUT_SECONDS_RAW="${GUARDEX_FINISH_WAIT_TIMEOUT_SECONDS:-1800}"
 WAIT_POLL_SECONDS_RAW="${GUARDEX_FINISH_WAIT_POLL_SECONDS:-10}"
+PARENT_GITLINK_AUTO_COMMIT_RAW="${GUARDEX_FINISH_PARENT_GITLINK_AUTO_COMMIT:-true}"
 
 run_guardex_cli() {
   if [[ -n "$CLI_ENTRY" ]]; then
@@ -67,6 +68,7 @@ CLEANUP_AFTER_MERGE="$(normalize_bool "$CLEANUP_AFTER_MERGE_RAW" "0")"
 WAIT_FOR_MERGE="$(normalize_bool "$WAIT_FOR_MERGE_RAW" "0")"
 WAIT_TIMEOUT_SECONDS="$(normalize_int "$WAIT_TIMEOUT_SECONDS_RAW" "1800" "30")"
 WAIT_POLL_SECONDS="$(normalize_int "$WAIT_POLL_SECONDS_RAW" "10" "0")"
+PARENT_GITLINK_AUTO_COMMIT="$(normalize_bool "$PARENT_GITLINK_AUTO_COMMIT_RAW" "1")"
 
 while [[ $# -gt 0 ]]; do
   case "$1" in
@@ -117,6 +119,14 @@ while [[ $# -gt 0 ]]; do
       WAIT_POLL_SECONDS="$(normalize_int "${2:-}" "10" "0")"
       shift 2
       ;;
+    --parent-gitlink-commit)
+      PARENT_GITLINK_AUTO_COMMIT=1
+      shift
+      ;;
+    --no-parent-gitlink-commit)
+      PARENT_GITLINK_AUTO_COMMIT=0
+      shift
+      ;;
     --mode)
       MERGE_MODE="${2:-auto}"
       shift 2
@@ -131,7 +141,7 @@ while [[ $# -gt 0 ]]; do
       ;;
     *)
       echo "[agent-branch-finish] Unknown argument: $1" >&2
-      echo "Usage: $0 [--base <branch>] [--branch <branch>] [--no-push] [--cleanup|--no-cleanup] [--wait-for-merge|--no-wait-for-merge] [--wait-timeout-seconds <n>] [--wait-poll-seconds <n>] [--keep-remote-branch|--delete-remote-branch] [--mode auto|direct|pr|--via-pr|--direct-only]" >&2
+      echo "Usage: $0 [--base <branch>] [--branch <branch>] [--no-push] [--cleanup|--no-cleanup] [--wait-for-merge|--no-wait-for-merge] [--wait-timeout-seconds <n>] [--wait-poll-seconds <n>] [--parent-gitlink-commit|--no-parent-gitlink-commit] [--keep-remote-branch|--delete-remote-branch] [--mode auto|direct|pr|--via-pr|--direct-only]" >&2
       exit 1
       ;;
   esac
@@ -173,6 +183,8 @@ if [[ -z "$stored_worktree_root_rel" ]]; then
   stored_worktree_root_rel=".omx/agent-worktrees"
 fi
 agent_worktree_root="${repo_common_root}/${stored_worktree_root_rel}"
+runtime_state_root_rel="$(dirname "$stored_worktree_root_rel")"
+temp_worktree_root="${repo_common_root}/${runtime_state_root_rel}/.tmp-worktrees"
 
 if [[ "$BASE_BRANCH_EXPLICIT" -eq 1 && -z "$BASE_BRANCH" ]]; then
   echo "[agent-branch-finish] --base requires a non-empty branch name." >&2
@@ -218,7 +230,7 @@ fi
 
 get_worktree_for_branch() {
   local branch="$1"
-  git -C "$repo_root" worktree list --porcelain | awk -v target="refs/heads/${branch}" -v probe_prefix="${agent_worktree_root}/__source-probe-" '
+  git -C "$repo_root" worktree list --porcelain | awk -v target="refs/heads/${branch}" -v probe_prefix="${temp_worktree_root}/__source-probe-" '
     $1 == "worktree" { wt = $2 }
     $1 == "branch" && $2 == target {
       if (index(wt, probe_prefix) != 1) {
@@ -242,7 +254,7 @@ remove_stale_source_probe_worktrees() {
     git -C "$stale_probe" merge --abort >/dev/null 2>&1 || true
     git -C "$repo_root" worktree remove "$stale_probe" --force >/dev/null 2>&1 || true
   done < <(
-    git -C "$repo_root" worktree list --porcelain | awk -v target="refs/heads/${branch}" -v probe_prefix="${agent_worktree_root}/__source-probe-" '
+    git -C "$repo_root" worktree list --porcelain | awk -v target="refs/heads/${branch}" -v probe_prefix="${temp_worktree_root}/__source-probe-" '
       $1 == "worktree" { wt = $2 }
       $1 == "branch" && $2 == target {
         if (index(wt, probe_prefix) == 1) {
@@ -264,11 +276,15 @@ source_worktree="$(get_worktree_for_branch "$SOURCE_BRANCH")"
 created_source_probe=0
 source_probe_path=""
 integration_worktree=""
+integration_branch=""
 
 cleanup() {
   if [[ -n "$integration_worktree" && -d "$integration_worktree" ]]; then
     git -C "$repo_root" worktree remove "$integration_worktree" --force >/dev/null 2>&1 || true
   fi
+  if [[ -n "${integration_branch:-}" ]]; then
+    git -C "$repo_root" branch -D "$integration_branch" >/dev/null 2>&1 || true
+  fi
   if [[ "$created_source_probe" -eq 1 && -n "$source_probe_path" && -d "$source_probe_path" ]]; then
     # Abort any in-progress git op so `worktree remove --force` succeeds on conflict-stuck probes.
     git -C "$source_probe_path" rebase --abort >/dev/null 2>&1 || true
@@ -279,7 +295,7 @@ cleanup() {
 trap cleanup EXIT
 
 if [[ -z "$source_worktree" ]]; then
-  source_probe_path="${agent_worktree_root}/__source-probe-${SOURCE_BRANCH//\//__}-$(date +%Y%m%d-%H%M%S)"
+  source_probe_path="${temp_worktree_root}/__source-probe-${SOURCE_BRANCH//\//__}-$(date +%Y%m%d-%H%M%S)"
   mkdir -p "$(dirname "$source_probe_path")"
   git -C "$repo_root" worktree add "$source_probe_path" "$SOURCE_BRANCH" >/dev/null
   source_worktree="$source_probe_path"
@@ -343,7 +359,7 @@ if [[ "$should_require_sync" -eq 1 ]] && git -C "$repo_root" show-ref --verify -
 fi
 
 integration_stamp="$(date +%Y%m%d-%H%M%S)"
-integration_worktree_base="${agent_worktree_root}/__integrate-${BASE_BRANCH//\//__}-${integration_stamp}"
+integration_worktree_base="${temp_worktree_root}/__integrate-${BASE_BRANCH//\//__}-${integration_stamp}"
 integration_branch_base="__agent_integrate_${BASE_BRANCH//\//_}_$(date +%Y%m%d_%H%M%S)"
 integration_worktree="$integration_worktree_base"
 integration_branch="$integration_branch_base"
@@ -455,6 +471,128 @@ read_pr_state() {
   return 0
 }
 
+read_merged_pr_for_head() {
+  local head_sha="${1:-}"
+  local state_line=""
+  local parsed_state=""
+  local parsed_merged_at=""
+  local parsed_url=""
+
+  if [[ -z "$head_sha" ]]; then
+    return 1
+  fi
+
+  state_line="$("$GH_BIN" pr list \
+    --state merged \
+    --head "$SOURCE_BRANCH" \
+    --base "$BASE_BRANCH" \
+    --json state,mergedAt,url,headRefOid \
+    --jq "map(select(.headRefOid == \"$head_sha\")) | sort_by(.mergedAt // \"\") | reverse | (.[0] // {}) | [(.state // \"\"), (.mergedAt // \"\"), (.url // \"\")] | join(\"\u001f\")" \
+    2>/dev/null || true)"
+  if [[ -z "$state_line" ]]; then
+    return 1
+  fi
+
+  IFS=$'\x1f' read -r parsed_state parsed_merged_at parsed_url <<< "$state_line"
+  if [[ -z "$parsed_state" && -z "$parsed_merged_at" && -z "$parsed_url" ]]; then
+    return 1
+  fi
+  if [[ "$parsed_state" != "MERGED" && -z "$parsed_merged_at" ]]; then
+    return 1
+  fi
+
+  PR_STATE="$parsed_state"
+  PR_MERGED_AT="$parsed_merged_at"
+  if [[ -n "$parsed_url" ]]; then
+    pr_url="$parsed_url"
+  fi
+  return 0
+}
+
+maybe_auto_commit_parent_gitlink() {
+  local base_wt="${1:-}"
+  local base_wt_real=""
+  local super_root_raw=""
+  local super_root=""
+  local subrepo_rel=""
+  local gitlink_mode=""
+  local gitlink_index_sha=""
+  local gitlink_parent_head_sha=""
+  local subrepo_head_sha=""
+  local update_index_output=""
+  local commit_output=""
+  local commit_message=""
+
+  if [[ "$PARENT_GITLINK_AUTO_COMMIT" -ne 1 || "$PUSH_ENABLED" -ne 1 ]]; then
+    return 0
+  fi
+  if [[ -z "$base_wt" ]]; then
+    return 0
+  fi
+  if ! base_wt_real="$(cd "$base_wt" && pwd -P 2>/dev/null)"; then
+    return 0
+  fi
+  if [[ "$base_wt_real" != "$repo_common_root" ]]; then
+    return 0
+  fi
+  if ! is_clean_worktree "$repo_common_root"; then
+    echo "[agent-branch-finish] Parent gitlink auto-commit skipped; nested base worktree is dirty: ${repo_common_root}" >&2
+    return 0
+  fi
+
+  super_root_raw="$(git -C "$repo_common_root" rev-parse --show-superproject-working-tree 2>/dev/null || true)"
+  if [[ -z "$super_root_raw" ]]; then
+    return 0
+  fi
+  if ! super_root="$(cd "$super_root_raw" && pwd -P 2>/dev/null)"; then
+    return 0
+  fi
+
+  case "$repo_common_root" in
+    "$super_root"/*) subrepo_rel="${repo_common_root#"$super_root"/}" ;;
+    *) return 0 ;;
+  esac
+  if [[ -z "$subrepo_rel" || "$subrepo_rel" == "$repo_common_root" ]]; then
+    return 0
+  fi
+
+  gitlink_mode="$(git -C "$super_root" ls-files -s -- "$subrepo_rel" | awk 'NR == 1 { print $1 }')"
+  if [[ "$gitlink_mode" != "160000" ]]; then
+    return 0
+  fi
+  gitlink_index_sha="$(git -C "$super_root" ls-files -s -- "$subrepo_rel" | awk 'NR == 1 { print $2 }')"
+  gitlink_parent_head_sha="$(git -C "$super_root" ls-tree HEAD -- "$subrepo_rel" | awk 'NR == 1 { print $3 }')"
+  subrepo_head_sha="$(git -C "$repo_common_root" rev-parse HEAD 2>/dev/null || true)"
+  if [[ -z "$subrepo_head_sha" ]]; then
+    return 0
+  fi
+  if [[ -n "$gitlink_index_sha" && "$gitlink_index_sha" == "$gitlink_parent_head_sha" && "$gitlink_index_sha" == "$subrepo_head_sha" ]]; then
+    return 0
+  fi
+
+  if [[ "$gitlink_index_sha" != "$subrepo_head_sha" ]]; then
+    if ! update_index_output="$(git -C "$super_root" update-index --cacheinfo 160000 "$subrepo_head_sha" "$subrepo_rel" 2>&1)"; then
+      echo "[agent-branch-finish] Warning: parent gitlink staging failed for ${subrepo_rel} in ${super_root}." >&2
+      [[ -n "$update_index_output" ]] && echo "$update_index_output" >&2
+      return 0
+    fi
+    gitlink_index_sha="$(git -C "$super_root" ls-files -s -- "$subrepo_rel" | awk 'NR == 1 { print $2 }')"
+  fi
+  gitlink_parent_head_sha="$(git -C "$super_root" ls-tree HEAD -- "$subrepo_rel" | awk 'NR == 1 { print $3 }')"
+  if [[ "$gitlink_index_sha" == "$gitlink_parent_head_sha" ]]; then
+    return 0
+  fi
+
+  commit_message="Update ${subrepo_rel} subrepo pointer"
+  if ! commit_output="$(git -C "$super_root" commit -m "$commit_message" -- "$subrepo_rel" 2>&1)"; then
+    echo "[agent-branch-finish] Warning: parent gitlink auto-commit failed in ${super_root}." >&2
+    [[ -n "$commit_output" ]] && echo "$commit_output" >&2
+    return 0
+  fi
+
+  echo "[agent-branch-finish] Parent gitlink auto-committed '${subrepo_rel}' in ${super_root}."
+}
+
 wait_for_pr_merge() {
   local deadline
   deadline=$(( $(date +%s) + WAIT_TIMEOUT_SECONDS ))
@@ -509,11 +647,22 @@ wait_for_pr_merge() {
 }
 
 run_pr_flow() {
+  local source_head_sha=""
+
   if ! command -v "$GH_BIN" >/dev/null 2>&1; then
     echo "[agent-branch-finish] PR fallback requested but GitHub CLI not found: ${GH_BIN}" >&2
     return 1
   fi
 
+  source_head_sha="$(git -C "$repo_root" rev-parse "$SOURCE_BRANCH" 2>/dev/null || true)"
+  if read_merged_pr_for_head "$source_head_sha"; then
+    echo "[agent-branch-finish] Source branch head already landed in a merged PR; skipping new PR creation and continuing cleanup." >&2
+    if [[ -n "$pr_url" ]]; then
+      echo "[agent-branch-finish] Merged PR: ${pr_url}" >&2
+    fi
+    return 0
+  fi
+
   git -C "$source_worktree" push -u origin "$SOURCE_BRANCH"
 
   pr_title="$(git -C "$repo_root" log -1 --pretty=%s "$SOURCE_BRANCH" 2>/dev/null || true)"
@@ -612,6 +761,7 @@ base_worktree="$(get_worktree_for_branch "$BASE_BRANCH")"
 if [[ -n "$base_worktree" ]] && is_clean_worktree "$base_worktree" && [[ "$PUSH_ENABLED" -eq 1 ]]; then
   git -C "$base_worktree" pull --ff-only origin "$BASE_BRANCH" >/dev/null 2>&1 || true
 fi
+maybe_auto_commit_parent_gitlink "$base_worktree"
 
 if [[ "$CLEANUP_AFTER_MERGE" -eq 1 ]]; then
   if [[ "$source_worktree" == "$repo_root" ]]; then

package/templates/scripts/agent-branch-start.sh

@@ -155,6 +155,15 @@ env_flag_truthy() {
   esac
 }
 
+maybe_fail_after_auto_transfer_stash() {
+  if env_flag_truthy "${GUARDEX_TEST_FAIL_AFTER_AUTO_TRANSFER_STASH:-}"; then
+    echo "[agent-branch-start] Simulated failure after capturing auto-transfer stash." >&2
+    return 1
+  fi
+
+  return 0
+}
+
 default_worktree_root_rel() {
   local raw_agent="$1"
   local override="${GUARDEX_AGENT_TYPE:-}"
@@ -580,6 +589,27 @@ fi
 auto_transfer_stash_ref=""
 auto_transfer_message=""
 auto_transfer_source_branch=""
+auto_transfer_completed=0
+
+restore_auto_transfer_stash_on_failure() {
+  local exit_code="${1:-0}"
+  if [[ "$exit_code" -eq 0 ]] || [[ -z "$auto_transfer_stash_ref" ]] || [[ "$auto_transfer_completed" -eq 1 ]]; then
+    return 0
+  fi
+
+  local transfer_label="${auto_transfer_source_branch:-$BASE_BRANCH}"
+  if git -C "$repo_root" stash apply "$auto_transfer_stash_ref" >/dev/null 2>&1; then
+    git -C "$repo_root" stash drop "$auto_transfer_stash_ref" >/dev/null 2>&1 || true
+    auto_transfer_stash_ref=""
+    echo "[agent-branch-start] Restored moved changes back to '${transfer_label}' after startup failure." >&2
+  else
+    echo "[agent-branch-start] Startup failed and auto-restore also failed." >&2
+    echo "[agent-branch-start] Changes are preserved in ${auto_transfer_stash_ref} on ${transfer_label}." >&2
+  fi
+}
+
+trap 'restore_auto_transfer_stash_on_failure "$?"' EXIT
+
 current_branch="$(git -C "$repo_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
 protected_branches_raw="$(resolve_protected_branches "$repo_root")"
 if [[ -n "$current_branch" && "$current_branch" != "HEAD" ]] && is_protected_branch_name "$current_branch" "$protected_branches_raw"; then
@@ -593,6 +623,9 @@ if [[ -n "$current_branch" && "$current_branch" != "HEAD" ]] && is_protected_bra
       if [[ -n "$auto_transfer_stash_ref" ]]; then
         auto_transfer_source_branch="$current_branch"
         echo "[agent-branch-start] Detected local changes on protected branch '${current_branch}'. Moving them to '${branch_name}'..."
+        if ! maybe_fail_after_auto_transfer_stash; then
+          exit 1
+        fi
       fi
     fi
   fi
@@ -610,7 +643,9 @@ git -C "$worktree_path" branch --unset-upstream "$branch_name" >/dev/null 2>&1 |
 
 if [[ -n "$auto_transfer_stash_ref" ]]; then
   if git -C "$worktree_path" stash apply "$auto_transfer_stash_ref" >/dev/null 2>&1; then
+    auto_transfer_completed=1
     git -C "$repo_root" stash drop "$auto_transfer_stash_ref" >/dev/null 2>&1 || true
+    auto_transfer_stash_ref=""
     transfer_label="${auto_transfer_source_branch:-$BASE_BRANCH}"
     echo "[agent-branch-start] Moved local changes from '${transfer_label}' into '${branch_name}'."
   else

package/templates/scripts/agent-worktree-prune.sh

@@ -20,7 +20,9 @@ PR_MERGED_LOOKUP_LOADED=0
 declare -A MERGED_PR_BRANCHES=()
 WORKTREE_ROOT_RELS=(
   ".omx/agent-worktrees"
+  ".omx/.tmp-worktrees"
   ".omc/agent-worktrees"
+  ".omc/.tmp-worktrees"
 )
 
 if [[ -n "$BASE_BRANCH" ]]; then
@@ -90,9 +92,15 @@ repo_common_dir="$(cd "$repo_common_dir" && pwd -P)"
 resolve_worktree_root_rel_for_entry() {
   local entry="$1"
   case "$entry" in
+    */.omc/.tmp-worktrees/*)
+      printf '%s' '.omc/.tmp-worktrees'
+      ;;
     */.omc/agent-worktrees/*)
       printf '%s' '.omc/agent-worktrees'
       ;;
+    */.omx/.tmp-worktrees/*)
+      printf '%s' '.omx/.tmp-worktrees'
+      ;;
     *)
       printf '%s' '.omx/agent-worktrees'
       ;;
@@ -538,6 +546,19 @@ if [[ "$DELETE_BRANCHES" -eq 1 ]]; then
     if branch_has_worktree "$branch"; then
       continue
     fi
+    if [[ "$branch" == __agent_integrate_* || "$branch" == __source-probe-* ]]; then
+      if ! branch_idle_gate "$branch" "" "temporary-worktree"; then
+        continue
+      fi
+      if run_cmd git -C "$repo_root" branch -D "$branch" >/dev/null 2>&1; then
+        removed_branches=$((removed_branches + 1))
+        echo "[agent-worktree-prune] Deleted stale temporary branch: ${branch}"
+      fi
+      continue
+    fi
+    if [[ "$branch" != agent/* ]]; then
+      continue
+    fi
     if ! branch_idle_gate "$branch" "" "stale-merged-branch"; then
       continue
     fi
@@ -566,7 +587,7 @@ if [[ "$DELETE_BRANCHES" -eq 1 ]]; then
         fi
       fi
     fi
-  done < <(git -C "$repo_root" for-each-ref --format='%(refname:short)' refs/heads/agent)
+  done < <(git -C "$repo_root" for-each-ref --format='%(refname:short)' refs/heads)
 fi
 
 run_cmd git -C "$repo_root" worktree prune

package/templates/vscode/guardex-active-agents/README.md

@@ -4,7 +4,7 @@ Local VS Code companion for Guardex-managed repos.
 
 ## Quick Start
 
-Use the welcome view in Source Control to create or inspect Guardex sandboxes quickly.
+Use the dedicated Active Agents sidebar icon to create or inspect Guardex sandboxes quickly.
 
 1. Install from a Guardex-wired repo:
 
@@ -13,16 +13,19 @@ node scripts/install-vscode-active-agents-extension.js
 ```
 
 2. Reload the VS Code window.
-3. In Source Control -> `Active Agents`, use `Start agent` to enter a task + agent name and launch the repo Guardex agent runner. The companion prefers `bash scripts/codex-agent.sh` when present, falls back to `npm run agent:codex --`, and only uses `gx branch start` as a last resort.
+3. In the Activity Bar, open the `Active Agents` hive icon under Source Control. Use `Start agent` to enter a task + agent name and launch the repo Guardex agent runner. The companion prefers `bash scripts/codex-agent.sh` when present, falls back to `npm run agent:codex --`, and only uses `gx branch start` as a last resort.
 
 What it does:
 
 - Bundles a local GitGuardex icon so repo installs show branded extension metadata inside VS Code.
-- Adds an `Active Agents` view to the Source Control container.
+- Bundles the optional `GitGuardex File Icons` theme for OpenSpec, agent worktree, and hook files in Explorer.
+- Adds a dedicated `Active Agents` Activity Bar container with a hive icon and live badge count for active sessions.
 - Renders one repo node per live Guardex workspace with grouped `ACTIVE AGENTS` and `CHANGES` sections.
 - Splits live sessions inside `ACTIVE AGENTS` into `BLOCKED`, `WORKING NOW`, `THINKING`, `STALLED`, and `DEAD` groups so stuck, active, and inactive lanes stand out immediately.
 - Mirrors the same live state in the VS Code status bar so the selected session or active-agent count stays visible outside the tree.
 - Shows one row per live Guardex sandbox session inside those activity groups, with changed-file rows nested under sessions that are touching files.
+- Labels session rows with provider identity and snapshot context; snapshot-backed rows use a one-letter snapshot badge such as `N` for `nagyviktor@edixa.com`.
+- Shows raw agent branch groups with the `git-branch` icon instead of the generic folder icon.
 - Shows repo-root git changes in a sibling `CHANGES` section when the guarded repo itself is dirty.
 - Derives session state from dirty worktree status, git conflict markers, heartbeat freshness, PID liveness, and recent file mtimes, surfaces working/dead/conflict counts in the repo/header summary, and shows changed-file counts for active edits.
 - Uses distinct VS Code codicons for each session state, including animated `loading~spin` for `WORKING NOW`.