@imdeadpool/guardex 7.0.14 → 7.0.16

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

@@ -5,11 +5,13 @@ TASK_NAME="task"
 AGENT_NAME="agent"
 BASE_BRANCH=""
 BASE_BRANCH_EXPLICIT=0
-WORKTREE_ROOT_REL=".omx/agent-worktrees"
+WORKTREE_ROOT_REL=""
+WORKTREE_ROOT_EXPLICIT=0
 OPENSPEC_AUTO_INIT_RAW="${GUARDEX_OPENSPEC_AUTO_INIT:-false}"
 OPENSPEC_PLAN_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_PLAN_SLUG:-}"
 OPENSPEC_CHANGE_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_CHANGE_SLUG:-}"
 OPENSPEC_CAPABILITY_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_CAPABILITY_SLUG:-}"
+OPENSPEC_MASTERPLAN_LABEL_RAW="${GUARDEX_OPENSPEC_MASTERPLAN_LABEL-masterplan}"
 PRINT_NAME_ONLY=0
 POSITIONAL_ARGS=()
 
@@ -44,6 +46,7 @@ while [[ $# -gt 0 ]]; do
       ;;
     --worktree-root)
       WORKTREE_ROOT_REL="${2:-.omx/agent-worktrees}"
+      WORKTREE_ROOT_EXPLICIT=1
       shift 2
       ;;
     --)
@@ -123,12 +126,41 @@ shorten_slug() {
   printf '%s' "$shortened"
 }
 
