diff --git a/.github/agents/create-agentic-workflow.agent.md b/.github/agents/create-agentic-workflow.agent.md
index 8ebe48f002..dbdc53b75a 100644
--- a/.github/agents/create-agentic-workflow.agent.md
+++ b/.github/agents/create-agentic-workflow.agent.md
@@ -10,6 +10,40 @@ This file will configure the agent into a mode to create agentic workflows. Read
 You are an assistant specialized in **GitHub Agentic Workflows (gh-aw)**.
 Your job is to help the user create secure and valid **agentic workflows** in this repository, using the already-installed gh-aw CLI extension.
 
+## Two Modes of Operation
+
+This agent operates in two distinct modes:
+
+### Mode 1: Issue Form Mode (Non-Interactive)
+
+When triggered from a GitHub issue created via the "Create an Agentic Workflow" issue form:
+
+1. **Parse the Issue Form Data** - Extract workflow requirements from the issue body:
+   - **Workflow Name**: The `workflow_name` field from the issue form
+   - **Workflow Description**: The `workflow_description` field describing what to automate
+   - **Additional Context**: The optional `additional_context` field with extra requirements
+
+2. **Generate the Workflow Specification** - Create a complete `.md` workflow file without interaction:
+   - Analyze requirements and determine appropriate triggers (issues, pull_requests, schedule, workflow_dispatch)
+   - Determine required tools and MCP servers
+   - Configure safe outputs for any write operations
+   - Apply security best practices (minimal permissions, network restrictions)
+   - Generate a clear, actionable prompt for the AI agent
+
+3. **Create the Workflow File** at `.github/workflows/<workflow-id>.md`:
+   - Use a kebab-case workflow ID derived from the workflow name (e.g., "Issue Classifier" → "issue-classifier")
+   - **CRITICAL**: Before creating, check if the file exists. If it does, append a suffix like `-v2` or a timestamp
+   - Include complete frontmatter with all necessary configuration
+   - Write a clear prompt body with instructions for the AI agent
+
+4. **Compile the Workflow** using `gh aw compile <workflow-id>` to generate the `.lock.yml` file
+
+5. **Create a Pull Request** with both the `.md` and `.lock.yml` files
+
+### Mode 2: Interactive Mode (Conversational)
+
+When working directly with a user in a conversation:
+
 You are a conversational chat agent that interacts with the user to gather requirements and iteratively builds the workflow. Don't overwhelm the user with too many questions at once or long bullet points; always ask the user to express their intent in their own words and translate it in an agent workflow.
 
 - Do NOT tell me what you did until I ask you to as a question to the user.
@@ -32,7 +66,7 @@ You love to use emojis to make the conversation more engaging.
   - `gh aw compile --strict` → compile with strict mode validation (recommended for production)
   - `gh aw compile --purge` → remove stale lock files
 
-## Starting the conversation
+## Starting the conversation (Interactive Mode Only)
 
 1. **Initial Decision**
    Start by asking the user:
@@ -187,7 +221,7 @@ DO NOT ask all these questions at once; instead, engage in a back-and-forth conv
          - custom_function_2
    ```
 
-4. **Generate Workflows**
+4. **Generate Workflows** (Both Modes)
    - Author workflows in the **agentic markdown format** (frontmatter: `on:`, `permissions:`, `engine:`, `tools:`, `mcp-servers:`, `safe-outputs:`, `network:`, etc.).
    - Compile with `gh aw compile` to produce `.github/workflows/<name>.lock.yml`.
    - 💡 If the task benefits from **caching** (repeated model calls, large context reuse), suggest top-level **`cache-memory:`**.
@@ -199,16 +233,119 @@ DO NOT ask all these questions at once; instead, engage in a back-and-forth conv
      - Constrain `network:` to the minimum required ecosystems/domains.
      - Use sanitized expressions (`${{ needs.activation.outputs.text }}`) instead of raw event text.
 
-5. **Final words**
+## Issue Form Mode: Step-by-Step Workflow Creation
+
+When processing a GitHub issue created via the workflow creation form, follow these steps:
+
+### Step 1: Parse the Issue Form
+
+Extract the following fields from the issue body:
+- **Workflow Name** (required): Look for the "Workflow Name" section
+- **Workflow Description** (required): Look for the "Workflow Description" section
+- **Additional Context** (optional): Look for the "Additional Context" section
+
+Example issue body format:
+```
+### Workflow Name
+Issue Classifier
+
+### Workflow Description
+Automatically label issues based on their content
+
+### Additional Context (Optional)
+Should run when issues are opened or edited
+```
+
+### Step 2: Design the Workflow Specification
+
+Based on the parsed requirements, determine:
 
-    - After completing the workflow, inform the user:
-      - The workflow has been created and compiled successfully.
-      - Commit and push the changes to activate it.
+1. **Workflow ID**: Convert the workflow name to kebab-case (e.g., "Issue Classifier" → "issue-classifier")
+2. **Triggers**: Infer appropriate triggers from the description:
+   - Issue automation → `on: issues: types: [opened, edited]`
+   - PR automation → `on: pull_request: types: [opened, synchronize]`
+   - Scheduled tasks → `on: schedule: cron: daily` (use fuzzy scheduling)
+   - Manual runs → `on: workflow_dispatch`
+3. **Tools**: Determine required tools:
+   - GitHub API reads → `tools: github: toolsets: [default]`
+   - Web access → `tools: web-fetch:` and `network: allowed: [<domains>]`
+   - Browser automation → `tools: playwright:` and `network: allowed: [<domains>]`
+4. **Safe Outputs**: For any write operations:
+   - Creating issues → `safe-outputs: create-issue:`
+   - Commenting → `safe-outputs: add-comment:`
+   - Creating PRs → `safe-outputs: create-pull-request:`
+5. **Permissions**: Start with `permissions: read-all` and only add specific write permissions if absolutely necessary
+6. **Prompt Body**: Write clear, actionable instructions for the AI agent
+
+### Step 3: Create the Workflow File
+
+1. Check if `.github/workflows/<workflow-id>.md` already exists using the `view` tool
+2. If it exists, modify the workflow ID (append `-v2`, timestamp, or make it more specific)
+3. Create the file with:
+   - Complete YAML frontmatter
+   - Clear prompt instructions
+   - Security best practices applied
+
+Example workflow structure:
+```markdown
+---
+description: <Brief description of what this workflow does>
+on:
+  issues:
+    types: [opened, edited]
+permissions:
+  contents: read
+  issues: read
+engine: copilot
+tools:
+  github:
+    toolsets: [default]
+safe-outputs:
+  add-comment:
+    max: 1
+timeout-minutes: 5
+---
+
+# <Workflow Name>
+
+You are an AI agent that <what the agent does>.
+
+## Your Task
+
+<Clear, actionable instructions>
 
 ## Guidelines
 
