hub-launch 1.16.0 → 1.18.0

package/dist/templates/scripts/hula-fix-commit.sh

@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-# hula-fix-commit.sh — Step 9 of the hula.fix workflow
-# Usage: bash .github/scripts/hula-fix-commit.sh <issue-number> <commit-message> [--worktree-path <path>]
-#
-# Performs: git add -A → git commit → git push from within the fix worktree
-# Outputs structured JSON to stdout; all other output goes to stderr
-# Exit codes: 0=success, 1=user error, 2=tool error
-
-set -euo pipefail
-
-# ── helpers ────────────────────────────────────────────────────────────────────
-
-json_escape() {
-  printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g; s/$/\\n/g' | tr -d '\n' | sed 's/\\n$//'
-}
-
-die() {
-  local code="$1"; shift
-  local safe_msg
-  safe_msg=$(json_escape "$*")
-  printf '{"status":"error","code":%d,"message":"%s"}\n' "$code" "$safe_msg" >&1
-  exit "$code"
-}
-
-# ── argument parsing ────────────────────────────────────────────────────────────
-
-ISSUE_NUMBER=''
-COMMIT_MSG=''
-WORKTREE_PATH=''
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --worktree-path)
-      WORKTREE_PATH="$2"; shift 2 ;;
-    --worktree-path=*)
-      WORKTREE_PATH="${1#--worktree-path=}"; shift ;;
-    *)
-      if [[ -z "$ISSUE_NUMBER" ]]; then
-        ISSUE_NUMBER="$1"
-      elif [[ -z "$COMMIT_MSG" ]]; then
-        COMMIT_MSG="$1"
-      else
-        die 1 "Unexpected argument: $1"
-      fi
-      shift ;;
-  esac
-done
-
-if [[ -z "$ISSUE_NUMBER" ]]; then
-  die 1 "Usage: bash .github/scripts/hula-fix-commit.sh <issue-number> <commit-message> [--worktree-path <path>]"
-fi
-
-if [[ -z "$COMMIT_MSG" ]]; then
-  die 1 "Commit message is required."
-fi
-
-# ── Resolve worktree path ─────────────────────────────────────────────────────
-
-if [[ -z "$WORKTREE_PATH" ]]; then
-  # Try to read from session file (use absolute path so it works from any CWD)
-  REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) || REPO_ROOT="$(pwd)"
-  SESSION_FILE="${REPO_ROOT}/.hublaunch/.fix-sessions/issue-${ISSUE_NUMBER}.json"
-  if [[ -f "$SESSION_FILE" ]]; then
-    # Extract worktreePath from JSON (handles both compact and pretty-printed formats).
-    # Pattern .*"worktreePath" *: *"\([^"]*\)".*  tolerates optional whitespace, matching:
-    #   - Compact: "worktreePath":"..."
-    #   - Pretty:  "worktreePath": "..."
-    WORKTREE_PATH=$(grep '"worktreePath"' "$SESSION_FILE" | sed 's/.*"worktreePath" *: *"\([^"]*\)".*/\1/')
-  fi
-fi
-
-if [[ -z "$WORKTREE_PATH" ]]; then
-  # Last resort: infer from repo name using config
-  REPO_NAME=$(gh repo view --json name -q '.name' 2>/dev/null) || die 2 "Failed to determine repo name."
-  SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-  source "${SCRIPT_DIR}/hula-read-config.sh"
-  WORKTREE_PATH="${HULA_WORKTREE_BASE_PATH}/hula/${REPO_NAME}/fix-${ISSUE_NUMBER}"
-fi
-
-if [[ ! -d "$WORKTREE_PATH" ]]; then
-  die 1 "Worktree not found at ${WORKTREE_PATH}. Run hula-fix-setup.sh first."
-fi
-
-# ── Check for changes ─────────────────────────────────────────────────────────
-
-cd "$WORKTREE_PATH"
-
-PORCELAIN=$(git status --porcelain 2>/dev/null)
-
-if [[ -z "$PORCELAIN" ]]; then
-  printf '{"status":"success","message":"Nothing to commit","filesChanged":0,"worktreePath":"%s"}\n' \
-    "$(json_escape "$WORKTREE_PATH")"
-  exit 0
-fi
-
-FILES_CHANGED=$(printf '%s' "$PORCELAIN" | grep -c '' || true)
-
-# ── Stage, commit, push ───────────────────────────────────────────────────────
-
-git add -A >&2 2>&1 || die 2 "git add failed"
-
-git commit -m "$COMMIT_MSG" >&2 2>&1 \
-  || die 2 "Failed to commit changes. Ensure git user.name and user.email are configured."
-
-git push >&2 2>&1 \
-  || die 2 "Push failed. Try: cd ${WORKTREE_PATH} && git push"
-
-# ── Output result ─────────────────────────────────────────────────────────────
-
-SAFE_MSG=$(json_escape "$COMMIT_MSG")
-SAFE_PATH=$(json_escape "$WORKTREE_PATH")
-
-printf '{"status":"success","commitMessage":"%s","filesChanged":%d,"worktreePath":"%s"}\n' \
-  "$SAFE_MSG" "$FILES_CHANGED" "$SAFE_PATH"

