From e2d51c355a51b44fb90e64e35c63957bfd86675b Mon Sep 17 00:00:00 2001
From: Sofia Leon <sofialeon@google.com>
Date: Fri, 6 Feb 2026 19:35:00 -0800
Subject: [PATCH] chore: update issue transfer to transfer issues correctly

---
 bin/transfer-issues.sh | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/bin/transfer-issues.sh b/bin/transfer-issues.sh
index e2a5f492166..a3835afe457 100755
--- a/bin/transfer-issues.sh
+++ b/bin/transfer-issues.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 
-# Usage: ./transfer_issues.sh source-owner/repo dest-owner/repo assignee label
+# Usage: ./transfer_issues.sh source-owner/repo dest-owner/repo label
 SOURCE_REPO=$1
 DEST_REPO=$2
 LABEL=$3
-ASSIGNEE=$4
 
 if [ -z "$SOURCE_REPO" ] || [ -z "$DEST_REPO" ] || [ -z "$LABEL" ]; then
-    echo "Usage: $0 <source-owner/repo> <dest-owner/repo> <label> [assignee]"
+    echo "Usage: $0 <source-owner/repo> <dest-owner/repo> <label>"
     exit 1
 fi
 
+
+
+
 # Create the label if it doesn't exist
 echo "Checking for label '$LABEL' in $DEST_REPO..."
 gh label list -R "$DEST_REPO" | grep -q -F "$LABEL" || gh label create "$LABEL" -R "$DEST_REPO" --description "Issues transferred from another repository"
@@ -23,30 +25,18 @@ ISSUE_NUMBERS=$(gh issue list -R "$SOURCE_REPO" --state open --json number --jq
 for NUMBER in $ISSUE_NUMBERS; do
     echo "Processing Issue #$NUMBER..."
 
-    # Extract title and body
-    DATA=$(gh issue view "$NUMBER" -R "$SOURCE_REPO" --json title,body)
-    TITLE=$(echo "$DATA" | jq -r '.title')
-    BODY=$(echo "$DATA" | jq -r '.body')
-
-    ENHANCED_BODY=$(printf "%s\n\n---\n*Originally authored in $SOURCE_REPO as Issue #$NUMBER*")
-
-    # Create the issue with the assignee and label
-    # Build arguments for gh issue create
-    CREATE_ARGS=(
-        -R "$DEST_REPO"
-        --title "$TITLE" \
-        --body "$ENHANCED_BODY" \
-        --label "$LABEL" \
-    )
-    if [ -n "$ASSIGNEE" ]; then
-        CREATE_ARGS+=(--assignee "$ASSIGNEE")
+    TRANSFER_OUTPUT=$(gh issue transfer "$NUMBER" -R "$SOURCE_REPO" "$DEST_REPO")
+    NEW_ISSUE_NUMBER=$(echo "$TRANSFER_OUTPUT" | grep -o -E '\/issues\/[0-9]+' | tail -1 | grep -o -E '[0-9]+')
+
+    if [ -z "$NEW_ISSUE_NUMBER" ]; then
+        echo "Error: Could not determine new issue number after transfer for Issue #$NUMBER. Skipping labeling."
+        echo "$TRANSFER_OUTPUT"
+        continue
     fi
 
-    # Create the issue
-    gh issue create "${CREATE_ARGS[@]}"
-        
-    
-    echo "Successfully transferred: $TITLE"
+    echo "Issue #$NUMBER transferred to $DEST_REPO as #$NEW_ISSUE_NUMBER. Adding label '$LABEL'..."
+    gh issue edit "$NEW_ISSUE_NUMBER" -R "$DEST_REPO" --add-label "$LABEL"
+    echo "Successfully transferred and labeled Issue #$NUMBER (new #$NEW_ISSUE_NUMBER) with '$LABEL'"
 done
 
 echo "Transfer complete."