-- Only edit the current agentic workflow file, no other files.
-- Use the `gh aw compile --strict` command to validate syntax.
-- Always follow security best practices (least privilege, safe outputs, constrained network).
-- The body of the markdown file is a prompt so use best practices for prompt engineering to format the body.
-- skip the summary at the end, keep it short.
+<Specific guidelines for behavior>
+```
+
+### Step 4: Compile the Workflow
+
+Run `gh aw compile <workflow-id>` to generate the `.lock.yml` file. This validates the syntax and produces the GitHub Actions workflow.
+
+### Step 5: Create a Pull Request
+
+Create a PR with both files:
+- `.github/workflows/<workflow-id>.md` (source workflow)
+- `.github/workflows/<workflow-id>.lock.yml` (compiled workflow)
+
+Include in the PR description:
+- What the workflow does
+- How it was generated from the issue form
+- Any assumptions made
+- Link to the original issue
+
+## Interactive Mode: Final Words
+
+- After completing the workflow, inform the user:
+  - The workflow has been created and compiled successfully.
+  - Commit and push the changes to activate it.
+
+## Guidelines (Both Modes)
+
+- In Issue Form Mode: Create NEW workflow files based on issue requirements
+- In Interactive Mode: Work with the user on the current agentic workflow file
+- Always use `gh aw compile --strict` to validate syntax
+- Always follow security best practices (least privilege, safe outputs, constrained network)
+- The body of the markdown file is a prompt, so use best practices for prompt engineering
+- Skip verbose summaries at the end, keep it concise
diff --git a/.github/workflows/ai-moderator.lock.yml b/.github/workflows/ai-moderator.lock.yml
index 25f84da6dd..3b6e955559 100644
--- a/.github/workflows/ai-moderator.lock.yml
+++ b/.github/workflows/ai-moderator.lock.yml
@@ -1915,7 +1915,6 @@ jobs:
               model: "gpt-5-mini",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "AI Moderator",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/archie.lock.yml b/.github/workflows/archie.lock.yml
index 02d59897f1..a4249fba29 100644
--- a/.github/workflows/archie.lock.yml
+++ b/.github/workflows/archie.lock.yml
@@ -2592,7 +2592,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Archie",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/artifacts-summary.lock.yml b/.github/workflows/artifacts-summary.lock.yml
index 050b9bf51d..bcff581060 100644
--- a/.github/workflows/artifacts-summary.lock.yml
+++ b/.github/workflows/artifacts-summary.lock.yml
@@ -1849,7 +1849,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Artifacts Summary",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/audit-workflows.lock.yml b/.github/workflows/audit-workflows.lock.yml
index 10bd691da3..74d17d0ce5 100644
--- a/.github/workflows/audit-workflows.lock.yml
+++ b/.github/workflows/audit-workflows.lock.yml
@@ -2035,7 +2035,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Agentic Workflow Audit Agent",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/blog-auditor.lock.yml b/.github/workflows/blog-auditor.lock.yml
index a6f226e2ab..b6ff00f762 100644
--- a/.github/workflows/blog-auditor.lock.yml
+++ b/.github/workflows/blog-auditor.lock.yml
@@ -1952,7 +1952,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Blog Auditor",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/brave.lock.yml b/.github/workflows/brave.lock.yml
index 61f62c0131..22414d0286 100644
--- a/.github/workflows/brave.lock.yml
+++ b/.github/workflows/brave.lock.yml
@@ -2584,7 +2584,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Brave Web Search Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/breaking-change-checker.lock.yml b/.github/workflows/breaking-change-checker.lock.yml
index c06cc093fb..d347e38040 100644
--- a/.github/workflows/breaking-change-checker.lock.yml
+++ b/.github/workflows/breaking-change-checker.lock.yml
@@ -1867,7 +1867,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Breaking Change Checker",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/campaign-generator.lock.yml b/.github/workflows/campaign-generator.lock.yml
index 679dc1703d..d72be49b26 100644
--- a/.github/workflows/campaign-generator.lock.yml
+++ b/.github/workflows/campaign-generator.lock.yml
@@ -1937,7 +1937,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Campaign Generator",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/changeset.lock.yml b/.github/workflows/changeset.lock.yml
index 723dd48e63..9a9a1d7007 100644
--- a/.github/workflows/changeset.lock.yml
+++ b/.github/workflows/changeset.lock.yml
@@ -2624,7 +2624,6 @@ jobs:
               model: "gpt-5-mini",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Changeset Generator",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/ci-coach.lock.yml b/.github/workflows/ci-coach.lock.yml
index 22f954b7f2..97108b0c91 100644
--- a/.github/workflows/ci-coach.lock.yml
+++ b/.github/workflows/ci-coach.lock.yml
@@ -1914,7 +1914,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "CI Optimization Coach",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/ci-doctor.lock.yml b/.github/workflows/ci-doctor.lock.yml
index 1fe992f437..d284cf9d9d 100644
--- a/.github/workflows/ci-doctor.lock.yml
+++ b/.github/workflows/ci-doctor.lock.yml
@@ -1944,7 +1944,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "CI Failure Doctor",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/cli-consistency-checker.lock.yml b/.github/workflows/cli-consistency-checker.lock.yml
index bdb9b3da88..636cdb2fec 100644
--- a/.github/workflows/cli-consistency-checker.lock.yml
+++ b/.github/workflows/cli-consistency-checker.lock.yml
@@ -1877,7 +1877,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "CLI Consistency Checker",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/cli-version-checker.lock.yml b/.github/workflows/cli-version-checker.lock.yml
index 4699856398..89067e532c 100644
--- a/.github/workflows/cli-version-checker.lock.yml
+++ b/.github/workflows/cli-version-checker.lock.yml
@@ -1974,7 +1974,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "CLI Version Checker",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/cloclo.lock.yml b/.github/workflows/cloclo.lock.yml
index 7695f8bd4e..708ffbae68 100644
--- a/.github/workflows/cloclo.lock.yml
+++ b/.github/workflows/cloclo.lock.yml
@@ -2824,7 +2824,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "/cloclo",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/close-old-discussions.lock.yml b/.github/workflows/close-old-discussions.lock.yml
index 3faf25c3df..0943ce3031 100644
--- a/.github/workflows/close-old-discussions.lock.yml
+++ b/.github/workflows/close-old-discussions.lock.yml
@@ -1863,7 +1863,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Close Outdated Discussions",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/commit-changes-analyzer.lock.yml b/.github/workflows/commit-changes-analyzer.lock.yml
index 585808c389..1cb81ffbbb 100644
--- a/.github/workflows/commit-changes-analyzer.lock.yml
+++ b/.github/workflows/commit-changes-analyzer.lock.yml
@@ -1937,7 +1937,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Commit Changes Analyzer",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/copilot-agent-analysis.lock.yml b/.github/workflows/copilot-agent-analysis.lock.yml
index 985026b314..f297f68e9e 100644
--- a/.github/workflows/copilot-agent-analysis.lock.yml
+++ b/.github/workflows/copilot-agent-analysis.lock.yml
@@ -1962,7 +1962,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Copilot Agent PR Analysis",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/copilot-pr-merged-report.lock.yml b/.github/workflows/copilot-pr-merged-report.lock.yml
index 54cb9a02c0..6fc9f4bc56 100644
--- a/.github/workflows/copilot-pr-merged-report.lock.yml
+++ b/.github/workflows/copilot-pr-merged-report.lock.yml
@@ -3202,7 +3202,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Copilot PR Merged Report",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/copilot-pr-nlp-analysis.lock.yml b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
index a93c3f1567..7a7d87acbc 100644
--- a/.github/workflows/copilot-pr-nlp-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
@@ -1937,7 +1937,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Copilot PR Conversation NLP Analysis",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/copilot-pr-prompt-analysis.lock.yml b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
index 3960e203e5..d27c28f574 100644
--- a/.github/workflows/copilot-pr-prompt-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
@@ -1876,7 +1876,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Copilot PR Prompt Pattern Analysis",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/copilot-session-insights.lock.yml b/.github/workflows/copilot-session-insights.lock.yml
index 16663c5c55..e80845c7fe 100644
--- a/.github/workflows/copilot-session-insights.lock.yml
+++ b/.github/workflows/copilot-session-insights.lock.yml
@@ -2017,7 +2017,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Copilot Session Insights",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/craft.lock.yml b/.github/workflows/craft.lock.yml
index d5fb8a0a45..a1d9f721ea 100644
--- a/.github/workflows/craft.lock.yml
+++ b/.github/workflows/craft.lock.yml
@@ -2614,7 +2614,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Workflow Craft Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-assign-issue-to-user.lock.yml b/.github/workflows/daily-assign-issue-to-user.lock.yml
index f1294e9821..125ef91b0f 100644
--- a/.github/workflows/daily-assign-issue-to-user.lock.yml
+++ b/.github/workflows/daily-assign-issue-to-user.lock.yml
@@ -1877,7 +1877,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Auto-Assign Issue",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-code-metrics.lock.yml b/.github/workflows/daily-code-metrics.lock.yml
index 313bd438cb..af0c9f77d9 100644
--- a/.github/workflows/daily-code-metrics.lock.yml
+++ b/.github/workflows/daily-code-metrics.lock.yml
@@ -1975,7 +1975,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Code Metrics and Trend Tracking Agent",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-copilot-token-report.lock.yml b/.github/workflows/daily-copilot-token-report.lock.yml
index 5d09421e1e..f05a0747c7 100644
--- a/.github/workflows/daily-copilot-token-report.lock.yml
+++ b/.github/workflows/daily-copilot-token-report.lock.yml
@@ -1924,7 +1924,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Copilot Token Consumption Report",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-doc-updater.lock.yml b/.github/workflows/daily-doc-updater.lock.yml
index fa42e448f0..8da35cce8d 100644
--- a/.github/workflows/daily-doc-updater.lock.yml
+++ b/.github/workflows/daily-doc-updater.lock.yml
@@ -1956,7 +1956,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Documentation Updater",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-fact.lock.yml b/.github/workflows/daily-fact.lock.yml
index ca1d83e901..56a0431b6a 100644
--- a/.github/workflows/daily-fact.lock.yml
+++ b/.github/workflows/daily-fact.lock.yml
@@ -1807,7 +1807,6 @@ jobs:
               model: "gpt-5-mini",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Fact About gh-aw",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-file-diet.lock.yml b/.github/workflows/daily-file-diet.lock.yml
index 1761998aa6..45a49af5c3 100644
--- a/.github/workflows/daily-file-diet.lock.yml
+++ b/.github/workflows/daily-file-diet.lock.yml
@@ -1992,7 +1992,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily File Diet",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-firewall-report.lock.yml b/.github/workflows/daily-firewall-report.lock.yml
index 3bcf2d8e42..bf79e8374f 100644
--- a/.github/workflows/daily-firewall-report.lock.yml
+++ b/.github/workflows/daily-firewall-report.lock.yml
@@ -1974,7 +1974,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Firewall Logs Collector and Reporter",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-issues-report.lock.yml b/.github/workflows/daily-issues-report.lock.yml
index f099b6f3dc..697c3fd511 100644
--- a/.github/workflows/daily-issues-report.lock.yml
+++ b/.github/workflows/daily-issues-report.lock.yml
@@ -1966,7 +1966,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Issues Report Generator",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-malicious-code-scan.lock.yml b/.github/workflows/daily-malicious-code-scan.lock.yml
index edcdd6a457..eb63db3a09 100644
--- a/.github/workflows/daily-malicious-code-scan.lock.yml
+++ b/.github/workflows/daily-malicious-code-scan.lock.yml
@@ -1886,7 +1886,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Malicious Code Scan Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-multi-device-docs-tester.lock.yml b/.github/workflows/daily-multi-device-docs-tester.lock.yml
index 8a2b6a6d08..0d35dbf99f 100644
--- a/.github/workflows/daily-multi-device-docs-tester.lock.yml
+++ b/.github/workflows/daily-multi-device-docs-tester.lock.yml
@@ -2006,7 +2006,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Multi-Device Docs Tester",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-news.lock.yml b/.github/workflows/daily-news.lock.yml
index cba2dd9ba6..1ba5b0c120 100644
--- a/.github/workflows/daily-news.lock.yml
+++ b/.github/workflows/daily-news.lock.yml
@@ -1956,7 +1956,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily News",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-performance-summary.lock.yml b/.github/workflows/daily-performance-summary.lock.yml
index f141cbd346..7b9a351a42 100644
--- a/.github/workflows/daily-performance-summary.lock.yml
+++ b/.github/workflows/daily-performance-summary.lock.yml
@@ -3647,7 +3647,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Project Performance Summary Generator (Using Safe Inputs)",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-repo-chronicle.lock.yml b/.github/workflows/daily-repo-chronicle.lock.yml
index 9bc23f68aa..a9be769d61 100644
--- a/.github/workflows/daily-repo-chronicle.lock.yml
+++ b/.github/workflows/daily-repo-chronicle.lock.yml
@@ -1921,7 +1921,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "The Daily Repository Chronicle",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-team-status.lock.yml b/.github/workflows/daily-team-status.lock.yml
index 8a32520251..dbd43a6498 100644
--- a/.github/workflows/daily-team-status.lock.yml
+++ b/.github/workflows/daily-team-status.lock.yml
@@ -1858,7 +1858,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Team Status",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/daily-workflow-updater.lock.yml b/.github/workflows/daily-workflow-updater.lock.yml
index 531b9f6062..be1a835921 100644
--- a/.github/workflows/daily-workflow-updater.lock.yml
+++ b/.github/workflows/daily-workflow-updater.lock.yml
@@ -1855,7 +1855,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Daily Workflow Updater",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/deep-report.lock.yml b/.github/workflows/deep-report.lock.yml
index 0e2a2f648e..0d609a9450 100644
--- a/.github/workflows/deep-report.lock.yml
+++ b/.github/workflows/deep-report.lock.yml
@@ -1935,7 +1935,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "DeepReport - Intelligence Gathering Agent",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/dependabot-go-checker.lock.yml b/.github/workflows/dependabot-go-checker.lock.yml
index d6c1a07f22..3984f8b5c2 100644
--- a/.github/workflows/dependabot-go-checker.lock.yml
+++ b/.github/workflows/dependabot-go-checker.lock.yml
@@ -1916,7 +1916,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Dependabot Dependency Checker",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/dev-hawk.lock.yml b/.github/workflows/dev-hawk.lock.yml
index e48f558762..8f3fc105d2 100644
--- a/.github/workflows/dev-hawk.lock.yml
+++ b/.github/workflows/dev-hawk.lock.yml
@@ -1866,7 +1866,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Dev Hawk",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/dev.lock.yml b/.github/workflows/dev.lock.yml
index 666e16b51e..00a614e66a 100644
--- a/.github/workflows/dev.lock.yml
+++ b/.github/workflows/dev.lock.yml
@@ -3221,7 +3221,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Dev",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/developer-docs-consolidator.lock.yml b/.github/workflows/developer-docs-consolidator.lock.yml
index 7aa295d72b..bb44f5acf2 100644
--- a/.github/workflows/developer-docs-consolidator.lock.yml
+++ b/.github/workflows/developer-docs-consolidator.lock.yml
@@ -2039,7 +2039,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Developer Documentation Consolidator",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/dictation-prompt.lock.yml b/.github/workflows/dictation-prompt.lock.yml
index 6a109b5d1a..db3240bae8 100644
--- a/.github/workflows/dictation-prompt.lock.yml
+++ b/.github/workflows/dictation-prompt.lock.yml
@@ -1858,7 +1858,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Dictation Prompt Generator",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/docs-noob-tester.lock.yml b/.github/workflows/docs-noob-tester.lock.yml
index e555e112b9..4fa72eaa61 100644
--- a/.github/workflows/docs-noob-tester.lock.yml
+++ b/.github/workflows/docs-noob-tester.lock.yml
@@ -1884,7 +1884,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Documentation Noob Tester",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/duplicate-code-detector.lock.yml b/.github/workflows/duplicate-code-detector.lock.yml
index 531906749b..0fea84c1eb 100644
--- a/.github/workflows/duplicate-code-detector.lock.yml
+++ b/.github/workflows/duplicate-code-detector.lock.yml
@@ -1868,7 +1868,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Duplicate Code Detector",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/example-permissions-warning.lock.yml b/.github/workflows/example-permissions-warning.lock.yml
index 4531f1ffb2..a366353362 100644
--- a/.github/workflows/example-permissions-warning.lock.yml
+++ b/.github/workflows/example-permissions-warning.lock.yml
@@ -324,7 +324,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Example: Properly Provisioned Permissions",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/example-workflow-analyzer.lock.yml b/.github/workflows/example-workflow-analyzer.lock.yml
index 6686fdb60c..275a223f2f 100644
--- a/.github/workflows/example-workflow-analyzer.lock.yml
+++ b/.github/workflows/example-workflow-analyzer.lock.yml
@@ -1957,7 +1957,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Weekly Workflow Analysis",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/firewall-escape.lock.yml b/.github/workflows/firewall-escape.lock.yml
index 000f58602a..3a1d9e36cc 100644
--- a/.github/workflows/firewall-escape.lock.yml
+++ b/.github/workflows/firewall-escape.lock.yml
@@ -364,7 +364,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Firewall Escape",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/firewall.lock.yml b/.github/workflows/firewall.lock.yml
index fa460d9d6c..363961e9f7 100644
--- a/.github/workflows/firewall.lock.yml
+++ b/.github/workflows/firewall.lock.yml
@@ -337,7 +337,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Firewall Test Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/github-mcp-structural-analysis.lock.yml b/.github/workflows/github-mcp-structural-analysis.lock.yml
index cff29ed2dc..8b8f339397 100644
--- a/.github/workflows/github-mcp-structural-analysis.lock.yml
+++ b/.github/workflows/github-mcp-structural-analysis.lock.yml
@@ -2009,7 +2009,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "GitHub MCP Structural Analysis",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/github-mcp-tools-report.lock.yml b/.github/workflows/github-mcp-tools-report.lock.yml
index a80fcf1e75..40a0efcdba 100644
--- a/.github/workflows/github-mcp-tools-report.lock.yml
+++ b/.github/workflows/github-mcp-tools-report.lock.yml
@@ -1977,7 +1977,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "GitHub MCP Remote Server Tools Report Generator",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/glossary-maintainer.lock.yml b/.github/workflows/glossary-maintainer.lock.yml
index 93024265d2..2e25029ba1 100644
--- a/.github/workflows/glossary-maintainer.lock.yml
+++ b/.github/workflows/glossary-maintainer.lock.yml
@@ -1893,7 +1893,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Glossary Maintainer",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/go-fan.lock.yml b/.github/workflows/go-fan.lock.yml
index 2d4c15487e..a68b25a775 100644
--- a/.github/workflows/go-fan.lock.yml
+++ b/.github/workflows/go-fan.lock.yml
@@ -1975,7 +1975,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Go Fan",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/go-file-size-reduction-project64.campaign.g.lock.yml b/.github/workflows/go-file-size-reduction-project64.campaign.g.lock.yml
index f9c815dd50..1b57eae222 100644
--- a/.github/workflows/go-file-size-reduction-project64.campaign.g.lock.yml
+++ b/.github/workflows/go-file-size-reduction-project64.campaign.g.lock.yml
@@ -1909,7 +1909,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Go File Size Reduction Campaign (Project 64)",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/go-file-size-reduction.campaign.g.lock.yml b/.github/workflows/go-file-size-reduction.campaign.g.lock.yml
index efecdf1eab..fa3379507f 100644
--- a/.github/workflows/go-file-size-reduction.campaign.g.lock.yml
+++ b/.github/workflows/go-file-size-reduction.campaign.g.lock.yml
@@ -1909,7 +1909,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Go File Size Reduction Campaign",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/go-logger.lock.yml b/.github/workflows/go-logger.lock.yml
index 50ee95524f..972a1b5bfe 100644
--- a/.github/workflows/go-logger.lock.yml
+++ b/.github/workflows/go-logger.lock.yml
@@ -1972,7 +1972,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Go Logger Enhancement",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/go-pattern-detector.lock.yml b/.github/workflows/go-pattern-detector.lock.yml
index 6520465204..7635572c50 100644
--- a/.github/workflows/go-pattern-detector.lock.yml
+++ b/.github/workflows/go-pattern-detector.lock.yml
@@ -1969,7 +1969,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Go Pattern Detector",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/grumpy-reviewer.lock.yml b/.github/workflows/grumpy-reviewer.lock.yml
index ecb6202f5a..538286d152 100644
--- a/.github/workflows/grumpy-reviewer.lock.yml
+++ b/.github/workflows/grumpy-reviewer.lock.yml
@@ -2655,7 +2655,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Grumpy Code Reviewer 🔥",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/hourly-ci-cleaner.lock.yml b/.github/workflows/hourly-ci-cleaner.lock.yml
index 03249247f8..addfc0f38e 100644
--- a/.github/workflows/hourly-ci-cleaner.lock.yml
+++ b/.github/workflows/hourly-ci-cleaner.lock.yml
@@ -1886,7 +1886,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Hourly CI Cleaner",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/human-ai-collaboration.lock.yml b/.github/workflows/human-ai-collaboration.lock.yml
index 11e3551899..2f3abdf95e 100644
--- a/.github/workflows/human-ai-collaboration.lock.yml
+++ b/.github/workflows/human-ai-collaboration.lock.yml
@@ -1896,7 +1896,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Human-AI Collaboration Campaign",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/incident-response.lock.yml b/.github/workflows/incident-response.lock.yml
index 19e2275a2c..1f0847b44e 100644
--- a/.github/workflows/incident-response.lock.yml
+++ b/.github/workflows/incident-response.lock.yml
@@ -2047,7 +2047,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Campaign - Incident Response",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/instructions-janitor.lock.yml b/.github/workflows/instructions-janitor.lock.yml
index f3140d216a..b711298381 100644
--- a/.github/workflows/instructions-janitor.lock.yml
+++ b/.github/workflows/instructions-janitor.lock.yml
@@ -1956,7 +1956,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Instructions Janitor",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/intelligence.lock.yml b/.github/workflows/intelligence.lock.yml
index ef2630a51e..02d595f10e 100644
--- a/.github/workflows/intelligence.lock.yml
+++ b/.github/workflows/intelligence.lock.yml
@@ -1979,7 +1979,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Campaign Intelligence System",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/issue-arborist.lock.yml b/.github/workflows/issue-arborist.lock.yml
index ee8dcf08ed..a1bc2b2138 100644
--- a/.github/workflows/issue-arborist.lock.yml
+++ b/.github/workflows/issue-arborist.lock.yml
@@ -1948,7 +1948,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Issue Arborist",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/issue-classifier.lock.yml b/.github/workflows/issue-classifier.lock.yml
index b9f8cb48ba..d09ebbdb02 100644
--- a/.github/workflows/issue-classifier.lock.yml
+++ b/.github/workflows/issue-classifier.lock.yml
@@ -2504,7 +2504,6 @@ jobs:
               model: process.env. || "",
               version: "",
               agent_version: "",
-              cli_version: "98a7cdf",
               workflow_name: "Issue Classifier",
               experimental: false,
               supports_tools_allowlist: false,
diff --git a/.github/workflows/issue-monster.lock.yml b/.github/workflows/issue-monster.lock.yml
index 2ed7766d9c..015b98fc9f 100644
--- a/.github/workflows/issue-monster.lock.yml
+++ b/.github/workflows/issue-monster.lock.yml
@@ -1876,7 +1876,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Issue Monster",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/issue-triage-agent.lock.yml b/.github/workflows/issue-triage-agent.lock.yml
index 91764c9a2f..bf29c263a1 100644
--- a/.github/workflows/issue-triage-agent.lock.yml
+++ b/.github/workflows/issue-triage-agent.lock.yml
@@ -1822,7 +1822,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Issue Triage Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/jsweep.lock.yml b/.github/workflows/jsweep.lock.yml
index aebf223233..f3ca263cfd 100644
--- a/.github/workflows/jsweep.lock.yml
+++ b/.github/workflows/jsweep.lock.yml
@@ -1890,7 +1890,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "jsweep - JavaScript Unbloater",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/layout-spec-maintainer.lock.yml b/.github/workflows/layout-spec-maintainer.lock.yml
index ced8e96df9..dc1374e6a6 100644
--- a/.github/workflows/layout-spec-maintainer.lock.yml
+++ b/.github/workflows/layout-spec-maintainer.lock.yml
@@ -1860,7 +1860,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Layout Specification Maintainer",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/lockfile-stats.lock.yml b/.github/workflows/lockfile-stats.lock.yml
index bb18d41e2d..5fb0e14584 100644
--- a/.github/workflows/lockfile-stats.lock.yml
+++ b/.github/workflows/lockfile-stats.lock.yml
@@ -1950,7 +1950,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Lockfile Statistics Analysis Agent",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/mcp-inspector.lock.yml b/.github/workflows/mcp-inspector.lock.yml
index 63d04069da..2b95185739 100644
--- a/.github/workflows/mcp-inspector.lock.yml
+++ b/.github/workflows/mcp-inspector.lock.yml
@@ -2144,7 +2144,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "MCP Inspector Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/mergefest.lock.yml b/.github/workflows/mergefest.lock.yml
index a93ba009ba..2eb3198a9d 100644
--- a/.github/workflows/mergefest.lock.yml
+++ b/.github/workflows/mergefest.lock.yml
@@ -2251,7 +2251,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Mergefest",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/notion-issue-summary.lock.yml b/.github/workflows/notion-issue-summary.lock.yml
index 64834934e3..42bf677fda 100644
--- a/.github/workflows/notion-issue-summary.lock.yml
+++ b/.github/workflows/notion-issue-summary.lock.yml
@@ -1821,7 +1821,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Issue Summary to Notion",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/org-health-report.lock.yml b/.github/workflows/org-health-report.lock.yml
index 24a08935b6..77adbcc85b 100644
--- a/.github/workflows/org-health-report.lock.yml
+++ b/.github/workflows/org-health-report.lock.yml
@@ -1925,7 +1925,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Organization Health Report",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/org-wide-rollout.lock.yml b/.github/workflows/org-wide-rollout.lock.yml
index f8027a9ce5..61b2721dec 100644
--- a/.github/workflows/org-wide-rollout.lock.yml
+++ b/.github/workflows/org-wide-rollout.lock.yml
@@ -2054,7 +2054,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Campaign - Org-Wide Rollout",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/pdf-summary.lock.yml b/.github/workflows/pdf-summary.lock.yml
index 7f2421ce4b..c642669482 100644
--- a/.github/workflows/pdf-summary.lock.yml
+++ b/.github/workflows/pdf-summary.lock.yml
@@ -2612,7 +2612,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Resource Summarizer Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/plan.lock.yml b/.github/workflows/plan.lock.yml
index fb6b9101be..85b69cd13f 100644
--- a/.github/workflows/plan.lock.yml
+++ b/.github/workflows/plan.lock.yml
@@ -2659,7 +2659,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Plan Command",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/poem-bot.lock.yml b/.github/workflows/poem-bot.lock.yml
index ebfde83ec1..dc89da5530 100644
--- a/.github/workflows/poem-bot.lock.yml
+++ b/.github/workflows/poem-bot.lock.yml
@@ -3118,7 +3118,6 @@ jobs:
               model: "gpt-5",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Poem Bot - A Creative Agentic Workflow",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/portfolio-analyst.lock.yml b/.github/workflows/portfolio-analyst.lock.yml
index 92a64c0d50..6811407bf8 100644
--- a/.github/workflows/portfolio-analyst.lock.yml
+++ b/.github/workflows/portfolio-analyst.lock.yml
@@ -1954,7 +1954,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Automated Portfolio Analyst",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/pr-nitpick-reviewer.lock.yml b/.github/workflows/pr-nitpick-reviewer.lock.yml
index a3bd4e83c0..33ddc4d0eb 100644
--- a/.github/workflows/pr-nitpick-reviewer.lock.yml
+++ b/.github/workflows/pr-nitpick-reviewer.lock.yml
@@ -2411,7 +2411,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "PR Nitpick Reviewer 🔍",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/prompt-clustering-analysis.lock.yml b/.github/workflows/prompt-clustering-analysis.lock.yml
index f8d766df3f..73ae33ea2d 100644
--- a/.github/workflows/prompt-clustering-analysis.lock.yml
+++ b/.github/workflows/prompt-clustering-analysis.lock.yml
@@ -2027,7 +2027,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Copilot Agent Prompt Clustering Analysis",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/python-data-charts.lock.yml b/.github/workflows/python-data-charts.lock.yml
index f656e50e5b..5932933261 100644
--- a/.github/workflows/python-data-charts.lock.yml
+++ b/.github/workflows/python-data-charts.lock.yml
@@ -1942,7 +1942,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Python Data Visualization Generator",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/q.lock.yml b/.github/workflows/q.lock.yml
index c0f1f86cef..0274cd8d19 100644
--- a/.github/workflows/q.lock.yml
+++ b/.github/workflows/q.lock.yml
@@ -2722,7 +2722,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Q",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/release.lock.yml b/.github/workflows/release.lock.yml
index 575ccd08b4..c8ca8f9ed7 100644
--- a/.github/workflows/release.lock.yml
+++ b/.github/workflows/release.lock.yml
@@ -1859,7 +1859,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Release",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/repo-tree-map.lock.yml b/.github/workflows/repo-tree-map.lock.yml
index 99509854c6..f716d47bcd 100644
--- a/.github/workflows/repo-tree-map.lock.yml
+++ b/.github/workflows/repo-tree-map.lock.yml
@@ -1849,7 +1849,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Repository Tree Map Generator",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/repository-quality-improver.lock.yml b/.github/workflows/repository-quality-improver.lock.yml
index 6b80f667db..3ecd8edbcb 100644
--- a/.github/workflows/repository-quality-improver.lock.yml
+++ b/.github/workflows/repository-quality-improver.lock.yml
@@ -1880,7 +1880,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Repository Quality Improvement Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/research.lock.yml b/.github/workflows/research.lock.yml
index 336d5a79d9..ccaf777cc3 100644
--- a/.github/workflows/research.lock.yml
+++ b/.github/workflows/research.lock.yml
@@ -1865,7 +1865,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Basic Research Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/safe-output-health.lock.yml b/.github/workflows/safe-output-health.lock.yml
index a7acf451b0..eb572eec6d 100644
--- a/.github/workflows/safe-output-health.lock.yml
+++ b/.github/workflows/safe-output-health.lock.yml
@@ -1979,7 +1979,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Safe Output Health Monitor",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/schema-consistency-checker.lock.yml b/.github/workflows/schema-consistency-checker.lock.yml
index 27cba1bd8e..f57d739735 100644
--- a/.github/workflows/schema-consistency-checker.lock.yml
+++ b/.github/workflows/schema-consistency-checker.lock.yml
@@ -1914,7 +1914,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Schema Consistency Checker",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/scout.lock.yml b/.github/workflows/scout.lock.yml
index 7240da8dac..ddb98b94d0 100644
--- a/.github/workflows/scout.lock.yml
+++ b/.github/workflows/scout.lock.yml
@@ -2765,7 +2765,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Scout",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/security-compliance.lock.yml b/.github/workflows/security-compliance.lock.yml
index c076092d07..f6bafc7afe 100644
--- a/.github/workflows/security-compliance.lock.yml
+++ b/.github/workflows/security-compliance.lock.yml
@@ -1901,7 +1901,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Security Compliance Campaign",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/security-fix-pr.lock.yml b/.github/workflows/security-fix-pr.lock.yml
index 2c6c9f7c92..7357a0a653 100644
--- a/.github/workflows/security-fix-pr.lock.yml
+++ b/.github/workflows/security-fix-pr.lock.yml
@@ -1964,7 +1964,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Security Fix PR",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/semantic-function-refactor.lock.yml b/.github/workflows/semantic-function-refactor.lock.yml
index 493c739a21..efb7333880 100644
--- a/.github/workflows/semantic-function-refactor.lock.yml
+++ b/.github/workflows/semantic-function-refactor.lock.yml
@@ -1994,7 +1994,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Semantic Function Refactoring",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/slide-deck-maintainer.lock.yml b/.github/workflows/slide-deck-maintainer.lock.yml
index 8cd9ceaef2..9e108043e5 100644
--- a/.github/workflows/slide-deck-maintainer.lock.yml
+++ b/.github/workflows/slide-deck-maintainer.lock.yml
@@ -1895,7 +1895,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Slide Deck Maintainer",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-claude.lock.yml b/.github/workflows/smoke-claude.lock.yml
index 5c3db7c7c7..5e469afa77 100644
--- a/.github/workflows/smoke-claude.lock.yml
+++ b/.github/workflows/smoke-claude.lock.yml
@@ -2500,7 +2500,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Claude",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-codex-firewall.lock.yml b/.github/workflows/smoke-codex-firewall.lock.yml
index 9768fd2fd6..b88c1e6db9 100644
--- a/.github/workflows/smoke-codex-firewall.lock.yml
+++ b/.github/workflows/smoke-codex-firewall.lock.yml
@@ -2358,7 +2358,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Codex Firewall",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-codex.lock.yml b/.github/workflows/smoke-codex.lock.yml
index fd255ee266..4a60b477a9 100644
--- a/.github/workflows/smoke-codex.lock.yml
+++ b/.github/workflows/smoke-codex.lock.yml
@@ -2415,7 +2415,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CODEX || "",
               version: "",
               agent_version: "0.75.0",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Codex",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-copilot-no-firewall.lock.yml b/.github/workflows/smoke-copilot-no-firewall.lock.yml
index a071a5083c..ec7de7bbfd 100644
--- a/.github/workflows/smoke-copilot-no-firewall.lock.yml
+++ b/.github/workflows/smoke-copilot-no-firewall.lock.yml
@@ -3704,7 +3704,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Copilot No Firewall",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-copilot-playwright.lock.yml b/.github/workflows/smoke-copilot-playwright.lock.yml
index 782ba6d12f..5735d77206 100644
--- a/.github/workflows/smoke-copilot-playwright.lock.yml
+++ b/.github/workflows/smoke-copilot-playwright.lock.yml
@@ -3803,7 +3803,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Copilot Playwright",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-copilot-safe-inputs.lock.yml b/.github/workflows/smoke-copilot-safe-inputs.lock.yml
index 22393ff11a..3f43a0abc1 100644
--- a/.github/workflows/smoke-copilot-safe-inputs.lock.yml
+++ b/.github/workflows/smoke-copilot-safe-inputs.lock.yml
@@ -3653,7 +3653,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Copilot Safe Inputs",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-copilot.lock.yml b/.github/workflows/smoke-copilot.lock.yml
index f239e98d38..aa7eaf20c3 100644
--- a/.github/workflows/smoke-copilot.lock.yml
+++ b/.github/workflows/smoke-copilot.lock.yml
@@ -2368,7 +2368,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Copilot",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-detector.lock.yml b/.github/workflows/smoke-detector.lock.yml
index 1997fc1540..2beb8132b7 100644
--- a/.github/workflows/smoke-detector.lock.yml
+++ b/.github/workflows/smoke-detector.lock.yml
@@ -2458,7 +2458,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke Detector - Smoke Test Failure Investigator",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-srt-custom-config.lock.yml b/.github/workflows/smoke-srt-custom-config.lock.yml
index 5cf8fd9567..11d49575b6 100644
--- a/.github/workflows/smoke-srt-custom-config.lock.yml
+++ b/.github/workflows/smoke-srt-custom-config.lock.yml
@@ -332,7 +332,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke SRT Custom Config",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/smoke-srt.lock.yml b/.github/workflows/smoke-srt.lock.yml
index 60a183fb93..be59a2f71b 100644
--- a/.github/workflows/smoke-srt.lock.yml
+++ b/.github/workflows/smoke-srt.lock.yml
@@ -1804,7 +1804,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Smoke SRT",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/spec-kit-execute.lock.yml b/.github/workflows/spec-kit-execute.lock.yml
index bd5321b9d3..86a2077a5a 100644
--- a/.github/workflows/spec-kit-execute.lock.yml
+++ b/.github/workflows/spec-kit-execute.lock.yml
@@ -1861,7 +1861,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Spec-Kit Execute",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/spec-kit-executor.lock.yml b/.github/workflows/spec-kit-executor.lock.yml
index 7ccadcbc31..dc63a0f563 100644
--- a/.github/workflows/spec-kit-executor.lock.yml
+++ b/.github/workflows/spec-kit-executor.lock.yml
@@ -1899,7 +1899,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Spec Kit Executor",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/speckit-dispatcher.lock.yml b/.github/workflows/speckit-dispatcher.lock.yml
index f3c9ab80d6..d6a1812a23 100644
--- a/.github/workflows/speckit-dispatcher.lock.yml
+++ b/.github/workflows/speckit-dispatcher.lock.yml
@@ -2703,7 +2703,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Spec-Kit Command Dispatcher",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/stale-repo-identifier.lock.yml b/.github/workflows/stale-repo-identifier.lock.yml
index 20e7351189..83cd0874ca 100644
--- a/.github/workflows/stale-repo-identifier.lock.yml
+++ b/.github/workflows/stale-repo-identifier.lock.yml
@@ -1991,7 +1991,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Stale Repository Identifier",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/static-analysis-report.lock.yml b/.github/workflows/static-analysis-report.lock.yml
index ec656c2914..dae2fd7152 100644
--- a/.github/workflows/static-analysis-report.lock.yml
+++ b/.github/workflows/static-analysis-report.lock.yml
@@ -1972,7 +1972,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Static Analysis Report",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/sub-issue-closer.lock.yml b/.github/workflows/sub-issue-closer.lock.yml
index 3b8a7f20fb..62aa303e5f 100644
--- a/.github/workflows/sub-issue-closer.lock.yml
+++ b/.github/workflows/sub-issue-closer.lock.yml
@@ -1887,7 +1887,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Sub-Issue Closer",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/super-linter.lock.yml b/.github/workflows/super-linter.lock.yml
index 98d33a10d3..0ead0cf884 100644
--- a/.github/workflows/super-linter.lock.yml
+++ b/.github/workflows/super-linter.lock.yml
@@ -1893,7 +1893,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Super Linter Report",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/technical-doc-writer.lock.yml b/.github/workflows/technical-doc-writer.lock.yml
index 6f3f208e15..8f7797a55c 100644
--- a/.github/workflows/technical-doc-writer.lock.yml
+++ b/.github/workflows/technical-doc-writer.lock.yml
@@ -1962,7 +1962,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Technical Doc Writer",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml
index 224e5b15e2..609e3cbe6d 100644
--- a/.github/workflows/tidy.lock.yml
+++ b/.github/workflows/tidy.lock.yml
@@ -2334,7 +2334,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Tidy",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/typist.lock.yml b/.github/workflows/typist.lock.yml
index 884aa291cf..1e1457c4f4 100644
--- a/.github/workflows/typist.lock.yml
+++ b/.github/workflows/typist.lock.yml
@@ -1959,7 +1959,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Typist - Go Type Analysis",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/unbloat-docs.lock.yml b/.github/workflows/unbloat-docs.lock.yml
index 32f7fd8218..54fb455535 100644
--- a/.github/workflows/unbloat-docs.lock.yml
+++ b/.github/workflows/unbloat-docs.lock.yml
@@ -2475,7 +2475,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_CLAUDE || "",
               version: "",
               agent_version: "2.0.73",
-              cli_version: "98a7cdf",
               workflow_name: "Documentation Unbloat",
               experimental: true,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/video-analyzer.lock.yml b/.github/workflows/video-analyzer.lock.yml
index be00ebd976..4447fdafda 100644
--- a/.github/workflows/video-analyzer.lock.yml
+++ b/.github/workflows/video-analyzer.lock.yml
@@ -1880,7 +1880,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Video Analysis Agent",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/weekly-issue-summary.lock.yml b/.github/workflows/weekly-issue-summary.lock.yml
index eb4f165fd3..9a8191778b 100644
--- a/.github/workflows/weekly-issue-summary.lock.yml
+++ b/.github/workflows/weekly-issue-summary.lock.yml
@@ -1876,7 +1876,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "98a7cdf",
               workflow_name: "Weekly Issue Summary",
               experimental: false,
               supports_tools_allowlist: true,
diff --git a/.github/workflows/workflow-generator.lock.yml b/.github/workflows/workflow-generator.lock.yml
index e3078b09ed..730f37980c 100644
--- a/.github/workflows/workflow-generator.lock.yml
+++ b/.github/workflows/workflow-generator.lock.yml
@@ -1937,7 +1937,6 @@ jobs:
               model: process.env.GH_AW_MODEL_AGENT_COPILOT || "",
               version: "",
               agent_version: "0.0.371",
-              cli_version: "5634d5b",
               workflow_name: "Workflow Generator",
               experimental: false,
               supports_tools_allowlist: true,
@@ -2048,26 +2047,39 @@ jobs:
           
           This issue has been assigned to an AI agent for workflow design. The agent will:
           
-          1. **Parse the workflow requirements** from the information provided above
-          2. **Generate a NEW workflow specification file** (`.md`) with appropriate triggers, tools, and safe outputs
-          3. **Create a pull request** with the new workflow file at `.github/workflows/<workflow-name>.md`
+          1. **Parse the workflow requirements** from the issue form fields above:
+             - Workflow Name
+             - Workflow Description
+             - Additional Context (if provided)
           
-          **IMPORTANT**: The agent will create a NEW workflow file following best practices for:
-          - Security (minimal permissions, safe outputs for write operations)
-          - Appropriate triggers (issues, pull requests, schedule, workflow_dispatch, etc.)
-          - Necessary tools and MCP servers
-          - Network restrictions when needed
-          - Proper safe output configuration for GitHub operations
+          2. **Generate a NEW workflow specification file** (`.md`) with:
+             - Kebab-case workflow ID derived from the name
+             - Complete YAML frontmatter (triggers, permissions, engine, tools, safe-outputs)
+             - Clear prompt body with instructions for the AI agent
+             - Security best practices applied
           
-          The workflow specification will include:
-          - Frontmatter with triggers, permissions, engine, and tools
-          - Clear prompt instructions for the AI agent
-          - Safe output configuration for any write operations
-          - Security best practices (network restrictions, minimal permissions)
+          3. **Compile the workflow** using `gh aw compile <workflow-id>` to generate the `.lock.yml` file
+          
+          4. **Create a pull request** with BOTH files:
+             - `.github/workflows/<workflow-id>.md` (source)
+             - `.github/workflows/<workflow-id>.lock.yml` (compiled)
+          
+          **IMPORTANT - Issue Form Mode**: The agent operates in non-interactive mode and will:
+          - Parse the issue form data directly
+          - Make intelligent decisions about triggers, tools, and permissions based on the description
+          - Create a complete, working workflow without back-and-forth conversation
+          - Follow the same pattern as the campaign generator
+          
+          **Best Practices Applied:**
+          - Security: minimal permissions, safe outputs for write operations
+          - Triggers: inferred from description (issues, pull_requests, schedule, workflow_dispatch)
+          - Tools: only include what's needed (github, web-fetch, playwright, etc.)
+          - Network: restricted to required domains/ecosystems
+          - Safe Outputs: for all GitHub write operations
           
           **Next Steps:**
-          - The AI agent will analyze your requirements and create a comprehensive workflow
-          - The workflow will be compiled automatically to ensure validity
+          - The AI agent will parse your requirements and generate a complete workflow
+          - Both `.md` and `.lock.yml` files will be included in the PR
           - Review the generated PR when it's ready
           - Merge the PR to activate your workflow
           ```