-# Collapse arbitrary agent identifiers to a clean role token: claude | codex |
-# <other-kebab>. Priority: GUARDEX_AGENT_TYPE env override, then the raw
-# AGENT_NAME (if it contains 'claude' or 'codex'), then CLAUDECODE=1 sentinel
-# (set by Claude Code CLI), else fall back to 'codex'. Any other role name
-# (integrator, executor, rust-port, etc.) is preserved as-is after slug
-# sanitization.
+env_flag_truthy() {
+  local raw="${1:-}"
+  local lowered
+  lowered="$(printf '%s' "$raw" | tr '[:upper:]' '[:lower:]')"
+  case "$lowered" in
+    1|true|yes|on) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+default_worktree_root_rel() {
+  local raw_agent="$1"
+  local override="${GUARDEX_AGENT_TYPE:-}"
+  local lowered_agent lowered_override
+  lowered_agent="$(printf '%s' "$raw_agent" | tr '[:upper:]' '[:lower:]')"
+  lowered_override="$(printf '%s' "$override" | tr '[:upper:]' '[:lower:]')"
+
+  if [[ -n "${CLAUDE_CODE_SESSION_ID:-}" ]] || env_flag_truthy "${CLAUDECODE:-}"; then
+    printf '.omc/agent-worktrees'
+    return 0
+  fi
+
+  if [[ "$lowered_agent" == *claude* ]] || [[ "$lowered_override" == *claude* ]]; then
+    printf '.omc/agent-worktrees'
+    return 0
+  fi
+
+  printf '.omx/agent-worktrees'
+}
+
+# Collapse arbitrary agent identifiers to a clean role token. Priority:
+# GUARDEX_AGENT_TYPE env override, then recognizable claude/codex aliases, then
+# a small legacy compatibility set, then the literal requested role after slug
+# sanitization. This preserves explicit roles such as planner/executor while
+# keeping the older bot -> codex fallback stable for existing callers.
 normalize_role() {
   local raw_agent="$1"
   local override="${GUARDEX_AGENT_TYPE:-}"
@@ -150,10 +182,13 @@ normalize_role() {
     printf 'claude'
     return 0
   fi
-  # Unrecognized raw name (rust-port-lead, some-worker, empty, ...): default to
-  # codex. To get a different role (integrator, executor, ...) pass the role
-  # explicitly via GUARDEX_AGENT_TYPE, handled above.
-  printf 'codex'
+  local sanitized
+  sanitized="$(sanitize_slug "$raw_agent" "codex")"
+  if [[ "$sanitized" == "bot" ]]; then
+    printf 'codex'
+    return 0
+  fi
+  printf '%s' "$sanitized"
 }
 
 # Timestamp the branch/worktree/openspec slug so parallel agents never collide
@@ -192,13 +227,35 @@ normalize_bool() {
 
 OPENSPEC_AUTO_INIT="$(normalize_bool "$OPENSPEC_AUTO_INIT_RAW" "1")"
 
+resolve_openspec_masterplan_label() {
+  local raw="${OPENSPEC_MASTERPLAN_LABEL_RAW:-}"
+  local label
+
+  if [[ "$OPENSPEC_AUTO_INIT" -ne 1 ]] || [[ -z "$raw" ]]; then
+    printf ''
+    return 0
+  fi
+
+  label="$(printf '%s' "$raw" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+//; s/-+$//; s/-{2,}/-/g')"
+  printf '%s' "$label"
+}
+
 resolve_openspec_plan_slug() {
   local branch_name="$1"
-  local task_slug="$2"
+  local agent_slug="$2"
+  local task_slug="$3"
+  local masterplan_label=""
+  local branch_leaf=""
   if [[ -n "$OPENSPEC_PLAN_SLUG_OVERRIDE" ]]; then
     sanitize_slug "$OPENSPEC_PLAN_SLUG_OVERRIDE" "$task_slug"
     return 0
   fi
+  masterplan_label="$(resolve_openspec_masterplan_label)"
+  if [[ -n "$masterplan_label" ]] && [[ "$branch_name" == "agent/${agent_slug}/"* ]]; then
+    branch_leaf="${branch_name#agent/${agent_slug}/}"
+    sanitize_slug "agent-${agent_slug}-${masterplan_label}-${branch_leaf}" "$task_slug"
+    return 0
+  fi
   sanitize_slug "${branch_name//\//-}" "$task_slug"
 }
 
@@ -221,6 +278,22 @@ resolve_openspec_capability_slug() {
   sanitize_slug "$task_slug" "general-behavior"
 }
 
+resolve_worktree_leaf() {
+  local branch_name="$1"
+  local agent_slug="$2"
+  local masterplan_label=""
+  local branch_leaf=""
+
+  masterplan_label="$(resolve_openspec_masterplan_label)"
+  if [[ -n "$masterplan_label" ]] && [[ "$branch_name" == "agent/${agent_slug}/"* ]]; then
+    branch_leaf="${branch_name#agent/${agent_slug}/}"
+    printf 'agent__%s__%s__%s' "$agent_slug" "$masterplan_label" "$branch_leaf"
+    return 0
+  fi
+
+  printf '%s' "${branch_name//\//__}"
+}
+
 has_local_changes() {
   local root="$1"
   if ! git -C "$root" diff --quiet; then
@@ -413,6 +486,9 @@ fi
 
 task_slug="$(sanitize_slug "$TASK_NAME" "task")"
 agent_slug="$(normalize_role "$AGENT_NAME")"
+if [[ "$WORKTREE_ROOT_EXPLICIT" -eq 0 ]]; then
+  WORKTREE_ROOT_REL="$(default_worktree_root_rel "$AGENT_NAME")"
+fi
 branch_timestamp="$(compose_branch_timestamp)"
 branch_descriptor="$(compose_branch_descriptor "$task_slug" "$branch_timestamp")"
 branch_name_base="agent/${agent_slug}/${branch_descriptor}"
@@ -460,8 +536,9 @@ done
 
 worktree_root="${repo_root}/${WORKTREE_ROOT_REL}"
 mkdir -p "$worktree_root"
-worktree_path="${worktree_root}/${branch_name//\//__}"
-openspec_plan_slug="$(resolve_openspec_plan_slug "$branch_name" "$task_slug")"
+worktree_leaf="$(resolve_worktree_leaf "$branch_name" "$agent_slug")"
+worktree_path="${worktree_root}/${worktree_leaf}"
+openspec_plan_slug="$(resolve_openspec_plan_slug "$branch_name" "$agent_slug" "$task_slug")"
 openspec_change_slug="$(resolve_openspec_change_slug "$branch_name" "$task_slug")"
 openspec_capability_slug="$(resolve_openspec_capability_slug "$task_slug")"
 
@@ -497,6 +574,7 @@ if ! worktree_add_output="$(git -C "$repo_root" worktree add -b "$branch_name" "
   exit 1
 fi
 git -C "$repo_root" config "branch.${branch_name}.guardexBase" "$BASE_BRANCH" >/dev/null 2>&1 || true
+git -C "$repo_root" config "branch.${branch_name}.guardexWorktreeRoot" "$WORKTREE_ROOT_REL" >/dev/null 2>&1 || true
 # Fresh agent branches should start unpublished; clear any inherited base-branch tracking.
 git -C "$worktree_path" branch --unset-upstream "$branch_name" >/dev/null 2>&1 || true
 
@@ -533,4 +611,4 @@ echo "[agent-branch-start] Next steps:"
 echo "  cd \"${worktree_path}\""
 echo "  python3 scripts/agent-file-locks.py claim --branch \"${branch_name}\" <file...>"
 echo "  # implement + commit"
-echo "  bash scripts/agent-branch-finish.sh --branch \"${branch_name}\" --base dev --via-pr --wait-for-merge"
+echo "  bash scripts/agent-branch-finish.sh --branch \"${branch_name}\" --base ${BASE_BRANCH} --via-pr --wait-for-merge"

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

@@ -18,6 +18,10 @@ GH_BIN="${GUARDEX_GH_BIN:-gh}"
 PR_MERGED_LOOKUP_DISABLED=0
 PR_MERGED_LOOKUP_LOADED=0
 declare -A MERGED_PR_BRANCHES=()
+WORKTREE_ROOT_RELS=(
+  ".omx/agent-worktrees"
+  ".omc/agent-worktrees"
+)
 
 if [[ -n "$BASE_BRANCH" ]]; then
   BASE_BRANCH_EXPLICIT=1
@@ -77,13 +81,36 @@ fi
 
 repo_root="$(git rev-parse --show-toplevel)"
 current_pwd="$(pwd -P)"
-worktree_root="${repo_root}/.omx/agent-worktrees"
 repo_common_dir="$(
   git -C "$repo_root" rev-parse --git-common-dir \
     | awk -v root="$repo_root" '{ if ($0 ~ /^\//) { print $0 } else { print root "/" $0 } }'
 )"
 repo_common_dir="$(cd "$repo_common_dir" && pwd -P)"
 
+resolve_worktree_root_rel_for_entry() {
+  local entry="$1"
+  case "$entry" in
+    */.omc/agent-worktrees/*)
+      printf '%s' '.omc/agent-worktrees'
+      ;;
+    *)
+      printf '%s' '.omx/agent-worktrees'
+      ;;
+  esac
+}
+
+is_managed_worktree_path() {
+  local entry="$1"
+  local rel root
+  for rel in "${WORKTREE_ROOT_RELS[@]}"; do
+    root="${repo_root}/${rel}"
+    if [[ "$entry" == "${root}"/* ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
 resolve_base_branch() {
   local configured=""
   local current=""
@@ -308,54 +335,59 @@ relocated_foreign=0
 skipped_foreign=0
 
 relocate_foreign_worktree_entries() {
-  [[ -d "$worktree_root" ]] || return 0
-
-  local entry=""
-  for entry in "${worktree_root}"/*; do
-    [[ -d "$entry" ]] || continue
-    if ! git -C "$entry" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-      continue
-    fi
-
-    local entry_common_dir=""
-    entry_common_dir="$(resolve_worktree_common_dir "$entry" || true)"
-    [[ -n "$entry_common_dir" ]] || continue
+  local rel="" worktree_root="" entry=""
+  for rel in "${WORKTREE_ROOT_RELS[@]}"; do
+    worktree_root="${repo_root}/${rel}"
+    [[ -d "$worktree_root" ]] || continue
+
+    for entry in "${worktree_root}"/*; do
+      [[ -d "$entry" ]] || continue
+      if ! git -C "$entry" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        continue
+      fi
 
-    if [[ "$entry_common_dir" == "$repo_common_dir" ]]; then
-      continue
-    fi
+      local entry_common_dir=""
+      entry_common_dir="$(resolve_worktree_common_dir "$entry" || true)"
+      [[ -n "$entry_common_dir" ]] || continue
 
-    if [[ "$(basename "$entry_common_dir")" != ".git" ]]; then
-      skipped_foreign=$((skipped_foreign + 1))
-      echo "[agent-worktree-prune] Skipping foreign worktree with unsupported git common dir: ${entry}"
-      continue
-    fi
+      if [[ "$entry_common_dir" == "$repo_common_dir" ]]; then
+        continue
+      fi
 
-    local owner_repo_root
-    owner_repo_root="$(dirname "$entry_common_dir")"
-    local owner_worktree_root="${owner_repo_root}/.omx/agent-worktrees"
-    local target_path
-    target_path="$(select_unique_worktree_path "$owner_worktree_root" "$(basename "$entry")")"
+      if [[ "$(basename "$entry_common_dir")" != ".git" ]]; then
+        skipped_foreign=$((skipped_foreign + 1))
+        echo "[agent-worktree-prune] Skipping foreign worktree with unsupported git common dir: ${entry}"
+        continue
+      fi
 
-    if [[ "$entry" == "$current_pwd" || "$current_pwd" == "${entry}"/* ]]; then
-      skipped_foreign=$((skipped_foreign + 1))
-      echo "[agent-worktree-prune] Skipping active foreign worktree: ${entry}"
-      continue
-    fi
+      local owner_repo_root
+      owner_repo_root="$(dirname "$entry_common_dir")"
+      local owner_worktree_root_rel owner_worktree_root
+      owner_worktree_root_rel="$(resolve_worktree_root_rel_for_entry "$entry")"
+      owner_worktree_root="${owner_repo_root}/${owner_worktree_root_rel}"
+      local target_path
+      target_path="$(select_unique_worktree_path "$owner_worktree_root" "$(basename "$entry")")"
+
+      if [[ "$entry" == "$current_pwd" || "$current_pwd" == "${entry}"/* ]]; then
+        skipped_foreign=$((skipped_foreign + 1))
+        echo "[agent-worktree-prune] Skipping active foreign worktree: ${entry}"
+        continue
+      fi
 
-    echo "[agent-worktree-prune] Relocating foreign worktree to owning repo: ${entry} -> ${target_path}"
-    if [[ "$DRY_RUN" -eq 1 ]]; then
-      relocated_foreign=$((relocated_foreign + 1))
-      continue
-    fi
+      echo "[agent-worktree-prune] Relocating foreign worktree to owning repo: ${entry} -> ${target_path}"
+      if [[ "$DRY_RUN" -eq 1 ]]; then
+        relocated_foreign=$((relocated_foreign + 1))
+        continue
+      fi
 
-    mkdir -p "$owner_worktree_root"
-    if git -C "$owner_repo_root" worktree move "$entry" "$target_path" >/dev/null 2>&1; then
-      relocated_foreign=$((relocated_foreign + 1))
-    else
-      skipped_foreign=$((skipped_foreign + 1))
-      echo "[agent-worktree-prune] Failed to relocate foreign worktree: ${entry}" >&2
-    fi
+      mkdir -p "$owner_worktree_root"
+      if git -C "$owner_repo_root" worktree move "$entry" "$target_path" >/dev/null 2>&1; then
+        relocated_foreign=$((relocated_foreign + 1))
+      else
+        skipped_foreign=$((skipped_foreign + 1))
+        echo "[agent-worktree-prune] Failed to relocate foreign worktree: ${entry}" >&2
+      fi
+    done
   done
 }
 
@@ -371,7 +403,9 @@ process_entry() {
   local branch_ref="$2"
 
   [[ -z "$wt" ]] && return
-  [[ "$wt" != "${worktree_root}"/* ]] && return
+  if ! is_managed_worktree_path "$wt"; then
+    return
+  fi
 
   local branch=""
   if [[ -n "$branch_ref" ]]; then

package/templates/scripts/codex-agent.sh

@@ -14,6 +14,7 @@ OPENSPEC_AUTO_INIT_RAW="${GUARDEX_OPENSPEC_AUTO_INIT:-true}"
 OPENSPEC_PLAN_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_PLAN_SLUG:-}"
 OPENSPEC_CHANGE_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_CHANGE_SLUG:-}"
 OPENSPEC_CAPABILITY_SLUG_OVERRIDE="${GUARDEX_OPENSPEC_CAPABILITY_SLUG:-}"
+OPENSPEC_MASTERPLAN_LABEL_RAW="${GUARDEX_OPENSPEC_MASTERPLAN_LABEL-masterplan}"
 
 normalize_bool() {
   local raw="${1:-}"
@@ -34,6 +35,19 @@ AUTO_CLEANUP="$(normalize_bool "$AUTO_CLEANUP_RAW" "1")"
 AUTO_WAIT_FOR_MERGE="$(normalize_bool "$AUTO_WAIT_FOR_MERGE_RAW" "1")"
 OPENSPEC_AUTO_INIT="$(normalize_bool "$OPENSPEC_AUTO_INIT_RAW" "1")"
 
+resolve_openspec_masterplan_label() {
+  local raw="${OPENSPEC_MASTERPLAN_LABEL_RAW:-}"
+  local label
+
+  if [[ "$OPENSPEC_AUTO_INIT" -ne 1 ]] || [[ -z "$raw" ]]; then
+    printf ''
+    return 0
+  fi
+
+  label="$(printf '%s' "$raw" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+//; s/-+$//; s/-{2,}/-/g')"
+  printf '%s' "$label"
+}
+
 if [[ -n "$BASE_BRANCH" ]]; then
   BASE_BRANCH_EXPLICIT=1
 fi
@@ -161,11 +175,21 @@ sanitize_slug() {
 resolve_openspec_plan_slug() {
   local branch_name="$1"
   local task_slug
+  local masterplan_label=""
+  local branch_role=""
+  local branch_leaf=""
   task_slug="$(sanitize_slug "$TASK_NAME" "task")"
   if [[ -n "$OPENSPEC_PLAN_SLUG_OVERRIDE" ]]; then
     sanitize_slug "$OPENSPEC_PLAN_SLUG_OVERRIDE" "$task_slug"
     return 0
   fi
+  masterplan_label="$(resolve_openspec_masterplan_label)"
+  if [[ -n "$masterplan_label" ]] && [[ "$branch_name" =~ ^agent/([^/]+)/(.+)$ ]]; then
+    branch_role="${BASH_REMATCH[1]}"
+    branch_leaf="${BASH_REMATCH[2]}"
+    sanitize_slug "agent-${branch_role}-${masterplan_label}-${branch_leaf}" "$task_slug"
+    return 0
+  fi
   sanitize_slug "${branch_name//\//-}" "$task_slug"
 }
 
@@ -190,6 +214,23 @@ resolve_openspec_capability_slug() {
   sanitize_slug "$task_slug" "general-behavior"
 }
 
+resolve_worktree_leaf() {
+  local branch_name="$1"
+  local masterplan_label=""
+  local branch_role=""
+  local branch_leaf=""
+
+  masterplan_label="$(resolve_openspec_masterplan_label)"
+  if [[ -n "$masterplan_label" ]] && [[ "$branch_name" =~ ^agent/([^/]+)/(.+)$ ]]; then
+    branch_role="${BASH_REMATCH[1]}"
+    branch_leaf="${BASH_REMATCH[2]}"
+    printf 'agent__%s__%s__%s' "$branch_role" "$masterplan_label" "$branch_leaf"
+    return 0
+  fi
+
+  printf '%s' "${branch_name//\//__}"
+}
+
 hydrate_local_helper_in_worktree() {
   local worktree="$1"
   local relative_path="$2"
@@ -249,6 +290,35 @@ resolve_start_ref() {
   return 1
 }
 
+origin_remote_looks_like_github() {
+  local wt="$1"
+  local origin_url=""
+  origin_url="$(git -C "$wt" remote get-url origin 2>/dev/null || true)"
+  [[ -n "$origin_url" && "$origin_url" =~ github\.com[:/] ]]
+}
+
+auto_finish_context_is_ready() {
+  local wt="$1"
+  local gh_bin="${GUARDEX_GH_BIN:-gh}"
+
+  if ! git -C "$wt" remote get-url origin >/dev/null 2>&1; then
+    return 1
+  fi
+  if ! command -v "$gh_bin" >/dev/null 2>&1; then
+    return 1
+  fi
+
+  if [[ -n "${GUARDEX_GH_BIN:-}" ]]; then
+    return 0
+  fi
+
+  if ! origin_remote_looks_like_github "$wt"; then
+    return 1
+  fi
+
+  "$gh_bin" auth status >/dev/null 2>&1
+}
+
 restore_repo_branch_if_changed() {
   local expected_branch="$1"
   if [[ -z "$expected_branch" || "$expected_branch" == "HEAD" ]]; then
@@ -285,7 +355,7 @@ start_sandbox_fallback() {
 
   worktree_root="${repo_root}/.omx/agent-worktrees"
   mkdir -p "$worktree_root"
-  worktree_path="${worktree_root}/${branch_name//\//__}"
+  worktree_path="${worktree_root}/$(resolve_worktree_leaf "$branch_name")"
   if [[ -e "$worktree_path" ]]; then
     echo "[codex-agent] Fallback worktree path already exists: $worktree_path" >&2
     return 1
@@ -317,7 +387,11 @@ initial_repo_branch="$(git -C "$repo_root" rev-parse --abbrev-ref HEAD 2>/dev/nu
 start_output=""
 start_status=0
 set +e
-start_output="$(GUARDEX_OPENSPEC_AUTO_INIT=0 bash "${repo_root}/scripts/agent-branch-start.sh" "${start_args[@]}" 2>&1)"
+start_output="$(
+  GUARDEX_OPENSPEC_AUTO_INIT="$OPENSPEC_AUTO_INIT" \
+  GUARDEX_OPENSPEC_MASTERPLAN_LABEL="$OPENSPEC_MASTERPLAN_LABEL_RAW" \
+  bash "${repo_root}/scripts/agent-branch-start.sh" "${start_args[@]}" 2>&1
+)"
 start_status=$?
 set -e
 
@@ -372,6 +446,17 @@ has_origin_remote() {
   git -C "$repo_root" remote get-url origin >/dev/null 2>&1
 }
 
+origin_remote_supports_pr_finish() {
+  local origin_url
+  origin_url="$(git -C "$repo_root" remote get-url origin 2>/dev/null || true)"
+  case "$origin_url" in
+    ''|/*|./*|../*|file://*)
+      return 1
+      ;;
+  esac
+  return 0
+}
+
 resolve_worktree_base_branch() {
   local _wt="$1"
   if [[ "$BASE_BRANCH_EXPLICIT" -eq 1 && -n "$BASE_BRANCH" ]]; then
@@ -685,7 +770,12 @@ run_finish_flow() {
       echo "[codex-agent] Auto-finish requires GitHub CLI for PR flow; command not found: ${GUARDEX_GH_BIN:-gh}" >&2
       return 2
     fi
-    finish_args+=(--via-pr)
+    if origin_remote_supports_pr_finish; then
+      finish_args+=(--via-pr)
+    else
+      echo "[codex-agent] Origin remote does not provide a mergeable PR surface; skipping auto-finish merge/PR pipeline." >&2
+      return 2
+    fi
   else
     echo "[codex-agent] No origin remote detected; skipping auto-finish merge/PR pipeline." >&2
     return 2
@@ -764,7 +854,9 @@ if [[ "$AUTO_FINISH" -eq 1 && -n "$worktree_branch" && "$worktree_branch" != "HE
   else
     echo "[codex-agent] Auto-finish enabled: commit -> push/PR -> merge (keep branch/worktree)."
   fi
-  if auto_commit_worktree_changes "$worktree_path" "$worktree_branch"; then
+  if ! auto_finish_context_is_ready "$worktree_path"; then
+    echo "[codex-agent] Auto-finish skipped for '${worktree_branch}' (no mergeable remote context)." >&2
+  elif auto_commit_worktree_changes "$worktree_path" "$worktree_branch"; then
     if run_finish_flow "$worktree_path" "$worktree_branch"; then
       auto_finish_completed=1
       echo "[codex-agent] Auto-finish completed for '${worktree_branch}'."

package/templates/scripts/guardex-docker-loader.sh

@@ -0,0 +1,123 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+compose_file="${GUARDEX_DOCKER_COMPOSE_FILE:-}"
+service="${GUARDEX_DOCKER_SERVICE:-}"
+mode="${GUARDEX_DOCKER_MODE:-auto}"
+workdir_override="${GUARDEX_DOCKER_WORKDIR:-}"
+
+usage() {
+  cat >&2 <<'EOF'
+Usage: bash scripts/guardex-docker-loader.sh [--] <command...>
+
+Environment:
+  GUARDEX_DOCKER_SERVICE=<compose-service>   required unless compose defines exactly one service
+  GUARDEX_DOCKER_COMPOSE_FILE=<path>         optional docker compose file override
+  GUARDEX_DOCKER_MODE=auto|exec|run          default: auto
+  GUARDEX_DOCKER_WORKDIR=<path>              optional working directory override inside the container
+EOF
+}
+
+choose_compose_cmd() {
+  if command -v docker >/dev/null 2>&1 && docker compose version >/dev/null 2>&1; then
+    printf 'docker compose'
+    return 0
+  fi
+  if command -v docker-compose >/dev/null 2>&1; then
+    printf 'docker-compose'
+    return 0
+  fi
+  return 1
+}
+
+mapfile_from_lines() {
+  local raw="$1"
+  local -n out_ref="$2"
+  out_ref=()
+  while IFS= read -r line; do
+    [[ -n "$line" ]] || continue
+    out_ref+=("$line")
+  done <<<"$raw"
+}
+
+if [[ "${1:-}" == "--" ]]; then
+  shift
+fi
+
+if [[ $# -eq 0 ]]; then
+  usage
+  exit 1
+fi
+
+if [[ "$mode" != "auto" && "$mode" != "exec" && "$mode" != "run" ]]; then
+  echo "[guardex-docker-loader] Invalid GUARDEX_DOCKER_MODE: $mode" >&2
+  usage
+  exit 1
+fi
+
+compose_cmd_raw="$(choose_compose_cmd)" || {
+  echo "[guardex-docker-loader] Docker Compose is not available. Install docker compose or docker-compose first." >&2
+  exit 1
+}
+IFS=' ' read -r -a compose_cmd <<<"$compose_cmd_raw"
+compose_args=()
+if [[ -n "$compose_file" ]]; then
+  compose_args=(-f "$compose_file")
+fi
+
+cd "$repo_root"
+
+services_raw="$("${compose_cmd[@]}" "${compose_args[@]}" config --services 2>/dev/null || true)"
+declare -a services
+mapfile_from_lines "$services_raw" services
+if [[ ${#services[@]} -eq 0 ]]; then
+  echo "[guardex-docker-loader] No Docker Compose services found. Add a compose file or set GUARDEX_DOCKER_COMPOSE_FILE." >&2
+  exit 1
+fi
+
+if [[ -z "$service" ]]; then
+  if [[ ${#services[@]} -eq 1 ]]; then
+    service="${services[0]}"
+  else
+    echo "[guardex-docker-loader] Multiple services found (${services[*]}). Set GUARDEX_DOCKER_SERVICE." >&2
+    exit 1
+  fi
+fi
+
+service_known=0
+for candidate in "${services[@]}"; do
+  if [[ "$candidate" == "$service" ]]; then
+    service_known=1
+    break
+  fi
+done
+if [[ $service_known -ne 1 ]]; then
+  echo "[guardex-docker-loader] Compose service not found: $service" >&2
+  exit 1
+fi
+
+run_mode="$mode"
+if [[ "$run_mode" == "auto" ]]; then
+  run_mode="run"
+  running_raw="$("${compose_cmd[@]}" "${compose_args[@]}" ps --status running --services 2>/dev/null || true)"
+  declare -a running_services
+  mapfile_from_lines "$running_raw" running_services
+  for candidate in "${running_services[@]}"; do
+    if [[ "$candidate" == "$service" ]]; then
+      run_mode="exec"
+      break
+    fi
+  done
+fi
+
+workdir_args=()
+if [[ -n "$workdir_override" ]]; then
+  workdir_args=(-w "$workdir_override")
+fi
+
+if [[ "$run_mode" == "exec" ]]; then
+  exec "${compose_cmd[@]}" "${compose_args[@]}" exec -T "${workdir_args[@]}" "$service" "$@"
+fi
+
+exec "${compose_cmd[@]}" "${compose_args[@]}" run --rm -T "${workdir_args[@]}" "$service" "$@"