package/dist/templates/scripts/hula-fix-setup.sh

@@ -1,152 +0,0 @@
-#!/usr/bin/env bash
-# hula-fix-setup.sh — Steps 2-6 of the hula.fix workflow
-# Usage: bash .github/scripts/hula-fix-setup.sh <issue-number> [--repo-root <path>]
-#
-# Performs: issue lookup → worktree creation → session file writing
-# Outputs structured JSON to stdout; all other output goes to stderr
-# Exit codes: 0=success, 1=user error, 2=tool error
-
-set -euo pipefail
-
-# ── helpers ────────────────────────────────────────────────────────────────────
-
-json_escape() {
-  # Escape a string for safe embedding inside a JSON double-quoted value
-  printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g; s/$/\\n/g' | tr -d '\n' | sed 's/\\n$//'
-}
-
-die() {
-  local code="$1"; shift
-  local safe_msg
-  safe_msg=$(json_escape "$*")
-  printf '{"status":"error","code":%d,"message":"%s"}\n' "$code" "$safe_msg" >&1
-  exit "$code"
-}
-
-emit_json() {
-  # emit_json key value [key value ...]
-  # Outputs compact single-line JSON: {"key":"value",...}
-  # All values must already be JSON-safe (escaped via json_escape).
-  local out='{'
-  local sep=''
-  while [[ $# -ge 2 ]]; do
-    local k="$1" v="$2"; shift 2
-    out="${out}${sep}\"${k}\":\"${v}\""
-    sep=','
-  done
-  printf '%s}\n' "$out"
-}
-
-# ── argument parsing ────────────────────────────────────────────────────────────
-
-ISSUE_NUMBER=''
-REPO_ROOT=''
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --repo-root)
-      REPO_ROOT="$2"; shift 2 ;;
-    --repo-root=*)
-      REPO_ROOT="${1#--repo-root=}"; shift ;;
-    [0-9]*)
-      ISSUE_NUMBER="$1"; shift ;;
-    *)
-      die 1 "Unknown argument: $1" ;;
-  esac
-done
-
-if [[ -z "$ISSUE_NUMBER" ]]; then
-  die 1 "Usage: bash .github/scripts/hula-fix-setup.sh <issue-number> [--repo-root <path>]"
-fi
-
-if [[ -n "$REPO_ROOT" ]]; then
-  cd "$REPO_ROOT"
-fi
-
-# ── Step 1: Infer owner/repo and repo name from git remote ─────────────────────
-
-NAME_WITH_OWNER=$(gh repo view --json nameWithOwner -q '.nameWithOwner' 2>/dev/null) \
-  || die 2 "Failed to determine repo from git remote. Is this a GitHub repo?"
-
-REPO_NAME=$(gh repo view --json name -q '.name' 2>/dev/null) \
-  || die 2 "Failed to determine repo name."
-
-# ── Step 2: Fetch issue details ────────────────────────────────────────────────
-
-ISSUE_JSON=$(gh issue view "$ISSUE_NUMBER" --json title,body,labels 2>/dev/null) \
-  || die 1 "Issue #${ISSUE_NUMBER} not found or not accessible."
-
-ISSUE_TITLE=$(printf '%s' "$ISSUE_JSON" | grep -o '"title":"[^"]*"' | head -1 | sed 's/"title":"//;s/"$//')
-
-# ── Step 3: Validate issue is tracked and has a PR (via hula view) ─────────────
-
-HULA_VIEW=$(hula view 2>&1) || true
-
-if printf '%s' "$HULA_VIEW" | grep -qi "not tracked\|no issues"; then
-  die 1 "Issue #${ISSUE_NUMBER} is not tracked. Run: hula track ${ISSUE_NUMBER}"
-fi
-
-# ── Step 4: Find PR branch for the issue ──────────────────────────────────────
-
-PR_BRANCH=$(gh pr list --search "linked:${ISSUE_NUMBER}" --json headRefName -q '.[0].headRefName' 2>/dev/null) || true
-
-if [[ -z "$PR_BRANCH" ]]; then
-  # Fallback: search PR bodies for issue references
-  # Handles both short format (#N) and full-path format (owner/repo#N)
-  # Uses gh's built-in jq (-q) — no external jq required
-  JQ_EXPR='.[] | select(.body != null) | select(.body | test("(Fixes|Closes|Resolves)[ ]+([A-Za-z0-9._-]+/[A-Za-z0-9._-]+)?#'"${ISSUE_NUMBER}"'([^0-9]|$)|(^|[^0-9])#'"${ISSUE_NUMBER}"'([^0-9]|$)"; "i")) | .headRefName'
-  PR_BRANCH=$(gh pr list --json headRefName,body --limit 100 -q "$JQ_EXPR" 2>/dev/null | head -1) || true
-fi
-
-if [[ -z "$PR_BRANCH" ]]; then
-  die 1 "No PR found for issue #${ISSUE_NUMBER}. Create a PR first with: hula checkout ${ISSUE_NUMBER}"
-fi
-
-# ── Step 5: Determine worktree path ───────────────────────────────────────────
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/hula-read-config.sh"
-WORKTREE_PATH="${HULA_WORKTREE_BASE_PATH}/hula/${REPO_NAME}/fix-${ISSUE_NUMBER}"
-
-# ── Step 6: Create or reuse the worktree ─────────────────────────────────────
-
-WORKTREE_STATUS='reused'
-
-if git worktree list --porcelain 2>/dev/null | grep -qxF "worktree ${WORKTREE_PATH}"; then
-  printf 'ℹ️  Resuming existing fix worktree at %s\n' "$WORKTREE_PATH" >&2
-else
-  printf '🌳 Creating fix worktree at: %s\n' "$WORKTREE_PATH" >&2
-  git fetch origin >&2 2>&1 || die 2 "git fetch origin failed"
-  git worktree add "$WORKTREE_PATH" "$PR_BRANCH" >&2 2>&1 \
-    || die 2 "Failed to create worktree at ${WORKTREE_PATH}. Check that branch ${PR_BRANCH} exists."
-  WORKTREE_STATUS='created'
-fi
-
-# ── Step 7: Write session file ────────────────────────────────────────────────
-
-REPO_ROOT_SESSION=$(git rev-parse --show-toplevel 2>/dev/null) || REPO_ROOT_SESSION="$(pwd)"
-SESSION_DIR="${REPO_ROOT_SESSION}/.hublaunch/.fix-sessions"
-mkdir -p "$SESSION_DIR"
-
-STARTED_AT=$(date -u +"%Y-%m-%dT%H:%M:%S.000Z" 2>/dev/null || date -u +"%Y-%m-%dT%H:%M:%SZ")
-
-SESSION_FILE="${SESSION_DIR}/issue-${ISSUE_NUMBER}.json"
-SAFE_WT_SESSION=$(json_escape "$WORKTREE_PATH")
-SAFE_BR_SESSION=$(json_escape "$PR_BRANCH")
-# Write compact single-line JSON via emit_json so the session file format matches
-# what readers (hula-fix-commit.sh) expect. Avoids the pretty-printed/compact mismatch.
-emit_json \
-  "issueNumber" "$ISSUE_NUMBER" \
-  "worktreePath" "$SAFE_WT_SESSION" \
-  "prBranch" "$SAFE_BR_SESSION" \
-  "startedAt" "$STARTED_AT" > "$SESSION_FILE"
-
-# ── Output result ─────────────────────────────────────────────────────────────
-
-SAFE_TITLE=$(json_escape "$ISSUE_TITLE")
-SAFE_BRANCH=$(json_escape "$PR_BRANCH")
-SAFE_WORKTREE=$(json_escape "$WORKTREE_PATH")
-SAFE_SESSION=$(json_escape "$SESSION_FILE")
-
-printf '{"status":"success","issueNumber":%s,"issueTitle":"%s","prBranch":"%s","worktreePath":"%s","sessionFile":"%s","worktreeStatus":"%s"}\n' \
-  "$ISSUE_NUMBER" "$SAFE_TITLE" "$SAFE_BRANCH" "$SAFE_WORKTREE" "$SAFE_SESSION" "$WORKTREE_STATUS"