diff --git a/.github/workflows/workflow-generator.md b/.github/workflows/workflow-generator.md
index 0d2da1d07f..d7527095ca 100644
--- a/.github/workflows/workflow-generator.md
+++ b/.github/workflows/workflow-generator.md
@@ -53,26 +53,39 @@ When updating the issue body, append the following instructions to make it clear
 
 This issue has been assigned to an AI agent for workflow design. The agent will:
 
-1. **Parse the workflow requirements** from the information provided above
-2. **Generate a NEW workflow specification file** (`.md`) with appropriate triggers, tools, and safe outputs
-3. **Create a pull request** with the new workflow file at `.github/workflows/<workflow-name>.md`
-
-**IMPORTANT**: The agent will create a NEW workflow file following best practices for:
-- Security (minimal permissions, safe outputs for write operations)
-- Appropriate triggers (issues, pull requests, schedule, workflow_dispatch, etc.)
-- Necessary tools and MCP servers
-- Network restrictions when needed
-- Proper safe output configuration for GitHub operations
-
-The workflow specification will include:
-- Frontmatter with triggers, permissions, engine, and tools
-- Clear prompt instructions for the AI agent
-- Safe output configuration for any write operations
-- Security best practices (network restrictions, minimal permissions)
+1. **Parse the workflow requirements** from the issue form fields above:
+   - Workflow Name
+   - Workflow Description
+   - Additional Context (if provided)
+
+2. **Generate a NEW workflow specification file** (`.md`) with:
+   - Kebab-case workflow ID derived from the name
+   - Complete YAML frontmatter (triggers, permissions, engine, tools, safe-outputs)
+   - Clear prompt body with instructions for the AI agent
+   - Security best practices applied
+
+3. **Compile the workflow** using `gh aw compile <workflow-id>` to generate the `.lock.yml` file
+
+4. **Create a pull request** with BOTH files:
+   - `.github/workflows/<workflow-id>.md` (source)
+   - `.github/workflows/<workflow-id>.lock.yml` (compiled)
+
+**IMPORTANT - Issue Form Mode**: The agent operates in non-interactive mode and will:
+- Parse the issue form data directly
+- Make intelligent decisions about triggers, tools, and permissions based on the description
+- Create a complete, working workflow without back-and-forth conversation
+- Follow the same pattern as the campaign generator
+
+**Best Practices Applied:**
+- Security: minimal permissions, safe outputs for write operations
+- Triggers: inferred from description (issues, pull_requests, schedule, workflow_dispatch)
+- Tools: only include what's needed (github, web-fetch, playwright, etc.)
+- Network: restricted to required domains/ecosystems
+- Safe Outputs: for all GitHub write operations
 
 **Next Steps:**
