diff --git a/.github/agents/cli-consistency-checker.md b/.github/agents/cli-consistency-checker.md
index 0f63dfb4e1e..7b1cddae897 100644
--- a/.github/agents/cli-consistency-checker.md
+++ b/.github/agents/cli-consistency-checker.md
@@ -71,8 +71,7 @@ Run `--help` for each of these commands:
 
 ### PR Subcommands
 ```bash
-./gh-aw pr create --help
-./gh-aw pr open --help
+./gh-aw pr transfer --help
 ```
 
 **IMPORTANT**: Capture the EXACT output of each command. This is what users actually see.
diff --git a/.github/workflows/cli-consistency-checker.lock.yml b/.github/workflows/cli-consistency-checker.lock.yml
index 8d095409d40..958c634fe92 100644
--- a/.github/workflows/cli-consistency-checker.lock.yml
+++ b/.github/workflows/cli-consistency-checker.lock.yml
@@ -975,8 +975,7 @@ jobs:
           
           ### PR Subcommands
           ```bash
-          ./gh-aw pr create --help
-          ./gh-aw pr open --help
+          ./gh-aw pr transfer --help
           ```
           
           **IMPORTANT**: Capture the EXACT output of each command. This is what users actually see.
diff --git a/.github/workflows/cli-consistency-checker.md b/.github/workflows/cli-consistency-checker.md
index 91e7e2f66fb..59eb78fb66f 100644
--- a/.github/workflows/cli-consistency-checker.md
+++ b/.github/workflows/cli-consistency-checker.md
@@ -97,8 +97,7 @@ Run `--help` for each of these commands:
 
 ### PR Subcommands
 ```bash
-./gh-aw pr create --help
-./gh-aw pr open --help
+./gh-aw pr transfer --help
 ```
 
 **IMPORTANT**: Capture the EXACT output of each command. This is what users actually see.
diff --git a/pkg/cli/.github/aw/imports/.gitattributes b/pkg/cli/.github/aw/imports/.gitattributes
deleted file mode 100644
index f0516fad90e..00000000000
--- a/pkg/cli/.github/aw/imports/.gitattributes
+++ /dev/null
@@ -1,5 +0,0 @@
-# Mark all cached import files as generated
-* linguist-generated=true
-
-# Use 'ours' merge strategy to keep local cached versions
-* merge=ours
diff --git a/pkg/cli/.github/aw/imports/githubnext/agentics/d3422bf940923ef1d43db5559652b8e1e71869f3/workflows_shared_reporting.md b/pkg/cli/.github/aw/imports/githubnext/agentics/d3422bf940923ef1d43db5559652b8e1e71869f3/workflows_shared_reporting.md
deleted file mode 100644
index baedaa9a639..00000000000
--- a/pkg/cli/.github/aw/imports/githubnext/agentics/d3422bf940923ef1d43db5559652b8e1e71869f3/workflows_shared_reporting.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-# No frontmatter configuration needed - this is a pure instructions file
----
-
-## Report Formatting
-
-Structure your report with an overview followed by detailed content:
-
-1. **Content Overview**: Start with 1-2 paragraphs that summarize the key findings, highlights, or main points of your report. This should give readers a quick understanding of what the report contains without needing to expand the details.
-
-2. **Detailed Content**: Place the rest of your report inside HTML `<details>` and `<summary>` tags to allow readers to expand and view the full information. **IMPORTANT**: Always wrap the summary text in `<b>` tags to make it bold.
-
-**Example format:**
-
-`````markdown
-Brief overview paragraph 1 introducing the report and its main findings.
-
-Optional overview paragraph 2 with additional context or highlights.
-
-<details>
-<summary><b>Full Report Details</b></summary>
-
-## Detailed Analysis
-
-Full report content with all sections, tables, and detailed information goes here.
-
-### Section 1
-[Content]
-
-### Section 2
-[Content]
-
-</details>
-`````
-
-## Reporting Workflow Run Information
-
-When analyzing workflow run logs or reporting information from GitHub Actions runs:
-
-### 1. Workflow Run ID Formatting
-
-**Always render workflow run IDs as clickable URLs** when mentioning them in your report. The workflow run data includes a `url` field that provides the full GitHub Actions run page URL.
-
-**Format:**
-
-`````markdown
-[§12345](https://github.com/owner/repo/actions/runs/12345)
-`````
-
-**Example:**
-
-`````markdown
-Analysis based on [§456789](https://github.com/githubnext/gh-aw/actions/runs/456789)
-`````
-
-### 2. Document References for Workflow Runs
-
-When your analysis is based on information mined from one or more workflow runs, **include up to 3 workflow run URLs as document references** at the end of your report.
-
-**Format:**
-
-`````markdown
----
-
-**References:**
-- [§12345](https://github.com/owner/repo/actions/runs/12345)
-- [§12346](https://github.com/owner/repo/actions/runs/12346)
-- [§12347](https://github.com/owner/repo/actions/runs/12347)
-`````
-
-**Guidelines:**
-
-- Include **maximum 3 references** to keep reports concise
-- Choose the most relevant or representative runs (e.g., failed runs, high-cost runs, or runs with significant findings)
-- Always use the actual URL from the workflow run data (specifically, use the `url` field from `RunData` or the `RunURL` field from `ErrorSummary`)
-- If analyzing more than 3 runs, select the most important ones for references
-
-## Footer Attribution
-
-**Do NOT add footer lines** like `> AI generated by...` to your comment. The system automatically appends attribution after your content to prevent duplicates.