package/dist/templates/scripts/hula-launch-run.sh

@@ -1,140 +0,0 @@
-#!/usr/bin/env bash
-# hula-launch-run.sh — Step 4 of the hula.launch workflow
-# Usage: bash .github/scripts/hula-launch-run.sh <plan-path> <branch-name> [--handoff <username>] [--test] [--kill] [--kill-and-relaunch]
-#        bash .github/scripts/hula-launch-run.sh <branch-name> --kill   # cancel only; no plan path required
-#
-# Performs: hula launch (which handles plan upload automatically)
-# Outputs structured JSON to stdout; all other output goes to stderr.
-# Exit codes: 0=success, 1=user error, 2=tool error
-
-set -euo pipefail
-
-# ── helpers ────────────────────────────────────────────────────────────────────
-
-json_escape() {
-  if command -v jq &>/dev/null; then
-    # jq -Rs . reads stdin as a raw string and outputs a JSON string (with surrounding quotes).
-    # Strip the surrounding quotes; the escaped content is safe to embed in JSON.
-    printf '%s' "$1" | jq -Rs . | sed 's/^"//;s/"$//'
-  else
-    # Fallback: escape backslashes and double quotes, collapse control chars to spaces
-    printf '%s' "$1" \
-      | sed 's/\\/\\\\/g; s/"/\\"/g' \
-      | tr '\n\r\t' '   '
-  fi
-}
-
-die() {
-  local code="$1"; shift
-  local safe_msg
-  safe_msg=$(json_escape "$*")
-  printf '{"status":"error","code":%d,"message":"%s"}\n' "$code" "$safe_msg" >&1
-  exit "$code"
-}
-
-# ── argument parsing ────────────────────────────────────────────────────────────
-
-PLAN_PATH=''
-BRANCH_NAME=''
-HANDOFF=''
-TEST=''
-KILL=''
-KILL_AND_RELAUNCH=''
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --handoff)
-      HANDOFF="$2"; shift 2 ;;
-    --handoff=*)
-      HANDOFF="${1#--handoff=}"; shift ;;
-    --test)
-      TEST=1; shift ;;
-    --kill)
-      KILL=1; shift ;;
-    --kill-and-relaunch)
-      KILL_AND_RELAUNCH=1; shift ;;
-    *)
-      if [[ -z "$PLAN_PATH" ]]; then
-        PLAN_PATH="$1"
-      elif [[ -z "$BRANCH_NAME" ]]; then
-        BRANCH_NAME="$1"
-      else
-        die 1 "Unexpected argument: $1"
-      fi
-      shift ;;
-  esac
-done
-
-if [[ -n "$KILL" && -n "$KILL_AND_RELAUNCH" ]]; then
-  die 1 "--kill and --kill-and-relaunch cannot be used together"
-fi
-
-if [[ -n "$KILL" ]]; then
-  # kill needs ONLY the branch name. Accept either "<branch-name> --kill" (a
-  # single positional) or "<plan-path> <branch-name> --kill" (the plan path is
-  # ignored — kill sends none). When only one positional was given it lands in
-  # PLAN_PATH, so re-home it as the branch name.
-  if [[ -z "$BRANCH_NAME" ]]; then
-    BRANCH_NAME="$PLAN_PATH"
-    PLAN_PATH=''
-  fi
-  if [[ -z "$BRANCH_NAME" ]]; then
-    die 1 "Usage: bash .github/scripts/hula-launch-run.sh <branch-name> --kill"
-  fi
-else
-  if [[ -z "$PLAN_PATH" || -z "$BRANCH_NAME" ]]; then
-    die 1 "Usage: bash .github/scripts/hula-launch-run.sh <plan-path> <branch-name> [--handoff <username>] [--test] [--kill-and-relaunch]"
-  fi
-fi
-
-# Reject paths with directory traversal sequences (only when a plan is in play)
-if [[ -n "$PLAN_PATH" ]] && printf '%s' "$PLAN_PATH" | grep -q '\.\.'; then
-  die 1 "Invalid plan path (path traversal not allowed): ${PLAN_PATH}"
-fi
-
-# ── Step 4: Run hula launch ─────────────────────────────────────────────────
-
-if [[ -n "$KILL" ]]; then
-  printf '🛑 Stopping in-flight task for branch: %s\n' "$BRANCH_NAME" >&2
-else
-  printf '🚀 Launching issue from plan: %s\n' "$PLAN_PATH" >&2
-fi
-
-# Build the launch invocation as an args array so the flags compose without
-# combinatorial if/else branching. Branch name is always first; the plan path is
-# a positional appended only when present (a bare --kill sends no plan path).
-LAUNCH_ARGS=("$BRANCH_NAME")
-if [[ -n "$PLAN_PATH" && -z "$KILL" ]]; then
-  LAUNCH_ARGS+=("$PLAN_PATH")
-fi
-if [[ -n "$HANDOFF" ]]; then
-  LAUNCH_ARGS+=(--handoff "$HANDOFF")
-fi
-if [[ -n "$TEST" ]]; then
-  LAUNCH_ARGS+=(--test)
-fi
-if [[ -n "$KILL" ]]; then
-  LAUNCH_ARGS+=(--kill)
-fi
-if [[ -n "$KILL_AND_RELAUNCH" ]]; then
-  LAUNCH_ARGS+=(--kill-and-relaunch)
-fi
-LAUNCH_OUTPUT=$(hula launch "${LAUNCH_ARGS[@]}" 2>&1) \
-  || die 2 "Launch failed: $LAUNCH_OUTPUT"
-
-# Extract issue number from CLI output (e.g. "Created issue #42" or "issue #42")
-ISSUE_NUMBER=$(printf '%s' "$LAUNCH_OUTPUT" | grep -oE '#[0-9]+' | head -1 | tr -d '#') || true
-
-# ── Output result ─────────────────────────────────────────────────────────────
-
-SAFE_PLAN=$(json_escape "$PLAN_PATH")
-SAFE_BRANCH=$(json_escape "$BRANCH_NAME")
-SAFE_HANDOFF=$(json_escape "$HANDOFF")
-SAFE_OUTPUT=$(json_escape "$LAUNCH_OUTPUT")
-
-printf '{"status":"success","issueNumber":"%s","branchName":"%s","planPath":"%s","handoff":"%s","cliOutput":"%s"}\n' \
-  "${ISSUE_NUMBER:-}" \
-  "$SAFE_BRANCH" \
-  "$SAFE_PLAN" \
-  "$SAFE_HANDOFF" \
-  "$SAFE_OUTPUT"