-- The AI agent will analyze your requirements and create a comprehensive workflow
-- The workflow will be compiled automatically to ensure validity
+- The AI agent will parse your requirements and generate a complete workflow
+- Both `.md` and `.lock.yml` files will be included in the PR
 - Review the generated PR when it's ready
 - Merge the PR to activate your workflow
 ```
diff --git a/docs/src/content/docs/labs.mdx b/docs/src/content/docs/labs.mdx
index b44457084f..a45e4b1dc4 100644
--- a/docs/src/content/docs/labs.mdx
+++ b/docs/src/content/docs/labs.mdx
@@ -126,6 +126,7 @@ These are experimental agentic workflows used by the GitHub Next team to learn,
 | [Weekly Issue Summary](https://github.com/githubnext/gh-aw/blob/main/.github/workflows/weekly-issue-summary.md) | copilot | [![Weekly Issue Summary](https://github.com/githubnext/gh-aw/actions/workflows/weekly-issue-summary.lock.yml/badge.svg)](https://github.com/githubnext/gh-aw/actions/workflows/weekly-issue-summary.lock.yml) | `0 15 * * 1` | - |
 | [Weekly Workflow Analysis](https://github.com/githubnext/gh-aw/blob/main/.github/workflows/example-workflow-analyzer.md) | claude | [![Weekly Workflow Analysis](https://github.com/githubnext/gh-aw/actions/workflows/example-workflow-analyzer.lock.yml/badge.svg)](https://github.com/githubnext/gh-aw/actions/workflows/example-workflow-analyzer.lock.yml) | - | - |
 | [Workflow Craft Agent](https://github.com/githubnext/gh-aw/blob/main/.github/workflows/craft.md) | copilot | [![Workflow Craft Agent](https://github.com/githubnext/gh-aw/actions/workflows/craft.lock.yml/badge.svg)](https://github.com/githubnext/gh-aw/actions/workflows/craft.lock.yml) | - | - |
+| [Workflow Generator](https://github.com/githubnext/gh-aw/blob/main/.github/workflows/workflow-generator.md) | copilot | [![Workflow Generator](https://github.com/githubnext/gh-aw/actions/workflows/workflow-generator.lock.yml/badge.svg)](https://github.com/githubnext/gh-aw/actions/workflows/workflow-generator.lock.yml) | - | - |
 
 :::note
 Badges update automatically. Click badges for run details or workflow names for source files.
diff --git a/pkg/cli/templates/create-agentic-workflow.agent.md b/pkg/cli/templates/create-agentic-workflow.agent.md
index 8ebe48f002..dbdc53b75a 100644
--- a/pkg/cli/templates/create-agentic-workflow.agent.md
+++ b/pkg/cli/templates/create-agentic-workflow.agent.md
@@ -10,6 +10,40 @@ This file will configure the agent into a mode to create agentic workflows. Read
 You are an assistant specialized in **GitHub Agentic Workflows (gh-aw)**.
 Your job is to help the user create secure and valid **agentic workflows** in this repository, using the already-installed gh-aw CLI extension.
 
+## Two Modes of Operation
+
+This agent operates in two distinct modes:
+
+### Mode 1: Issue Form Mode (Non-Interactive)
+
+When triggered from a GitHub issue created via the "Create an Agentic Workflow" issue form:
+
+1. **Parse the Issue Form Data** - Extract workflow requirements from the issue body:
+   - **Workflow Name**: The `workflow_name` field from the issue form
+   - **Workflow Description**: The `workflow_description` field describing what to automate
+   - **Additional Context**: The optional `additional_context` field with extra requirements
+
+2. **Generate the Workflow Specification** - Create a complete `.md` workflow file without interaction:
+   - Analyze requirements and determine appropriate triggers (issues, pull_requests, schedule, workflow_dispatch)
+   - Determine required tools and MCP servers
+   - Configure safe outputs for any write operations
+   - Apply security best practices (minimal permissions, network restrictions)
+   - Generate a clear, actionable prompt for the AI agent
+
+3. **Create the Workflow File** at `.github/workflows/<workflow-id>.md`:
+   - Use a kebab-case workflow ID derived from the workflow name (e.g., "Issue Classifier" → "issue-classifier")
+   - **CRITICAL**: Before creating, check if the file exists. If it does, append a suffix like `-v2` or a timestamp
+   - Include complete frontmatter with all necessary configuration
+   - Write a clear prompt body with instructions for the AI agent
+
+4. **Compile the Workflow** using `gh aw compile <workflow-id>` to generate the `.lock.yml` file
+
+5. **Create a Pull Request** with both the `.md` and `.lock.yml` files
+
+### Mode 2: Interactive Mode (Conversational)
+
+When working directly with a user in a conversation:
+
 You are a conversational chat agent that interacts with the user to gather requirements and iteratively builds the workflow. Don't overwhelm the user with too many questions at once or long bullet points; always ask the user to express their intent in their own words and translate it in an agent workflow.
 
 - Do NOT tell me what you did until I ask you to as a question to the user.
@@ -32,7 +66,7 @@ You love to use emojis to make the conversation more engaging.
   - `gh aw compile --strict` → compile with strict mode validation (recommended for production)
   - `gh aw compile --purge` → remove stale lock files
 
-## Starting the conversation
+## Starting the conversation (Interactive Mode Only)
 
 1. **Initial Decision**
    Start by asking the user:
@@ -187,7 +221,7 @@ DO NOT ask all these questions at once; instead, engage in a back-and-forth conv
          - custom_function_2
    ```
 
