ghx: fix pr create compatibility

Author: jolestar

skills/ghx/scripts/lib/publish.sh

@@ -80,6 +80,11 @@ resolve_output_path_for_read() {
     esac
 }
 
+extract_pr_url_from_text() {
+    local text="$1"
+    printf '%s\n' "$text" | grep -Eo 'https://github\.com/[^[:space:]]+/pull/[0-9]+' | tail -n 1
+}
+
 # Find existing comment by marker
 # Usage: find_existing_comment <pr_number> <marker>
 # Output: Comment ID if found, empty string otherwise
@@ -234,17 +239,26 @@ action_create_pr() {
         return 0
     fi
 
-    # Check if head branch exists (best-effort, don't fail for remote branches)
+    # Check if head branch exists (best-effort, don't fail for remote branches).
+    # Avoid assuming the caller's current directory is a git worktree.
     log_info "Verifying head branch (best-effort): $head"
-    if ! git rev-parse --verify "$head" >/dev/null 2>&1; then
-        log_warn "Unable to verify local branch '$head'; it may be remote-only or a cross-fork ref. Proceeding and letting 'gh pr create' validate the head."
+    if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        if ! git rev-parse --verify "$head" >/dev/null 2>&1; then
+            log_warn "Unable to verify local branch '$head'; it may be remote-only or a cross-fork ref. Proceeding and letting 'gh pr create' validate the head."
+        fi
+    else
+        log_info "Current directory is not a git worktree; skipping local branch verification."
     fi
 
+    local body_file
+    body_file=$(mktemp "${TMPDIR:-/tmp}/ghx-pr-body-XXXXXX.md")
+    printf '%s' "$body_content" > "$body_file"
+
     # Build gh pr create command
     local cmd=(gh pr create)
     cmd+=("--repo" "$PR_OWNER/$PR_REPO")
     cmd+=("--title" "$title")
-    cmd+=("--body" "$body_content")
+    cmd+=("--body-file" "$body_file")
     cmd+=("--base" "$base")
     cmd+=("--head" "$head")
 
@@ -259,18 +273,34 @@ action_create_pr() {
         cmd+=("--label" "$label_list")
     fi
 
-    # Create PR
+    # Create PR. Older gh versions do not support `gh pr create --json`.
     log_info "Creating PR..."
-    local pr_json
-    if ! pr_json=$("${cmd[@]}" --json number,url 2>&1); then
-        log_error "Failed to create PR: $pr_json"
+    local pr_output
+    if ! pr_output=$("${cmd[@]}" 2>&1); then
+        rm -f "$body_file"
+        log_error "Failed to create PR: $pr_output"
         return 1
     fi
+    rm -f "$body_file"
 
-    # Extract PR info from structured JSON output
+    # gh pr create typically prints the PR URL on stdout. Fall back to pr list if needed.
     local pr_number pr_url
-    pr_number=$(echo "$pr_json" | jq -r '.number')
-    pr_url=$(echo "$pr_json" | jq -r '.url')
+    pr_url=$(extract_pr_url_from_text "$pr_output" || true)
+    if [[ -z "$pr_url" ]]; then
+        local created_pr
+        created_pr=$(gh pr list --head "$head" --repo "$PR_OWNER/$PR_REPO" --json number,url --jq '.[0] // empty' 2>/dev/null || echo "")
+        if [[ -n "$created_pr" ]]; then
+            pr_number=$(echo "$created_pr" | jq -r '.number // empty')
+            pr_url=$(echo "$created_pr" | jq -r '.url // empty')
+        fi
+    fi
+    if [[ -z "${pr_number:-}" && "$pr_url" =~ /pull/([0-9]+)$ ]]; then
+        pr_number="${BASH_REMATCH[1]}"
+    fi
+    if [[ -z "${pr_number:-}" || -z "$pr_url" ]]; then
+        log_error "Created PR but could not determine PR number/url from gh output: $pr_output"
+        return 1
+    fi
 
     log_info "✅ Created PR #$pr_number"
     log_info "   URL: $pr_url"

tests/skill-mode/test_publisher.sh

@@ -518,6 +518,85 @@ INNEREOF
     cleanup_test_env "$tmp_dir"
 }
 
+test_create_pr_compat_and_cwd_stable() {
+    local test_name="create_pr_compat_and_cwd_stable"
+    log_info "Running test: $test_name"
+
+    local tmp_dir
+    tmp_dir=$(setup_test_env "$test_name")
+    local output_dir="$tmp_dir/output"
+    local bin_dir="$tmp_dir/bin"
+    local caller_dir="$tmp_dir/caller"
+    local body_file_rel="pr-body.md"
+
+    mkdir -p "$output_dir" "$bin_dir" "$caller_dir"
+    printf 'PR body\n' > "$output_dir/$body_file_rel"
+
+    cat > "$bin_dir/gh" << 'INNEREOF'
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ "${1:-}" == "auth" && "${2:-}" == "status" ]]; then
+  echo "github.com"
+  echo "  ✓ Logged in to github.com"
+  exit 0
+fi
+
+if [[ "${1:-}" == "pr" && "${2:-}" == "list" ]]; then
+  echo "[]"
+  exit 0
+fi
+
+if [[ "${1:-}" == "pr" && "${2:-}" == "create" ]]; then
+  for arg in "$@"; do
+    if [[ "$arg" == "--json" ]]; then
+      echo "unknown flag: --json" >&2
+      exit 1
+    fi
+  done
+  echo "https://github.com/owner/repo/pull/123"
+  exit 0
+fi
+
+exit 0
+INNEREOF
+    chmod +x "$bin_dir/gh"
+    export PATH="$bin_dir:$PATH"
+    export GITHUB_OUTPUT_DIR="$output_dir"
+
+    local before_pwd after_pwd output status=0
+    before_pwd=$(cd "$caller_dir" && pwd)
+    if output=$(cd "$caller_dir" && bash "$GHX_SCRIPT" pr create --repo=owner/repo --title="Compat PR" --body-file="$body_file_rel" --head=feature/test --base=main 2>&1); then
+        status=0
+    else
+        status=$?
+    fi
+    after_pwd=$(cd "$caller_dir" && pwd)
+
+    TESTS_RUN=$((TESTS_RUN + 1))
+    if [[ $status -eq 0 ]]; then
+        TESTS_PASSED=$((TESTS_PASSED + 1))
+        log_info "✓ create-pr works without gh --json support"
+    else
+        TESTS_FAILED=$((TESTS_FAILED + 1))
+        log_error "✗ create-pr should work with older gh (status=$status, output: $output)"
+    fi
+
+    TESTS_RUN=$((TESTS_RUN + 1))
+    if [[ "$before_pwd" == "$after_pwd" ]]; then
+        TESTS_PASSED=$((TESTS_PASSED + 1))
+        log_info "✓ create-pr does not disturb caller working directory"
+    else
+        TESTS_FAILED=$((TESTS_FAILED + 1))
+        log_error "✗ create-pr should not change caller working directory"
+    fi
+
+    assert_file_exists "$output_dir/publish-results.json" "publish-results.json should be generated for create-pr"
+    assert_json_valid "$output_dir/publish-results.json" "create-pr publish-results.json should be valid JSON"
+
+    cleanup_test_env "$tmp_dir"
+}
+
 test_reply_review_multiline_messages() {
     local test_name="reply_review_multiline"
     log_info "Running test: $test_name (regression test for issue #551)"
@@ -619,6 +698,7 @@ main() {
     test_body_file_stdin
     test_batch_and_direct_conflict
     test_batch_path_traversal_rejected
+    test_create_pr_compat_and_cwd_stable
     test_reply_review_multiline_messages
 
     # Summary