package/dist/templates/scripts/hula-merge-local.sh

@@ -1,138 +0,0 @@
-#!/usr/bin/env bash
-# hula-merge-local.sh — Path A of the hula.merge workflow (local session merge)
-# Usage: bash .github/scripts/hula-merge-local.sh <issue-number> <worktree-path> <commit-message> [--skip-tests] [--dry-run]
-#
-# Performs: commit + push from worktree → hula merge → remove worktree → delete session file
-# Outputs structured JSON to stdout; all other output goes to stderr.
-# Exit codes: 0=success, 1=user error, 2=tool error
-
-set -euo pipefail
-
-# ── helpers ────────────────────────────────────────────────────────────────────
-
-json_escape() {
-  printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g; s/$/\\n/g' | tr -d '\n' | sed 's/\\n$//'
-}
-
-die() {
-  local code="$1"; shift
-  local safe_msg
-  safe_msg=$(json_escape "$*")
-  printf '{"status":"error","code":%d,"message":"%s"}\n' "$code" "$safe_msg" >&1
-  exit "$code"
-}
-
-# ── argument parsing ────────────────────────────────────────────────────────────
-
-ISSUE_NUMBER=''
-WORKTREE_PATH=''
-COMMIT_MSG=''
-SKIP_TESTS=false
-DRY_RUN=false
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --skip-tests) SKIP_TESTS=true; shift ;;
-    --dry-run)    DRY_RUN=true;    shift ;;
-    *)
-      if [[ -z "$ISSUE_NUMBER" ]]; then
-        ISSUE_NUMBER="$1"
-      elif [[ -z "$WORKTREE_PATH" ]]; then
-        WORKTREE_PATH="$1"
-      elif [[ -z "$COMMIT_MSG" ]]; then
-        COMMIT_MSG="$1"
-      else
-        die 1 "Unexpected argument: $1"
-      fi
-      shift ;;
-  esac
-done
-
-if [[ -z "$ISSUE_NUMBER" || -z "$WORKTREE_PATH" || -z "$COMMIT_MSG" ]]; then
-  die 1 "Usage: bash .github/scripts/hula-merge-local.sh <issue-number> <worktree-path> <commit-message> [--skip-tests] [--dry-run]"
-fi
-
-if [[ ! -d "$WORKTREE_PATH" ]]; then
-  die 1 "Worktree not found at ${WORKTREE_PATH}."
-fi
-
-# Compute absolute session file path before cd (so it resolves correctly later)
-REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) || REPO_ROOT="$(pwd)"
-SESSION_FILE="${REPO_ROOT}/.hublaunch/.fix-sessions/issue-${ISSUE_NUMBER}.json"
-
-# ── Step A3: Commit and push from worktree ────────────────────────────────────
-
-cd "$WORKTREE_PATH"
-
-PORCELAIN=$(git status --porcelain 2>/dev/null)
-COMMITTED=false
-FILES_CHANGED=0
-
-if [[ -n "$PORCELAIN" ]]; then
-  FILES_CHANGED=$(printf '%s' "$PORCELAIN" | grep -c '' || true)
-
-  if [[ "$DRY_RUN" == false ]]; then
-    git add -A >&2 2>&1 \
-      || die 2 "git add failed in worktree ${WORKTREE_PATH}"
-
-    git commit -m "$COMMIT_MSG" >&2 2>&1 \
-      || die 2 "Failed to commit changes. Ensure git user.name and user.email are configured."
-
-    git push >&2 2>&1 \
-      || die 2 "Push failed. Try: cd ${WORKTREE_PATH} && git push"
-
-    COMMITTED=true
-  else
-    printf '🔍 Dry run: would commit %d file(s) with message: %s\n' "$FILES_CHANGED" "$COMMIT_MSG" >&2
-    COMMITTED=false
-  fi
-else
-  printf 'ℹ️  No changes to commit, proceeding to merge...\n' >&2
-fi
-
-# ── Step A4: Merge the PR ─────────────────────────────────────────────────────
-
-# Return to the main repo root (parent of worktree if possible)
-cd - > /dev/null 2>&1 || true
-
-if [[ "$DRY_RUN" == false ]]; then
-  printf '🔀 Merging PR for issue #%s...\n' "$ISSUE_NUMBER" >&2
-  hula merge "$ISSUE_NUMBER" >&2 2>&1 \
-    || die 2 "Failed to merge PR for issue #${ISSUE_NUMBER}. Session preserved — run /hula-merge again after resolving."
-fi
-
-# ── Step A5: Remove fix worktree ──────────────────────────────────────────────
-
-if [[ "$DRY_RUN" == false ]]; then
-  printf '🧹 Removing fix worktree: %s\n' "$WORKTREE_PATH" >&2
-  git worktree remove "$WORKTREE_PATH" --force >&2 2>&1 \
-    || printf '⚠️  Could not remove worktree at %s (may already be gone)\n' "$WORKTREE_PATH" >&2
-fi
-
-# ── Step A6: Clean up session file ───────────────────────────────────────────
-
-SESSION_CLEANED=false
-
-if [[ -f "$SESSION_FILE" ]]; then
-  if [[ "$DRY_RUN" == false ]]; then
-    rm -f "$SESSION_FILE"
-    SESSION_CLEANED=true
-    printf '🧹 Cleaned up session file\n' >&2
-  else
-    printf '🔍 Dry run: would delete session file %s\n' "$SESSION_FILE" >&2
-  fi
-fi
-
-# ── Output result ─────────────────────────────────────────────────────────────
-
-SAFE_MSG=$(json_escape "$COMMIT_MSG")
-SAFE_PATH=$(json_escape "$WORKTREE_PATH")
-
-printf '{"status":"success","issueNumber":%s,"committed":%s,"filesChanged":%d,"worktreeRemoved":%s,"sessionCleaned":%s,"commitMessage":"%s","worktreePath":"%s"}\n' \
-  "$ISSUE_NUMBER" \
-  "$([ "$COMMITTED" == true ] && echo 'true' || echo 'false')" \
-  "$FILES_CHANGED" \
-  "$([ "$DRY_RUN" == false ] && echo 'true' || echo 'false')" \
-  "$([ "$SESSION_CLEANED" == true ] && echo 'true' || echo 'false')" \
-  "$SAFE_MSG" \
-  "$SAFE_PATH"