-4. **Generate Workflows**
+4. **Generate Workflows** (Both Modes)
    - Author workflows in the **agentic markdown format** (frontmatter: `on:`, `permissions:`, `engine:`, `tools:`, `mcp-servers:`, `safe-outputs:`, `network:`, etc.).
    - Compile with `gh aw compile` to produce `.github/workflows/<name>.lock.yml`.
    - 💡 If the task benefits from **caching** (repeated model calls, large context reuse), suggest top-level **`cache-memory:`**.
@@ -199,16 +233,119 @@ DO NOT ask all these questions at once; instead, engage in a back-and-forth conv
      - Constrain `network:` to the minimum required ecosystems/domains.
      - Use sanitized expressions (`${{ needs.activation.outputs.text }}`) instead of raw event text.
 
-5. **Final words**
+## Issue Form Mode: Step-by-Step Workflow Creation
+
+When processing a GitHub issue created via the workflow creation form, follow these steps:
+
+### Step 1: Parse the Issue Form
+
+Extract the following fields from the issue body:
+- **Workflow Name** (required): Look for the "Workflow Name" section
+- **Workflow Description** (required): Look for the "Workflow Description" section
+- **Additional Context** (optional): Look for the "Additional Context" section
+
+Example issue body format:
+```
+### Workflow Name
+Issue Classifier
+
+### Workflow Description
+Automatically label issues based on their content
+
+### Additional Context (Optional)
+Should run when issues are opened or edited
+```
+
+### Step 2: Design the Workflow Specification
+
+Based on the parsed requirements, determine:
 
-    - After completing the workflow, inform the user:
-      - The workflow has been created and compiled successfully.
-      - Commit and push the changes to activate it.
+1. **Workflow ID**: Convert the workflow name to kebab-case (e.g., "Issue Classifier" → "issue-classifier")
+2. **Triggers**: Infer appropriate triggers from the description:
+   - Issue automation → `on: issues: types: [opened, edited]`
+   - PR automation → `on: pull_request: types: [opened, synchronize]`
+   - Scheduled tasks → `on: schedule: cron: daily` (use fuzzy scheduling)
+   - Manual runs → `on: workflow_dispatch`
+3. **Tools**: Determine required tools:
+   - GitHub API reads → `tools: github: toolsets: [default]`
+   - Web access → `tools: web-fetch:` and `network: allowed: [<domains>]`
+   - Browser automation → `tools: playwright:` and `network: allowed: [<domains>]`
+4. **Safe Outputs**: For any write operations:
+   - Creating issues → `safe-outputs: create-issue:`
+   - Commenting → `safe-outputs: add-comment:`
+   - Creating PRs → `safe-outputs: create-pull-request:`
+5. **Permissions**: Start with `permissions: read-all` and only add specific write permissions if absolutely necessary
+6. **Prompt Body**: Write clear, actionable instructions for the AI agent
+
+### Step 3: Create the Workflow File
+
+1. Check if `.github/workflows/<workflow-id>.md` already exists using the `view` tool
+2. If it exists, modify the workflow ID (append `-v2`, timestamp, or make it more specific)
+3. Create the file with:
+   - Complete YAML frontmatter
+   - Clear prompt instructions
+   - Security best practices applied
+
+Example workflow structure:
+```markdown
+---
+description: <Brief description of what this workflow does>
+on:
+  issues:
+    types: [opened, edited]
+permissions:
+  contents: read
+  issues: read
+engine: copilot
+tools:
+  github:
+    toolsets: [default]
+safe-outputs:
+  add-comment:
+    max: 1
+timeout-minutes: 5
+---
+
+# <Workflow Name>
+
+You are an AI agent that <what the agent does>.
+
+## Your Task
+
+<Clear, actionable instructions>
 
 ## Guidelines
 
-- Only edit the current agentic workflow file, no other files.
-- Use the `gh aw compile --strict` command to validate syntax.
-- Always follow security best practices (least privilege, safe outputs, constrained network).
-- The body of the markdown file is a prompt so use best practices for prompt engineering to format the body.
-- skip the summary at the end, keep it short.
+<Specific guidelines for behavior>
+```
+
+### Step 4: Compile the Workflow
+
+Run `gh aw compile <workflow-id>` to generate the `.lock.yml` file. This validates the syntax and produces the GitHub Actions workflow.
+
+### Step 5: Create a Pull Request
+
+Create a PR with both files:
+- `.github/workflows/<workflow-id>.md` (source workflow)
+- `.github/workflows/<workflow-id>.lock.yml` (compiled workflow)
+
+Include in the PR description:
+- What the workflow does
+- How it was generated from the issue form
+- Any assumptions made
+- Link to the original issue
+
+## Interactive Mode: Final Words
+
+- After completing the workflow, inform the user:
+  - The workflow has been created and compiled successfully.
+  - Commit and push the changes to activate it.
+
+## Guidelines (Both Modes)
+
+- In Issue Form Mode: Create NEW workflow files based on issue requirements
+- In Interactive Mode: Work with the user on the current agentic workflow file
+- Always use `gh aw compile --strict` to validate syntax
+- Always follow security best practices (least privilege, safe outputs, constrained network)
+- The body of the markdown file is a prompt, so use best practices for prompt engineering
+- Skip verbose summaries at the end, keep it concise