package/dist/templates/scripts/hula-merge-remote.sh

@@ -1,94 +0,0 @@
-#!/usr/bin/env bash
-# hula-merge-remote.sh — Path B of the hula.merge workflow (remote-only merge)
-# Usage: bash .github/scripts/hula-merge-remote.sh <issue-number> [--session-path <path>]
-#
-# Merges the PR directly on GitHub, then optionally cleans up a stale session file.
-# Outputs structured JSON to stdout; all other output goes to stderr.
-# Exit codes: 0=success, 1=user error, 2=tool error
-
-set -euo pipefail
-
-# ── helpers ────────────────────────────────────────────────────────────────────
-
-json_escape() {
-  printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g; s/$/\\n/g' | tr -d '\n' | sed 's/\\n$//'
-}
-
-die() {
-  local code="$1"; shift
-  local safe_msg
-  safe_msg=$(json_escape "$*")
-  printf '{"status":"error","code":%d,"message":"%s"}\n' "$code" "$safe_msg" >&1
-  exit "$code"
-}
-
-# ── argument parsing ────────────────────────────────────────────────────────────
-
-ISSUE_NUMBER=''
-SESSION_PATH=''
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --session-path)
-      SESSION_PATH="$2"; shift 2 ;;
-    --session-path=*)
-      SESSION_PATH="${1#--session-path=}"; shift ;;
-    [0-9]*)
-      ISSUE_NUMBER="$1"; shift ;;
-    *)
-      die 1 "Unknown argument: $1" ;;
-  esac
-done
-
-if [[ -z "$ISSUE_NUMBER" ]]; then
-  die 1 "Usage: bash .github/scripts/hula-merge-remote.sh <issue-number> [--session-path <path>]"
-fi
-
-# ── Step B1: Merge the PR via hula CLI ───────────────────────────────────────
-
-printf '🔀 Merging PR for issue #%s (remote-only)...\n' "$ISSUE_NUMBER" >&2
-
-# Capture the CLI output so we can detect whether the local default branch was
-# fast-forwarded, while still surfacing it live to the user (on stderr — stdout
-# is reserved for the structured JSON result).
-set +e
-MERGE_OUTPUT=$(hula merge "$ISSUE_NUMBER" 2>&1)
-MERGE_EXIT=$?
-set -e
-
-printf '%s\n' "$MERGE_OUTPUT" >&2
-
-if [[ $MERGE_EXIT -ne 0 ]]; then
-  die 2 "Failed to merge PR for issue #${ISSUE_NUMBER}. Check the PR on GitHub."
-fi
-
-# Detect whether `hula merge` actually fast-forwarded the local default branch.
-# The CLI prints "✓ Local <branch> fast-forwarded to origin/<branch>" on success
-# and a specific warning (with remediation) on each skip/failure mode.
-LOCAL_UPDATED=false
-if printf '%s' "$MERGE_OUTPUT" | grep -q "Local.*fast-forwarded"; then
-  LOCAL_UPDATED=true
-fi
-
-# ── Step B2: Clean up stale session file (if applicable) ─────────────────────
-
-SESSION_CLEANED=false
-
-# Default session file path if not provided (use absolute path so it works from any CWD)
-if [[ -z "$SESSION_PATH" ]]; then
-  REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) || REPO_ROOT="$(pwd)"
-  SESSION_PATH="${REPO_ROOT}/.hublaunch/.fix-sessions/issue-${ISSUE_NUMBER}.json"
-fi
-
-if [[ -f "$SESSION_PATH" ]]; then
-  rm -f "$SESSION_PATH"
-  SESSION_CLEANED=true
-  printf '🧹 Cleaned up stale session file\n' >&2
-fi
-
-# ── Output result ─────────────────────────────────────────────────────────────
-
-printf '{"status":"success","issueNumber":%s,"sessionCleaned":%s,"localUpdated":%s}\n' \
-  "$ISSUE_NUMBER" \
-  "$([ "$SESSION_CLEANED" == true ] && echo 'true' || echo 'false')" \
-  "$([ "$LOCAL_UPDATED" == true ] && echo 'true' || echo 'false')"

package/dist/templates/scripts/hula-read-config.sh

@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-# hula-read-config.sh — Shared config reader for hula shell scripts
-# Source this file; do NOT execute directly.
-#
-# After sourcing, the following variables are set:
-#   HULA_WORKTREE_BASE_PATH  — absolute resolved worktreeBasePath
-#
-# Reads worktreeBasePath from .hublaunch/hublaunch.config.js.
-# Falls back to ".hula-worktrees" (resolved relative to repo root).
-
-_hula_read_worktree_base_path() {
-  local repo_root
-  repo_root=$(git rev-parse --show-toplevel 2>/dev/null) || {
-    printf 'Warning: could not determine repo root\n' >&2
-    repo_root="$(pwd)"
-  }
-  local config_file="${repo_root}/.hublaunch/hublaunch.config.js"
-  local base_path=""
-
-  if [[ -f "$config_file" ]]; then
-    base_path=$(grep 'worktreeBasePath' "$config_file" \
-      | grep -v '^\s*//' \
-      | sed "s/.*worktreeBasePath[^'\"]*['\"]\\([^'\"]*\\)['\"].*/\\1/" \
-      | head -1) || true
-  fi
-
-  # Default to .hula-worktrees if not found or empty
-  base_path="${base_path:-.hula-worktrees}"
-
-  # Resolve relative paths against repo root
-  if [[ "$base_path" != /* ]]; then
-    base_path="${repo_root}/${base_path}"
-  fi
-
-  printf '%s' "$base_path"
-}
-
-HULA_WORKTREE_BASE_PATH=$(_hula_read_worktree_base_path)