From 92e6d8de1eb364142b87f69a4e54dec0904c4c19 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 30 Apr 2026 00:54:17 +0000
Subject: [PATCH 1/5] Add skills.md and runtime detection for SKILL.md files in
 workflows

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/e00ec7fc-0ada-4438-b703-81c4b85f28d9

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 .github/aw/skills.md                          | 145 ++++++++++++++++++
 .github/workflows/ace-editor.lock.yml         |   3 +
 .../agent-performance-analyzer.lock.yml       |   3 +
 .../workflows/agent-persona-explorer.lock.yml |   3 +
 .github/workflows/ai-moderator.lock.yml       |   3 +
 .../workflows/api-consumption-report.lock.yml |   3 +
 .github/workflows/approach-validator.lock.yml |   3 +
 .github/workflows/archie.lock.yml             |   3 +
 .../workflows/architecture-guardian.lock.yml  |   3 +
 .github/workflows/artifacts-summary.lock.yml  |   3 +
 .github/workflows/audit-workflows.lock.yml    |   3 +
 .github/workflows/auto-triage-issues.lock.yml |   3 +
 .../aw-failure-investigator.lock.yml          |   3 +
 .github/workflows/blog-auditor.lock.yml       |   3 +
 .github/workflows/bot-detection.lock.yml      |   3 +
 .github/workflows/brave.lock.yml              |   3 +
 .../breaking-change-checker.lock.yml          |   3 +
 .github/workflows/changeset.lock.yml          |   3 +
 .github/workflows/ci-coach.lock.yml           |   3 +
 .github/workflows/ci-doctor.lock.yml          |   3 +
 .../claude-code-user-docs-review.lock.yml     |   3 +
 .../cli-consistency-checker.lock.yml          |   3 +
 .../workflows/cli-version-checker.lock.yml    |   3 +
 .github/workflows/cloclo.lock.yml             |   3 +
 .../workflows/code-scanning-fixer.lock.yml    |   3 +
 .github/workflows/code-simplifier.lock.yml    |   3 +
 .../codex-github-remote-mcp-test.lock.yml     |   3 +
 .../commit-changes-analyzer.lock.yml          |   3 +
 .../constraint-solving-potd.lock.yml          |   3 +
 .github/workflows/contribution-check.lock.yml |   3 +
 .../workflows/copilot-agent-analysis.lock.yml |   3 +
 .../copilot-cli-deep-research.lock.yml        |   3 +
 .github/workflows/copilot-opt.lock.yml        |   3 +
 .../copilot-pr-merged-report.lock.yml         |   3 +
 .../copilot-pr-nlp-analysis.lock.yml          |   3 +
 .../copilot-pr-prompt-analysis.lock.yml       |   3 +
 .../copilot-session-insights.lock.yml         |   3 +
 .../workflows/copilot-token-audit.lock.yml    |   3 +
 .../copilot-token-optimizer.lock.yml          |   3 +
 .github/workflows/craft.lock.yml              |   3 +
 .../daily-architecture-diagram.lock.yml       |   3 +
 .../daily-assign-issue-to-user.lock.yml       |   3 +
 ...strostylelite-markdown-spellcheck.lock.yml |   3 +
 ...daily-aw-cross-repo-compile-check.lock.yml |   3 +
 .../daily-cache-strategy-analyzer.lock.yml    |  15 +-
 .../daily-caveman-optimizer.lock.yml          |   3 +
 .github/workflows/daily-choice-test.lock.yml  |   3 +
 .../workflows/daily-cli-performance.lock.yml  |   3 +
 .../workflows/daily-cli-tools-tester.lock.yml |   3 +
 .github/workflows/daily-code-metrics.lock.yml |   3 +
 .../daily-community-attribution.lock.yml      |   3 +
 .../workflows/daily-compiler-quality.lock.yml |   3 +
 .github/workflows/daily-doc-healer.lock.yml   |   3 +
 .github/workflows/daily-doc-updater.lock.yml  |   3 +
 .github/workflows/daily-fact.lock.yml         |  15 +-
 .github/workflows/daily-file-diet.lock.yml    |   3 +
 .../workflows/daily-firewall-report.lock.yml  |   3 +
 .../workflows/daily-function-namer.lock.yml   |   3 +
 .github/workflows/daily-hippo-learn.lock.yml  |   3 +
 .../workflows/daily-issues-report.lock.yml    |   3 +
 .../daily-malicious-code-scan.lock.yml        |   3 +
 .../daily-mcp-concurrency-analysis.lock.yml   |   3 +
 .../daily-multi-device-docs-tester.lock.yml   |   3 +
 .github/workflows/daily-news.lock.yml         |   3 +
 .../daily-observability-report.lock.yml       |  15 +-
 ...aily-otel-instrumentation-advisor.lock.yml |   3 +
 .../daily-performance-summary.lock.yml        |   3 +
 .github/workflows/daily-regulatory.lock.yml   |   3 +
 .../daily-rendering-scripts-verifier.lock.yml |   3 +
 .../workflows/daily-repo-chronicle.lock.yml   |   3 +
 .../daily-safe-output-integrator.lock.yml     |   3 +
 .../daily-safe-output-optimizer.lock.yml      |   3 +
 .../daily-safe-outputs-conformance.lock.yml   |   3 +
 .../workflows/daily-secrets-analysis.lock.yml |   3 +
 .../daily-security-observability.lock.yml     |   3 +
 .../daily-security-red-team.lock.yml          |   3 +
 .github/workflows/daily-semgrep-scan.lock.yml |   3 +
 .../workflows/daily-sentrux-report.lock.yml   |   3 +
 .../workflows/daily-skill-optimizer.lock.yml  |   3 +
 .../daily-syntax-error-quality.lock.yml       |   3 +
 .../daily-team-evolution-insights.lock.yml    |   3 +
 .github/workflows/daily-team-status.lock.yml  |   3 +
 .../daily-testify-uber-super-expert.lock.yml  |   3 +
 .../daily-token-consumption-report.lock.yml   |   3 +
 .../workflows/daily-workflow-updater.lock.yml |   3 +
 .github/workflows/dead-code-remover.lock.yml  |   3 +
 .github/workflows/deep-report.lock.yml        |   3 +
 .github/workflows/delight.lock.yml            |   3 +
 .github/workflows/dependabot-burner.lock.yml  |   3 +
 .../workflows/dependabot-go-checker.lock.yml  |   3 +
 .github/workflows/dependabot-repair.lock.yml  |   3 +
 .../deployment-incident-monitor.lock.yml      |   3 +
 .../workflows/design-decision-gate.lock.yml   |   3 +
 .github/workflows/dev-hawk.lock.yml           |   3 +
 .github/workflows/dev.lock.yml                |   3 +
 .../developer-docs-consolidator.lock.yml      |   3 +
 .github/workflows/dictation-prompt.lock.yml   |   3 +
 .../workflows/discussion-task-miner.lock.yml  |   3 +
 .github/workflows/docs-noob-tester.lock.yml   |   3 +
 .github/workflows/draft-pr-cleanup.lock.yml   |   3 +
 .../duplicate-code-detector.lock.yml          |  15 +-
 .../example-permissions-warning.lock.yml      |   3 +
 .../example-workflow-analyzer.lock.yml        |   3 +
 .github/workflows/firewall-escape.lock.yml    |   3 +
 .github/workflows/firewall.lock.yml           |   3 +
 .../workflows/functional-pragmatist.lock.yml  |   3 +
 .../github-mcp-structural-analysis.lock.yml   |   3 +
 .../github-mcp-tools-report.lock.yml          |   3 +
 .../github-remote-mcp-auth-test.lock.yml      |   3 +
 .../workflows/glossary-maintainer.lock.yml    |   3 +
 .github/workflows/go-fan.lock.yml             |   3 +
 .github/workflows/go-logger.lock.yml          |   3 +
 .../workflows/go-pattern-detector.lock.yml    |   3 +
 .github/workflows/gpclean.lock.yml            |   3 +
 .github/workflows/grumpy-reviewer.lock.yml    |  15 +-
 .github/workflows/hippo-embed.lock.yml        |   3 +
 .github/workflows/hourly-ci-cleaner.lock.yml  |   3 +
 .../workflows/instructions-janitor.lock.yml   |   3 +
 .github/workflows/issue-arborist.lock.yml     |  15 +-
 .github/workflows/issue-monster.lock.yml      |   3 +
 .github/workflows/issue-triage-agent.lock.yml |   3 +
 .github/workflows/jsweep.lock.yml             |   3 +
 .../workflows/layout-spec-maintainer.lock.yml |   3 +
 .github/workflows/lockfile-stats.lock.yml     |   3 +
 .github/workflows/mcp-inspector.lock.yml      |   3 +
 .github/workflows/mergefest.lock.yml          |   3 +
 .github/workflows/metrics-collector.lock.yml  |   3 +
 .../workflows/notion-issue-summary.lock.yml   |   3 +
 .github/workflows/org-health-report.lock.yml  |   3 +
 .github/workflows/pdf-summary.lock.yml        |   3 +
 .github/workflows/plan.lock.yml               |   3 +
 .github/workflows/poem-bot.lock.yml           |   3 +
 .../workflows/pr-nitpick-reviewer.lock.yml    |   3 +
 .github/workflows/pr-triage-agent.lock.yml    |   3 +
 .../prompt-clustering-analysis.lock.yml       |   3 +
 .github/workflows/python-data-charts.lock.yml |   3 +
 .github/workflows/q.lock.yml                  |   3 +
 .../workflows/refactoring-cadence.lock.yml    |   3 +
 .github/workflows/refiner.lock.yml            |   3 +
 .github/workflows/release.lock.yml            |   3 +
 .../workflows/repo-audit-analyzer.lock.yml    |   3 +
 .github/workflows/repo-tree-map.lock.yml      |   3 +
 .../repository-quality-improver.lock.yml      |   3 +
 .github/workflows/research.lock.yml           |   3 +
 .github/workflows/safe-output-health.lock.yml |   3 +
 .../schema-consistency-checker.lock.yml       |   3 +
 .../schema-feature-coverage.lock.yml          |  15 +-
 .github/workflows/scout.lock.yml              |   3 +
 .../workflows/security-compliance.lock.yml    |   3 +
 .github/workflows/security-review.lock.yml    |   3 +
 .../semantic-function-refactor.lock.yml       |   3 +
 .github/workflows/sergo.lock.yml              |   3 +
 .../workflows/slide-deck-maintainer.lock.yml  |   3 +
 .../workflows/smoke-agent-all-merged.lock.yml |   3 +
 .../workflows/smoke-agent-all-none.lock.yml   |   3 +
 .../smoke-agent-public-approved.lock.yml      |   3 +
 .../smoke-agent-public-none.lock.yml          |   3 +
 .../smoke-agent-scoped-approved.lock.yml      |   3 +
 .../workflows/smoke-call-workflow.lock.yml    |  15 +-
 .github/workflows/smoke-ci.lock.yml           |   3 +
 .github/workflows/smoke-claude.lock.yml       |   3 +
 .github/workflows/smoke-codex.lock.yml        |  15 +-
 .github/workflows/smoke-copilot-arm.lock.yml  |   3 +
 .github/workflows/smoke-copilot.lock.yml      |   3 +
 .../smoke-create-cross-repo-pr.lock.yml       |   3 +
 .github/workflows/smoke-crush.lock.yml        |   3 +
 .github/workflows/smoke-gemini.lock.yml       |   3 +
 .github/workflows/smoke-multi-pr.lock.yml     |   3 +
 .github/workflows/smoke-opencode.lock.yml     |   3 +
 .github/workflows/smoke-project.lock.yml      |   3 +
 .../workflows/smoke-service-ports.lock.yml    |   3 +
 .github/workflows/smoke-temporary-id.lock.yml |   3 +
 .github/workflows/smoke-test-tools.lock.yml   |   3 +
 .../smoke-update-cross-repo-pr.lock.yml       |   3 +
 .../smoke-workflow-call-with-inputs.lock.yml  |   3 +
 .../workflows/smoke-workflow-call.lock.yml    |   3 +
 .github/workflows/spec-enforcer.lock.yml      |   3 +
 .github/workflows/spec-extractor.lock.yml     |   3 +
 .github/workflows/spec-librarian.lock.yml     |   3 +
 .../workflows/stale-repo-identifier.lock.yml  |   3 +
 .../workflows/static-analysis-report.lock.yml |   3 +
 .../workflows/step-name-alignment.lock.yml    |   3 +
 .github/workflows/sub-issue-closer.lock.yml   |   3 +
 .github/workflows/super-linter.lock.yml       |   3 +
 .../workflows/technical-doc-writer.lock.yml   |   3 +
 .github/workflows/terminal-stylist.lock.yml   |   3 +
 .../test-create-pr-error-handling.lock.yml    |   3 +
 .github/workflows/test-dispatcher.lock.yml    |   3 +
 .../test-project-url-default.lock.yml         |   3 +
 .../workflows/test-quality-sentinel.lock.yml  |   3 +
 .github/workflows/test-workflow.lock.yml      |   3 +
 .github/workflows/tidy.lock.yml               |   3 +
 .github/workflows/typist.lock.yml             |   3 +
 .../workflows/ubuntu-image-analyzer.lock.yml  |   3 +
 .github/workflows/unbloat-docs.lock.yml       |   3 +
 .github/workflows/update-astro.lock.yml       |   3 +
 .github/workflows/video-analyzer.lock.yml     |   3 +
 .../visual-regression-checker.lock.yml        |   3 +
 .../weekly-blog-post-writer.lock.yml          |   3 +
 .../weekly-editors-health-check.lock.yml      |   3 +
 .../workflows/weekly-issue-summary.lock.yml   |   3 +
 .../weekly-safe-outputs-spec-review.lock.yml  |   3 +
 .github/workflows/workflow-generator.lock.yml |   3 +
 .../workflow-health-manager.lock.yml          |   3 +
 .../workflows/workflow-normalizer.lock.yml    |   3 +
 .../workflow-skill-extractor.lock.yml         |   3 +
 actions/setup/md/skills_prompt.md             |  15 ++
 pkg/workflow/prompt_constants.go              |   1 +
 .../basic-copilot.golden                      |   3 +
 .../with-imports.golden                       |   3 +
 pkg/workflow/unified_prompt_step.go           |   8 +
 pkg/workflow/unified_prompt_step_test.go      |   5 +-
 212 files changed, 848 insertions(+), 55 deletions(-)
 create mode 100644 .github/aw/skills.md
 create mode 100644 actions/setup/md/skills_prompt.md

diff --git a/.github/aw/skills.md b/.github/aw/skills.md
new file mode 100644
index 00000000000..1d8ce023dd5
--- /dev/null
+++ b/.github/aw/skills.md
@@ -0,0 +1,145 @@
+---
+description: Guide for leveraging skills (SKILL.md files) in agentic workflows — hint strategy and fusion strategy
+---
+
+# Skills in Agentic Workflows
+
+Consult this file when you want a workflow to take advantage of skills — domain-specific knowledge files (`SKILL.md`) that live in the repository under `skills/` or `.github/skills/`.
+
+Skills are **not loaded automatically**. The workflow's prompt must direct the agent to either discover and read them at runtime, or have their relevant content fused into the prompt at authoring time.
+
+---
+
+## Detecting Skills
+
+At runtime, find skill files with:
+
+```bash
+find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6
+```
+
+List available skills and their locations before deciding which strategy to apply.
+
+---
+
+## Strategy 1 — Hint (Generalist)
+
+**Use when**: The task strategy is not fully known at authoring time, or when the agent must adapt to whatever skills are available.
+
+The workflow prompt hints that skills exist and asks the agent to discover and apply the relevant ones itself. The agent decides which skill files to read and how much of each to use.
+
+**Pattern**:
+
+```markdown
+If the repository contains `SKILL.md` files under `skills/`, check which ones are
+relevant to this task. For each relevant skill, read its content and apply the
+guidance it provides.
+```
+
+**When to prefer this**:
+- The task domain is broad or open-ended
+- You don't know at authoring time which skills will exist
+- You want the agent to self-select relevant skills from a growing library
+- The overhead of reading an extra file is acceptable
+
+**Tradeoff**: The agent may read and summarise more skill content than needed, which costs context tokens and can dilute focus.
+
+---
+
+## Strategy 2 — Fusion (Ultra-Cognitive)
+
+**Use when**: You know exactly which skill (or which part of a skill) is needed, and you want to minimise context overhead.
+
+Extract and inline **only the specific sections** of the skill content that the agent needs. Do not paste the entire SKILL.md; identify the minimal fragment, then remix it into the workflow prompt so the agent receives precise, surgical guidance without loading the full file.
+
+**Pattern**:
+
+```markdown
+<!-- From skills/github-mcp-server/SKILL.md — only the "authentication" section -->
+
+When calling GitHub MCP tools, use the pre-configured token already injected into the
+environment. Never prompt the user for credentials.
+```
+
+**When to prefer this**:
+- You know exactly which skill section applies
+- Context budget is limited (long prompts or many tools already registered)
+- The workflow runs frequently and latency matters
+- You want deterministic, stable behaviour without dynamic skill discovery
+
+**Tradeoff**: Requires manual authoring effort. If the upstream skill changes, the fused fragment must be updated by hand.
+
+---
+
+## Choosing Between the Two Strategies
+
+| Factor | Hint | Fusion |
+|---|---|---|
+| **Task domain** | Broad / unknown | Narrow / well-defined |
+| **Skill set** | Grows dynamically | Known and stable |
+| **Context budget** | Generous | Tight |
+| **Maintenance burden** | Low (agent self-selects) | Higher (manual sync with source) |
+| **Determinism** | Lower (agent chooses) | Higher (exact fragment) |
+| **Scale** | Poor (entire skills loaded) | Good (minimal content) |
+
+Fusion scales better because entire skills are never loaded. Prefer fusion when you know the task domain and the specific skill sections required.
+
+---
+
+## Example: Hint Strategy
+
+```markdown
+---
+on:
+  issues:
+    types: [opened]
+engine: copilot
+tools:
+  github:
+    toolsets: [issues]
+permissions:
+  issues: write
+---
+
+Triage the newly opened issue.
+
+If there are relevant skills under `skills/`, read them and apply their guidance.
+Focus on skills related to issue classification or project conventions.
+```
+
+---
+
+## Example: Fusion Strategy
+
+```markdown
+---
+on:
+  pull_request:
+    types: [opened, synchronize]
+engine: copilot
+tools:
+  github:
+    toolsets: [pull_requests]
+permissions:
+  pull-requests: write
+---
+
+Review the pull request for adherence to project conventions.
+
+<!-- Fused from skills/developer/SKILL.md#code-organization -->
+Prefer many smaller files grouped by functionality. Add new files for new features
+rather than extending existing ones. Keep validators under 300 lines; split when
+a single file covers more than one domain.
+<!-- End fusion -->
+
+Report findings as inline review comments.
+```
+
+---
+
+## Anti-Patterns
+
+- ❌ **Do not load entire skill files** when only one section is relevant — use fusion instead
+- ❌ **Do not hint without bounds** — if using the hint strategy, constrain the agent with a `maxdepth` and a relevance filter to avoid reading every SKILL.md in a large repo
+- ❌ **Do not paste skills verbatim** without adapting them to the workflow's context — fused fragments should read as natural prose, not as lifted documentation
+- ❌ **Do not hard-code skill file paths** in hints — use `find` so the prompt still works when skills are reorganised
diff --git a/.github/workflows/ace-editor.lock.yml b/.github/workflows/ace-editor.lock.yml
index 2aa7462d4f2..064659d8418 100644
--- a/.github/workflows/ace-editor.lock.yml
+++ b/.github/workflows/ace-editor.lock.yml
@@ -247,6 +247,9 @@ jobs:
           
           GH_AW_PROMPT_0571c40b9b9857c4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0571c40b9b9857c4_EOF'
           </system>
           {{#runtime-import .github/workflows/ace-editor.md}}
diff --git a/.github/workflows/agent-performance-analyzer.lock.yml b/.github/workflows/agent-performance-analyzer.lock.yml
index 624aaf00e78..39be7ed94f5 100644
--- a/.github/workflows/agent-performance-analyzer.lock.yml
+++ b/.github/workflows/agent-performance-analyzer.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_75bc7f749c7339be_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_75bc7f749c7339be_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/agent-persona-explorer.lock.yml b/.github/workflows/agent-persona-explorer.lock.yml
index 1a92ac2cfcf..a7934bed349 100644
--- a/.github/workflows/agent-persona-explorer.lock.yml
+++ b/.github/workflows/agent-persona-explorer.lock.yml
@@ -231,6 +231,9 @@ jobs:
           
           GH_AW_PROMPT_7a1be3299129c2b7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_7a1be3299129c2b7_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/ai-moderator.lock.yml b/.github/workflows/ai-moderator.lock.yml
index 5f6493b0803..92da0dc15ff 100644
--- a/.github/workflows/ai-moderator.lock.yml
+++ b/.github/workflows/ai-moderator.lock.yml
@@ -270,6 +270,9 @@ jobs:
           
           GH_AW_PROMPT_2854fab51269987e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2854fab51269987e_EOF'
           </system>
           {{#runtime-import .github/workflows/ai-moderator.md}}
diff --git a/.github/workflows/api-consumption-report.lock.yml b/.github/workflows/api-consumption-report.lock.yml
index 7cae7a69d89..8b312fb7ae5 100644
--- a/.github/workflows/api-consumption-report.lock.yml
+++ b/.github/workflows/api-consumption-report.lock.yml
@@ -247,6 +247,9 @@ jobs:
           
           GH_AW_PROMPT_2a3fea36388c950d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2a3fea36388c950d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/approach-validator.lock.yml b/.github/workflows/approach-validator.lock.yml
index 3183b0054e2..6b208c60939 100644
--- a/.github/workflows/approach-validator.lock.yml
+++ b/.github/workflows/approach-validator.lock.yml
@@ -260,6 +260,9 @@ jobs:
           
           GH_AW_PROMPT_c1826eb2224aa7ae_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c1826eb2224aa7ae_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/safe-output-upload-artifact.md}}
diff --git a/.github/workflows/archie.lock.yml b/.github/workflows/archie.lock.yml
index 03e0f225d11..b746a5d8df9 100644
--- a/.github/workflows/archie.lock.yml
+++ b/.github/workflows/archie.lock.yml
@@ -275,6 +275,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_87e239b174c50a03_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/architecture-guardian.lock.yml b/.github/workflows/architecture-guardian.lock.yml
index bde8af029af..47b8eb228f4 100644
--- a/.github/workflows/architecture-guardian.lock.yml
+++ b/.github/workflows/architecture-guardian.lock.yml
@@ -220,6 +220,9 @@ jobs:
           
           GH_AW_PROMPT_39c70d8a2443c5c7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_39c70d8a2443c5c7_EOF'
           </system>
           {{#runtime-import .github/workflows/architecture-guardian.md}}
diff --git a/.github/workflows/artifacts-summary.lock.yml b/.github/workflows/artifacts-summary.lock.yml
index 24d690d63b6..dd8187a9046 100644
--- a/.github/workflows/artifacts-summary.lock.yml
+++ b/.github/workflows/artifacts-summary.lock.yml
@@ -217,6 +217,9 @@ jobs:
           
           GH_AW_PROMPT_0b6cabe580a9c36c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0b6cabe580a9c36c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/audit-workflows.lock.yml b/.github/workflows/audit-workflows.lock.yml
index 2f3ee1b7e5e..d043776285c 100644
--- a/.github/workflows/audit-workflows.lock.yml
+++ b/.github/workflows/audit-workflows.lock.yml
@@ -251,6 +251,9 @@ jobs:
           
           GH_AW_PROMPT_a48b8f0681a71fa0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a48b8f0681a71fa0_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/auto-triage-issues.lock.yml b/.github/workflows/auto-triage-issues.lock.yml
index 57efadf9622..58ea9ed9144 100644
--- a/.github/workflows/auto-triage-issues.lock.yml
+++ b/.github/workflows/auto-triage-issues.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_acbbe709b3acdcf4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_acbbe709b3acdcf4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/aw-failure-investigator.lock.yml b/.github/workflows/aw-failure-investigator.lock.yml
index 0452262e8e7..beffe64817c 100644
--- a/.github/workflows/aw-failure-investigator.lock.yml
+++ b/.github/workflows/aw-failure-investigator.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_d2050658d4489b3f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_d2050658d4489b3f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/blog-auditor.lock.yml b/.github/workflows/blog-auditor.lock.yml
index 8315564fc42..20ffd51a208 100644
--- a/.github/workflows/blog-auditor.lock.yml
+++ b/.github/workflows/blog-auditor.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_771d61fb0fb5ffad_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_771d61fb0fb5ffad_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/bot-detection.lock.yml b/.github/workflows/bot-detection.lock.yml
index 4d557484718..b0679ddf6bf 100644
--- a/.github/workflows/bot-detection.lock.yml
+++ b/.github/workflows/bot-detection.lock.yml
@@ -226,6 +226,9 @@ jobs:
           
           GH_AW_PROMPT_5c36ab16716f9d71_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_5c36ab16716f9d71_EOF'
           </system>
           {{#runtime-import .github/workflows/bot-detection.md}}
diff --git a/.github/workflows/brave.lock.yml b/.github/workflows/brave.lock.yml
index 1aa2fcfe161..4ebfa352818 100644
--- a/.github/workflows/brave.lock.yml
+++ b/.github/workflows/brave.lock.yml
@@ -265,6 +265,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_49863381d8f5674f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/brave.md}}
diff --git a/.github/workflows/breaking-change-checker.lock.yml b/.github/workflows/breaking-change-checker.lock.yml
index 14b35ca92e3..7bf0e393a60 100644
--- a/.github/workflows/breaking-change-checker.lock.yml
+++ b/.github/workflows/breaking-change-checker.lock.yml
@@ -220,6 +220,9 @@ jobs:
           
           GH_AW_PROMPT_323d89b4a9e41164_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_323d89b4a9e41164_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/changeset.lock.yml b/.github/workflows/changeset.lock.yml
index 55a8f69e9c6..386b4eebd2c 100644
--- a/.github/workflows/changeset.lock.yml
+++ b/.github/workflows/changeset.lock.yml
@@ -270,6 +270,9 @@ jobs:
           
           GH_AW_PROMPT_f9230b228c3ade5f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f9230b228c3ade5f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/changeset-format.md}}
diff --git a/.github/workflows/ci-coach.lock.yml b/.github/workflows/ci-coach.lock.yml
index cf704f303fe..fafb303d8b2 100644
--- a/.github/workflows/ci-coach.lock.yml
+++ b/.github/workflows/ci-coach.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_7a2e23ba30062ebd_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/cli_proxy_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_7a2e23ba30062ebd_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/ci-data-analysis.md}}
diff --git a/.github/workflows/ci-doctor.lock.yml b/.github/workflows/ci-doctor.lock.yml
index d8d2a99c3b5..00b73dc0277 100644
--- a/.github/workflows/ci-doctor.lock.yml
+++ b/.github/workflows/ci-doctor.lock.yml
@@ -280,6 +280,9 @@ jobs:
           
           GH_AW_PROMPT_3107df830c29773c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_3107df830c29773c_EOF'
           </system>
           {{#runtime-import .github/workflows/ci-doctor.md}}
diff --git a/.github/workflows/claude-code-user-docs-review.lock.yml b/.github/workflows/claude-code-user-docs-review.lock.yml
index 90ded4a80a9..faa2aa06797 100644
--- a/.github/workflows/claude-code-user-docs-review.lock.yml
+++ b/.github/workflows/claude-code-user-docs-review.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_bc6f0c544c0b951b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_bc6f0c544c0b951b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/cli-consistency-checker.lock.yml b/.github/workflows/cli-consistency-checker.lock.yml
index 9493b13909c..3bff18d058d 100644
--- a/.github/workflows/cli-consistency-checker.lock.yml
+++ b/.github/workflows/cli-consistency-checker.lock.yml
@@ -214,6 +214,9 @@ jobs:
           
           GH_AW_PROMPT_c0f2a49a3806cd0a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c0f2a49a3806cd0a_EOF'
           </system>
           {{#runtime-import .github/workflows/cli-consistency-checker.md}}
diff --git a/.github/workflows/cli-version-checker.lock.yml b/.github/workflows/cli-version-checker.lock.yml
index 2f7f9d2e56b..1a15baba790 100644
--- a/.github/workflows/cli-version-checker.lock.yml
+++ b/.github/workflows/cli-version-checker.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_1cb164cb4aa17a5d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1cb164cb4aa17a5d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/cloclo.lock.yml b/.github/workflows/cloclo.lock.yml
index 469b6749155..c73472a5bfe 100644
--- a/.github/workflows/cloclo.lock.yml
+++ b/.github/workflows/cloclo.lock.yml
@@ -328,6 +328,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2f983bf8a8c9cb5e_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/code-scanning-fixer.lock.yml b/.github/workflows/code-scanning-fixer.lock.yml
index 502396a5649..7c9f1416ac2 100644
--- a/.github/workflows/code-scanning-fixer.lock.yml
+++ b/.github/workflows/code-scanning-fixer.lock.yml
@@ -226,6 +226,9 @@ jobs:
           
           GH_AW_PROMPT_a3b72589f6fc470c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a3b72589f6fc470c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/code-simplifier.lock.yml b/.github/workflows/code-simplifier.lock.yml
index 8519dcacaa6..bbf543b426f 100644
--- a/.github/workflows/code-simplifier.lock.yml
+++ b/.github/workflows/code-simplifier.lock.yml
@@ -232,6 +232,9 @@ jobs:
           
           GH_AW_PROMPT_54a4b28872c44243_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_54a4b28872c44243_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/codex-github-remote-mcp-test.lock.yml b/.github/workflows/codex-github-remote-mcp-test.lock.yml
index 65da63214f9..61d32f85265 100644
--- a/.github/workflows/codex-github-remote-mcp-test.lock.yml
+++ b/.github/workflows/codex-github-remote-mcp-test.lock.yml
@@ -206,6 +206,9 @@ jobs:
           
           GH_AW_PROMPT_56be9e1ef4b9261a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_56be9e1ef4b9261a_EOF'
           </system>
           {{#runtime-import .github/workflows/codex-github-remote-mcp-test.md}}
diff --git a/.github/workflows/commit-changes-analyzer.lock.yml b/.github/workflows/commit-changes-analyzer.lock.yml
index 07f972cc332..eeab45fa09f 100644
--- a/.github/workflows/commit-changes-analyzer.lock.yml
+++ b/.github/workflows/commit-changes-analyzer.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_c6ba27c7d7f9057e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c6ba27c7d7f9057e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/constraint-solving-potd.lock.yml b/.github/workflows/constraint-solving-potd.lock.yml
index 6c3995b370d..a9d186cdcc1 100644
--- a/.github/workflows/constraint-solving-potd.lock.yml
+++ b/.github/workflows/constraint-solving-potd.lock.yml
@@ -219,6 +219,9 @@ jobs:
           
           GH_AW_PROMPT_94e7287544da83b8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_94e7287544da83b8_EOF'
           </system>
           {{#runtime-import .github/workflows/constraint-solving-potd.md}}
diff --git a/.github/workflows/contribution-check.lock.yml b/.github/workflows/contribution-check.lock.yml
index b47a2a5a45e..76c0660ede1 100644
--- a/.github/workflows/contribution-check.lock.yml
+++ b/.github/workflows/contribution-check.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_c45bd882916329c6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c45bd882916329c6_EOF'
           </system>
           {{#runtime-import .github/workflows/contribution-check.md}}
diff --git a/.github/workflows/copilot-agent-analysis.lock.yml b/.github/workflows/copilot-agent-analysis.lock.yml
index 49f361c7f40..72f83062256 100644
--- a/.github/workflows/copilot-agent-analysis.lock.yml
+++ b/.github/workflows/copilot-agent-analysis.lock.yml
@@ -244,6 +244,9 @@ jobs:
           
           GH_AW_PROMPT_e8af2cc2a2fbd6e3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_e8af2cc2a2fbd6e3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/copilot-pr-analysis-base.md}}
diff --git a/.github/workflows/copilot-cli-deep-research.lock.yml b/.github/workflows/copilot-cli-deep-research.lock.yml
index cd38aa39ddd..2da4ddd8a93 100644
--- a/.github/workflows/copilot-cli-deep-research.lock.yml
+++ b/.github/workflows/copilot-cli-deep-research.lock.yml
@@ -218,6 +218,9 @@ jobs:
           
           GH_AW_PROMPT_7d7a99f9086230e9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_7d7a99f9086230e9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/copilot-opt.lock.yml b/.github/workflows/copilot-opt.lock.yml
index 52ff1acd69f..c3b9bd5e0eb 100644
--- a/.github/workflows/copilot-opt.lock.yml
+++ b/.github/workflows/copilot-opt.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_ae30f9b44f06bbdb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ae30f9b44f06bbdb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/copilot-pr-merged-report.lock.yml b/.github/workflows/copilot-pr-merged-report.lock.yml
index f12a19de30c..dce69104d52 100644
--- a/.github/workflows/copilot-pr-merged-report.lock.yml
+++ b/.github/workflows/copilot-pr-merged-report.lock.yml
@@ -197,6 +197,9 @@ jobs:
           </safe-output-tools>
           GH_AW_PROMPT_4802dcbccdc6c215_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_4802dcbccdc6c215_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/copilot-pr-nlp-analysis.lock.yml b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
index dfdb65ed3e5..5d4970dc9c3 100644
--- a/.github/workflows/copilot-pr-nlp-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
@@ -242,6 +242,9 @@ jobs:
           
           GH_AW_PROMPT_bfdc232b84fd83d9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_bfdc232b84fd83d9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/copilot-pr-analysis-base.md}}
diff --git a/.github/workflows/copilot-pr-prompt-analysis.lock.yml b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
index 3496d5029dc..ad56e1c5f63 100644
--- a/.github/workflows/copilot-pr-prompt-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
@@ -237,6 +237,9 @@ jobs:
           
           GH_AW_PROMPT_1da7095d771f1966_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1da7095d771f1966_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/copilot-pr-analysis-base.md}}
diff --git a/.github/workflows/copilot-session-insights.lock.yml b/.github/workflows/copilot-session-insights.lock.yml
index 720b1abe384..f45393f6dc3 100644
--- a/.github/workflows/copilot-session-insights.lock.yml
+++ b/.github/workflows/copilot-session-insights.lock.yml
@@ -250,6 +250,9 @@ jobs:
           
           GH_AW_PROMPT_317daefa67de4e54_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_317daefa67de4e54_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/copilot-token-audit.lock.yml b/.github/workflows/copilot-token-audit.lock.yml
index 038982f9ad6..a73b11b204e 100644
--- a/.github/workflows/copilot-token-audit.lock.yml
+++ b/.github/workflows/copilot-token-audit.lock.yml
@@ -243,6 +243,9 @@ jobs:
           
           GH_AW_PROMPT_ebb38a51743f7aa4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ebb38a51743f7aa4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/gh-aw.md}}
diff --git a/.github/workflows/copilot-token-optimizer.lock.yml b/.github/workflows/copilot-token-optimizer.lock.yml
index 812704e8479..6cc0bb9634f 100644
--- a/.github/workflows/copilot-token-optimizer.lock.yml
+++ b/.github/workflows/copilot-token-optimizer.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_958392f59ada5f3c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/cli_proxy_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_958392f59ada5f3c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/craft.lock.yml b/.github/workflows/craft.lock.yml
index 17447eb77d6..02bf26f1c89 100644
--- a/.github/workflows/craft.lock.yml
+++ b/.github/workflows/craft.lock.yml
@@ -267,6 +267,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0938d13c8e03385e_EOF'
           </system>
           {{#runtime-import .github/workflows/craft.md}}
diff --git a/.github/workflows/daily-architecture-diagram.lock.yml b/.github/workflows/daily-architecture-diagram.lock.yml
index 2a72f00aa4b..df7153e6703 100644
--- a/.github/workflows/daily-architecture-diagram.lock.yml
+++ b/.github/workflows/daily-architecture-diagram.lock.yml
@@ -233,6 +233,9 @@ jobs:
           
           GH_AW_PROMPT_06cc9adb72460c38_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_06cc9adb72460c38_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-assign-issue-to-user.lock.yml b/.github/workflows/daily-assign-issue-to-user.lock.yml
index 7dc739ce089..154554c9229 100644
--- a/.github/workflows/daily-assign-issue-to-user.lock.yml
+++ b/.github/workflows/daily-assign-issue-to-user.lock.yml
@@ -224,6 +224,9 @@ jobs:
           
           GH_AW_PROMPT_f5f9cbddeca39871_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f5f9cbddeca39871_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml b/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
index 7a16646b4a7..f79b55773e5 100644
--- a/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
+++ b/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_347d7becffeaa86e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_347d7becffeaa86e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/otel.md}}
diff --git a/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml b/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
index 648839b58dd..8afa684a851 100644
--- a/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
+++ b/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_b9b3547d7529d338_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b9b3547d7529d338_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-cache-strategy-analyzer.lock.yml b/.github/workflows/daily-cache-strategy-analyzer.lock.yml
index d448a01d80f..648eadd7b37 100644
--- a/.github/workflows/daily-cache-strategy-analyzer.lock.yml
+++ b/.github/workflows/daily-cache-strategy-analyzer.lock.yml
@@ -245,6 +245,9 @@ jobs:
           
           GH_AW_PROMPT_e16b3d9f376629a0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_e16b3d9f376629a0_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
@@ -1385,18 +1388,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_cde02794eefbccc6_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_5e67492c7f345b01_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_cde02794eefbccc6_EOF
+          GH_AW_MCP_CONFIG_5e67492c7f345b01_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_e619097f2953d05d_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_032ce6595f7da61e_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1407,11 +1410,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_e619097f2953d05d_EOF
+          GH_AW_MCP_CONFIG_032ce6595f7da61e_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_4429e8ccca07f280_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_33d746bc2d355fc7_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1421,7 +1424,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_4429e8ccca07f280_EOF
+          GH_AW_CODEX_SHELL_POLICY_33d746bc2d355fc7_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-caveman-optimizer.lock.yml b/.github/workflows/daily-caveman-optimizer.lock.yml
index 992e120b632..7fb88c0b930 100644
--- a/.github/workflows/daily-caveman-optimizer.lock.yml
+++ b/.github/workflows/daily-caveman-optimizer.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_c86040c388498857_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c86040c388498857_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/otel.md}}
diff --git a/.github/workflows/daily-choice-test.lock.yml b/.github/workflows/daily-choice-test.lock.yml
index 2f79c840330..02a649c4f23 100644
--- a/.github/workflows/daily-choice-test.lock.yml
+++ b/.github/workflows/daily-choice-test.lock.yml
@@ -232,6 +232,9 @@ jobs:
           
           GH_AW_PROMPT_cc851a8c6a90d45c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_cc851a8c6a90d45c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/daily-cli-performance.lock.yml b/.github/workflows/daily-cli-performance.lock.yml
index a494464b75d..68000f20f8d 100644
--- a/.github/workflows/daily-cli-performance.lock.yml
+++ b/.github/workflows/daily-cli-performance.lock.yml
@@ -260,6 +260,9 @@ jobs:
           
           GH_AW_PROMPT_93d9536c2ed70fa7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_93d9536c2ed70fa7_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/go-make.md}}
diff --git a/.github/workflows/daily-cli-tools-tester.lock.yml b/.github/workflows/daily-cli-tools-tester.lock.yml
index fc787942dd9..ac090e03fc1 100644
--- a/.github/workflows/daily-cli-tools-tester.lock.yml
+++ b/.github/workflows/daily-cli-tools-tester.lock.yml
@@ -237,6 +237,9 @@ jobs:
           
           GH_AW_PROMPT_7845b77019682aa9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_7845b77019682aa9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-code-metrics.lock.yml b/.github/workflows/daily-code-metrics.lock.yml
index 124ca571e5b..9dd78fa4020 100644
--- a/.github/workflows/daily-code-metrics.lock.yml
+++ b/.github/workflows/daily-code-metrics.lock.yml
@@ -245,6 +245,9 @@ jobs:
           
           GH_AW_PROMPT_e45ff8a78a8305e1_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_e45ff8a78a8305e1_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/python-dataviz.md}}
diff --git a/.github/workflows/daily-community-attribution.lock.yml b/.github/workflows/daily-community-attribution.lock.yml
index eb6155f51d1..decadf32e5b 100644
--- a/.github/workflows/daily-community-attribution.lock.yml
+++ b/.github/workflows/daily-community-attribution.lock.yml
@@ -237,6 +237,9 @@ jobs:
           
           GH_AW_PROMPT_3642021c242227f5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_3642021c242227f5_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/community-attribution.md}}
diff --git a/.github/workflows/daily-compiler-quality.lock.yml b/.github/workflows/daily-compiler-quality.lock.yml
index f25c65b31d9..24b6729c403 100644
--- a/.github/workflows/daily-compiler-quality.lock.yml
+++ b/.github/workflows/daily-compiler-quality.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_0836f336b83a50af_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0836f336b83a50af_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-doc-healer.lock.yml b/.github/workflows/daily-doc-healer.lock.yml
index 7ce946941a2..50468cd19d2 100644
--- a/.github/workflows/daily-doc-healer.lock.yml
+++ b/.github/workflows/daily-doc-healer.lock.yml
@@ -241,6 +241,9 @@ jobs:
           
           GH_AW_PROMPT_1a6ccb96f19ae648_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1a6ccb96f19ae648_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-doc-updater.lock.yml b/.github/workflows/daily-doc-updater.lock.yml
index 2bad62898df..a566dae01fb 100644
--- a/.github/workflows/daily-doc-updater.lock.yml
+++ b/.github/workflows/daily-doc-updater.lock.yml
@@ -240,6 +240,9 @@ jobs:
           
           GH_AW_PROMPT_60321b637369216b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_60321b637369216b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/daily-fact.lock.yml b/.github/workflows/daily-fact.lock.yml
index d051dbd276e..d321754422c 100644
--- a/.github/workflows/daily-fact.lock.yml
+++ b/.github/workflows/daily-fact.lock.yml
@@ -241,6 +241,9 @@ jobs:
           
           GH_AW_PROMPT_ffb32d86a97a96e6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ffb32d86a97a96e6_EOF'
           </system>
           
@@ -1396,18 +1399,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_ec69e68403dc5e6a_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_9d1d766df0483b8c_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_ec69e68403dc5e6a_EOF
+          GH_AW_MCP_CONFIG_9d1d766df0483b8c_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_50ecf8915c8f3c53_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_f5635a2159c01676_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1418,11 +1421,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_50ecf8915c8f3c53_EOF
+          GH_AW_MCP_CONFIG_f5635a2159c01676_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_edc2f2577f4a498d_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_57ddd272ae6cb5c1_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1432,7 +1435,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_edc2f2577f4a498d_EOF
+          GH_AW_CODEX_SHELL_POLICY_57ddd272ae6cb5c1_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-file-diet.lock.yml b/.github/workflows/daily-file-diet.lock.yml
index e7cc64812c5..a14e907278a 100644
--- a/.github/workflows/daily-file-diet.lock.yml
+++ b/.github/workflows/daily-file-diet.lock.yml
@@ -236,6 +236,9 @@ jobs:
           
           GH_AW_PROMPT_200f63e58c279776_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_200f63e58c279776_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-firewall-report.lock.yml b/.github/workflows/daily-firewall-report.lock.yml
index 9b8c389c19a..ad251db15bc 100644
--- a/.github/workflows/daily-firewall-report.lock.yml
+++ b/.github/workflows/daily-firewall-report.lock.yml
@@ -247,6 +247,9 @@ jobs:
           
           GH_AW_PROMPT_36c89e0507e45aff_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_36c89e0507e45aff_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/trending-charts-simple.md}}
diff --git a/.github/workflows/daily-function-namer.lock.yml b/.github/workflows/daily-function-namer.lock.yml
index d89dce1e6d3..2892cd564a6 100644
--- a/.github/workflows/daily-function-namer.lock.yml
+++ b/.github/workflows/daily-function-namer.lock.yml
@@ -239,6 +239,9 @@ jobs:
           
           GH_AW_PROMPT_c14a880afa97f469_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c14a880afa97f469_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-hippo-learn.lock.yml b/.github/workflows/daily-hippo-learn.lock.yml
index df057d90291..281afbd7821 100644
--- a/.github/workflows/daily-hippo-learn.lock.yml
+++ b/.github/workflows/daily-hippo-learn.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_8c26d89de701feb4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_8c26d89de701feb4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/hippo-memory.md}}
diff --git a/.github/workflows/daily-issues-report.lock.yml b/.github/workflows/daily-issues-report.lock.yml
index 955f5b5c95a..1eaecb81261 100644
--- a/.github/workflows/daily-issues-report.lock.yml
+++ b/.github/workflows/daily-issues-report.lock.yml
@@ -250,6 +250,9 @@ jobs:
           
           GH_AW_PROMPT_b9b7669c1673eceb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b9b7669c1673eceb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/daily-malicious-code-scan.lock.yml b/.github/workflows/daily-malicious-code-scan.lock.yml
index 467ef1d3cf4..5339c725461 100644
--- a/.github/workflows/daily-malicious-code-scan.lock.yml
+++ b/.github/workflows/daily-malicious-code-scan.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_25b1dcbd4862ff19_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_25b1dcbd4862ff19_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/daily-mcp-concurrency-analysis.lock.yml b/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
index 63d16431e33..d6a00ea88d1 100644
--- a/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
+++ b/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
@@ -233,6 +233,9 @@ jobs:
           
           GH_AW_PROMPT_a619b11732dded21_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a619b11732dded21_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-multi-device-docs-tester.lock.yml b/.github/workflows/daily-multi-device-docs-tester.lock.yml
index 476199b8e3d..824584f0b5e 100644
--- a/.github/workflows/daily-multi-device-docs-tester.lock.yml
+++ b/.github/workflows/daily-multi-device-docs-tester.lock.yml
@@ -241,6 +241,9 @@ jobs:
           
           GH_AW_PROMPT_e8776210a33b59c8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_e8776210a33b59c8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/docs-server-lifecycle.md}}
diff --git a/.github/workflows/daily-news.lock.yml b/.github/workflows/daily-news.lock.yml
index 236ebe6a292..e0718d99b23 100644
--- a/.github/workflows/daily-news.lock.yml
+++ b/.github/workflows/daily-news.lock.yml
@@ -242,6 +242,9 @@ jobs:
           
           GH_AW_PROMPT_28e02fa8d0cb2ffc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_28e02fa8d0cb2ffc_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/tavily.md}}
diff --git a/.github/workflows/daily-observability-report.lock.yml b/.github/workflows/daily-observability-report.lock.yml
index 5de29eeaf14..430dc1b9eab 100644
--- a/.github/workflows/daily-observability-report.lock.yml
+++ b/.github/workflows/daily-observability-report.lock.yml
@@ -244,6 +244,9 @@ jobs:
           
           GH_AW_PROMPT_5ff4c2c393419636_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_5ff4c2c393419636_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
@@ -1313,18 +1316,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_95e1a7a74282e29e_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_8ad9c899e09d6c0c_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_95e1a7a74282e29e_EOF
+          GH_AW_MCP_CONFIG_8ad9c899e09d6c0c_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_4c86d984ec9612fa_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_1b9d4f6a59b7402f_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1335,11 +1338,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_4c86d984ec9612fa_EOF
+          GH_AW_MCP_CONFIG_1b9d4f6a59b7402f_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_6e37a3e971381c9a_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_748e09df526ed5a7_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1349,7 +1352,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_6e37a3e971381c9a_EOF
+          GH_AW_CODEX_SHELL_POLICY_748e09df526ed5a7_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-otel-instrumentation-advisor.lock.yml b/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
index de32835d20e..c307f467255 100644
--- a/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
+++ b/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_825f42c0ed6fe118_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_825f42c0ed6fe118_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-performance-summary.lock.yml b/.github/workflows/daily-performance-summary.lock.yml
index 658e025dabc..5bde445690e 100644
--- a/.github/workflows/daily-performance-summary.lock.yml
+++ b/.github/workflows/daily-performance-summary.lock.yml
@@ -244,6 +244,9 @@ jobs:
           
           GH_AW_PROMPT_5e13b7f1cb142ce3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_5e13b7f1cb142ce3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-queries-mcp-script.md}}
diff --git a/.github/workflows/daily-regulatory.lock.yml b/.github/workflows/daily-regulatory.lock.yml
index c6c5afc7511..ab4bb84e985 100644
--- a/.github/workflows/daily-regulatory.lock.yml
+++ b/.github/workflows/daily-regulatory.lock.yml
@@ -236,6 +236,9 @@ jobs:
           
           GH_AW_PROMPT_5633618930b71403_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_5633618930b71403_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-queries-mcp-script.md}}
diff --git a/.github/workflows/daily-rendering-scripts-verifier.lock.yml b/.github/workflows/daily-rendering-scripts-verifier.lock.yml
index e6f562869b1..9c18349107d 100644
--- a/.github/workflows/daily-rendering-scripts-verifier.lock.yml
+++ b/.github/workflows/daily-rendering-scripts-verifier.lock.yml
@@ -251,6 +251,9 @@ jobs:
           
           GH_AW_PROMPT_557c0faadbf09e8b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_557c0faadbf09e8b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/daily-repo-chronicle.lock.yml b/.github/workflows/daily-repo-chronicle.lock.yml
index 1479f45ed8f..2c9bc5e081f 100644
--- a/.github/workflows/daily-repo-chronicle.lock.yml
+++ b/.github/workflows/daily-repo-chronicle.lock.yml
@@ -236,6 +236,9 @@ jobs:
           
           GH_AW_PROMPT_8c2d3ee58b7bb859_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_8c2d3ee58b7bb859_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/trends.md}}
diff --git a/.github/workflows/daily-safe-output-integrator.lock.yml b/.github/workflows/daily-safe-output-integrator.lock.yml
index d987db01b0b..c68cb65d8df 100644
--- a/.github/workflows/daily-safe-output-integrator.lock.yml
+++ b/.github/workflows/daily-safe-output-integrator.lock.yml
@@ -230,6 +230,9 @@ jobs:
           
           GH_AW_PROMPT_b71e1da8f93008ab_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b71e1da8f93008ab_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-safe-output-optimizer.lock.yml b/.github/workflows/daily-safe-output-optimizer.lock.yml
index 4166ace44cc..1fecafa2fb6 100644
--- a/.github/workflows/daily-safe-output-optimizer.lock.yml
+++ b/.github/workflows/daily-safe-output-optimizer.lock.yml
@@ -249,6 +249,9 @@ jobs:
           
           GH_AW_PROMPT_817a63e0f68f33a6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_817a63e0f68f33a6_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/aw-logs-24h-fetch.md}}
diff --git a/.github/workflows/daily-safe-outputs-conformance.lock.yml b/.github/workflows/daily-safe-outputs-conformance.lock.yml
index 9904b64d85f..afdcd9ebe61 100644
--- a/.github/workflows/daily-safe-outputs-conformance.lock.yml
+++ b/.github/workflows/daily-safe-outputs-conformance.lock.yml
@@ -233,6 +233,9 @@ jobs:
           
           GH_AW_PROMPT_6a8f1d610d0fcade_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_6a8f1d610d0fcade_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-secrets-analysis.lock.yml b/.github/workflows/daily-secrets-analysis.lock.yml
index 42209a31d3e..350437eb806 100644
--- a/.github/workflows/daily-secrets-analysis.lock.yml
+++ b/.github/workflows/daily-secrets-analysis.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_cf0ff54e475d0865_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_cf0ff54e475d0865_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-security-observability.lock.yml b/.github/workflows/daily-security-observability.lock.yml
index cc596f62203..c37419d203d 100644
--- a/.github/workflows/daily-security-observability.lock.yml
+++ b/.github/workflows/daily-security-observability.lock.yml
@@ -246,6 +246,9 @@ jobs:
           
           GH_AW_PROMPT_eccc76a7aebec463_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_eccc76a7aebec463_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/python-dataviz.md}}
diff --git a/.github/workflows/daily-security-red-team.lock.yml b/.github/workflows/daily-security-red-team.lock.yml
index a6fe17deba1..f95402d0c4e 100644
--- a/.github/workflows/daily-security-red-team.lock.yml
+++ b/.github/workflows/daily-security-red-team.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_d3d52693cea323fd_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_d3d52693cea323fd_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/daily-semgrep-scan.lock.yml b/.github/workflows/daily-semgrep-scan.lock.yml
index 21e10b1b735..1140b8557e6 100644
--- a/.github/workflows/daily-semgrep-scan.lock.yml
+++ b/.github/workflows/daily-semgrep-scan.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_3aaf13339fe74d32_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_3aaf13339fe74d32_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/daily-sentrux-report.lock.yml b/.github/workflows/daily-sentrux-report.lock.yml
index b11d88dbd8a..f6ddec6640b 100644
--- a/.github/workflows/daily-sentrux-report.lock.yml
+++ b/.github/workflows/daily-sentrux-report.lock.yml
@@ -236,6 +236,9 @@ jobs:
           
           GH_AW_PROMPT_719df1a6ce2b4e6a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_719df1a6ce2b4e6a_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/sentrux.md}}
diff --git a/.github/workflows/daily-skill-optimizer.lock.yml b/.github/workflows/daily-skill-optimizer.lock.yml
index f02875a1514..fda0fa39965 100644
--- a/.github/workflows/daily-skill-optimizer.lock.yml
+++ b/.github/workflows/daily-skill-optimizer.lock.yml
@@ -232,6 +232,9 @@ jobs:
           
           GH_AW_PROMPT_f4ec88ed2b9e2a22_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f4ec88ed2b9e2a22_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/otel.md}}
diff --git a/.github/workflows/daily-syntax-error-quality.lock.yml b/.github/workflows/daily-syntax-error-quality.lock.yml
index 7b4e8a83ef0..b7ccdfb0aef 100644
--- a/.github/workflows/daily-syntax-error-quality.lock.yml
+++ b/.github/workflows/daily-syntax-error-quality.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_9d57e41cc36f359c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_9d57e41cc36f359c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-team-evolution-insights.lock.yml b/.github/workflows/daily-team-evolution-insights.lock.yml
index 2e2706281d5..674c21d2ea2 100644
--- a/.github/workflows/daily-team-evolution-insights.lock.yml
+++ b/.github/workflows/daily-team-evolution-insights.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_da76ab4822bf9782_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_da76ab4822bf9782_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-team-status.lock.yml b/.github/workflows/daily-team-status.lock.yml
index 7c4248dce22..ba434f2b831 100644
--- a/.github/workflows/daily-team-status.lock.yml
+++ b/.github/workflows/daily-team-status.lock.yml
@@ -245,6 +245,9 @@ jobs:
           
           GH_AW_PROMPT_2ad6e991fcd00de3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2ad6e991fcd00de3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-testify-uber-super-expert.lock.yml b/.github/workflows/daily-testify-uber-super-expert.lock.yml
index 33b8289d823..f02ad095b7c 100644
--- a/.github/workflows/daily-testify-uber-super-expert.lock.yml
+++ b/.github/workflows/daily-testify-uber-super-expert.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_863e1f99e9ceceac_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_863e1f99e9ceceac_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-token-consumption-report.lock.yml b/.github/workflows/daily-token-consumption-report.lock.yml
index be08cbac443..32746b3baf5 100644
--- a/.github/workflows/daily-token-consumption-report.lock.yml
+++ b/.github/workflows/daily-token-consumption-report.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_d52ca919c5c7ce90_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_d52ca919c5c7ce90_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/sentry.md}}
diff --git a/.github/workflows/daily-workflow-updater.lock.yml b/.github/workflows/daily-workflow-updater.lock.yml
index 2e0011c2b2a..d7b9e4af82b 100644
--- a/.github/workflows/daily-workflow-updater.lock.yml
+++ b/.github/workflows/daily-workflow-updater.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_2f621c28df87af7d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2f621c28df87af7d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/dead-code-remover.lock.yml b/.github/workflows/dead-code-remover.lock.yml
index ef98a015108..778d0830388 100644
--- a/.github/workflows/dead-code-remover.lock.yml
+++ b/.github/workflows/dead-code-remover.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_cc0d01ecb284cabe_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_cc0d01ecb284cabe_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/deep-report.lock.yml b/.github/workflows/deep-report.lock.yml
index 23682bca62e..2cd28b594df 100644
--- a/.github/workflows/deep-report.lock.yml
+++ b/.github/workflows/deep-report.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_06cf79caca093559_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_06cf79caca093559_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/delight.lock.yml b/.github/workflows/delight.lock.yml
index f10da610979..b9a320c5009 100644
--- a/.github/workflows/delight.lock.yml
+++ b/.github/workflows/delight.lock.yml
@@ -232,6 +232,9 @@ jobs:
           
           GH_AW_PROMPT_30c38f50ad21ce73_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_30c38f50ad21ce73_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/dependabot-burner.lock.yml b/.github/workflows/dependabot-burner.lock.yml
index 0a765b32ed5..b23f88031d2 100644
--- a/.github/workflows/dependabot-burner.lock.yml
+++ b/.github/workflows/dependabot-burner.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_429b41a82a28aa30_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_429b41a82a28aa30_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/dependabot-go-checker.lock.yml b/.github/workflows/dependabot-go-checker.lock.yml
index 97f7dc64f3d..4e6bd92bd96 100644
--- a/.github/workflows/dependabot-go-checker.lock.yml
+++ b/.github/workflows/dependabot-go-checker.lock.yml
@@ -222,6 +222,9 @@ jobs:
           
           GH_AW_PROMPT_4e8a698fd9d253b0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_4e8a698fd9d253b0_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/dependabot-repair.lock.yml b/.github/workflows/dependabot-repair.lock.yml
index fc9721bca06..ab1ff7ec696 100644
--- a/.github/workflows/dependabot-repair.lock.yml
+++ b/.github/workflows/dependabot-repair.lock.yml
@@ -237,6 +237,9 @@ jobs:
           
           GH_AW_PROMPT_b11b891ab1eea9e8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b11b891ab1eea9e8_EOF'
           </system>
           {{#runtime-import .github/workflows/dependabot-repair.md}}
diff --git a/.github/workflows/deployment-incident-monitor.lock.yml b/.github/workflows/deployment-incident-monitor.lock.yml
index aeb7e91bbd6..1dcf6ed1583 100644
--- a/.github/workflows/deployment-incident-monitor.lock.yml
+++ b/.github/workflows/deployment-incident-monitor.lock.yml
@@ -219,6 +219,9 @@ jobs:
           
           GH_AW_PROMPT_c23a074926bb8516_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c23a074926bb8516_EOF'
           </system>
           {{#runtime-import .github/workflows/deployment-incident-monitor.md}}
diff --git a/.github/workflows/design-decision-gate.lock.yml b/.github/workflows/design-decision-gate.lock.yml
index 5197f91d8cc..5dae421171b 100644
--- a/.github/workflows/design-decision-gate.lock.yml
+++ b/.github/workflows/design-decision-gate.lock.yml
@@ -254,6 +254,9 @@ jobs:
           
           GH_AW_PROMPT_60a1e42cd1dd824e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_60a1e42cd1dd824e_EOF'
           </system>
           {{#runtime-import .github/agents/adr-writer.agent.md}}
diff --git a/.github/workflows/dev-hawk.lock.yml b/.github/workflows/dev-hawk.lock.yml
index d5d82f3579c..cc1100dfc8c 100644
--- a/.github/workflows/dev-hawk.lock.yml
+++ b/.github/workflows/dev-hawk.lock.yml
@@ -231,6 +231,9 @@ jobs:
           
           GH_AW_PROMPT_c845abc30647a9b9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c845abc30647a9b9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/dev.lock.yml b/.github/workflows/dev.lock.yml
index ba2ce6ec3e2..4500621bbd6 100644
--- a/.github/workflows/dev.lock.yml
+++ b/.github/workflows/dev.lock.yml
@@ -274,6 +274,9 @@ jobs:
           
           GH_AW_PROMPT_a3ed2e742aa6c3de_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a3ed2e742aa6c3de_EOF'
           </system>
           {{#runtime-import .github/workflows/dev.md}}
diff --git a/.github/workflows/developer-docs-consolidator.lock.yml b/.github/workflows/developer-docs-consolidator.lock.yml
index 5d2e4864a47..bf213f9a8fb 100644
--- a/.github/workflows/developer-docs-consolidator.lock.yml
+++ b/.github/workflows/developer-docs-consolidator.lock.yml
@@ -246,6 +246,9 @@ jobs:
           
           GH_AW_PROMPT_c06e57c35a47e3f4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c06e57c35a47e3f4_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/dictation-prompt.lock.yml b/.github/workflows/dictation-prompt.lock.yml
index e232da064c5..99af67bfa4c 100644
--- a/.github/workflows/dictation-prompt.lock.yml
+++ b/.github/workflows/dictation-prompt.lock.yml
@@ -220,6 +220,9 @@ jobs:
           
           GH_AW_PROMPT_167c42fef4e52d53_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_167c42fef4e52d53_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/discussion-task-miner.lock.yml b/.github/workflows/discussion-task-miner.lock.yml
index 567c809243c..7a8fc66820a 100644
--- a/.github/workflows/discussion-task-miner.lock.yml
+++ b/.github/workflows/discussion-task-miner.lock.yml
@@ -221,6 +221,9 @@ jobs:
           
           GH_AW_PROMPT_c4ccfc574d2c382e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c4ccfc574d2c382e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/docs-noob-tester.lock.yml b/.github/workflows/docs-noob-tester.lock.yml
index d1fee9ce382..1cc0e5f1914 100644
--- a/.github/workflows/docs-noob-tester.lock.yml
+++ b/.github/workflows/docs-noob-tester.lock.yml
@@ -234,6 +234,9 @@ jobs:
           
           GH_AW_PROMPT_f108143180cedb5e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f108143180cedb5e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/docs-server-lifecycle.md}}
diff --git a/.github/workflows/draft-pr-cleanup.lock.yml b/.github/workflows/draft-pr-cleanup.lock.yml
index 527dd1edf01..3ab60e4849d 100644
--- a/.github/workflows/draft-pr-cleanup.lock.yml
+++ b/.github/workflows/draft-pr-cleanup.lock.yml
@@ -214,6 +214,9 @@ jobs:
           
           GH_AW_PROMPT_1b5e00bf134b6a95_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1b5e00bf134b6a95_EOF'
           </system>
           {{#runtime-import .github/workflows/draft-pr-cleanup.md}}
diff --git a/.github/workflows/duplicate-code-detector.lock.yml b/.github/workflows/duplicate-code-detector.lock.yml
index 1d354de8da5..b7de5991daa 100644
--- a/.github/workflows/duplicate-code-detector.lock.yml
+++ b/.github/workflows/duplicate-code-detector.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_747f86d9b82bfc1b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_747f86d9b82bfc1b_EOF'
           </system>
           ## Serena Code Analysis
@@ -1267,18 +1270,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_f61d2880509eb963_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_a9cd71c2c390bbf1_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_f61d2880509eb963_EOF
+          GH_AW_MCP_CONFIG_a9cd71c2c390bbf1_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_433f967830eca9ca_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_3cab68d26a191564_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1289,11 +1292,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_433f967830eca9ca_EOF
+          GH_AW_MCP_CONFIG_3cab68d26a191564_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_7762303d9cc2080c_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_e86f0918b08181f8_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1303,7 +1306,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_7762303d9cc2080c_EOF
+          GH_AW_CODEX_SHELL_POLICY_e86f0918b08181f8_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/example-permissions-warning.lock.yml b/.github/workflows/example-permissions-warning.lock.yml
index 9359eb72a1c..9f4a201a554 100644
--- a/.github/workflows/example-permissions-warning.lock.yml
+++ b/.github/workflows/example-permissions-warning.lock.yml
@@ -204,6 +204,9 @@ jobs:
           
           GH_AW_PROMPT_ae3a17b862f1109e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ae3a17b862f1109e_EOF'
           </system>
           {{#runtime-import .github/workflows/example-permissions-warning.md}}
diff --git a/.github/workflows/example-workflow-analyzer.lock.yml b/.github/workflows/example-workflow-analyzer.lock.yml
index 2db0ab5af0b..bdb9ea700c6 100644
--- a/.github/workflows/example-workflow-analyzer.lock.yml
+++ b/.github/workflows/example-workflow-analyzer.lock.yml
@@ -239,6 +239,9 @@ jobs:
           
           GH_AW_PROMPT_b54df4f7db1055fb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b54df4f7db1055fb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/firewall-escape.lock.yml b/.github/workflows/firewall-escape.lock.yml
index 26742c03315..152c35939cb 100644
--- a/.github/workflows/firewall-escape.lock.yml
+++ b/.github/workflows/firewall-escape.lock.yml
@@ -244,6 +244,9 @@ jobs:
           
           GH_AW_PROMPT_4d9e57e339dbc997_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_4d9e57e339dbc997_EOF'
           </system>
           {{#runtime-import .github/workflows/firewall-escape.md}}
diff --git a/.github/workflows/firewall.lock.yml b/.github/workflows/firewall.lock.yml
index 544a034a217..da6949651e6 100644
--- a/.github/workflows/firewall.lock.yml
+++ b/.github/workflows/firewall.lock.yml
@@ -204,6 +204,9 @@ jobs:
           
           GH_AW_PROMPT_3852c8916270385c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_3852c8916270385c_EOF'
           </system>
           {{#runtime-import .github/workflows/firewall.md}}
diff --git a/.github/workflows/functional-pragmatist.lock.yml b/.github/workflows/functional-pragmatist.lock.yml
index b522688b207..7bccb7306d1 100644
--- a/.github/workflows/functional-pragmatist.lock.yml
+++ b/.github/workflows/functional-pragmatist.lock.yml
@@ -226,6 +226,9 @@ jobs:
           
           GH_AW_PROMPT_2a93dd5da2776952_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2a93dd5da2776952_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/github-mcp-structural-analysis.lock.yml b/.github/workflows/github-mcp-structural-analysis.lock.yml
index fdbaabf807b..82139c17225 100644
--- a/.github/workflows/github-mcp-structural-analysis.lock.yml
+++ b/.github/workflows/github-mcp-structural-analysis.lock.yml
@@ -242,6 +242,9 @@ jobs:
           
           GH_AW_PROMPT_3ba4f9c395e5bcb6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_3ba4f9c395e5bcb6_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/python-dataviz.md}}
diff --git a/.github/workflows/github-mcp-tools-report.lock.yml b/.github/workflows/github-mcp-tools-report.lock.yml
index bdc4fe036c8..324540332a8 100644
--- a/.github/workflows/github-mcp-tools-report.lock.yml
+++ b/.github/workflows/github-mcp-tools-report.lock.yml
@@ -241,6 +241,9 @@ jobs:
           
           GH_AW_PROMPT_23eab3a3b62941d3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_23eab3a3b62941d3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/github-remote-mcp-auth-test.lock.yml b/.github/workflows/github-remote-mcp-auth-test.lock.yml
index e78fefd7f0e..24108ad5d7b 100644
--- a/.github/workflows/github-remote-mcp-auth-test.lock.yml
+++ b/.github/workflows/github-remote-mcp-auth-test.lock.yml
@@ -235,6 +235,9 @@ jobs:
           
           GH_AW_PROMPT_a535e73ab33e528e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a535e73ab33e528e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/glossary-maintainer.lock.yml b/.github/workflows/glossary-maintainer.lock.yml
index 06db960ec2a..6c4915fb755 100644
--- a/.github/workflows/glossary-maintainer.lock.yml
+++ b/.github/workflows/glossary-maintainer.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_df8691e1f84fbaa3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_df8691e1f84fbaa3_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/go-fan.lock.yml b/.github/workflows/go-fan.lock.yml
index f5231244117..94a8e217702 100644
--- a/.github/workflows/go-fan.lock.yml
+++ b/.github/workflows/go-fan.lock.yml
@@ -242,6 +242,9 @@ jobs:
           
           GH_AW_PROMPT_5464e417cd118c0e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_5464e417cd118c0e_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/go-logger.lock.yml b/.github/workflows/go-logger.lock.yml
index 46145d729e1..64e8ebedbf8 100644
--- a/.github/workflows/go-logger.lock.yml
+++ b/.github/workflows/go-logger.lock.yml
@@ -231,6 +231,9 @@ jobs:
           
           GH_AW_PROMPT_62eba90e58c4f484_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_62eba90e58c4f484_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/go-make.md}}
diff --git a/.github/workflows/go-pattern-detector.lock.yml b/.github/workflows/go-pattern-detector.lock.yml
index fb40d998138..c1af91081e8 100644
--- a/.github/workflows/go-pattern-detector.lock.yml
+++ b/.github/workflows/go-pattern-detector.lock.yml
@@ -226,6 +226,9 @@ jobs:
           
           GH_AW_PROMPT_11d1dc8414fd260f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_11d1dc8414fd260f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/ast-grep.md}}
diff --git a/.github/workflows/gpclean.lock.yml b/.github/workflows/gpclean.lock.yml
index e45c33b3403..40a703d33bb 100644
--- a/.github/workflows/gpclean.lock.yml
+++ b/.github/workflows/gpclean.lock.yml
@@ -226,6 +226,9 @@ jobs:
           
           GH_AW_PROMPT_fedacafa2d5987fc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_fedacafa2d5987fc_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/grumpy-reviewer.lock.yml b/.github/workflows/grumpy-reviewer.lock.yml
index 777ffc51b3e..feb3d44ac2c 100644
--- a/.github/workflows/grumpy-reviewer.lock.yml
+++ b/.github/workflows/grumpy-reviewer.lock.yml
@@ -282,6 +282,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ca213f2bb4c609e2_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
@@ -1327,18 +1330,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_ed3f5f7ae6d46211_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_b37958ee5d7af99f_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_ed3f5f7ae6d46211_EOF
+          GH_AW_MCP_CONFIG_b37958ee5d7af99f_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_621731268c57b171_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_0374eddda26ce031_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1349,11 +1352,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_621731268c57b171_EOF
+          GH_AW_MCP_CONFIG_0374eddda26ce031_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_9cc4594525b47cb7_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_63bd566cb955e631_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1363,7 +1366,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_9cc4594525b47cb7_EOF
+          GH_AW_CODEX_SHELL_POLICY_63bd566cb955e631_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/hippo-embed.lock.yml b/.github/workflows/hippo-embed.lock.yml
index 843ab2321e5..c2b78f21ec7 100644
--- a/.github/workflows/hippo-embed.lock.yml
+++ b/.github/workflows/hippo-embed.lock.yml
@@ -205,6 +205,9 @@ jobs:
           
           GH_AW_PROMPT_1801f836372654bc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1801f836372654bc_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/hippo-memory.md}}
diff --git a/.github/workflows/hourly-ci-cleaner.lock.yml b/.github/workflows/hourly-ci-cleaner.lock.yml
index e5b89b05417..659102a275e 100644
--- a/.github/workflows/hourly-ci-cleaner.lock.yml
+++ b/.github/workflows/hourly-ci-cleaner.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_a4c33d830034c7ff_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a4c33d830034c7ff_EOF'
           </system>
           {{#runtime-import .github/agents/ci-cleaner.agent.md}}
diff --git a/.github/workflows/instructions-janitor.lock.yml b/.github/workflows/instructions-janitor.lock.yml
index d262f14f34f..74d9495184f 100644
--- a/.github/workflows/instructions-janitor.lock.yml
+++ b/.github/workflows/instructions-janitor.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_c0fdee58eb98fb81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c0fdee58eb98fb81_EOF'
           </system>
           {{#runtime-import .github/workflows/instructions-janitor.md}}
diff --git a/.github/workflows/issue-arborist.lock.yml b/.github/workflows/issue-arborist.lock.yml
index 7875cd04f4a..eab9039d051 100644
--- a/.github/workflows/issue-arborist.lock.yml
+++ b/.github/workflows/issue-arborist.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_40db7ed1b5e86002_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_40db7ed1b5e86002_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
@@ -1305,18 +1308,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_e156f70414e5d26b_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_62c0331189577651_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_e156f70414e5d26b_EOF
+          GH_AW_MCP_CONFIG_62c0331189577651_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_fe28c92a01366917_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_356e76e46d5628db_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1327,11 +1330,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_fe28c92a01366917_EOF
+          GH_AW_MCP_CONFIG_356e76e46d5628db_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_61295b5a33cb2148_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_bd8c04110378f9eb_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1341,7 +1344,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_61295b5a33cb2148_EOF
+          GH_AW_CODEX_SHELL_POLICY_bd8c04110378f9eb_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/issue-monster.lock.yml b/.github/workflows/issue-monster.lock.yml
index 460f846b9ab..c1f26f86e00 100644
--- a/.github/workflows/issue-monster.lock.yml
+++ b/.github/workflows/issue-monster.lock.yml
@@ -607,6 +607,9 @@ jobs:
           
           GH_AW_PROMPT_58ecfcf47a8787df_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_58ecfcf47a8787df_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/issue-triage-agent.lock.yml b/.github/workflows/issue-triage-agent.lock.yml
index 3bd217378e8..256343b8811 100644
--- a/.github/workflows/issue-triage-agent.lock.yml
+++ b/.github/workflows/issue-triage-agent.lock.yml
@@ -223,6 +223,9 @@ jobs:
           
           GH_AW_PROMPT_0b8d67a8d512ea81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0b8d67a8d512ea81_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/jsweep.lock.yml b/.github/workflows/jsweep.lock.yml
index 60e30c6eedf..58844d0f261 100644
--- a/.github/workflows/jsweep.lock.yml
+++ b/.github/workflows/jsweep.lock.yml
@@ -231,6 +231,9 @@ jobs:
           
           GH_AW_PROMPT_45dd6562b2fb7643_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_45dd6562b2fb7643_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/layout-spec-maintainer.lock.yml b/.github/workflows/layout-spec-maintainer.lock.yml
index 18a28299189..8fba07f4aff 100644
--- a/.github/workflows/layout-spec-maintainer.lock.yml
+++ b/.github/workflows/layout-spec-maintainer.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_ce7c1391ca7c1aa8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ce7c1391ca7c1aa8_EOF'
           </system>
           {{#runtime-import .github/workflows/layout-spec-maintainer.md}}
diff --git a/.github/workflows/lockfile-stats.lock.yml b/.github/workflows/lockfile-stats.lock.yml
index 5f2263bfdaa..4a2a46b2dd4 100644
--- a/.github/workflows/lockfile-stats.lock.yml
+++ b/.github/workflows/lockfile-stats.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_61aa761659405206_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_61aa761659405206_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/mcp-inspector.lock.yml b/.github/workflows/mcp-inspector.lock.yml
index 5b42524cc39..d9a5238ee42 100644
--- a/.github/workflows/mcp-inspector.lock.yml
+++ b/.github/workflows/mcp-inspector.lock.yml
@@ -282,6 +282,9 @@ jobs:
           
           GH_AW_PROMPT_bdd5adaa4f427d0f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_bdd5adaa4f427d0f_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/mergefest.lock.yml b/.github/workflows/mergefest.lock.yml
index bae3f59418f..997b067cd7e 100644
--- a/.github/workflows/mergefest.lock.yml
+++ b/.github/workflows/mergefest.lock.yml
@@ -272,6 +272,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1dc0005748a496ab_EOF'
           </system>
           {{#runtime-import .github/workflows/mergefest.md}}
diff --git a/.github/workflows/metrics-collector.lock.yml b/.github/workflows/metrics-collector.lock.yml
index 466bb119f52..73c3a4720f3 100644
--- a/.github/workflows/metrics-collector.lock.yml
+++ b/.github/workflows/metrics-collector.lock.yml
@@ -217,6 +217,9 @@ jobs:
           
           GH_AW_PROMPT_a700af2ab27794da_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a700af2ab27794da_EOF'
           </system>
           {{#runtime-import .github/workflows/metrics-collector.md}}
diff --git a/.github/workflows/notion-issue-summary.lock.yml b/.github/workflows/notion-issue-summary.lock.yml
index 4cb84d4b4ad..a9978c58427 100644
--- a/.github/workflows/notion-issue-summary.lock.yml
+++ b/.github/workflows/notion-issue-summary.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_825884c84f66cdde_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_825884c84f66cdde_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/notion.md}}
diff --git a/.github/workflows/org-health-report.lock.yml b/.github/workflows/org-health-report.lock.yml
index a4c752da450..e4ebe6ad07f 100644
--- a/.github/workflows/org-health-report.lock.yml
+++ b/.github/workflows/org-health-report.lock.yml
@@ -232,6 +232,9 @@ jobs:
           
           GH_AW_PROMPT_8d94051de3622e61_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_8d94051de3622e61_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/pdf-summary.lock.yml b/.github/workflows/pdf-summary.lock.yml
index ca5af0a1f1f..41e5af79672 100644
--- a/.github/workflows/pdf-summary.lock.yml
+++ b/.github/workflows/pdf-summary.lock.yml
@@ -298,6 +298,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b882b92635115046_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/markitdown.md}}
diff --git a/.github/workflows/plan.lock.yml b/.github/workflows/plan.lock.yml
index 3812b99dbc4..569e08f5739 100644
--- a/.github/workflows/plan.lock.yml
+++ b/.github/workflows/plan.lock.yml
@@ -271,6 +271,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2170f44eb653670d_EOF'
           </system>
           {{#runtime-import .github/workflows/plan.md}}
diff --git a/.github/workflows/poem-bot.lock.yml b/.github/workflows/poem-bot.lock.yml
index 3eb4649807f..cca6ec4fa3b 100644
--- a/.github/workflows/poem-bot.lock.yml
+++ b/.github/workflows/poem-bot.lock.yml
@@ -295,6 +295,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_19ae3bb8b5c482fd_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/pr-nitpick-reviewer.lock.yml b/.github/workflows/pr-nitpick-reviewer.lock.yml
index 0fd6afd849f..16de6d57624 100644
--- a/.github/workflows/pr-nitpick-reviewer.lock.yml
+++ b/.github/workflows/pr-nitpick-reviewer.lock.yml
@@ -277,6 +277,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_06a57a4830833cb8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/pr-code-review-config.md}}
diff --git a/.github/workflows/pr-triage-agent.lock.yml b/.github/workflows/pr-triage-agent.lock.yml
index 0bb053f41e5..195148ea82e 100644
--- a/.github/workflows/pr-triage-agent.lock.yml
+++ b/.github/workflows/pr-triage-agent.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_253153894c917844_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_253153894c917844_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/prompt-clustering-analysis.lock.yml b/.github/workflows/prompt-clustering-analysis.lock.yml
index b6afb34248a..92a216afa40 100644
--- a/.github/workflows/prompt-clustering-analysis.lock.yml
+++ b/.github/workflows/prompt-clustering-analysis.lock.yml
@@ -253,6 +253,9 @@ jobs:
           
           GH_AW_PROMPT_ed5417896bdbdb8e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ed5417896bdbdb8e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/python-data-charts.lock.yml b/.github/workflows/python-data-charts.lock.yml
index bf17ad5d5c2..217283a48fe 100644
--- a/.github/workflows/python-data-charts.lock.yml
+++ b/.github/workflows/python-data-charts.lock.yml
@@ -232,6 +232,9 @@ jobs:
           
           GH_AW_PROMPT_130cf5488a7b6ad4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_130cf5488a7b6ad4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/charts-with-trending.md}}
diff --git a/.github/workflows/q.lock.yml b/.github/workflows/q.lock.yml
index f82333ec53e..f205a2b0c61 100644
--- a/.github/workflows/q.lock.yml
+++ b/.github/workflows/q.lock.yml
@@ -310,6 +310,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_4fdd9801819d223c_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/refactoring-cadence.lock.yml b/.github/workflows/refactoring-cadence.lock.yml
index a733e23343b..aeaeae6acc4 100644
--- a/.github/workflows/refactoring-cadence.lock.yml
+++ b/.github/workflows/refactoring-cadence.lock.yml
@@ -217,6 +217,9 @@ jobs:
           
           GH_AW_PROMPT_8a1b92b889a26592_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_8a1b92b889a26592_EOF'
           </system>
           {{#runtime-import .github/workflows/refactoring-cadence.md}}
diff --git a/.github/workflows/refiner.lock.yml b/.github/workflows/refiner.lock.yml
index 70355a848bb..cff430bbe06 100644
--- a/.github/workflows/refiner.lock.yml
+++ b/.github/workflows/refiner.lock.yml
@@ -255,6 +255,9 @@ jobs:
           
           GH_AW_PROMPT_8bcb6566d1be6fcb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_8bcb6566d1be6fcb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/release.lock.yml b/.github/workflows/release.lock.yml
index a287522df23..b89b2892b8f 100644
--- a/.github/workflows/release.lock.yml
+++ b/.github/workflows/release.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_79342ddfec0e424b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_79342ddfec0e424b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/community-attribution.md}}
diff --git a/.github/workflows/repo-audit-analyzer.lock.yml b/.github/workflows/repo-audit-analyzer.lock.yml
index 093a4861a2e..9d612d008a1 100644
--- a/.github/workflows/repo-audit-analyzer.lock.yml
+++ b/.github/workflows/repo-audit-analyzer.lock.yml
@@ -241,6 +241,9 @@ jobs:
           
           GH_AW_PROMPT_281009734093affb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_281009734093affb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/repo-tree-map.lock.yml b/.github/workflows/repo-tree-map.lock.yml
index 65f39e04869..4075820260f 100644
--- a/.github/workflows/repo-tree-map.lock.yml
+++ b/.github/workflows/repo-tree-map.lock.yml
@@ -223,6 +223,9 @@ jobs:
           
           GH_AW_PROMPT_d7a36150f4488be6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_d7a36150f4488be6_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/repository-quality-improver.lock.yml b/.github/workflows/repository-quality-improver.lock.yml
index c0ba2ed8a2a..1e43e9f896d 100644
--- a/.github/workflows/repository-quality-improver.lock.yml
+++ b/.github/workflows/repository-quality-improver.lock.yml
@@ -241,6 +241,9 @@ jobs:
           
           GH_AW_PROMPT_4f44a3ac5441beb0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_4f44a3ac5441beb0_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/research.lock.yml b/.github/workflows/research.lock.yml
index 146474a6bd4..3b3bb9d18c1 100644
--- a/.github/workflows/research.lock.yml
+++ b/.github/workflows/research.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_98d74baf63f8b6ad_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_98d74baf63f8b6ad_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/tavily.md}}
diff --git a/.github/workflows/safe-output-health.lock.yml b/.github/workflows/safe-output-health.lock.yml
index 82df160e4c7..65528f8b2d8 100644
--- a/.github/workflows/safe-output-health.lock.yml
+++ b/.github/workflows/safe-output-health.lock.yml
@@ -244,6 +244,9 @@ jobs:
           
           GH_AW_PROMPT_4b0b7f84e0fb41f7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_4b0b7f84e0fb41f7_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/aw-logs-24h-fetch.md}}
diff --git a/.github/workflows/schema-consistency-checker.lock.yml b/.github/workflows/schema-consistency-checker.lock.yml
index dc5ad89c26b..6cbf25c134b 100644
--- a/.github/workflows/schema-consistency-checker.lock.yml
+++ b/.github/workflows/schema-consistency-checker.lock.yml
@@ -240,6 +240,9 @@ jobs:
           
           GH_AW_PROMPT_d984ba9ebca19fc3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_d984ba9ebca19fc3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/schema-feature-coverage.lock.yml b/.github/workflows/schema-feature-coverage.lock.yml
index a8be24d2c4f..28a6cb4ba60 100644
--- a/.github/workflows/schema-feature-coverage.lock.yml
+++ b/.github/workflows/schema-feature-coverage.lock.yml
@@ -226,6 +226,9 @@ jobs:
           
           GH_AW_PROMPT_fae8e9bb7c978eec_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_fae8e9bb7c978eec_EOF'
           </system>
           {{#runtime-import .github/workflows/schema-feature-coverage.md}}
@@ -1195,18 +1198,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_6adcf160d554f9c7_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_e65482b52fb240c7_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_6adcf160d554f9c7_EOF
+          GH_AW_MCP_CONFIG_e65482b52fb240c7_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_f8ed89966c50634f_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_42379fb8416637f6_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1217,11 +1220,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_f8ed89966c50634f_EOF
+          GH_AW_MCP_CONFIG_42379fb8416637f6_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_f73327a3d252091a_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_0e8855dc7bcc3334_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1231,7 +1234,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_f73327a3d252091a_EOF
+          GH_AW_CODEX_SHELL_POLICY_0e8855dc7bcc3334_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/scout.lock.yml b/.github/workflows/scout.lock.yml
index 8973880531f..8d3caba67dc 100644
--- a/.github/workflows/scout.lock.yml
+++ b/.github/workflows/scout.lock.yml
@@ -329,6 +329,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_8272fdeb55a2370c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/security-compliance.lock.yml b/.github/workflows/security-compliance.lock.yml
index e9cd8c64b72..65589f2371d 100644
--- a/.github/workflows/security-compliance.lock.yml
+++ b/.github/workflows/security-compliance.lock.yml
@@ -234,6 +234,9 @@ jobs:
           
           GH_AW_PROMPT_e182ce1782081fe9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_e182ce1782081fe9_EOF'
           </system>
           {{#runtime-import .github/workflows/security-compliance.md}}
diff --git a/.github/workflows/security-review.lock.yml b/.github/workflows/security-review.lock.yml
index 40ef312d3f8..1386d9cade9 100644
--- a/.github/workflows/security-review.lock.yml
+++ b/.github/workflows/security-review.lock.yml
@@ -274,6 +274,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ee0f70d59b920340_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/semantic-function-refactor.lock.yml b/.github/workflows/semantic-function-refactor.lock.yml
index ddc38820c96..ed0d9f0a17f 100644
--- a/.github/workflows/semantic-function-refactor.lock.yml
+++ b/.github/workflows/semantic-function-refactor.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_63264fecff0f6f38_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_63264fecff0f6f38_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/sergo.lock.yml b/.github/workflows/sergo.lock.yml
index f883edf8b5b..130b6d0b174 100644
--- a/.github/workflows/sergo.lock.yml
+++ b/.github/workflows/sergo.lock.yml
@@ -241,6 +241,9 @@ jobs:
           
           GH_AW_PROMPT_4179d90e1e2bd67a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_4179d90e1e2bd67a_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/slide-deck-maintainer.lock.yml b/.github/workflows/slide-deck-maintainer.lock.yml
index 109cacf7d9e..fac27eb5e62 100644
--- a/.github/workflows/slide-deck-maintainer.lock.yml
+++ b/.github/workflows/slide-deck-maintainer.lock.yml
@@ -240,6 +240,9 @@ jobs:
           
           GH_AW_PROMPT_f9dfff389c6d2518_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f9dfff389c6d2518_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/smoke-agent-all-merged.lock.yml b/.github/workflows/smoke-agent-all-merged.lock.yml
index f82723ceac5..aa40f9f7750 100644
--- a/.github/workflows/smoke-agent-all-merged.lock.yml
+++ b/.github/workflows/smoke-agent-all-merged.lock.yml
@@ -267,6 +267,9 @@ jobs:
           
           GH_AW_PROMPT_2154fa1d6c586071_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2154fa1d6c586071_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-agent-all-none.lock.yml b/.github/workflows/smoke-agent-all-none.lock.yml
index 0853d43e876..5ab1e669695 100644
--- a/.github/workflows/smoke-agent-all-none.lock.yml
+++ b/.github/workflows/smoke-agent-all-none.lock.yml
@@ -267,6 +267,9 @@ jobs:
           
           GH_AW_PROMPT_d87d9898ea35480b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_d87d9898ea35480b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-agent-public-approved.lock.yml b/.github/workflows/smoke-agent-public-approved.lock.yml
index 764a0044f0b..03769cff931 100644
--- a/.github/workflows/smoke-agent-public-approved.lock.yml
+++ b/.github/workflows/smoke-agent-public-approved.lock.yml
@@ -269,6 +269,9 @@ jobs:
           
           GH_AW_PROMPT_3e689fc9bcbf861a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_3e689fc9bcbf861a_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/smoke-agent-public-none.lock.yml b/.github/workflows/smoke-agent-public-none.lock.yml
index e3ab6923918..44106fd9d7f 100644
--- a/.github/workflows/smoke-agent-public-none.lock.yml
+++ b/.github/workflows/smoke-agent-public-none.lock.yml
@@ -267,6 +267,9 @@ jobs:
           
           GH_AW_PROMPT_b5f95b20ac0f0789_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b5f95b20ac0f0789_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-agent-scoped-approved.lock.yml b/.github/workflows/smoke-agent-scoped-approved.lock.yml
index dc5b65369b7..a5ca1d9aa8a 100644
--- a/.github/workflows/smoke-agent-scoped-approved.lock.yml
+++ b/.github/workflows/smoke-agent-scoped-approved.lock.yml
@@ -268,6 +268,9 @@ jobs:
           
           GH_AW_PROMPT_b21bd306ae054208_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b21bd306ae054208_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/smoke-call-workflow.lock.yml b/.github/workflows/smoke-call-workflow.lock.yml
index 4358249a289..e1a780bb22b 100644
--- a/.github/workflows/smoke-call-workflow.lock.yml
+++ b/.github/workflows/smoke-call-workflow.lock.yml
@@ -254,6 +254,9 @@ jobs:
           
           GH_AW_PROMPT_0bcd7ba305cfca31_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0bcd7ba305cfca31_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
@@ -1227,18 +1230,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_cb693f0aba47d10f_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_521cb5c999d93d42_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_cb693f0aba47d10f_EOF
+          GH_AW_MCP_CONFIG_521cb5c999d93d42_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_1241538d7c0ff11a_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_59831d6958e619d6_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1249,11 +1252,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_1241538d7c0ff11a_EOF
+          GH_AW_MCP_CONFIG_59831d6958e619d6_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_4f5e4c03ceae6f43_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_e2842d29131de42e_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1263,7 +1266,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_4f5e4c03ceae6f43_EOF
+          GH_AW_CODEX_SHELL_POLICY_e2842d29131de42e_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/smoke-ci.lock.yml b/.github/workflows/smoke-ci.lock.yml
index 9742bb35e30..aaf0705c865 100644
--- a/.github/workflows/smoke-ci.lock.yml
+++ b/.github/workflows/smoke-ci.lock.yml
@@ -250,6 +250,9 @@ jobs:
           
           GH_AW_PROMPT_06e3e19b06693820_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_06e3e19b06693820_EOF'
           </system>
           {{#runtime-import .github/workflows/smoke-ci.md}}
diff --git a/.github/workflows/smoke-claude.lock.yml b/.github/workflows/smoke-claude.lock.yml
index 035fed59d8e..7965c41c68b 100644
--- a/.github/workflows/smoke-claude.lock.yml
+++ b/.github/workflows/smoke-claude.lock.yml
@@ -307,6 +307,9 @@ jobs:
           
           GH_AW_PROMPT_1ff941a307e33158_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1ff941a307e33158_EOF'
           </system>
           
diff --git a/.github/workflows/smoke-codex.lock.yml b/.github/workflows/smoke-codex.lock.yml
index b4dbae3720b..b68a46ac588 100644
--- a/.github/workflows/smoke-codex.lock.yml
+++ b/.github/workflows/smoke-codex.lock.yml
@@ -305,6 +305,9 @@ jobs:
           
           GH_AW_PROMPT_928d68ef3e3a244b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_928d68ef3e3a244b_EOF'
           </system>
           ## Serena Code Analysis
@@ -1782,18 +1785,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_c3c511e6a42c188c_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_54254f1b40d557a3_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_c3c511e6a42c188c_EOF
+          GH_AW_MCP_CONFIG_54254f1b40d557a3_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_9b1b5080e582142e_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_16ff8c107bf13ee2_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1804,11 +1807,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_9b1b5080e582142e_EOF
+          GH_AW_MCP_CONFIG_16ff8c107bf13ee2_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_d2d6560daa399a2f_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_dc90eca25964650a_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1818,7 +1821,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_d2d6560daa399a2f_EOF
+          GH_AW_CODEX_SHELL_POLICY_dc90eca25964650a_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/smoke-copilot-arm.lock.yml b/.github/workflows/smoke-copilot-arm.lock.yml
index a9e82f8ad3d..68def71b11e 100644
--- a/.github/workflows/smoke-copilot-arm.lock.yml
+++ b/.github/workflows/smoke-copilot-arm.lock.yml
@@ -300,6 +300,9 @@ jobs:
           
           GH_AW_PROMPT_e8adced155d997d7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_e8adced155d997d7_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/smoke-copilot.lock.yml b/.github/workflows/smoke-copilot.lock.yml
index 7e80af598d2..302c5d3c1b6 100644
--- a/.github/workflows/smoke-copilot.lock.yml
+++ b/.github/workflows/smoke-copilot.lock.yml
@@ -297,6 +297,9 @@ jobs:
           
           GH_AW_PROMPT_da9cd13ddf198bed_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_da9cd13ddf198bed_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/smoke-create-cross-repo-pr.lock.yml b/.github/workflows/smoke-create-cross-repo-pr.lock.yml
index c1cdfb09b78..bd2afd8e17b 100644
--- a/.github/workflows/smoke-create-cross-repo-pr.lock.yml
+++ b/.github/workflows/smoke-create-cross-repo-pr.lock.yml
@@ -269,6 +269,9 @@ jobs:
           
           GH_AW_PROMPT_0420ea7924b34dcb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0420ea7924b34dcb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-crush.lock.yml b/.github/workflows/smoke-crush.lock.yml
index cd46fb2d7be..0bbb583c563 100644
--- a/.github/workflows/smoke-crush.lock.yml
+++ b/.github/workflows/smoke-crush.lock.yml
@@ -275,6 +275,9 @@ jobs:
           
           GH_AW_PROMPT_b4fa4429d3aa72ae_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_b4fa4429d3aa72ae_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/smoke-gemini.lock.yml b/.github/workflows/smoke-gemini.lock.yml
index ce5df2f7013..8c4652a1dac 100644
--- a/.github/workflows/smoke-gemini.lock.yml
+++ b/.github/workflows/smoke-gemini.lock.yml
@@ -290,6 +290,9 @@ jobs:
           
           GH_AW_PROMPT_46b9e9e2ca0cb2d1_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_46b9e9e2ca0cb2d1_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/smoke-multi-pr.lock.yml b/.github/workflows/smoke-multi-pr.lock.yml
index 116c228565c..5ea83ddbce1 100644
--- a/.github/workflows/smoke-multi-pr.lock.yml
+++ b/.github/workflows/smoke-multi-pr.lock.yml
@@ -287,6 +287,9 @@ jobs:
           
           GH_AW_PROMPT_48a536a540ddcea8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_48a536a540ddcea8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-opencode.lock.yml b/.github/workflows/smoke-opencode.lock.yml
index a31811918b4..f8ce4129cf6 100644
--- a/.github/workflows/smoke-opencode.lock.yml
+++ b/.github/workflows/smoke-opencode.lock.yml
@@ -287,6 +287,9 @@ jobs:
           
           GH_AW_PROMPT_ce2042b8038d4875_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ce2042b8038d4875_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/smoke-project.lock.yml b/.github/workflows/smoke-project.lock.yml
index e4cbe9d0925..9376b4cb4a6 100644
--- a/.github/workflows/smoke-project.lock.yml
+++ b/.github/workflows/smoke-project.lock.yml
@@ -288,6 +288,9 @@ jobs:
           
           GH_AW_PROMPT_58453f345124cba3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_58453f345124cba3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-service-ports.lock.yml b/.github/workflows/smoke-service-ports.lock.yml
index 01ec9b0ad97..423244722c6 100644
--- a/.github/workflows/smoke-service-ports.lock.yml
+++ b/.github/workflows/smoke-service-ports.lock.yml
@@ -244,6 +244,9 @@ jobs:
           
           GH_AW_PROMPT_1c9fa53e6b54b6a3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_1c9fa53e6b54b6a3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-temporary-id.lock.yml b/.github/workflows/smoke-temporary-id.lock.yml
index c830f91f815..f8478ba0cf4 100644
--- a/.github/workflows/smoke-temporary-id.lock.yml
+++ b/.github/workflows/smoke-temporary-id.lock.yml
@@ -283,6 +283,9 @@ jobs:
           
           GH_AW_PROMPT_f9d203436b94b03a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f9d203436b94b03a_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-test-tools.lock.yml b/.github/workflows/smoke-test-tools.lock.yml
index 8ea1ebc4103..ea5122636d9 100644
--- a/.github/workflows/smoke-test-tools.lock.yml
+++ b/.github/workflows/smoke-test-tools.lock.yml
@@ -273,6 +273,9 @@ jobs:
           
           GH_AW_PROMPT_0289aca023ea6d07_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_0289aca023ea6d07_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-update-cross-repo-pr.lock.yml b/.github/workflows/smoke-update-cross-repo-pr.lock.yml
index cd0d8766293..041a7dfb9df 100644
--- a/.github/workflows/smoke-update-cross-repo-pr.lock.yml
+++ b/.github/workflows/smoke-update-cross-repo-pr.lock.yml
@@ -272,6 +272,9 @@ jobs:
           
           GH_AW_PROMPT_95b80c043e2e7005_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_95b80c043e2e7005_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-workflow-call-with-inputs.lock.yml b/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
index 051c4046921..5bab9a9750d 100644
--- a/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
+++ b/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
@@ -273,6 +273,9 @@ jobs:
           
           GH_AW_PROMPT_f2d76cd8a1ef2de8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f2d76cd8a1ef2de8_EOF'
           </system>
           {{#runtime-import .github/workflows/smoke-workflow-call-with-inputs.md}}
diff --git a/.github/workflows/smoke-workflow-call.lock.yml b/.github/workflows/smoke-workflow-call.lock.yml
index 4ecaba0709a..00de3744f33 100644
--- a/.github/workflows/smoke-workflow-call.lock.yml
+++ b/.github/workflows/smoke-workflow-call.lock.yml
@@ -277,6 +277,9 @@ jobs:
           
           GH_AW_PROMPT_022421748a24fe95_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_022421748a24fe95_EOF'
           </system>
           {{#runtime-import .github/workflows/smoke-workflow-call.md}}
diff --git a/.github/workflows/spec-enforcer.lock.yml b/.github/workflows/spec-enforcer.lock.yml
index 17de0b05fbd..f6f9de92061 100644
--- a/.github/workflows/spec-enforcer.lock.yml
+++ b/.github/workflows/spec-enforcer.lock.yml
@@ -230,6 +230,9 @@ jobs:
           
           GH_AW_PROMPT_c74a170bf37c0660_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c74a170bf37c0660_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/spec-extractor.lock.yml b/.github/workflows/spec-extractor.lock.yml
index 5057392edf9..63942fa3bbd 100644
--- a/.github/workflows/spec-extractor.lock.yml
+++ b/.github/workflows/spec-extractor.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_3daaac1a891d7da5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_3daaac1a891d7da5_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/spec-librarian.lock.yml b/.github/workflows/spec-librarian.lock.yml
index ca57ca60689..0df784ac42e 100644
--- a/.github/workflows/spec-librarian.lock.yml
+++ b/.github/workflows/spec-librarian.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_2c4d45d7f39bcff2_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2c4d45d7f39bcff2_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/stale-repo-identifier.lock.yml b/.github/workflows/stale-repo-identifier.lock.yml
index 4dfdae26ef3..1cf37cea57a 100644
--- a/.github/workflows/stale-repo-identifier.lock.yml
+++ b/.github/workflows/stale-repo-identifier.lock.yml
@@ -255,6 +255,9 @@ jobs:
           
           GH_AW_PROMPT_ede8520bbc966539_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ede8520bbc966539_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/static-analysis-report.lock.yml b/.github/workflows/static-analysis-report.lock.yml
index ac63e22c904..b12e07a58ec 100644
--- a/.github/workflows/static-analysis-report.lock.yml
+++ b/.github/workflows/static-analysis-report.lock.yml
@@ -231,6 +231,9 @@ jobs:
           
           GH_AW_PROMPT_a7f209ebfd14c3f4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a7f209ebfd14c3f4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/step-name-alignment.lock.yml b/.github/workflows/step-name-alignment.lock.yml
index 1965e4dd182..8c55503b12a 100644
--- a/.github/workflows/step-name-alignment.lock.yml
+++ b/.github/workflows/step-name-alignment.lock.yml
@@ -224,6 +224,9 @@ jobs:
           
           GH_AW_PROMPT_651666ff422bb502_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_651666ff422bb502_EOF'
           </system>
           {{#runtime-import .github/workflows/step-name-alignment.md}}
diff --git a/.github/workflows/sub-issue-closer.lock.yml b/.github/workflows/sub-issue-closer.lock.yml
index 7bf865d1e40..30f9bbf8db7 100644
--- a/.github/workflows/sub-issue-closer.lock.yml
+++ b/.github/workflows/sub-issue-closer.lock.yml
@@ -221,6 +221,9 @@ jobs:
           
           GH_AW_PROMPT_5ca5aaf91141261e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_5ca5aaf91141261e_EOF'
           </system>
           {{#runtime-import .github/workflows/sub-issue-closer.md}}
diff --git a/.github/workflows/super-linter.lock.yml b/.github/workflows/super-linter.lock.yml
index ce9c223a713..d8fcfa0b29a 100644
--- a/.github/workflows/super-linter.lock.yml
+++ b/.github/workflows/super-linter.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_f5b38ff132780914_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_f5b38ff132780914_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/technical-doc-writer.lock.yml b/.github/workflows/technical-doc-writer.lock.yml
index 83c58aa9c39..31374282c0c 100644
--- a/.github/workflows/technical-doc-writer.lock.yml
+++ b/.github/workflows/technical-doc-writer.lock.yml
@@ -234,6 +234,9 @@ jobs:
           
           GH_AW_PROMPT_2ce6bd8ddc747cbe_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2ce6bd8ddc747cbe_EOF'
           </system>
           {{#runtime-import .github/skills/documentation/SKILL.md}}
diff --git a/.github/workflows/terminal-stylist.lock.yml b/.github/workflows/terminal-stylist.lock.yml
index ea5b28dc1f0..6da7d5f21df 100644
--- a/.github/workflows/terminal-stylist.lock.yml
+++ b/.github/workflows/terminal-stylist.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_622a0a32a37a95cc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_622a0a32a37a95cc_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/test-create-pr-error-handling.lock.yml b/.github/workflows/test-create-pr-error-handling.lock.yml
index 1672a366c15..6d1376fa56e 100644
--- a/.github/workflows/test-create-pr-error-handling.lock.yml
+++ b/.github/workflows/test-create-pr-error-handling.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_2e5a2dbd67e67053_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_2e5a2dbd67e67053_EOF'
           </system>
           {{#runtime-import .github/workflows/test-create-pr-error-handling.md}}
diff --git a/.github/workflows/test-dispatcher.lock.yml b/.github/workflows/test-dispatcher.lock.yml
index 62794afaaa9..3dea1c8c824 100644
--- a/.github/workflows/test-dispatcher.lock.yml
+++ b/.github/workflows/test-dispatcher.lock.yml
@@ -217,6 +217,9 @@ jobs:
           
           GH_AW_PROMPT_639e483721a07aa6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_639e483721a07aa6_EOF'
           </system>
           {{#runtime-import .github/workflows/test-dispatcher.md}}
diff --git a/.github/workflows/test-project-url-default.lock.yml b/.github/workflows/test-project-url-default.lock.yml
index 6003c3080ab..75612657995 100644
--- a/.github/workflows/test-project-url-default.lock.yml
+++ b/.github/workflows/test-project-url-default.lock.yml
@@ -218,6 +218,9 @@ jobs:
           
           GH_AW_PROMPT_115a32ce3f02db9a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_115a32ce3f02db9a_EOF'
           </system>
           {{#runtime-import .github/workflows/test-project-url-default.md}}
diff --git a/.github/workflows/test-quality-sentinel.lock.yml b/.github/workflows/test-quality-sentinel.lock.yml
index 865674f14a0..bdcf68d8c91 100644
--- a/.github/workflows/test-quality-sentinel.lock.yml
+++ b/.github/workflows/test-quality-sentinel.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_18ecf389234a57b4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_18ecf389234a57b4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/test-workflow.lock.yml b/.github/workflows/test-workflow.lock.yml
index c72ef221534..af8f89b31d4 100644
--- a/.github/workflows/test-workflow.lock.yml
+++ b/.github/workflows/test-workflow.lock.yml
@@ -207,6 +207,9 @@ jobs:
           
           GH_AW_PROMPT_d2100dd9504f0ecb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_d2100dd9504f0ecb_EOF'
           </system>
           {{#runtime-import .github/workflows/test-workflow.md}}
diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml
index 0c41675faaf..7579347558e 100644
--- a/.github/workflows/tidy.lock.yml
+++ b/.github/workflows/tidy.lock.yml
@@ -292,6 +292,9 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_68ec8859b6f02696_EOF'
           </system>
           {{#runtime-import .github/workflows/tidy.md}}
diff --git a/.github/workflows/typist.lock.yml b/.github/workflows/typist.lock.yml
index 6ab1bba8665..09d4bcd30d1 100644
--- a/.github/workflows/typist.lock.yml
+++ b/.github/workflows/typist.lock.yml
@@ -238,6 +238,9 @@ jobs:
           
           GH_AW_PROMPT_05cd7a92a03dca4b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_05cd7a92a03dca4b_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/ubuntu-image-analyzer.lock.yml b/.github/workflows/ubuntu-image-analyzer.lock.yml
index a50ef8c3281..10b581e5c4f 100644
--- a/.github/workflows/ubuntu-image-analyzer.lock.yml
+++ b/.github/workflows/ubuntu-image-analyzer.lock.yml
@@ -231,6 +231,9 @@ jobs:
           
           GH_AW_PROMPT_37168e83c534310c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_37168e83c534310c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/unbloat-docs.lock.yml b/.github/workflows/unbloat-docs.lock.yml
index e1516045e67..70bce3bac72 100644
--- a/.github/workflows/unbloat-docs.lock.yml
+++ b/.github/workflows/unbloat-docs.lock.yml
@@ -286,6 +286,9 @@ jobs:
           
           GH_AW_PROMPT_05157cda456dcfb3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_05157cda456dcfb3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/update-astro.lock.yml b/.github/workflows/update-astro.lock.yml
index 8d7ccb9eabe..10d00bd58e6 100644
--- a/.github/workflows/update-astro.lock.yml
+++ b/.github/workflows/update-astro.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_e761d0bef082d79d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_e761d0bef082d79d_EOF'
           </system>
           {{#runtime-import .github/workflows/update-astro.md}}
diff --git a/.github/workflows/video-analyzer.lock.yml b/.github/workflows/video-analyzer.lock.yml
index c693e9ae8f3..e29ea274819 100644
--- a/.github/workflows/video-analyzer.lock.yml
+++ b/.github/workflows/video-analyzer.lock.yml
@@ -225,6 +225,9 @@ jobs:
           
           GH_AW_PROMPT_5e55eb320375d33b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_5e55eb320375d33b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/ffmpeg.md}}
diff --git a/.github/workflows/visual-regression-checker.lock.yml b/.github/workflows/visual-regression-checker.lock.yml
index d7c08fa61d3..da36ad8cbf9 100644
--- a/.github/workflows/visual-regression-checker.lock.yml
+++ b/.github/workflows/visual-regression-checker.lock.yml
@@ -240,6 +240,9 @@ jobs:
           
           GH_AW_PROMPT_c79f5dc89b1c0500_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_c79f5dc89b1c0500_EOF'
           </system>
           {{#runtime-import .github/workflows/visual-regression-checker.md}}
diff --git a/.github/workflows/weekly-blog-post-writer.lock.yml b/.github/workflows/weekly-blog-post-writer.lock.yml
index 2adf00a2b35..74baa757039 100644
--- a/.github/workflows/weekly-blog-post-writer.lock.yml
+++ b/.github/workflows/weekly-blog-post-writer.lock.yml
@@ -231,6 +231,9 @@ jobs:
           
           GH_AW_PROMPT_8291c4dfab1bd39d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_8291c4dfab1bd39d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/weekly-editors-health-check.lock.yml b/.github/workflows/weekly-editors-health-check.lock.yml
index 71b14d2c7ab..9bab3a70e13 100644
--- a/.github/workflows/weekly-editors-health-check.lock.yml
+++ b/.github/workflows/weekly-editors-health-check.lock.yml
@@ -229,6 +229,9 @@ jobs:
           
           GH_AW_PROMPT_734dc520e9323e06_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_734dc520e9323e06_EOF'
           </system>
           {{#runtime-import .github/workflows/weekly-editors-health-check.md}}
diff --git a/.github/workflows/weekly-issue-summary.lock.yml b/.github/workflows/weekly-issue-summary.lock.yml
index a01e08b6231..b3c80253183 100644
--- a/.github/workflows/weekly-issue-summary.lock.yml
+++ b/.github/workflows/weekly-issue-summary.lock.yml
@@ -244,6 +244,9 @@ jobs:
           
           GH_AW_PROMPT_508326a69dd2f474_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_508326a69dd2f474_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/weekly-safe-outputs-spec-review.lock.yml b/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
index ff9ef292475..7fbab479cd5 100644
--- a/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
+++ b/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_dd5ce0f0ce7b0ccb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_dd5ce0f0ce7b0ccb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/workflow-generator.lock.yml b/.github/workflows/workflow-generator.lock.yml
index eb11d2633ac..6d098d5c934 100644
--- a/.github/workflows/workflow-generator.lock.yml
+++ b/.github/workflows/workflow-generator.lock.yml
@@ -260,6 +260,9 @@ jobs:
           
           GH_AW_PROMPT_a2f5a38e58a2e615_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_a2f5a38e58a2e615_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/workflow-health-manager.lock.yml b/.github/workflows/workflow-health-manager.lock.yml
index 27b81aa8eba..8d6e364e26c 100644
--- a/.github/workflows/workflow-health-manager.lock.yml
+++ b/.github/workflows/workflow-health-manager.lock.yml
@@ -228,6 +228,9 @@ jobs:
           
           GH_AW_PROMPT_60b97bb4586a8734_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_60b97bb4586a8734_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/workflow-normalizer.lock.yml b/.github/workflows/workflow-normalizer.lock.yml
index 8b817ce7464..89fa5965bdf 100644
--- a/.github/workflows/workflow-normalizer.lock.yml
+++ b/.github/workflows/workflow-normalizer.lock.yml
@@ -227,6 +227,9 @@ jobs:
           
           GH_AW_PROMPT_476e26a6aca6d1d8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_476e26a6aca6d1d8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/workflow-skill-extractor.lock.yml b/.github/workflows/workflow-skill-extractor.lock.yml
index e0038807ca1..cbdf4f33c29 100644
--- a/.github/workflows/workflow-skill-extractor.lock.yml
+++ b/.github/workflows/workflow-skill-extractor.lock.yml
@@ -223,6 +223,9 @@ jobs:
           
           GH_AW_PROMPT_ae8bac670414c599_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_ae8bac670414c599_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/actions/setup/md/skills_prompt.md b/actions/setup/md/skills_prompt.md
new file mode 100644
index 00000000000..33f16649b29
--- /dev/null
+++ b/actions/setup/md/skills_prompt.md
@@ -0,0 +1,15 @@
+<skills>
+This repository contains skill files (`SKILL.md`) that provide domain-specific knowledge and guidance. Skill files are located under `skills/` or `.github/skills/` directories.
+
+You may use skills in two ways:
+
+**1. Hint (generalist)** — When your task strategy is not fully defined, discover relevant skills at runtime and apply them:
+```bash
+find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6
+```
+Read only the skills that are relevant to your current task. Do not load all skills indiscriminately.
+
+**2. Fusion (precise)** — When a specific skill section directly applies to your task, read only that section and integrate its guidance surgically. Do not paste the entire skill file; extract the minimum fragment needed.
+
+Prefer the **fusion approach** when you can identify the relevant skill and section upfront — it uses less context and produces more focused output.
+</skills>
diff --git a/pkg/workflow/prompt_constants.go b/pkg/workflow/prompt_constants.go
index 16a70139fc8..5f35f57c917 100644
--- a/pkg/workflow/prompt_constants.go
+++ b/pkg/workflow/prompt_constants.go
@@ -30,6 +30,7 @@ const (
 	mcpCLIToolsPromptFile                   = "mcp_cli_tools_prompt.md"
 	cliProxyPromptFile                      = "cli_proxy_prompt.md"
 	cliProxyWithSafeOutputsPromptFile       = "cli_proxy_with_safeoutputs_prompt.md"
+	skillsPromptFile                        = "skills_prompt.md"
 )
 
 // GitHub context prompt is kept embedded because it contains GitHub Actions expressions
diff --git a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
index a7c10c811d1..bbab4d86c24 100644
--- a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
+++ b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
@@ -162,6 +162,9 @@ jobs:
           
           GH_AW_PROMPT_NORM_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_NORM_EOF'
           </system>
           # Mission
diff --git a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
index f83c9b318ef..8fe9e286a45 100644
--- a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
+++ b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
@@ -162,6 +162,9 @@ jobs:
           
           GH_AW_PROMPT_NORM_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
+          fi
           cat << 'GH_AW_PROMPT_NORM_EOF'
           </system>
           {{#runtime-import shared/tools.md}}
diff --git a/pkg/workflow/unified_prompt_step.go b/pkg/workflow/unified_prompt_step.go
index c0a72b1bf7b..fe9385c2b29 100644
--- a/pkg/workflow/unified_prompt_step.go
+++ b/pkg/workflow/unified_prompt_step.go
@@ -305,6 +305,14 @@ func (c *Compiler) collectPromptSections(data *WorkflowData) []PromptSection {
 		}
 	}
 
+	// 12. Skills instructions (if SKILL.md files are present in the workspace at runtime)
+	unifiedPromptLog.Print("Adding skills detection section")
+	sections = append(sections, PromptSection{
+		Content:        skillsPromptFile,
+		IsFile:         true,
+		ShellCondition: `find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .`,
+	})
+
 	return sections
 }
 
diff --git a/pkg/workflow/unified_prompt_step_test.go b/pkg/workflow/unified_prompt_step_test.go
index dea1b3e779c..4b566b87571 100644
--- a/pkg/workflow/unified_prompt_step_test.go
+++ b/pkg/workflow/unified_prompt_step_test.go
@@ -49,6 +49,7 @@ func TestCollectPromptSections_Order(t *testing.T) {
 	// 6. Safe outputs
 	// 7. GitHub context
 	// 8. PR context
+	// 9. Skills detection
 
 	var sectionTypes []string
 	for _, section := range sections {
@@ -59,6 +60,8 @@ func TestCollectPromptSections_Order(t *testing.T) {
 				sectionTypes = append(sectionTypes, "playwright")
 			} else if strings.Contains(section.Content, "pr_context") {
 				sectionTypes = append(sectionTypes, "pr-context")
+			} else if strings.Contains(section.Content, "skills") {
+				sectionTypes = append(sectionTypes, "skills")
 			}
 		} else {
 			if strings.Contains(section.Content, "## Note") {
@@ -76,7 +79,7 @@ func TestCollectPromptSections_Order(t *testing.T) {
 	}
 
 	// Verify expected order (not all may be present, but order should be maintained)
-	expectedOrder := []string{"temp", "playwright", "trial", "cache", "repo", "safe-outputs", "github", "pr-context"}
+	expectedOrder := []string{"temp", "playwright", "trial", "cache", "repo", "safe-outputs", "github", "pr-context", "skills"}
 
 	// Check that the sections we found appear in the expected order
 	lastIndex := -1

From b92141df99977dae4a5c476ab231dd4536bf6d8d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 30 Apr 2026 00:56:13 +0000
Subject: [PATCH 2/5] Reduce SKILL.md detection maxdepth from 6 to 4 and update
 golden files + lock files

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/e00ec7fc-0ada-4438-b703-81c4b85f28d9

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 .github/workflows/ace-editor.lock.yml              |  2 +-
 .../workflows/agent-performance-analyzer.lock.yml  |  2 +-
 .github/workflows/agent-persona-explorer.lock.yml  |  2 +-
 .github/workflows/ai-moderator.lock.yml            |  2 +-
 .github/workflows/api-consumption-report.lock.yml  |  2 +-
 .github/workflows/approach-validator.lock.yml      |  2 +-
 .github/workflows/archie.lock.yml                  |  2 +-
 .github/workflows/architecture-guardian.lock.yml   |  2 +-
 .github/workflows/artifacts-summary.lock.yml       |  2 +-
 .github/workflows/audit-workflows.lock.yml         |  2 +-
 .github/workflows/auto-triage-issues.lock.yml      |  2 +-
 .github/workflows/aw-failure-investigator.lock.yml |  2 +-
 .github/workflows/blog-auditor.lock.yml            |  2 +-
 .github/workflows/bot-detection.lock.yml           |  2 +-
 .github/workflows/brave.lock.yml                   |  2 +-
 .github/workflows/breaking-change-checker.lock.yml |  2 +-
 .github/workflows/changeset.lock.yml               |  2 +-
 .github/workflows/ci-coach.lock.yml                |  2 +-
 .github/workflows/ci-doctor.lock.yml               |  2 +-
 .../claude-code-user-docs-review.lock.yml          |  2 +-
 .github/workflows/cli-consistency-checker.lock.yml |  2 +-
 .github/workflows/cli-version-checker.lock.yml     |  2 +-
 .github/workflows/cloclo.lock.yml                  |  2 +-
 .github/workflows/code-scanning-fixer.lock.yml     |  2 +-
 .github/workflows/code-simplifier.lock.yml         |  2 +-
 .../codex-github-remote-mcp-test.lock.yml          |  2 +-
 .github/workflows/commit-changes-analyzer.lock.yml |  2 +-
 .github/workflows/constraint-solving-potd.lock.yml |  2 +-
 .github/workflows/contribution-check.lock.yml      |  2 +-
 .github/workflows/copilot-agent-analysis.lock.yml  |  2 +-
 .../workflows/copilot-cli-deep-research.lock.yml   |  2 +-
 .github/workflows/copilot-opt.lock.yml             |  2 +-
 .../workflows/copilot-pr-merged-report.lock.yml    |  2 +-
 .github/workflows/copilot-pr-nlp-analysis.lock.yml |  2 +-
 .../workflows/copilot-pr-prompt-analysis.lock.yml  |  2 +-
 .../workflows/copilot-session-insights.lock.yml    |  2 +-
 .github/workflows/copilot-token-audit.lock.yml     |  2 +-
 .github/workflows/copilot-token-optimizer.lock.yml |  2 +-
 .github/workflows/craft.lock.yml                   |  2 +-
 .../workflows/daily-architecture-diagram.lock.yml  |  2 +-
 .../workflows/daily-assign-issue-to-user.lock.yml  |  2 +-
 ...ily-astrostylelite-markdown-spellcheck.lock.yml |  2 +-
 .../daily-aw-cross-repo-compile-check.lock.yml     |  2 +-
 .../daily-cache-strategy-analyzer.lock.yml         | 14 +++++++-------
 .github/workflows/daily-caveman-optimizer.lock.yml |  2 +-
 .github/workflows/daily-choice-test.lock.yml       |  2 +-
 .github/workflows/daily-cli-performance.lock.yml   |  2 +-
 .github/workflows/daily-cli-tools-tester.lock.yml  |  2 +-
 .github/workflows/daily-code-metrics.lock.yml      |  2 +-
 .../workflows/daily-community-attribution.lock.yml |  2 +-
 .github/workflows/daily-compiler-quality.lock.yml  |  2 +-
 .github/workflows/daily-doc-healer.lock.yml        |  2 +-
 .github/workflows/daily-doc-updater.lock.yml       |  2 +-
 .github/workflows/daily-fact.lock.yml              | 14 +++++++-------
 .github/workflows/daily-file-diet.lock.yml         |  2 +-
 .github/workflows/daily-firewall-report.lock.yml   |  2 +-
 .github/workflows/daily-function-namer.lock.yml    |  2 +-
 .github/workflows/daily-hippo-learn.lock.yml       |  2 +-
 .github/workflows/daily-issues-report.lock.yml     |  2 +-
 .../workflows/daily-malicious-code-scan.lock.yml   |  2 +-
 .../daily-mcp-concurrency-analysis.lock.yml        |  2 +-
 .../daily-multi-device-docs-tester.lock.yml        |  2 +-
 .github/workflows/daily-news.lock.yml              |  2 +-
 .../workflows/daily-observability-report.lock.yml  | 14 +++++++-------
 .../daily-otel-instrumentation-advisor.lock.yml    |  2 +-
 .../workflows/daily-performance-summary.lock.yml   |  2 +-
 .github/workflows/daily-regulatory.lock.yml        |  2 +-
 .../daily-rendering-scripts-verifier.lock.yml      |  2 +-
 .github/workflows/daily-repo-chronicle.lock.yml    |  2 +-
 .../daily-safe-output-integrator.lock.yml          |  2 +-
 .../workflows/daily-safe-output-optimizer.lock.yml |  2 +-
 .../daily-safe-outputs-conformance.lock.yml        |  2 +-
 .github/workflows/daily-secrets-analysis.lock.yml  |  2 +-
 .../daily-security-observability.lock.yml          |  2 +-
 .github/workflows/daily-security-red-team.lock.yml |  2 +-
 .github/workflows/daily-semgrep-scan.lock.yml      |  2 +-
 .github/workflows/daily-sentrux-report.lock.yml    |  2 +-
 .github/workflows/daily-skill-optimizer.lock.yml   |  2 +-
 .../workflows/daily-syntax-error-quality.lock.yml  |  2 +-
 .../daily-team-evolution-insights.lock.yml         |  2 +-
 .github/workflows/daily-team-status.lock.yml       |  2 +-
 .../daily-testify-uber-super-expert.lock.yml       |  2 +-
 .../daily-token-consumption-report.lock.yml        |  2 +-
 .github/workflows/daily-workflow-updater.lock.yml  |  2 +-
 .github/workflows/dead-code-remover.lock.yml       |  2 +-
 .github/workflows/deep-report.lock.yml             |  2 +-
 .github/workflows/delight.lock.yml                 |  2 +-
 .github/workflows/dependabot-burner.lock.yml       |  2 +-
 .github/workflows/dependabot-go-checker.lock.yml   |  2 +-
 .github/workflows/dependabot-repair.lock.yml       |  2 +-
 .../workflows/deployment-incident-monitor.lock.yml |  2 +-
 .github/workflows/design-decision-gate.lock.yml    |  2 +-
 .github/workflows/dev-hawk.lock.yml                |  2 +-
 .github/workflows/dev.lock.yml                     |  2 +-
 .../workflows/developer-docs-consolidator.lock.yml |  2 +-
 .github/workflows/dictation-prompt.lock.yml        |  2 +-
 .github/workflows/discussion-task-miner.lock.yml   |  2 +-
 .github/workflows/docs-noob-tester.lock.yml        |  2 +-
 .github/workflows/draft-pr-cleanup.lock.yml        |  2 +-
 .github/workflows/duplicate-code-detector.lock.yml | 14 +++++++-------
 .../workflows/example-permissions-warning.lock.yml |  2 +-
 .../workflows/example-workflow-analyzer.lock.yml   |  2 +-
 .github/workflows/firewall-escape.lock.yml         |  2 +-
 .github/workflows/firewall.lock.yml                |  2 +-
 .github/workflows/functional-pragmatist.lock.yml   |  2 +-
 .../github-mcp-structural-analysis.lock.yml        |  2 +-
 .github/workflows/github-mcp-tools-report.lock.yml |  2 +-
 .../workflows/github-remote-mcp-auth-test.lock.yml |  2 +-
 .github/workflows/glossary-maintainer.lock.yml     |  2 +-
 .github/workflows/go-fan.lock.yml                  |  2 +-
 .github/workflows/go-logger.lock.yml               |  2 +-
 .github/workflows/go-pattern-detector.lock.yml     |  2 +-
 .github/workflows/gpclean.lock.yml                 |  2 +-
 .github/workflows/grumpy-reviewer.lock.yml         | 14 +++++++-------
 .github/workflows/hippo-embed.lock.yml             |  2 +-
 .github/workflows/hourly-ci-cleaner.lock.yml       |  2 +-
 .github/workflows/instructions-janitor.lock.yml    |  2 +-
 .github/workflows/issue-arborist.lock.yml          | 14 +++++++-------
 .github/workflows/issue-monster.lock.yml           |  2 +-
 .github/workflows/issue-triage-agent.lock.yml      |  2 +-
 .github/workflows/jsweep.lock.yml                  |  2 +-
 .github/workflows/layout-spec-maintainer.lock.yml  |  2 +-
 .github/workflows/lockfile-stats.lock.yml          |  2 +-
 .github/workflows/mcp-inspector.lock.yml           |  2 +-
 .github/workflows/mergefest.lock.yml               |  2 +-
 .github/workflows/metrics-collector.lock.yml       |  2 +-
 .github/workflows/notion-issue-summary.lock.yml    |  2 +-
 .github/workflows/org-health-report.lock.yml       |  2 +-
 .github/workflows/pdf-summary.lock.yml             |  2 +-
 .github/workflows/plan.lock.yml                    |  2 +-
 .github/workflows/poem-bot.lock.yml                |  2 +-
 .github/workflows/pr-nitpick-reviewer.lock.yml     |  2 +-
 .github/workflows/pr-triage-agent.lock.yml         |  2 +-
 .../workflows/prompt-clustering-analysis.lock.yml  |  2 +-
 .github/workflows/python-data-charts.lock.yml      |  2 +-
 .github/workflows/q.lock.yml                       |  2 +-
 .github/workflows/refactoring-cadence.lock.yml     |  2 +-
 .github/workflows/refiner.lock.yml                 |  2 +-
 .github/workflows/release.lock.yml                 |  2 +-
 .github/workflows/repo-audit-analyzer.lock.yml     |  2 +-
 .github/workflows/repo-tree-map.lock.yml           |  2 +-
 .../workflows/repository-quality-improver.lock.yml |  2 +-
 .github/workflows/research.lock.yml                |  2 +-
 .github/workflows/safe-output-health.lock.yml      |  2 +-
 .../workflows/schema-consistency-checker.lock.yml  |  2 +-
 .github/workflows/schema-feature-coverage.lock.yml | 14 +++++++-------
 .github/workflows/scout.lock.yml                   |  2 +-
 .github/workflows/security-compliance.lock.yml     |  2 +-
 .github/workflows/security-review.lock.yml         |  2 +-
 .../workflows/semantic-function-refactor.lock.yml  |  2 +-
 .github/workflows/sergo.lock.yml                   |  2 +-
 .github/workflows/slide-deck-maintainer.lock.yml   |  2 +-
 .github/workflows/smoke-agent-all-merged.lock.yml  |  2 +-
 .github/workflows/smoke-agent-all-none.lock.yml    |  2 +-
 .../workflows/smoke-agent-public-approved.lock.yml |  2 +-
 .github/workflows/smoke-agent-public-none.lock.yml |  2 +-
 .../workflows/smoke-agent-scoped-approved.lock.yml |  2 +-
 .github/workflows/smoke-call-workflow.lock.yml     | 14 +++++++-------
 .github/workflows/smoke-ci.lock.yml                |  2 +-
 .github/workflows/smoke-claude.lock.yml            |  2 +-
 .github/workflows/smoke-codex.lock.yml             | 14 +++++++-------
 .github/workflows/smoke-copilot-arm.lock.yml       |  2 +-
 .github/workflows/smoke-copilot.lock.yml           |  2 +-
 .../workflows/smoke-create-cross-repo-pr.lock.yml  |  2 +-
 .github/workflows/smoke-crush.lock.yml             |  2 +-
 .github/workflows/smoke-gemini.lock.yml            |  2 +-
 .github/workflows/smoke-multi-pr.lock.yml          |  2 +-
 .github/workflows/smoke-opencode.lock.yml          |  2 +-
 .github/workflows/smoke-project.lock.yml           |  2 +-
 .github/workflows/smoke-service-ports.lock.yml     |  2 +-
 .github/workflows/smoke-temporary-id.lock.yml      |  2 +-
 .github/workflows/smoke-test-tools.lock.yml        |  2 +-
 .../workflows/smoke-update-cross-repo-pr.lock.yml  |  2 +-
 .../smoke-workflow-call-with-inputs.lock.yml       |  2 +-
 .github/workflows/smoke-workflow-call.lock.yml     |  2 +-
 .github/workflows/spec-enforcer.lock.yml           |  2 +-
 .github/workflows/spec-extractor.lock.yml          |  2 +-
 .github/workflows/spec-librarian.lock.yml          |  2 +-
 .github/workflows/stale-repo-identifier.lock.yml   |  2 +-
 .github/workflows/static-analysis-report.lock.yml  |  2 +-
 .github/workflows/step-name-alignment.lock.yml     |  2 +-
 .github/workflows/sub-issue-closer.lock.yml        |  2 +-
 .github/workflows/super-linter.lock.yml            |  2 +-
 .github/workflows/technical-doc-writer.lock.yml    |  2 +-
 .github/workflows/terminal-stylist.lock.yml        |  2 +-
 .../test-create-pr-error-handling.lock.yml         |  2 +-
 .github/workflows/test-dispatcher.lock.yml         |  2 +-
 .../workflows/test-project-url-default.lock.yml    |  2 +-
 .github/workflows/test-quality-sentinel.lock.yml   |  2 +-
 .github/workflows/test-workflow.lock.yml           |  2 +-
 .github/workflows/tidy.lock.yml                    |  2 +-
 .github/workflows/typist.lock.yml                  |  2 +-
 .github/workflows/ubuntu-image-analyzer.lock.yml   |  2 +-
 .github/workflows/unbloat-docs.lock.yml            |  2 +-
 .github/workflows/update-astro.lock.yml            |  2 +-
 .github/workflows/video-analyzer.lock.yml          |  2 +-
 .../workflows/visual-regression-checker.lock.yml   |  2 +-
 .github/workflows/weekly-blog-post-writer.lock.yml |  2 +-
 .../workflows/weekly-editors-health-check.lock.yml |  2 +-
 .github/workflows/weekly-issue-summary.lock.yml    |  2 +-
 .../weekly-safe-outputs-spec-review.lock.yml       |  2 +-
 .github/workflows/workflow-generator.lock.yml      |  2 +-
 .github/workflows/workflow-health-manager.lock.yml |  2 +-
 .github/workflows/workflow-normalizer.lock.yml     |  2 +-
 .../workflows/workflow-skill-extractor.lock.yml    |  2 +-
 .../basic-copilot.golden                           |  2 +-
 .../with-imports.golden                            |  2 +-
 pkg/workflow/unified_prompt_step.go                |  2 +-
 208 files changed, 262 insertions(+), 262 deletions(-)

diff --git a/.github/workflows/ace-editor.lock.yml b/.github/workflows/ace-editor.lock.yml
index 064659d8418..5ec543d6365 100644
--- a/.github/workflows/ace-editor.lock.yml
+++ b/.github/workflows/ace-editor.lock.yml
@@ -247,7 +247,7 @@ jobs:
           
           GH_AW_PROMPT_0571c40b9b9857c4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0571c40b9b9857c4_EOF'
diff --git a/.github/workflows/agent-performance-analyzer.lock.yml b/.github/workflows/agent-performance-analyzer.lock.yml
index 39be7ed94f5..d922bbc96ff 100644
--- a/.github/workflows/agent-performance-analyzer.lock.yml
+++ b/.github/workflows/agent-performance-analyzer.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_75bc7f749c7339be_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_75bc7f749c7339be_EOF'
diff --git a/.github/workflows/agent-persona-explorer.lock.yml b/.github/workflows/agent-persona-explorer.lock.yml
index a7934bed349..8c002041848 100644
--- a/.github/workflows/agent-persona-explorer.lock.yml
+++ b/.github/workflows/agent-persona-explorer.lock.yml
@@ -231,7 +231,7 @@ jobs:
           
           GH_AW_PROMPT_7a1be3299129c2b7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_7a1be3299129c2b7_EOF'
diff --git a/.github/workflows/ai-moderator.lock.yml b/.github/workflows/ai-moderator.lock.yml
index 92da0dc15ff..9103438b27a 100644
--- a/.github/workflows/ai-moderator.lock.yml
+++ b/.github/workflows/ai-moderator.lock.yml
@@ -270,7 +270,7 @@ jobs:
           
           GH_AW_PROMPT_2854fab51269987e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2854fab51269987e_EOF'
diff --git a/.github/workflows/api-consumption-report.lock.yml b/.github/workflows/api-consumption-report.lock.yml
index 8b312fb7ae5..8cd8d92036a 100644
--- a/.github/workflows/api-consumption-report.lock.yml
+++ b/.github/workflows/api-consumption-report.lock.yml
@@ -247,7 +247,7 @@ jobs:
           
           GH_AW_PROMPT_2a3fea36388c950d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2a3fea36388c950d_EOF'
diff --git a/.github/workflows/approach-validator.lock.yml b/.github/workflows/approach-validator.lock.yml
index 6b208c60939..6836de9da52 100644
--- a/.github/workflows/approach-validator.lock.yml
+++ b/.github/workflows/approach-validator.lock.yml
@@ -260,7 +260,7 @@ jobs:
           
           GH_AW_PROMPT_c1826eb2224aa7ae_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c1826eb2224aa7ae_EOF'
diff --git a/.github/workflows/archie.lock.yml b/.github/workflows/archie.lock.yml
index b746a5d8df9..46d90dcad0e 100644
--- a/.github/workflows/archie.lock.yml
+++ b/.github/workflows/archie.lock.yml
@@ -275,7 +275,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_87e239b174c50a03_EOF'
diff --git a/.github/workflows/architecture-guardian.lock.yml b/.github/workflows/architecture-guardian.lock.yml
index 47b8eb228f4..794e544cf04 100644
--- a/.github/workflows/architecture-guardian.lock.yml
+++ b/.github/workflows/architecture-guardian.lock.yml
@@ -220,7 +220,7 @@ jobs:
           
           GH_AW_PROMPT_39c70d8a2443c5c7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_39c70d8a2443c5c7_EOF'
diff --git a/.github/workflows/artifacts-summary.lock.yml b/.github/workflows/artifacts-summary.lock.yml
index dd8187a9046..63e2744586b 100644
--- a/.github/workflows/artifacts-summary.lock.yml
+++ b/.github/workflows/artifacts-summary.lock.yml
@@ -217,7 +217,7 @@ jobs:
           
           GH_AW_PROMPT_0b6cabe580a9c36c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0b6cabe580a9c36c_EOF'
diff --git a/.github/workflows/audit-workflows.lock.yml b/.github/workflows/audit-workflows.lock.yml
index d043776285c..97af3a952f0 100644
--- a/.github/workflows/audit-workflows.lock.yml
+++ b/.github/workflows/audit-workflows.lock.yml
@@ -251,7 +251,7 @@ jobs:
           
           GH_AW_PROMPT_a48b8f0681a71fa0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a48b8f0681a71fa0_EOF'
diff --git a/.github/workflows/auto-triage-issues.lock.yml b/.github/workflows/auto-triage-issues.lock.yml
index 58ea9ed9144..65e280e3a45 100644
--- a/.github/workflows/auto-triage-issues.lock.yml
+++ b/.github/workflows/auto-triage-issues.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_acbbe709b3acdcf4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_acbbe709b3acdcf4_EOF'
diff --git a/.github/workflows/aw-failure-investigator.lock.yml b/.github/workflows/aw-failure-investigator.lock.yml
index beffe64817c..7e1a75043d5 100644
--- a/.github/workflows/aw-failure-investigator.lock.yml
+++ b/.github/workflows/aw-failure-investigator.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_d2050658d4489b3f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_d2050658d4489b3f_EOF'
diff --git a/.github/workflows/blog-auditor.lock.yml b/.github/workflows/blog-auditor.lock.yml
index 20ffd51a208..c6403975ac8 100644
--- a/.github/workflows/blog-auditor.lock.yml
+++ b/.github/workflows/blog-auditor.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_771d61fb0fb5ffad_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_771d61fb0fb5ffad_EOF'
diff --git a/.github/workflows/bot-detection.lock.yml b/.github/workflows/bot-detection.lock.yml
index b0679ddf6bf..6ce537279a8 100644
--- a/.github/workflows/bot-detection.lock.yml
+++ b/.github/workflows/bot-detection.lock.yml
@@ -226,7 +226,7 @@ jobs:
           
           GH_AW_PROMPT_5c36ab16716f9d71_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_5c36ab16716f9d71_EOF'
diff --git a/.github/workflows/brave.lock.yml b/.github/workflows/brave.lock.yml
index 4ebfa352818..a15336c99a2 100644
--- a/.github/workflows/brave.lock.yml
+++ b/.github/workflows/brave.lock.yml
@@ -265,7 +265,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_49863381d8f5674f_EOF'
diff --git a/.github/workflows/breaking-change-checker.lock.yml b/.github/workflows/breaking-change-checker.lock.yml
index 7bf0e393a60..e48bb7bbf1d 100644
--- a/.github/workflows/breaking-change-checker.lock.yml
+++ b/.github/workflows/breaking-change-checker.lock.yml
@@ -220,7 +220,7 @@ jobs:
           
           GH_AW_PROMPT_323d89b4a9e41164_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_323d89b4a9e41164_EOF'
diff --git a/.github/workflows/changeset.lock.yml b/.github/workflows/changeset.lock.yml
index 386b4eebd2c..fa9e3bf8482 100644
--- a/.github/workflows/changeset.lock.yml
+++ b/.github/workflows/changeset.lock.yml
@@ -270,7 +270,7 @@ jobs:
           
           GH_AW_PROMPT_f9230b228c3ade5f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f9230b228c3ade5f_EOF'
diff --git a/.github/workflows/ci-coach.lock.yml b/.github/workflows/ci-coach.lock.yml
index fafb303d8b2..bf3f09a9a59 100644
--- a/.github/workflows/ci-coach.lock.yml
+++ b/.github/workflows/ci-coach.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_7a2e23ba30062ebd_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/cli_proxy_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_7a2e23ba30062ebd_EOF'
diff --git a/.github/workflows/ci-doctor.lock.yml b/.github/workflows/ci-doctor.lock.yml
index 00b73dc0277..85bf9d4cbe7 100644
--- a/.github/workflows/ci-doctor.lock.yml
+++ b/.github/workflows/ci-doctor.lock.yml
@@ -280,7 +280,7 @@ jobs:
           
           GH_AW_PROMPT_3107df830c29773c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_3107df830c29773c_EOF'
diff --git a/.github/workflows/claude-code-user-docs-review.lock.yml b/.github/workflows/claude-code-user-docs-review.lock.yml
index faa2aa06797..78943f25810 100644
--- a/.github/workflows/claude-code-user-docs-review.lock.yml
+++ b/.github/workflows/claude-code-user-docs-review.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_bc6f0c544c0b951b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_bc6f0c544c0b951b_EOF'
diff --git a/.github/workflows/cli-consistency-checker.lock.yml b/.github/workflows/cli-consistency-checker.lock.yml
index 3bff18d058d..1ecac7f366f 100644
--- a/.github/workflows/cli-consistency-checker.lock.yml
+++ b/.github/workflows/cli-consistency-checker.lock.yml
@@ -214,7 +214,7 @@ jobs:
           
           GH_AW_PROMPT_c0f2a49a3806cd0a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c0f2a49a3806cd0a_EOF'
diff --git a/.github/workflows/cli-version-checker.lock.yml b/.github/workflows/cli-version-checker.lock.yml
index 1a15baba790..02f444aa0b0 100644
--- a/.github/workflows/cli-version-checker.lock.yml
+++ b/.github/workflows/cli-version-checker.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_1cb164cb4aa17a5d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1cb164cb4aa17a5d_EOF'
diff --git a/.github/workflows/cloclo.lock.yml b/.github/workflows/cloclo.lock.yml
index c73472a5bfe..382de2fc38f 100644
--- a/.github/workflows/cloclo.lock.yml
+++ b/.github/workflows/cloclo.lock.yml
@@ -328,7 +328,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2f983bf8a8c9cb5e_EOF'
diff --git a/.github/workflows/code-scanning-fixer.lock.yml b/.github/workflows/code-scanning-fixer.lock.yml
index 7c9f1416ac2..5bf8cb162f3 100644
--- a/.github/workflows/code-scanning-fixer.lock.yml
+++ b/.github/workflows/code-scanning-fixer.lock.yml
@@ -226,7 +226,7 @@ jobs:
           
           GH_AW_PROMPT_a3b72589f6fc470c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a3b72589f6fc470c_EOF'
diff --git a/.github/workflows/code-simplifier.lock.yml b/.github/workflows/code-simplifier.lock.yml
index bbf543b426f..b8a2f5e1d89 100644
--- a/.github/workflows/code-simplifier.lock.yml
+++ b/.github/workflows/code-simplifier.lock.yml
@@ -232,7 +232,7 @@ jobs:
           
           GH_AW_PROMPT_54a4b28872c44243_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_54a4b28872c44243_EOF'
diff --git a/.github/workflows/codex-github-remote-mcp-test.lock.yml b/.github/workflows/codex-github-remote-mcp-test.lock.yml
index 61d32f85265..7e662b2a90d 100644
--- a/.github/workflows/codex-github-remote-mcp-test.lock.yml
+++ b/.github/workflows/codex-github-remote-mcp-test.lock.yml
@@ -206,7 +206,7 @@ jobs:
           
           GH_AW_PROMPT_56be9e1ef4b9261a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_56be9e1ef4b9261a_EOF'
diff --git a/.github/workflows/commit-changes-analyzer.lock.yml b/.github/workflows/commit-changes-analyzer.lock.yml
index eeab45fa09f..77aa3e6a137 100644
--- a/.github/workflows/commit-changes-analyzer.lock.yml
+++ b/.github/workflows/commit-changes-analyzer.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_c6ba27c7d7f9057e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c6ba27c7d7f9057e_EOF'
diff --git a/.github/workflows/constraint-solving-potd.lock.yml b/.github/workflows/constraint-solving-potd.lock.yml
index a9d186cdcc1..7fc6440c264 100644
--- a/.github/workflows/constraint-solving-potd.lock.yml
+++ b/.github/workflows/constraint-solving-potd.lock.yml
@@ -219,7 +219,7 @@ jobs:
           
           GH_AW_PROMPT_94e7287544da83b8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_94e7287544da83b8_EOF'
diff --git a/.github/workflows/contribution-check.lock.yml b/.github/workflows/contribution-check.lock.yml
index 76c0660ede1..f036f5919c9 100644
--- a/.github/workflows/contribution-check.lock.yml
+++ b/.github/workflows/contribution-check.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_c45bd882916329c6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c45bd882916329c6_EOF'
diff --git a/.github/workflows/copilot-agent-analysis.lock.yml b/.github/workflows/copilot-agent-analysis.lock.yml
index 72f83062256..69fdb038ffd 100644
--- a/.github/workflows/copilot-agent-analysis.lock.yml
+++ b/.github/workflows/copilot-agent-analysis.lock.yml
@@ -244,7 +244,7 @@ jobs:
           
           GH_AW_PROMPT_e8af2cc2a2fbd6e3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_e8af2cc2a2fbd6e3_EOF'
diff --git a/.github/workflows/copilot-cli-deep-research.lock.yml b/.github/workflows/copilot-cli-deep-research.lock.yml
index 2da4ddd8a93..1201e6a0f54 100644
--- a/.github/workflows/copilot-cli-deep-research.lock.yml
+++ b/.github/workflows/copilot-cli-deep-research.lock.yml
@@ -218,7 +218,7 @@ jobs:
           
           GH_AW_PROMPT_7d7a99f9086230e9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_7d7a99f9086230e9_EOF'
diff --git a/.github/workflows/copilot-opt.lock.yml b/.github/workflows/copilot-opt.lock.yml
index c3b9bd5e0eb..f5f278c0ec2 100644
--- a/.github/workflows/copilot-opt.lock.yml
+++ b/.github/workflows/copilot-opt.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_ae30f9b44f06bbdb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ae30f9b44f06bbdb_EOF'
diff --git a/.github/workflows/copilot-pr-merged-report.lock.yml b/.github/workflows/copilot-pr-merged-report.lock.yml
index dce69104d52..92be674dbcc 100644
--- a/.github/workflows/copilot-pr-merged-report.lock.yml
+++ b/.github/workflows/copilot-pr-merged-report.lock.yml
@@ -197,7 +197,7 @@ jobs:
           </safe-output-tools>
           GH_AW_PROMPT_4802dcbccdc6c215_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_4802dcbccdc6c215_EOF'
diff --git a/.github/workflows/copilot-pr-nlp-analysis.lock.yml b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
index 5d4970dc9c3..14a06061167 100644
--- a/.github/workflows/copilot-pr-nlp-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
@@ -242,7 +242,7 @@ jobs:
           
           GH_AW_PROMPT_bfdc232b84fd83d9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_bfdc232b84fd83d9_EOF'
diff --git a/.github/workflows/copilot-pr-prompt-analysis.lock.yml b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
index ad56e1c5f63..04eb4da1e3e 100644
--- a/.github/workflows/copilot-pr-prompt-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
@@ -237,7 +237,7 @@ jobs:
           
           GH_AW_PROMPT_1da7095d771f1966_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1da7095d771f1966_EOF'
diff --git a/.github/workflows/copilot-session-insights.lock.yml b/.github/workflows/copilot-session-insights.lock.yml
index f45393f6dc3..3389784e8aa 100644
--- a/.github/workflows/copilot-session-insights.lock.yml
+++ b/.github/workflows/copilot-session-insights.lock.yml
@@ -250,7 +250,7 @@ jobs:
           
           GH_AW_PROMPT_317daefa67de4e54_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_317daefa67de4e54_EOF'
diff --git a/.github/workflows/copilot-token-audit.lock.yml b/.github/workflows/copilot-token-audit.lock.yml
index a73b11b204e..6f7ec09a77d 100644
--- a/.github/workflows/copilot-token-audit.lock.yml
+++ b/.github/workflows/copilot-token-audit.lock.yml
@@ -243,7 +243,7 @@ jobs:
           
           GH_AW_PROMPT_ebb38a51743f7aa4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ebb38a51743f7aa4_EOF'
diff --git a/.github/workflows/copilot-token-optimizer.lock.yml b/.github/workflows/copilot-token-optimizer.lock.yml
index 6cc0bb9634f..3ba8c09084d 100644
--- a/.github/workflows/copilot-token-optimizer.lock.yml
+++ b/.github/workflows/copilot-token-optimizer.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_958392f59ada5f3c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/cli_proxy_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_958392f59ada5f3c_EOF'
diff --git a/.github/workflows/craft.lock.yml b/.github/workflows/craft.lock.yml
index 02bf26f1c89..55f11a625f0 100644
--- a/.github/workflows/craft.lock.yml
+++ b/.github/workflows/craft.lock.yml
@@ -267,7 +267,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0938d13c8e03385e_EOF'
diff --git a/.github/workflows/daily-architecture-diagram.lock.yml b/.github/workflows/daily-architecture-diagram.lock.yml
index df7153e6703..4446c4b4715 100644
--- a/.github/workflows/daily-architecture-diagram.lock.yml
+++ b/.github/workflows/daily-architecture-diagram.lock.yml
@@ -233,7 +233,7 @@ jobs:
           
           GH_AW_PROMPT_06cc9adb72460c38_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_06cc9adb72460c38_EOF'
diff --git a/.github/workflows/daily-assign-issue-to-user.lock.yml b/.github/workflows/daily-assign-issue-to-user.lock.yml
index 154554c9229..194856f24ba 100644
--- a/.github/workflows/daily-assign-issue-to-user.lock.yml
+++ b/.github/workflows/daily-assign-issue-to-user.lock.yml
@@ -224,7 +224,7 @@ jobs:
           
           GH_AW_PROMPT_f5f9cbddeca39871_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f5f9cbddeca39871_EOF'
diff --git a/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml b/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
index f79b55773e5..24ef397365e 100644
--- a/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
+++ b/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_347d7becffeaa86e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_347d7becffeaa86e_EOF'
diff --git a/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml b/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
index 8afa684a851..45938561fb1 100644
--- a/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
+++ b/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_b9b3547d7529d338_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b9b3547d7529d338_EOF'
diff --git a/.github/workflows/daily-cache-strategy-analyzer.lock.yml b/.github/workflows/daily-cache-strategy-analyzer.lock.yml
index 648eadd7b37..21d0e32c2f2 100644
--- a/.github/workflows/daily-cache-strategy-analyzer.lock.yml
+++ b/.github/workflows/daily-cache-strategy-analyzer.lock.yml
@@ -245,7 +245,7 @@ jobs:
           
           GH_AW_PROMPT_e16b3d9f376629a0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_e16b3d9f376629a0_EOF'
@@ -1388,18 +1388,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_5e67492c7f345b01_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_85e772e89d73ed0c_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_5e67492c7f345b01_EOF
+          GH_AW_MCP_CONFIG_85e772e89d73ed0c_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_032ce6595f7da61e_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_fab0425f837d4865_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1410,11 +1410,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_032ce6595f7da61e_EOF
+          GH_AW_MCP_CONFIG_fab0425f837d4865_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_33d746bc2d355fc7_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_8e14bf118603786e_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1424,7 +1424,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_33d746bc2d355fc7_EOF
+          GH_AW_CODEX_SHELL_POLICY_8e14bf118603786e_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-caveman-optimizer.lock.yml b/.github/workflows/daily-caveman-optimizer.lock.yml
index 7fb88c0b930..21aec3e0a1d 100644
--- a/.github/workflows/daily-caveman-optimizer.lock.yml
+++ b/.github/workflows/daily-caveman-optimizer.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_c86040c388498857_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c86040c388498857_EOF'
diff --git a/.github/workflows/daily-choice-test.lock.yml b/.github/workflows/daily-choice-test.lock.yml
index 02a649c4f23..8d36b37d678 100644
--- a/.github/workflows/daily-choice-test.lock.yml
+++ b/.github/workflows/daily-choice-test.lock.yml
@@ -232,7 +232,7 @@ jobs:
           
           GH_AW_PROMPT_cc851a8c6a90d45c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_cc851a8c6a90d45c_EOF'
diff --git a/.github/workflows/daily-cli-performance.lock.yml b/.github/workflows/daily-cli-performance.lock.yml
index 68000f20f8d..1d62c7796f4 100644
--- a/.github/workflows/daily-cli-performance.lock.yml
+++ b/.github/workflows/daily-cli-performance.lock.yml
@@ -260,7 +260,7 @@ jobs:
           
           GH_AW_PROMPT_93d9536c2ed70fa7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_93d9536c2ed70fa7_EOF'
diff --git a/.github/workflows/daily-cli-tools-tester.lock.yml b/.github/workflows/daily-cli-tools-tester.lock.yml
index ac090e03fc1..0f6a40cbb20 100644
--- a/.github/workflows/daily-cli-tools-tester.lock.yml
+++ b/.github/workflows/daily-cli-tools-tester.lock.yml
@@ -237,7 +237,7 @@ jobs:
           
           GH_AW_PROMPT_7845b77019682aa9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_7845b77019682aa9_EOF'
diff --git a/.github/workflows/daily-code-metrics.lock.yml b/.github/workflows/daily-code-metrics.lock.yml
index 9dd78fa4020..ed9ae660c96 100644
--- a/.github/workflows/daily-code-metrics.lock.yml
+++ b/.github/workflows/daily-code-metrics.lock.yml
@@ -245,7 +245,7 @@ jobs:
           
           GH_AW_PROMPT_e45ff8a78a8305e1_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_e45ff8a78a8305e1_EOF'
diff --git a/.github/workflows/daily-community-attribution.lock.yml b/.github/workflows/daily-community-attribution.lock.yml
index decadf32e5b..394ba36bac8 100644
--- a/.github/workflows/daily-community-attribution.lock.yml
+++ b/.github/workflows/daily-community-attribution.lock.yml
@@ -237,7 +237,7 @@ jobs:
           
           GH_AW_PROMPT_3642021c242227f5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_3642021c242227f5_EOF'
diff --git a/.github/workflows/daily-compiler-quality.lock.yml b/.github/workflows/daily-compiler-quality.lock.yml
index 24b6729c403..63c55382a26 100644
--- a/.github/workflows/daily-compiler-quality.lock.yml
+++ b/.github/workflows/daily-compiler-quality.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_0836f336b83a50af_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0836f336b83a50af_EOF'
diff --git a/.github/workflows/daily-doc-healer.lock.yml b/.github/workflows/daily-doc-healer.lock.yml
index 50468cd19d2..2ec2bf3c2cf 100644
--- a/.github/workflows/daily-doc-healer.lock.yml
+++ b/.github/workflows/daily-doc-healer.lock.yml
@@ -241,7 +241,7 @@ jobs:
           
           GH_AW_PROMPT_1a6ccb96f19ae648_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1a6ccb96f19ae648_EOF'
diff --git a/.github/workflows/daily-doc-updater.lock.yml b/.github/workflows/daily-doc-updater.lock.yml
index a566dae01fb..9ee72a47a5b 100644
--- a/.github/workflows/daily-doc-updater.lock.yml
+++ b/.github/workflows/daily-doc-updater.lock.yml
@@ -240,7 +240,7 @@ jobs:
           
           GH_AW_PROMPT_60321b637369216b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_60321b637369216b_EOF'
diff --git a/.github/workflows/daily-fact.lock.yml b/.github/workflows/daily-fact.lock.yml
index d321754422c..ad6f3882b5b 100644
--- a/.github/workflows/daily-fact.lock.yml
+++ b/.github/workflows/daily-fact.lock.yml
@@ -241,7 +241,7 @@ jobs:
           
           GH_AW_PROMPT_ffb32d86a97a96e6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ffb32d86a97a96e6_EOF'
@@ -1399,18 +1399,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_9d1d766df0483b8c_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_d853212227db6d06_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_9d1d766df0483b8c_EOF
+          GH_AW_MCP_CONFIG_d853212227db6d06_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_f5635a2159c01676_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_d77e10501a9dc0b8_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1421,11 +1421,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_f5635a2159c01676_EOF
+          GH_AW_MCP_CONFIG_d77e10501a9dc0b8_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_57ddd272ae6cb5c1_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_4d9e89e918ed6784_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1435,7 +1435,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_57ddd272ae6cb5c1_EOF
+          GH_AW_CODEX_SHELL_POLICY_4d9e89e918ed6784_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-file-diet.lock.yml b/.github/workflows/daily-file-diet.lock.yml
index a14e907278a..0d4c40b3d79 100644
--- a/.github/workflows/daily-file-diet.lock.yml
+++ b/.github/workflows/daily-file-diet.lock.yml
@@ -236,7 +236,7 @@ jobs:
           
           GH_AW_PROMPT_200f63e58c279776_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_200f63e58c279776_EOF'
diff --git a/.github/workflows/daily-firewall-report.lock.yml b/.github/workflows/daily-firewall-report.lock.yml
index ad251db15bc..5ef00dda4c3 100644
--- a/.github/workflows/daily-firewall-report.lock.yml
+++ b/.github/workflows/daily-firewall-report.lock.yml
@@ -247,7 +247,7 @@ jobs:
           
           GH_AW_PROMPT_36c89e0507e45aff_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_36c89e0507e45aff_EOF'
diff --git a/.github/workflows/daily-function-namer.lock.yml b/.github/workflows/daily-function-namer.lock.yml
index 2892cd564a6..8e51fa42b8c 100644
--- a/.github/workflows/daily-function-namer.lock.yml
+++ b/.github/workflows/daily-function-namer.lock.yml
@@ -239,7 +239,7 @@ jobs:
           
           GH_AW_PROMPT_c14a880afa97f469_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c14a880afa97f469_EOF'
diff --git a/.github/workflows/daily-hippo-learn.lock.yml b/.github/workflows/daily-hippo-learn.lock.yml
index 281afbd7821..a20efe28385 100644
--- a/.github/workflows/daily-hippo-learn.lock.yml
+++ b/.github/workflows/daily-hippo-learn.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_8c26d89de701feb4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_8c26d89de701feb4_EOF'
diff --git a/.github/workflows/daily-issues-report.lock.yml b/.github/workflows/daily-issues-report.lock.yml
index 1eaecb81261..91522b99a59 100644
--- a/.github/workflows/daily-issues-report.lock.yml
+++ b/.github/workflows/daily-issues-report.lock.yml
@@ -250,7 +250,7 @@ jobs:
           
           GH_AW_PROMPT_b9b7669c1673eceb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b9b7669c1673eceb_EOF'
diff --git a/.github/workflows/daily-malicious-code-scan.lock.yml b/.github/workflows/daily-malicious-code-scan.lock.yml
index 5339c725461..60c0f7d138f 100644
--- a/.github/workflows/daily-malicious-code-scan.lock.yml
+++ b/.github/workflows/daily-malicious-code-scan.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_25b1dcbd4862ff19_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_25b1dcbd4862ff19_EOF'
diff --git a/.github/workflows/daily-mcp-concurrency-analysis.lock.yml b/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
index d6a00ea88d1..354f5303702 100644
--- a/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
+++ b/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
@@ -233,7 +233,7 @@ jobs:
           
           GH_AW_PROMPT_a619b11732dded21_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a619b11732dded21_EOF'
diff --git a/.github/workflows/daily-multi-device-docs-tester.lock.yml b/.github/workflows/daily-multi-device-docs-tester.lock.yml
index 824584f0b5e..bfb189d0a8e 100644
--- a/.github/workflows/daily-multi-device-docs-tester.lock.yml
+++ b/.github/workflows/daily-multi-device-docs-tester.lock.yml
@@ -241,7 +241,7 @@ jobs:
           
           GH_AW_PROMPT_e8776210a33b59c8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_e8776210a33b59c8_EOF'
diff --git a/.github/workflows/daily-news.lock.yml b/.github/workflows/daily-news.lock.yml
index e0718d99b23..d91ea5850fb 100644
--- a/.github/workflows/daily-news.lock.yml
+++ b/.github/workflows/daily-news.lock.yml
@@ -242,7 +242,7 @@ jobs:
           
           GH_AW_PROMPT_28e02fa8d0cb2ffc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_28e02fa8d0cb2ffc_EOF'
diff --git a/.github/workflows/daily-observability-report.lock.yml b/.github/workflows/daily-observability-report.lock.yml
index 430dc1b9eab..82a0ae56e15 100644
--- a/.github/workflows/daily-observability-report.lock.yml
+++ b/.github/workflows/daily-observability-report.lock.yml
@@ -244,7 +244,7 @@ jobs:
           
           GH_AW_PROMPT_5ff4c2c393419636_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_5ff4c2c393419636_EOF'
@@ -1316,18 +1316,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_8ad9c899e09d6c0c_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_6d58d9b6c1c7f3d7_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_8ad9c899e09d6c0c_EOF
+          GH_AW_MCP_CONFIG_6d58d9b6c1c7f3d7_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_1b9d4f6a59b7402f_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_75050c2c115d2147_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1338,11 +1338,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_1b9d4f6a59b7402f_EOF
+          GH_AW_MCP_CONFIG_75050c2c115d2147_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_748e09df526ed5a7_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_b88015f5abf6c71f_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1352,7 +1352,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_748e09df526ed5a7_EOF
+          GH_AW_CODEX_SHELL_POLICY_b88015f5abf6c71f_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-otel-instrumentation-advisor.lock.yml b/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
index c307f467255..f122a0f8c78 100644
--- a/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
+++ b/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_825f42c0ed6fe118_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_825f42c0ed6fe118_EOF'
diff --git a/.github/workflows/daily-performance-summary.lock.yml b/.github/workflows/daily-performance-summary.lock.yml
index 5bde445690e..93549f46c2e 100644
--- a/.github/workflows/daily-performance-summary.lock.yml
+++ b/.github/workflows/daily-performance-summary.lock.yml
@@ -244,7 +244,7 @@ jobs:
           
           GH_AW_PROMPT_5e13b7f1cb142ce3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_5e13b7f1cb142ce3_EOF'
diff --git a/.github/workflows/daily-regulatory.lock.yml b/.github/workflows/daily-regulatory.lock.yml
index ab4bb84e985..816fff5bb5b 100644
--- a/.github/workflows/daily-regulatory.lock.yml
+++ b/.github/workflows/daily-regulatory.lock.yml
@@ -236,7 +236,7 @@ jobs:
           
           GH_AW_PROMPT_5633618930b71403_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_5633618930b71403_EOF'
diff --git a/.github/workflows/daily-rendering-scripts-verifier.lock.yml b/.github/workflows/daily-rendering-scripts-verifier.lock.yml
index 9c18349107d..a9fff714ec4 100644
--- a/.github/workflows/daily-rendering-scripts-verifier.lock.yml
+++ b/.github/workflows/daily-rendering-scripts-verifier.lock.yml
@@ -251,7 +251,7 @@ jobs:
           
           GH_AW_PROMPT_557c0faadbf09e8b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_557c0faadbf09e8b_EOF'
diff --git a/.github/workflows/daily-repo-chronicle.lock.yml b/.github/workflows/daily-repo-chronicle.lock.yml
index 2c9bc5e081f..2406a0671e0 100644
--- a/.github/workflows/daily-repo-chronicle.lock.yml
+++ b/.github/workflows/daily-repo-chronicle.lock.yml
@@ -236,7 +236,7 @@ jobs:
           
           GH_AW_PROMPT_8c2d3ee58b7bb859_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_8c2d3ee58b7bb859_EOF'
diff --git a/.github/workflows/daily-safe-output-integrator.lock.yml b/.github/workflows/daily-safe-output-integrator.lock.yml
index c68cb65d8df..ffba1a2873a 100644
--- a/.github/workflows/daily-safe-output-integrator.lock.yml
+++ b/.github/workflows/daily-safe-output-integrator.lock.yml
@@ -230,7 +230,7 @@ jobs:
           
           GH_AW_PROMPT_b71e1da8f93008ab_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b71e1da8f93008ab_EOF'
diff --git a/.github/workflows/daily-safe-output-optimizer.lock.yml b/.github/workflows/daily-safe-output-optimizer.lock.yml
index 1fecafa2fb6..5b2a7335ee9 100644
--- a/.github/workflows/daily-safe-output-optimizer.lock.yml
+++ b/.github/workflows/daily-safe-output-optimizer.lock.yml
@@ -249,7 +249,7 @@ jobs:
           
           GH_AW_PROMPT_817a63e0f68f33a6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_817a63e0f68f33a6_EOF'
diff --git a/.github/workflows/daily-safe-outputs-conformance.lock.yml b/.github/workflows/daily-safe-outputs-conformance.lock.yml
index afdcd9ebe61..7ba4d1415a2 100644
--- a/.github/workflows/daily-safe-outputs-conformance.lock.yml
+++ b/.github/workflows/daily-safe-outputs-conformance.lock.yml
@@ -233,7 +233,7 @@ jobs:
           
           GH_AW_PROMPT_6a8f1d610d0fcade_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_6a8f1d610d0fcade_EOF'
diff --git a/.github/workflows/daily-secrets-analysis.lock.yml b/.github/workflows/daily-secrets-analysis.lock.yml
index 350437eb806..35c85eabfb1 100644
--- a/.github/workflows/daily-secrets-analysis.lock.yml
+++ b/.github/workflows/daily-secrets-analysis.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_cf0ff54e475d0865_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_cf0ff54e475d0865_EOF'
diff --git a/.github/workflows/daily-security-observability.lock.yml b/.github/workflows/daily-security-observability.lock.yml
index c37419d203d..01cdefdf30f 100644
--- a/.github/workflows/daily-security-observability.lock.yml
+++ b/.github/workflows/daily-security-observability.lock.yml
@@ -246,7 +246,7 @@ jobs:
           
           GH_AW_PROMPT_eccc76a7aebec463_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_eccc76a7aebec463_EOF'
diff --git a/.github/workflows/daily-security-red-team.lock.yml b/.github/workflows/daily-security-red-team.lock.yml
index f95402d0c4e..d5d26cf20fc 100644
--- a/.github/workflows/daily-security-red-team.lock.yml
+++ b/.github/workflows/daily-security-red-team.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_d3d52693cea323fd_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_d3d52693cea323fd_EOF'
diff --git a/.github/workflows/daily-semgrep-scan.lock.yml b/.github/workflows/daily-semgrep-scan.lock.yml
index 1140b8557e6..c2899252369 100644
--- a/.github/workflows/daily-semgrep-scan.lock.yml
+++ b/.github/workflows/daily-semgrep-scan.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_3aaf13339fe74d32_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_3aaf13339fe74d32_EOF'
diff --git a/.github/workflows/daily-sentrux-report.lock.yml b/.github/workflows/daily-sentrux-report.lock.yml
index f6ddec6640b..87dffd79f0b 100644
--- a/.github/workflows/daily-sentrux-report.lock.yml
+++ b/.github/workflows/daily-sentrux-report.lock.yml
@@ -236,7 +236,7 @@ jobs:
           
           GH_AW_PROMPT_719df1a6ce2b4e6a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_719df1a6ce2b4e6a_EOF'
diff --git a/.github/workflows/daily-skill-optimizer.lock.yml b/.github/workflows/daily-skill-optimizer.lock.yml
index fda0fa39965..4c42b80643f 100644
--- a/.github/workflows/daily-skill-optimizer.lock.yml
+++ b/.github/workflows/daily-skill-optimizer.lock.yml
@@ -232,7 +232,7 @@ jobs:
           
           GH_AW_PROMPT_f4ec88ed2b9e2a22_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f4ec88ed2b9e2a22_EOF'
diff --git a/.github/workflows/daily-syntax-error-quality.lock.yml b/.github/workflows/daily-syntax-error-quality.lock.yml
index b7ccdfb0aef..2209d12c219 100644
--- a/.github/workflows/daily-syntax-error-quality.lock.yml
+++ b/.github/workflows/daily-syntax-error-quality.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_9d57e41cc36f359c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_9d57e41cc36f359c_EOF'
diff --git a/.github/workflows/daily-team-evolution-insights.lock.yml b/.github/workflows/daily-team-evolution-insights.lock.yml
index 674c21d2ea2..5801f8b1d25 100644
--- a/.github/workflows/daily-team-evolution-insights.lock.yml
+++ b/.github/workflows/daily-team-evolution-insights.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_da76ab4822bf9782_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_da76ab4822bf9782_EOF'
diff --git a/.github/workflows/daily-team-status.lock.yml b/.github/workflows/daily-team-status.lock.yml
index ba434f2b831..86ae5bd8d60 100644
--- a/.github/workflows/daily-team-status.lock.yml
+++ b/.github/workflows/daily-team-status.lock.yml
@@ -245,7 +245,7 @@ jobs:
           
           GH_AW_PROMPT_2ad6e991fcd00de3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2ad6e991fcd00de3_EOF'
diff --git a/.github/workflows/daily-testify-uber-super-expert.lock.yml b/.github/workflows/daily-testify-uber-super-expert.lock.yml
index f02ad095b7c..5f7977d9b9e 100644
--- a/.github/workflows/daily-testify-uber-super-expert.lock.yml
+++ b/.github/workflows/daily-testify-uber-super-expert.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_863e1f99e9ceceac_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_863e1f99e9ceceac_EOF'
diff --git a/.github/workflows/daily-token-consumption-report.lock.yml b/.github/workflows/daily-token-consumption-report.lock.yml
index 32746b3baf5..15660ace720 100644
--- a/.github/workflows/daily-token-consumption-report.lock.yml
+++ b/.github/workflows/daily-token-consumption-report.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_d52ca919c5c7ce90_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_d52ca919c5c7ce90_EOF'
diff --git a/.github/workflows/daily-workflow-updater.lock.yml b/.github/workflows/daily-workflow-updater.lock.yml
index d7b9e4af82b..bb50a35f366 100644
--- a/.github/workflows/daily-workflow-updater.lock.yml
+++ b/.github/workflows/daily-workflow-updater.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_2f621c28df87af7d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2f621c28df87af7d_EOF'
diff --git a/.github/workflows/dead-code-remover.lock.yml b/.github/workflows/dead-code-remover.lock.yml
index 778d0830388..7076bd0a6d2 100644
--- a/.github/workflows/dead-code-remover.lock.yml
+++ b/.github/workflows/dead-code-remover.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_cc0d01ecb284cabe_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_cc0d01ecb284cabe_EOF'
diff --git a/.github/workflows/deep-report.lock.yml b/.github/workflows/deep-report.lock.yml
index 2cd28b594df..bb58d63ca85 100644
--- a/.github/workflows/deep-report.lock.yml
+++ b/.github/workflows/deep-report.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_06cf79caca093559_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_06cf79caca093559_EOF'
diff --git a/.github/workflows/delight.lock.yml b/.github/workflows/delight.lock.yml
index b9a320c5009..269647e18fb 100644
--- a/.github/workflows/delight.lock.yml
+++ b/.github/workflows/delight.lock.yml
@@ -232,7 +232,7 @@ jobs:
           
           GH_AW_PROMPT_30c38f50ad21ce73_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_30c38f50ad21ce73_EOF'
diff --git a/.github/workflows/dependabot-burner.lock.yml b/.github/workflows/dependabot-burner.lock.yml
index b23f88031d2..82fd84e8945 100644
--- a/.github/workflows/dependabot-burner.lock.yml
+++ b/.github/workflows/dependabot-burner.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_429b41a82a28aa30_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_429b41a82a28aa30_EOF'
diff --git a/.github/workflows/dependabot-go-checker.lock.yml b/.github/workflows/dependabot-go-checker.lock.yml
index 4e6bd92bd96..ab4e80b8278 100644
--- a/.github/workflows/dependabot-go-checker.lock.yml
+++ b/.github/workflows/dependabot-go-checker.lock.yml
@@ -222,7 +222,7 @@ jobs:
           
           GH_AW_PROMPT_4e8a698fd9d253b0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_4e8a698fd9d253b0_EOF'
diff --git a/.github/workflows/dependabot-repair.lock.yml b/.github/workflows/dependabot-repair.lock.yml
index ab1ff7ec696..65d1b59712e 100644
--- a/.github/workflows/dependabot-repair.lock.yml
+++ b/.github/workflows/dependabot-repair.lock.yml
@@ -237,7 +237,7 @@ jobs:
           
           GH_AW_PROMPT_b11b891ab1eea9e8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b11b891ab1eea9e8_EOF'
diff --git a/.github/workflows/deployment-incident-monitor.lock.yml b/.github/workflows/deployment-incident-monitor.lock.yml
index 1dcf6ed1583..d30a85f97a6 100644
--- a/.github/workflows/deployment-incident-monitor.lock.yml
+++ b/.github/workflows/deployment-incident-monitor.lock.yml
@@ -219,7 +219,7 @@ jobs:
           
           GH_AW_PROMPT_c23a074926bb8516_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c23a074926bb8516_EOF'
diff --git a/.github/workflows/design-decision-gate.lock.yml b/.github/workflows/design-decision-gate.lock.yml
index 5dae421171b..3ef09a92c5d 100644
--- a/.github/workflows/design-decision-gate.lock.yml
+++ b/.github/workflows/design-decision-gate.lock.yml
@@ -254,7 +254,7 @@ jobs:
           
           GH_AW_PROMPT_60a1e42cd1dd824e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_60a1e42cd1dd824e_EOF'
diff --git a/.github/workflows/dev-hawk.lock.yml b/.github/workflows/dev-hawk.lock.yml
index cc1100dfc8c..da680322791 100644
--- a/.github/workflows/dev-hawk.lock.yml
+++ b/.github/workflows/dev-hawk.lock.yml
@@ -231,7 +231,7 @@ jobs:
           
           GH_AW_PROMPT_c845abc30647a9b9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c845abc30647a9b9_EOF'
diff --git a/.github/workflows/dev.lock.yml b/.github/workflows/dev.lock.yml
index 4500621bbd6..d793d2a038c 100644
--- a/.github/workflows/dev.lock.yml
+++ b/.github/workflows/dev.lock.yml
@@ -274,7 +274,7 @@ jobs:
           
           GH_AW_PROMPT_a3ed2e742aa6c3de_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a3ed2e742aa6c3de_EOF'
diff --git a/.github/workflows/developer-docs-consolidator.lock.yml b/.github/workflows/developer-docs-consolidator.lock.yml
index bf213f9a8fb..74f9ee2148c 100644
--- a/.github/workflows/developer-docs-consolidator.lock.yml
+++ b/.github/workflows/developer-docs-consolidator.lock.yml
@@ -246,7 +246,7 @@ jobs:
           
           GH_AW_PROMPT_c06e57c35a47e3f4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c06e57c35a47e3f4_EOF'
diff --git a/.github/workflows/dictation-prompt.lock.yml b/.github/workflows/dictation-prompt.lock.yml
index 99af67bfa4c..84870458ad2 100644
--- a/.github/workflows/dictation-prompt.lock.yml
+++ b/.github/workflows/dictation-prompt.lock.yml
@@ -220,7 +220,7 @@ jobs:
           
           GH_AW_PROMPT_167c42fef4e52d53_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_167c42fef4e52d53_EOF'
diff --git a/.github/workflows/discussion-task-miner.lock.yml b/.github/workflows/discussion-task-miner.lock.yml
index 7a8fc66820a..5a616c675c3 100644
--- a/.github/workflows/discussion-task-miner.lock.yml
+++ b/.github/workflows/discussion-task-miner.lock.yml
@@ -221,7 +221,7 @@ jobs:
           
           GH_AW_PROMPT_c4ccfc574d2c382e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c4ccfc574d2c382e_EOF'
diff --git a/.github/workflows/docs-noob-tester.lock.yml b/.github/workflows/docs-noob-tester.lock.yml
index 1cc0e5f1914..bdb8f7122d0 100644
--- a/.github/workflows/docs-noob-tester.lock.yml
+++ b/.github/workflows/docs-noob-tester.lock.yml
@@ -234,7 +234,7 @@ jobs:
           
           GH_AW_PROMPT_f108143180cedb5e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f108143180cedb5e_EOF'
diff --git a/.github/workflows/draft-pr-cleanup.lock.yml b/.github/workflows/draft-pr-cleanup.lock.yml
index 3ab60e4849d..7c3fe024ee8 100644
--- a/.github/workflows/draft-pr-cleanup.lock.yml
+++ b/.github/workflows/draft-pr-cleanup.lock.yml
@@ -214,7 +214,7 @@ jobs:
           
           GH_AW_PROMPT_1b5e00bf134b6a95_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1b5e00bf134b6a95_EOF'
diff --git a/.github/workflows/duplicate-code-detector.lock.yml b/.github/workflows/duplicate-code-detector.lock.yml
index b7de5991daa..7983185b6cd 100644
--- a/.github/workflows/duplicate-code-detector.lock.yml
+++ b/.github/workflows/duplicate-code-detector.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_747f86d9b82bfc1b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_747f86d9b82bfc1b_EOF'
@@ -1270,18 +1270,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_a9cd71c2c390bbf1_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_d45070af0a51e721_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_a9cd71c2c390bbf1_EOF
+          GH_AW_MCP_CONFIG_d45070af0a51e721_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_3cab68d26a191564_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_3923d531e6d98d91_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1292,11 +1292,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_3cab68d26a191564_EOF
+          GH_AW_MCP_CONFIG_3923d531e6d98d91_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_e86f0918b08181f8_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_12369ac77a42383e_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1306,7 +1306,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_e86f0918b08181f8_EOF
+          GH_AW_CODEX_SHELL_POLICY_12369ac77a42383e_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/example-permissions-warning.lock.yml b/.github/workflows/example-permissions-warning.lock.yml
index 9f4a201a554..9513b27c38b 100644
--- a/.github/workflows/example-permissions-warning.lock.yml
+++ b/.github/workflows/example-permissions-warning.lock.yml
@@ -204,7 +204,7 @@ jobs:
           
           GH_AW_PROMPT_ae3a17b862f1109e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ae3a17b862f1109e_EOF'
diff --git a/.github/workflows/example-workflow-analyzer.lock.yml b/.github/workflows/example-workflow-analyzer.lock.yml
index bdb9ea700c6..6f09c47a11f 100644
--- a/.github/workflows/example-workflow-analyzer.lock.yml
+++ b/.github/workflows/example-workflow-analyzer.lock.yml
@@ -239,7 +239,7 @@ jobs:
           
           GH_AW_PROMPT_b54df4f7db1055fb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b54df4f7db1055fb_EOF'
diff --git a/.github/workflows/firewall-escape.lock.yml b/.github/workflows/firewall-escape.lock.yml
index 152c35939cb..000ca8ce419 100644
--- a/.github/workflows/firewall-escape.lock.yml
+++ b/.github/workflows/firewall-escape.lock.yml
@@ -244,7 +244,7 @@ jobs:
           
           GH_AW_PROMPT_4d9e57e339dbc997_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_4d9e57e339dbc997_EOF'
diff --git a/.github/workflows/firewall.lock.yml b/.github/workflows/firewall.lock.yml
index da6949651e6..c5ea446a60d 100644
--- a/.github/workflows/firewall.lock.yml
+++ b/.github/workflows/firewall.lock.yml
@@ -204,7 +204,7 @@ jobs:
           
           GH_AW_PROMPT_3852c8916270385c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_3852c8916270385c_EOF'
diff --git a/.github/workflows/functional-pragmatist.lock.yml b/.github/workflows/functional-pragmatist.lock.yml
index 7bccb7306d1..571b422c385 100644
--- a/.github/workflows/functional-pragmatist.lock.yml
+++ b/.github/workflows/functional-pragmatist.lock.yml
@@ -226,7 +226,7 @@ jobs:
           
           GH_AW_PROMPT_2a93dd5da2776952_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2a93dd5da2776952_EOF'
diff --git a/.github/workflows/github-mcp-structural-analysis.lock.yml b/.github/workflows/github-mcp-structural-analysis.lock.yml
index 82139c17225..27f4696b35e 100644
--- a/.github/workflows/github-mcp-structural-analysis.lock.yml
+++ b/.github/workflows/github-mcp-structural-analysis.lock.yml
@@ -242,7 +242,7 @@ jobs:
           
           GH_AW_PROMPT_3ba4f9c395e5bcb6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_3ba4f9c395e5bcb6_EOF'
diff --git a/.github/workflows/github-mcp-tools-report.lock.yml b/.github/workflows/github-mcp-tools-report.lock.yml
index 324540332a8..bd5eaea59b7 100644
--- a/.github/workflows/github-mcp-tools-report.lock.yml
+++ b/.github/workflows/github-mcp-tools-report.lock.yml
@@ -241,7 +241,7 @@ jobs:
           
           GH_AW_PROMPT_23eab3a3b62941d3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_23eab3a3b62941d3_EOF'
diff --git a/.github/workflows/github-remote-mcp-auth-test.lock.yml b/.github/workflows/github-remote-mcp-auth-test.lock.yml
index 24108ad5d7b..068b2529ae8 100644
--- a/.github/workflows/github-remote-mcp-auth-test.lock.yml
+++ b/.github/workflows/github-remote-mcp-auth-test.lock.yml
@@ -235,7 +235,7 @@ jobs:
           
           GH_AW_PROMPT_a535e73ab33e528e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a535e73ab33e528e_EOF'
diff --git a/.github/workflows/glossary-maintainer.lock.yml b/.github/workflows/glossary-maintainer.lock.yml
index 6c4915fb755..d7fd8902205 100644
--- a/.github/workflows/glossary-maintainer.lock.yml
+++ b/.github/workflows/glossary-maintainer.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_df8691e1f84fbaa3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_df8691e1f84fbaa3_EOF'
diff --git a/.github/workflows/go-fan.lock.yml b/.github/workflows/go-fan.lock.yml
index 94a8e217702..1b4016860f7 100644
--- a/.github/workflows/go-fan.lock.yml
+++ b/.github/workflows/go-fan.lock.yml
@@ -242,7 +242,7 @@ jobs:
           
           GH_AW_PROMPT_5464e417cd118c0e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_5464e417cd118c0e_EOF'
diff --git a/.github/workflows/go-logger.lock.yml b/.github/workflows/go-logger.lock.yml
index 64e8ebedbf8..431adfb791e 100644
--- a/.github/workflows/go-logger.lock.yml
+++ b/.github/workflows/go-logger.lock.yml
@@ -231,7 +231,7 @@ jobs:
           
           GH_AW_PROMPT_62eba90e58c4f484_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_62eba90e58c4f484_EOF'
diff --git a/.github/workflows/go-pattern-detector.lock.yml b/.github/workflows/go-pattern-detector.lock.yml
index c1af91081e8..f03788044a4 100644
--- a/.github/workflows/go-pattern-detector.lock.yml
+++ b/.github/workflows/go-pattern-detector.lock.yml
@@ -226,7 +226,7 @@ jobs:
           
           GH_AW_PROMPT_11d1dc8414fd260f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_11d1dc8414fd260f_EOF'
diff --git a/.github/workflows/gpclean.lock.yml b/.github/workflows/gpclean.lock.yml
index 40a703d33bb..c704ec3e12b 100644
--- a/.github/workflows/gpclean.lock.yml
+++ b/.github/workflows/gpclean.lock.yml
@@ -226,7 +226,7 @@ jobs:
           
           GH_AW_PROMPT_fedacafa2d5987fc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_fedacafa2d5987fc_EOF'
diff --git a/.github/workflows/grumpy-reviewer.lock.yml b/.github/workflows/grumpy-reviewer.lock.yml
index feb3d44ac2c..88ed15d0f66 100644
--- a/.github/workflows/grumpy-reviewer.lock.yml
+++ b/.github/workflows/grumpy-reviewer.lock.yml
@@ -282,7 +282,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ca213f2bb4c609e2_EOF'
@@ -1330,18 +1330,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_b37958ee5d7af99f_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_47c2706feedaa87d_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_b37958ee5d7af99f_EOF
+          GH_AW_MCP_CONFIG_47c2706feedaa87d_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_0374eddda26ce031_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_f0963e28d24207f5_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1352,11 +1352,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_0374eddda26ce031_EOF
+          GH_AW_MCP_CONFIG_f0963e28d24207f5_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_63bd566cb955e631_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_020bd07960fef1b9_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1366,7 +1366,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_63bd566cb955e631_EOF
+          GH_AW_CODEX_SHELL_POLICY_020bd07960fef1b9_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/hippo-embed.lock.yml b/.github/workflows/hippo-embed.lock.yml
index c2b78f21ec7..4e958b61c44 100644
--- a/.github/workflows/hippo-embed.lock.yml
+++ b/.github/workflows/hippo-embed.lock.yml
@@ -205,7 +205,7 @@ jobs:
           
           GH_AW_PROMPT_1801f836372654bc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1801f836372654bc_EOF'
diff --git a/.github/workflows/hourly-ci-cleaner.lock.yml b/.github/workflows/hourly-ci-cleaner.lock.yml
index 659102a275e..25b09c24b6e 100644
--- a/.github/workflows/hourly-ci-cleaner.lock.yml
+++ b/.github/workflows/hourly-ci-cleaner.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_a4c33d830034c7ff_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a4c33d830034c7ff_EOF'
diff --git a/.github/workflows/instructions-janitor.lock.yml b/.github/workflows/instructions-janitor.lock.yml
index 74d9495184f..6bccc796e67 100644
--- a/.github/workflows/instructions-janitor.lock.yml
+++ b/.github/workflows/instructions-janitor.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_c0fdee58eb98fb81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c0fdee58eb98fb81_EOF'
diff --git a/.github/workflows/issue-arborist.lock.yml b/.github/workflows/issue-arborist.lock.yml
index eab9039d051..f7ad1b54e13 100644
--- a/.github/workflows/issue-arborist.lock.yml
+++ b/.github/workflows/issue-arborist.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_40db7ed1b5e86002_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_40db7ed1b5e86002_EOF'
@@ -1308,18 +1308,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_62c0331189577651_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_1829af9aa862150e_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_62c0331189577651_EOF
+          GH_AW_MCP_CONFIG_1829af9aa862150e_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_356e76e46d5628db_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_27e7c4b67410b4ad_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1330,11 +1330,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_356e76e46d5628db_EOF
+          GH_AW_MCP_CONFIG_27e7c4b67410b4ad_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_bd8c04110378f9eb_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_5e73f76a0c397926_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1344,7 +1344,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_bd8c04110378f9eb_EOF
+          GH_AW_CODEX_SHELL_POLICY_5e73f76a0c397926_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/issue-monster.lock.yml b/.github/workflows/issue-monster.lock.yml
index c1f26f86e00..098c328e934 100644
--- a/.github/workflows/issue-monster.lock.yml
+++ b/.github/workflows/issue-monster.lock.yml
@@ -607,7 +607,7 @@ jobs:
           
           GH_AW_PROMPT_58ecfcf47a8787df_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_58ecfcf47a8787df_EOF'
diff --git a/.github/workflows/issue-triage-agent.lock.yml b/.github/workflows/issue-triage-agent.lock.yml
index 256343b8811..a0fc3a7b26a 100644
--- a/.github/workflows/issue-triage-agent.lock.yml
+++ b/.github/workflows/issue-triage-agent.lock.yml
@@ -223,7 +223,7 @@ jobs:
           
           GH_AW_PROMPT_0b8d67a8d512ea81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0b8d67a8d512ea81_EOF'
diff --git a/.github/workflows/jsweep.lock.yml b/.github/workflows/jsweep.lock.yml
index 58844d0f261..65dc2bb14db 100644
--- a/.github/workflows/jsweep.lock.yml
+++ b/.github/workflows/jsweep.lock.yml
@@ -231,7 +231,7 @@ jobs:
           
           GH_AW_PROMPT_45dd6562b2fb7643_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_45dd6562b2fb7643_EOF'
diff --git a/.github/workflows/layout-spec-maintainer.lock.yml b/.github/workflows/layout-spec-maintainer.lock.yml
index 8fba07f4aff..3e3bd238ddf 100644
--- a/.github/workflows/layout-spec-maintainer.lock.yml
+++ b/.github/workflows/layout-spec-maintainer.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_ce7c1391ca7c1aa8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ce7c1391ca7c1aa8_EOF'
diff --git a/.github/workflows/lockfile-stats.lock.yml b/.github/workflows/lockfile-stats.lock.yml
index 4a2a46b2dd4..e1d1d6e53f0 100644
--- a/.github/workflows/lockfile-stats.lock.yml
+++ b/.github/workflows/lockfile-stats.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_61aa761659405206_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_61aa761659405206_EOF'
diff --git a/.github/workflows/mcp-inspector.lock.yml b/.github/workflows/mcp-inspector.lock.yml
index d9a5238ee42..7a44b937e3b 100644
--- a/.github/workflows/mcp-inspector.lock.yml
+++ b/.github/workflows/mcp-inspector.lock.yml
@@ -282,7 +282,7 @@ jobs:
           
           GH_AW_PROMPT_bdd5adaa4f427d0f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_bdd5adaa4f427d0f_EOF'
diff --git a/.github/workflows/mergefest.lock.yml b/.github/workflows/mergefest.lock.yml
index 997b067cd7e..f55f941e4bc 100644
--- a/.github/workflows/mergefest.lock.yml
+++ b/.github/workflows/mergefest.lock.yml
@@ -272,7 +272,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1dc0005748a496ab_EOF'
diff --git a/.github/workflows/metrics-collector.lock.yml b/.github/workflows/metrics-collector.lock.yml
index 73c3a4720f3..42fe35b5905 100644
--- a/.github/workflows/metrics-collector.lock.yml
+++ b/.github/workflows/metrics-collector.lock.yml
@@ -217,7 +217,7 @@ jobs:
           
           GH_AW_PROMPT_a700af2ab27794da_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a700af2ab27794da_EOF'
diff --git a/.github/workflows/notion-issue-summary.lock.yml b/.github/workflows/notion-issue-summary.lock.yml
index a9978c58427..8c4fd07e0ab 100644
--- a/.github/workflows/notion-issue-summary.lock.yml
+++ b/.github/workflows/notion-issue-summary.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_825884c84f66cdde_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_825884c84f66cdde_EOF'
diff --git a/.github/workflows/org-health-report.lock.yml b/.github/workflows/org-health-report.lock.yml
index e4ebe6ad07f..ff10fe84608 100644
--- a/.github/workflows/org-health-report.lock.yml
+++ b/.github/workflows/org-health-report.lock.yml
@@ -232,7 +232,7 @@ jobs:
           
           GH_AW_PROMPT_8d94051de3622e61_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_8d94051de3622e61_EOF'
diff --git a/.github/workflows/pdf-summary.lock.yml b/.github/workflows/pdf-summary.lock.yml
index 41e5af79672..adab7ce7876 100644
--- a/.github/workflows/pdf-summary.lock.yml
+++ b/.github/workflows/pdf-summary.lock.yml
@@ -298,7 +298,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b882b92635115046_EOF'
diff --git a/.github/workflows/plan.lock.yml b/.github/workflows/plan.lock.yml
index 569e08f5739..55bab928f94 100644
--- a/.github/workflows/plan.lock.yml
+++ b/.github/workflows/plan.lock.yml
@@ -271,7 +271,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2170f44eb653670d_EOF'
diff --git a/.github/workflows/poem-bot.lock.yml b/.github/workflows/poem-bot.lock.yml
index cca6ec4fa3b..e528b58691f 100644
--- a/.github/workflows/poem-bot.lock.yml
+++ b/.github/workflows/poem-bot.lock.yml
@@ -295,7 +295,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_19ae3bb8b5c482fd_EOF'
diff --git a/.github/workflows/pr-nitpick-reviewer.lock.yml b/.github/workflows/pr-nitpick-reviewer.lock.yml
index 16de6d57624..1028b1ed415 100644
--- a/.github/workflows/pr-nitpick-reviewer.lock.yml
+++ b/.github/workflows/pr-nitpick-reviewer.lock.yml
@@ -277,7 +277,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_06a57a4830833cb8_EOF'
diff --git a/.github/workflows/pr-triage-agent.lock.yml b/.github/workflows/pr-triage-agent.lock.yml
index 195148ea82e..caf7120fd8a 100644
--- a/.github/workflows/pr-triage-agent.lock.yml
+++ b/.github/workflows/pr-triage-agent.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_253153894c917844_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_253153894c917844_EOF'
diff --git a/.github/workflows/prompt-clustering-analysis.lock.yml b/.github/workflows/prompt-clustering-analysis.lock.yml
index 92a216afa40..bce4ec317b8 100644
--- a/.github/workflows/prompt-clustering-analysis.lock.yml
+++ b/.github/workflows/prompt-clustering-analysis.lock.yml
@@ -253,7 +253,7 @@ jobs:
           
           GH_AW_PROMPT_ed5417896bdbdb8e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ed5417896bdbdb8e_EOF'
diff --git a/.github/workflows/python-data-charts.lock.yml b/.github/workflows/python-data-charts.lock.yml
index 217283a48fe..ebaddc00d4b 100644
--- a/.github/workflows/python-data-charts.lock.yml
+++ b/.github/workflows/python-data-charts.lock.yml
@@ -232,7 +232,7 @@ jobs:
           
           GH_AW_PROMPT_130cf5488a7b6ad4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_130cf5488a7b6ad4_EOF'
diff --git a/.github/workflows/q.lock.yml b/.github/workflows/q.lock.yml
index f205a2b0c61..c05f81f1ce8 100644
--- a/.github/workflows/q.lock.yml
+++ b/.github/workflows/q.lock.yml
@@ -310,7 +310,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_4fdd9801819d223c_EOF'
diff --git a/.github/workflows/refactoring-cadence.lock.yml b/.github/workflows/refactoring-cadence.lock.yml
index aeaeae6acc4..a9d641dac07 100644
--- a/.github/workflows/refactoring-cadence.lock.yml
+++ b/.github/workflows/refactoring-cadence.lock.yml
@@ -217,7 +217,7 @@ jobs:
           
           GH_AW_PROMPT_8a1b92b889a26592_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_8a1b92b889a26592_EOF'
diff --git a/.github/workflows/refiner.lock.yml b/.github/workflows/refiner.lock.yml
index cff430bbe06..bb094edba25 100644
--- a/.github/workflows/refiner.lock.yml
+++ b/.github/workflows/refiner.lock.yml
@@ -255,7 +255,7 @@ jobs:
           
           GH_AW_PROMPT_8bcb6566d1be6fcb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_8bcb6566d1be6fcb_EOF'
diff --git a/.github/workflows/release.lock.yml b/.github/workflows/release.lock.yml
index b89b2892b8f..225cb799e6e 100644
--- a/.github/workflows/release.lock.yml
+++ b/.github/workflows/release.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_79342ddfec0e424b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_79342ddfec0e424b_EOF'
diff --git a/.github/workflows/repo-audit-analyzer.lock.yml b/.github/workflows/repo-audit-analyzer.lock.yml
index 9d612d008a1..2696f70dba7 100644
--- a/.github/workflows/repo-audit-analyzer.lock.yml
+++ b/.github/workflows/repo-audit-analyzer.lock.yml
@@ -241,7 +241,7 @@ jobs:
           
           GH_AW_PROMPT_281009734093affb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_281009734093affb_EOF'
diff --git a/.github/workflows/repo-tree-map.lock.yml b/.github/workflows/repo-tree-map.lock.yml
index 4075820260f..f3c62ce717f 100644
--- a/.github/workflows/repo-tree-map.lock.yml
+++ b/.github/workflows/repo-tree-map.lock.yml
@@ -223,7 +223,7 @@ jobs:
           
           GH_AW_PROMPT_d7a36150f4488be6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_d7a36150f4488be6_EOF'
diff --git a/.github/workflows/repository-quality-improver.lock.yml b/.github/workflows/repository-quality-improver.lock.yml
index 1e43e9f896d..6e31e087d82 100644
--- a/.github/workflows/repository-quality-improver.lock.yml
+++ b/.github/workflows/repository-quality-improver.lock.yml
@@ -241,7 +241,7 @@ jobs:
           
           GH_AW_PROMPT_4f44a3ac5441beb0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_4f44a3ac5441beb0_EOF'
diff --git a/.github/workflows/research.lock.yml b/.github/workflows/research.lock.yml
index 3b3bb9d18c1..4e123cd5d28 100644
--- a/.github/workflows/research.lock.yml
+++ b/.github/workflows/research.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_98d74baf63f8b6ad_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_98d74baf63f8b6ad_EOF'
diff --git a/.github/workflows/safe-output-health.lock.yml b/.github/workflows/safe-output-health.lock.yml
index 65528f8b2d8..f5512e40904 100644
--- a/.github/workflows/safe-output-health.lock.yml
+++ b/.github/workflows/safe-output-health.lock.yml
@@ -244,7 +244,7 @@ jobs:
           
           GH_AW_PROMPT_4b0b7f84e0fb41f7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_4b0b7f84e0fb41f7_EOF'
diff --git a/.github/workflows/schema-consistency-checker.lock.yml b/.github/workflows/schema-consistency-checker.lock.yml
index 6cbf25c134b..cc5d9d0ecaa 100644
--- a/.github/workflows/schema-consistency-checker.lock.yml
+++ b/.github/workflows/schema-consistency-checker.lock.yml
@@ -240,7 +240,7 @@ jobs:
           
           GH_AW_PROMPT_d984ba9ebca19fc3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_d984ba9ebca19fc3_EOF'
diff --git a/.github/workflows/schema-feature-coverage.lock.yml b/.github/workflows/schema-feature-coverage.lock.yml
index 28a6cb4ba60..00daa0d93a3 100644
--- a/.github/workflows/schema-feature-coverage.lock.yml
+++ b/.github/workflows/schema-feature-coverage.lock.yml
@@ -226,7 +226,7 @@ jobs:
           
           GH_AW_PROMPT_fae8e9bb7c978eec_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_fae8e9bb7c978eec_EOF'
@@ -1198,18 +1198,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_e65482b52fb240c7_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_7cfc3fb1079471e4_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_e65482b52fb240c7_EOF
+          GH_AW_MCP_CONFIG_7cfc3fb1079471e4_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_42379fb8416637f6_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_d1057d47b6ca73df_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1220,11 +1220,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_42379fb8416637f6_EOF
+          GH_AW_MCP_CONFIG_d1057d47b6ca73df_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_0e8855dc7bcc3334_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_b5b077b468335d61_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1234,7 +1234,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_0e8855dc7bcc3334_EOF
+          GH_AW_CODEX_SHELL_POLICY_b5b077b468335d61_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/scout.lock.yml b/.github/workflows/scout.lock.yml
index 8d3caba67dc..d25a40ec385 100644
--- a/.github/workflows/scout.lock.yml
+++ b/.github/workflows/scout.lock.yml
@@ -329,7 +329,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_8272fdeb55a2370c_EOF'
diff --git a/.github/workflows/security-compliance.lock.yml b/.github/workflows/security-compliance.lock.yml
index 65589f2371d..da896e300d6 100644
--- a/.github/workflows/security-compliance.lock.yml
+++ b/.github/workflows/security-compliance.lock.yml
@@ -234,7 +234,7 @@ jobs:
           
           GH_AW_PROMPT_e182ce1782081fe9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_e182ce1782081fe9_EOF'
diff --git a/.github/workflows/security-review.lock.yml b/.github/workflows/security-review.lock.yml
index 1386d9cade9..d944c8f82bd 100644
--- a/.github/workflows/security-review.lock.yml
+++ b/.github/workflows/security-review.lock.yml
@@ -274,7 +274,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ee0f70d59b920340_EOF'
diff --git a/.github/workflows/semantic-function-refactor.lock.yml b/.github/workflows/semantic-function-refactor.lock.yml
index ed0d9f0a17f..978e83e623d 100644
--- a/.github/workflows/semantic-function-refactor.lock.yml
+++ b/.github/workflows/semantic-function-refactor.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_63264fecff0f6f38_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_63264fecff0f6f38_EOF'
diff --git a/.github/workflows/sergo.lock.yml b/.github/workflows/sergo.lock.yml
index 130b6d0b174..ba7ec19f177 100644
--- a/.github/workflows/sergo.lock.yml
+++ b/.github/workflows/sergo.lock.yml
@@ -241,7 +241,7 @@ jobs:
           
           GH_AW_PROMPT_4179d90e1e2bd67a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_4179d90e1e2bd67a_EOF'
diff --git a/.github/workflows/slide-deck-maintainer.lock.yml b/.github/workflows/slide-deck-maintainer.lock.yml
index fac27eb5e62..8d8c3d9d981 100644
--- a/.github/workflows/slide-deck-maintainer.lock.yml
+++ b/.github/workflows/slide-deck-maintainer.lock.yml
@@ -240,7 +240,7 @@ jobs:
           
           GH_AW_PROMPT_f9dfff389c6d2518_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f9dfff389c6d2518_EOF'
diff --git a/.github/workflows/smoke-agent-all-merged.lock.yml b/.github/workflows/smoke-agent-all-merged.lock.yml
index aa40f9f7750..5b91e876183 100644
--- a/.github/workflows/smoke-agent-all-merged.lock.yml
+++ b/.github/workflows/smoke-agent-all-merged.lock.yml
@@ -267,7 +267,7 @@ jobs:
           
           GH_AW_PROMPT_2154fa1d6c586071_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2154fa1d6c586071_EOF'
diff --git a/.github/workflows/smoke-agent-all-none.lock.yml b/.github/workflows/smoke-agent-all-none.lock.yml
index 5ab1e669695..f0a78abd24c 100644
--- a/.github/workflows/smoke-agent-all-none.lock.yml
+++ b/.github/workflows/smoke-agent-all-none.lock.yml
@@ -267,7 +267,7 @@ jobs:
           
           GH_AW_PROMPT_d87d9898ea35480b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_d87d9898ea35480b_EOF'
diff --git a/.github/workflows/smoke-agent-public-approved.lock.yml b/.github/workflows/smoke-agent-public-approved.lock.yml
index 03769cff931..bc71b041fd7 100644
--- a/.github/workflows/smoke-agent-public-approved.lock.yml
+++ b/.github/workflows/smoke-agent-public-approved.lock.yml
@@ -269,7 +269,7 @@ jobs:
           
           GH_AW_PROMPT_3e689fc9bcbf861a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_3e689fc9bcbf861a_EOF'
diff --git a/.github/workflows/smoke-agent-public-none.lock.yml b/.github/workflows/smoke-agent-public-none.lock.yml
index 44106fd9d7f..785012c07d8 100644
--- a/.github/workflows/smoke-agent-public-none.lock.yml
+++ b/.github/workflows/smoke-agent-public-none.lock.yml
@@ -267,7 +267,7 @@ jobs:
           
           GH_AW_PROMPT_b5f95b20ac0f0789_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b5f95b20ac0f0789_EOF'
diff --git a/.github/workflows/smoke-agent-scoped-approved.lock.yml b/.github/workflows/smoke-agent-scoped-approved.lock.yml
index a5ca1d9aa8a..7ef750e7335 100644
--- a/.github/workflows/smoke-agent-scoped-approved.lock.yml
+++ b/.github/workflows/smoke-agent-scoped-approved.lock.yml
@@ -268,7 +268,7 @@ jobs:
           
           GH_AW_PROMPT_b21bd306ae054208_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b21bd306ae054208_EOF'
diff --git a/.github/workflows/smoke-call-workflow.lock.yml b/.github/workflows/smoke-call-workflow.lock.yml
index e1a780bb22b..acc9c1171e8 100644
--- a/.github/workflows/smoke-call-workflow.lock.yml
+++ b/.github/workflows/smoke-call-workflow.lock.yml
@@ -254,7 +254,7 @@ jobs:
           
           GH_AW_PROMPT_0bcd7ba305cfca31_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0bcd7ba305cfca31_EOF'
@@ -1230,18 +1230,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_521cb5c999d93d42_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_7cb1f239d7dcc678_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_521cb5c999d93d42_EOF
+          GH_AW_MCP_CONFIG_7cb1f239d7dcc678_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_59831d6958e619d6_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_54fe6699938ad0e5_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1252,11 +1252,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_59831d6958e619d6_EOF
+          GH_AW_MCP_CONFIG_54fe6699938ad0e5_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_e2842d29131de42e_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_da706fbae40c11ac_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1266,7 +1266,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_e2842d29131de42e_EOF
+          GH_AW_CODEX_SHELL_POLICY_da706fbae40c11ac_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/smoke-ci.lock.yml b/.github/workflows/smoke-ci.lock.yml
index aaf0705c865..8952f5fa683 100644
--- a/.github/workflows/smoke-ci.lock.yml
+++ b/.github/workflows/smoke-ci.lock.yml
@@ -250,7 +250,7 @@ jobs:
           
           GH_AW_PROMPT_06e3e19b06693820_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_06e3e19b06693820_EOF'
diff --git a/.github/workflows/smoke-claude.lock.yml b/.github/workflows/smoke-claude.lock.yml
index 7965c41c68b..48333cbf1ed 100644
--- a/.github/workflows/smoke-claude.lock.yml
+++ b/.github/workflows/smoke-claude.lock.yml
@@ -307,7 +307,7 @@ jobs:
           
           GH_AW_PROMPT_1ff941a307e33158_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1ff941a307e33158_EOF'
diff --git a/.github/workflows/smoke-codex.lock.yml b/.github/workflows/smoke-codex.lock.yml
index b68a46ac588..d2618608ce4 100644
--- a/.github/workflows/smoke-codex.lock.yml
+++ b/.github/workflows/smoke-codex.lock.yml
@@ -305,7 +305,7 @@ jobs:
           
           GH_AW_PROMPT_928d68ef3e3a244b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_928d68ef3e3a244b_EOF'
@@ -1785,18 +1785,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_54254f1b40d557a3_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_e00013f3149f4ae6_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_54254f1b40d557a3_EOF
+          GH_AW_MCP_CONFIG_e00013f3149f4ae6_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_16ff8c107bf13ee2_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_d6631508eb0fbab1_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1807,11 +1807,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_16ff8c107bf13ee2_EOF
+          GH_AW_MCP_CONFIG_d6631508eb0fbab1_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_dc90eca25964650a_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_c6359efe5dd4c06c_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1821,7 +1821,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_dc90eca25964650a_EOF
+          GH_AW_CODEX_SHELL_POLICY_c6359efe5dd4c06c_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/smoke-copilot-arm.lock.yml b/.github/workflows/smoke-copilot-arm.lock.yml
index 68def71b11e..2e44e65307c 100644
--- a/.github/workflows/smoke-copilot-arm.lock.yml
+++ b/.github/workflows/smoke-copilot-arm.lock.yml
@@ -300,7 +300,7 @@ jobs:
           
           GH_AW_PROMPT_e8adced155d997d7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_e8adced155d997d7_EOF'
diff --git a/.github/workflows/smoke-copilot.lock.yml b/.github/workflows/smoke-copilot.lock.yml
index 302c5d3c1b6..326a011d007 100644
--- a/.github/workflows/smoke-copilot.lock.yml
+++ b/.github/workflows/smoke-copilot.lock.yml
@@ -297,7 +297,7 @@ jobs:
           
           GH_AW_PROMPT_da9cd13ddf198bed_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_da9cd13ddf198bed_EOF'
diff --git a/.github/workflows/smoke-create-cross-repo-pr.lock.yml b/.github/workflows/smoke-create-cross-repo-pr.lock.yml
index bd2afd8e17b..75122119b9f 100644
--- a/.github/workflows/smoke-create-cross-repo-pr.lock.yml
+++ b/.github/workflows/smoke-create-cross-repo-pr.lock.yml
@@ -269,7 +269,7 @@ jobs:
           
           GH_AW_PROMPT_0420ea7924b34dcb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0420ea7924b34dcb_EOF'
diff --git a/.github/workflows/smoke-crush.lock.yml b/.github/workflows/smoke-crush.lock.yml
index 0bbb583c563..36850743c21 100644
--- a/.github/workflows/smoke-crush.lock.yml
+++ b/.github/workflows/smoke-crush.lock.yml
@@ -275,7 +275,7 @@ jobs:
           
           GH_AW_PROMPT_b4fa4429d3aa72ae_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_b4fa4429d3aa72ae_EOF'
diff --git a/.github/workflows/smoke-gemini.lock.yml b/.github/workflows/smoke-gemini.lock.yml
index 8c4652a1dac..c20416e0d48 100644
--- a/.github/workflows/smoke-gemini.lock.yml
+++ b/.github/workflows/smoke-gemini.lock.yml
@@ -290,7 +290,7 @@ jobs:
           
           GH_AW_PROMPT_46b9e9e2ca0cb2d1_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_46b9e9e2ca0cb2d1_EOF'
diff --git a/.github/workflows/smoke-multi-pr.lock.yml b/.github/workflows/smoke-multi-pr.lock.yml
index 5ea83ddbce1..bfc53cc10ff 100644
--- a/.github/workflows/smoke-multi-pr.lock.yml
+++ b/.github/workflows/smoke-multi-pr.lock.yml
@@ -287,7 +287,7 @@ jobs:
           
           GH_AW_PROMPT_48a536a540ddcea8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_48a536a540ddcea8_EOF'
diff --git a/.github/workflows/smoke-opencode.lock.yml b/.github/workflows/smoke-opencode.lock.yml
index f8ce4129cf6..9c0b4b59184 100644
--- a/.github/workflows/smoke-opencode.lock.yml
+++ b/.github/workflows/smoke-opencode.lock.yml
@@ -287,7 +287,7 @@ jobs:
           
           GH_AW_PROMPT_ce2042b8038d4875_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ce2042b8038d4875_EOF'
diff --git a/.github/workflows/smoke-project.lock.yml b/.github/workflows/smoke-project.lock.yml
index 9376b4cb4a6..5eb694226bc 100644
--- a/.github/workflows/smoke-project.lock.yml
+++ b/.github/workflows/smoke-project.lock.yml
@@ -288,7 +288,7 @@ jobs:
           
           GH_AW_PROMPT_58453f345124cba3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_58453f345124cba3_EOF'
diff --git a/.github/workflows/smoke-service-ports.lock.yml b/.github/workflows/smoke-service-ports.lock.yml
index 423244722c6..17a9a44b35a 100644
--- a/.github/workflows/smoke-service-ports.lock.yml
+++ b/.github/workflows/smoke-service-ports.lock.yml
@@ -244,7 +244,7 @@ jobs:
           
           GH_AW_PROMPT_1c9fa53e6b54b6a3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_1c9fa53e6b54b6a3_EOF'
diff --git a/.github/workflows/smoke-temporary-id.lock.yml b/.github/workflows/smoke-temporary-id.lock.yml
index f8478ba0cf4..3876c7cab10 100644
--- a/.github/workflows/smoke-temporary-id.lock.yml
+++ b/.github/workflows/smoke-temporary-id.lock.yml
@@ -283,7 +283,7 @@ jobs:
           
           GH_AW_PROMPT_f9d203436b94b03a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f9d203436b94b03a_EOF'
diff --git a/.github/workflows/smoke-test-tools.lock.yml b/.github/workflows/smoke-test-tools.lock.yml
index ea5122636d9..e1727a8a333 100644
--- a/.github/workflows/smoke-test-tools.lock.yml
+++ b/.github/workflows/smoke-test-tools.lock.yml
@@ -273,7 +273,7 @@ jobs:
           
           GH_AW_PROMPT_0289aca023ea6d07_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_0289aca023ea6d07_EOF'
diff --git a/.github/workflows/smoke-update-cross-repo-pr.lock.yml b/.github/workflows/smoke-update-cross-repo-pr.lock.yml
index 041a7dfb9df..a45244eeeec 100644
--- a/.github/workflows/smoke-update-cross-repo-pr.lock.yml
+++ b/.github/workflows/smoke-update-cross-repo-pr.lock.yml
@@ -272,7 +272,7 @@ jobs:
           
           GH_AW_PROMPT_95b80c043e2e7005_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_95b80c043e2e7005_EOF'
diff --git a/.github/workflows/smoke-workflow-call-with-inputs.lock.yml b/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
index 5bab9a9750d..12074ff96b0 100644
--- a/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
+++ b/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
@@ -273,7 +273,7 @@ jobs:
           
           GH_AW_PROMPT_f2d76cd8a1ef2de8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f2d76cd8a1ef2de8_EOF'
diff --git a/.github/workflows/smoke-workflow-call.lock.yml b/.github/workflows/smoke-workflow-call.lock.yml
index 00de3744f33..3dbd984a0aa 100644
--- a/.github/workflows/smoke-workflow-call.lock.yml
+++ b/.github/workflows/smoke-workflow-call.lock.yml
@@ -277,7 +277,7 @@ jobs:
           
           GH_AW_PROMPT_022421748a24fe95_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_022421748a24fe95_EOF'
diff --git a/.github/workflows/spec-enforcer.lock.yml b/.github/workflows/spec-enforcer.lock.yml
index f6f9de92061..f90ea8347ff 100644
--- a/.github/workflows/spec-enforcer.lock.yml
+++ b/.github/workflows/spec-enforcer.lock.yml
@@ -230,7 +230,7 @@ jobs:
           
           GH_AW_PROMPT_c74a170bf37c0660_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c74a170bf37c0660_EOF'
diff --git a/.github/workflows/spec-extractor.lock.yml b/.github/workflows/spec-extractor.lock.yml
index 63942fa3bbd..3524180e62f 100644
--- a/.github/workflows/spec-extractor.lock.yml
+++ b/.github/workflows/spec-extractor.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_3daaac1a891d7da5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_3daaac1a891d7da5_EOF'
diff --git a/.github/workflows/spec-librarian.lock.yml b/.github/workflows/spec-librarian.lock.yml
index 0df784ac42e..a200d8538a1 100644
--- a/.github/workflows/spec-librarian.lock.yml
+++ b/.github/workflows/spec-librarian.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_2c4d45d7f39bcff2_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2c4d45d7f39bcff2_EOF'
diff --git a/.github/workflows/stale-repo-identifier.lock.yml b/.github/workflows/stale-repo-identifier.lock.yml
index 1cf37cea57a..17a37235f0a 100644
--- a/.github/workflows/stale-repo-identifier.lock.yml
+++ b/.github/workflows/stale-repo-identifier.lock.yml
@@ -255,7 +255,7 @@ jobs:
           
           GH_AW_PROMPT_ede8520bbc966539_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ede8520bbc966539_EOF'
diff --git a/.github/workflows/static-analysis-report.lock.yml b/.github/workflows/static-analysis-report.lock.yml
index b12e07a58ec..de54c48cb4b 100644
--- a/.github/workflows/static-analysis-report.lock.yml
+++ b/.github/workflows/static-analysis-report.lock.yml
@@ -231,7 +231,7 @@ jobs:
           
           GH_AW_PROMPT_a7f209ebfd14c3f4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a7f209ebfd14c3f4_EOF'
diff --git a/.github/workflows/step-name-alignment.lock.yml b/.github/workflows/step-name-alignment.lock.yml
index 8c55503b12a..898051ebf47 100644
--- a/.github/workflows/step-name-alignment.lock.yml
+++ b/.github/workflows/step-name-alignment.lock.yml
@@ -224,7 +224,7 @@ jobs:
           
           GH_AW_PROMPT_651666ff422bb502_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_651666ff422bb502_EOF'
diff --git a/.github/workflows/sub-issue-closer.lock.yml b/.github/workflows/sub-issue-closer.lock.yml
index 30f9bbf8db7..51fee0fefad 100644
--- a/.github/workflows/sub-issue-closer.lock.yml
+++ b/.github/workflows/sub-issue-closer.lock.yml
@@ -221,7 +221,7 @@ jobs:
           
           GH_AW_PROMPT_5ca5aaf91141261e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_5ca5aaf91141261e_EOF'
diff --git a/.github/workflows/super-linter.lock.yml b/.github/workflows/super-linter.lock.yml
index d8fcfa0b29a..a445ad59ee3 100644
--- a/.github/workflows/super-linter.lock.yml
+++ b/.github/workflows/super-linter.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_f5b38ff132780914_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_f5b38ff132780914_EOF'
diff --git a/.github/workflows/technical-doc-writer.lock.yml b/.github/workflows/technical-doc-writer.lock.yml
index 31374282c0c..acf62a4f1f8 100644
--- a/.github/workflows/technical-doc-writer.lock.yml
+++ b/.github/workflows/technical-doc-writer.lock.yml
@@ -234,7 +234,7 @@ jobs:
           
           GH_AW_PROMPT_2ce6bd8ddc747cbe_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2ce6bd8ddc747cbe_EOF'
diff --git a/.github/workflows/terminal-stylist.lock.yml b/.github/workflows/terminal-stylist.lock.yml
index 6da7d5f21df..31ae9ed5b70 100644
--- a/.github/workflows/terminal-stylist.lock.yml
+++ b/.github/workflows/terminal-stylist.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_622a0a32a37a95cc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_622a0a32a37a95cc_EOF'
diff --git a/.github/workflows/test-create-pr-error-handling.lock.yml b/.github/workflows/test-create-pr-error-handling.lock.yml
index 6d1376fa56e..6ffde0eb0af 100644
--- a/.github/workflows/test-create-pr-error-handling.lock.yml
+++ b/.github/workflows/test-create-pr-error-handling.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_2e5a2dbd67e67053_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_2e5a2dbd67e67053_EOF'
diff --git a/.github/workflows/test-dispatcher.lock.yml b/.github/workflows/test-dispatcher.lock.yml
index 3dea1c8c824..7e9db3b2c31 100644
--- a/.github/workflows/test-dispatcher.lock.yml
+++ b/.github/workflows/test-dispatcher.lock.yml
@@ -217,7 +217,7 @@ jobs:
           
           GH_AW_PROMPT_639e483721a07aa6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_639e483721a07aa6_EOF'
diff --git a/.github/workflows/test-project-url-default.lock.yml b/.github/workflows/test-project-url-default.lock.yml
index 75612657995..1719dd0b94d 100644
--- a/.github/workflows/test-project-url-default.lock.yml
+++ b/.github/workflows/test-project-url-default.lock.yml
@@ -218,7 +218,7 @@ jobs:
           
           GH_AW_PROMPT_115a32ce3f02db9a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_115a32ce3f02db9a_EOF'
diff --git a/.github/workflows/test-quality-sentinel.lock.yml b/.github/workflows/test-quality-sentinel.lock.yml
index bdcf68d8c91..79ec360c520 100644
--- a/.github/workflows/test-quality-sentinel.lock.yml
+++ b/.github/workflows/test-quality-sentinel.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_18ecf389234a57b4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_18ecf389234a57b4_EOF'
diff --git a/.github/workflows/test-workflow.lock.yml b/.github/workflows/test-workflow.lock.yml
index af8f89b31d4..8c558c2568f 100644
--- a/.github/workflows/test-workflow.lock.yml
+++ b/.github/workflows/test-workflow.lock.yml
@@ -207,7 +207,7 @@ jobs:
           
           GH_AW_PROMPT_d2100dd9504f0ecb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_d2100dd9504f0ecb_EOF'
diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml
index 7579347558e..d92d09c442c 100644
--- a/.github/workflows/tidy.lock.yml
+++ b/.github/workflows/tidy.lock.yml
@@ -292,7 +292,7 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_68ec8859b6f02696_EOF'
diff --git a/.github/workflows/typist.lock.yml b/.github/workflows/typist.lock.yml
index 09d4bcd30d1..a9ebf3b876d 100644
--- a/.github/workflows/typist.lock.yml
+++ b/.github/workflows/typist.lock.yml
@@ -238,7 +238,7 @@ jobs:
           
           GH_AW_PROMPT_05cd7a92a03dca4b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_05cd7a92a03dca4b_EOF'
diff --git a/.github/workflows/ubuntu-image-analyzer.lock.yml b/.github/workflows/ubuntu-image-analyzer.lock.yml
index 10b581e5c4f..ca1f13fee8a 100644
--- a/.github/workflows/ubuntu-image-analyzer.lock.yml
+++ b/.github/workflows/ubuntu-image-analyzer.lock.yml
@@ -231,7 +231,7 @@ jobs:
           
           GH_AW_PROMPT_37168e83c534310c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_37168e83c534310c_EOF'
diff --git a/.github/workflows/unbloat-docs.lock.yml b/.github/workflows/unbloat-docs.lock.yml
index 70bce3bac72..65c858b7224 100644
--- a/.github/workflows/unbloat-docs.lock.yml
+++ b/.github/workflows/unbloat-docs.lock.yml
@@ -286,7 +286,7 @@ jobs:
           
           GH_AW_PROMPT_05157cda456dcfb3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_05157cda456dcfb3_EOF'
diff --git a/.github/workflows/update-astro.lock.yml b/.github/workflows/update-astro.lock.yml
index 10d00bd58e6..c407d9730a6 100644
--- a/.github/workflows/update-astro.lock.yml
+++ b/.github/workflows/update-astro.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_e761d0bef082d79d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_e761d0bef082d79d_EOF'
diff --git a/.github/workflows/video-analyzer.lock.yml b/.github/workflows/video-analyzer.lock.yml
index e29ea274819..049e97aac37 100644
--- a/.github/workflows/video-analyzer.lock.yml
+++ b/.github/workflows/video-analyzer.lock.yml
@@ -225,7 +225,7 @@ jobs:
           
           GH_AW_PROMPT_5e55eb320375d33b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_5e55eb320375d33b_EOF'
diff --git a/.github/workflows/visual-regression-checker.lock.yml b/.github/workflows/visual-regression-checker.lock.yml
index da36ad8cbf9..20868097df2 100644
--- a/.github/workflows/visual-regression-checker.lock.yml
+++ b/.github/workflows/visual-regression-checker.lock.yml
@@ -240,7 +240,7 @@ jobs:
           
           GH_AW_PROMPT_c79f5dc89b1c0500_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_c79f5dc89b1c0500_EOF'
diff --git a/.github/workflows/weekly-blog-post-writer.lock.yml b/.github/workflows/weekly-blog-post-writer.lock.yml
index 74baa757039..0d6375cabeb 100644
--- a/.github/workflows/weekly-blog-post-writer.lock.yml
+++ b/.github/workflows/weekly-blog-post-writer.lock.yml
@@ -231,7 +231,7 @@ jobs:
           
           GH_AW_PROMPT_8291c4dfab1bd39d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_8291c4dfab1bd39d_EOF'
diff --git a/.github/workflows/weekly-editors-health-check.lock.yml b/.github/workflows/weekly-editors-health-check.lock.yml
index 9bab3a70e13..babcda03c40 100644
--- a/.github/workflows/weekly-editors-health-check.lock.yml
+++ b/.github/workflows/weekly-editors-health-check.lock.yml
@@ -229,7 +229,7 @@ jobs:
           
           GH_AW_PROMPT_734dc520e9323e06_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_734dc520e9323e06_EOF'
diff --git a/.github/workflows/weekly-issue-summary.lock.yml b/.github/workflows/weekly-issue-summary.lock.yml
index b3c80253183..cc1893789e2 100644
--- a/.github/workflows/weekly-issue-summary.lock.yml
+++ b/.github/workflows/weekly-issue-summary.lock.yml
@@ -244,7 +244,7 @@ jobs:
           
           GH_AW_PROMPT_508326a69dd2f474_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_508326a69dd2f474_EOF'
diff --git a/.github/workflows/weekly-safe-outputs-spec-review.lock.yml b/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
index 7fbab479cd5..cc590d502b1 100644
--- a/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
+++ b/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_dd5ce0f0ce7b0ccb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_dd5ce0f0ce7b0ccb_EOF'
diff --git a/.github/workflows/workflow-generator.lock.yml b/.github/workflows/workflow-generator.lock.yml
index 6d098d5c934..ce89c3f2618 100644
--- a/.github/workflows/workflow-generator.lock.yml
+++ b/.github/workflows/workflow-generator.lock.yml
@@ -260,7 +260,7 @@ jobs:
           
           GH_AW_PROMPT_a2f5a38e58a2e615_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_a2f5a38e58a2e615_EOF'
diff --git a/.github/workflows/workflow-health-manager.lock.yml b/.github/workflows/workflow-health-manager.lock.yml
index 8d6e364e26c..77bdd0cfcab 100644
--- a/.github/workflows/workflow-health-manager.lock.yml
+++ b/.github/workflows/workflow-health-manager.lock.yml
@@ -228,7 +228,7 @@ jobs:
           
           GH_AW_PROMPT_60b97bb4586a8734_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_60b97bb4586a8734_EOF'
diff --git a/.github/workflows/workflow-normalizer.lock.yml b/.github/workflows/workflow-normalizer.lock.yml
index 89fa5965bdf..99020cf767c 100644
--- a/.github/workflows/workflow-normalizer.lock.yml
+++ b/.github/workflows/workflow-normalizer.lock.yml
@@ -227,7 +227,7 @@ jobs:
           
           GH_AW_PROMPT_476e26a6aca6d1d8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_476e26a6aca6d1d8_EOF'
diff --git a/.github/workflows/workflow-skill-extractor.lock.yml b/.github/workflows/workflow-skill-extractor.lock.yml
index cbdf4f33c29..617fa8f7d65 100644
--- a/.github/workflows/workflow-skill-extractor.lock.yml
+++ b/.github/workflows/workflow-skill-extractor.lock.yml
@@ -223,7 +223,7 @@ jobs:
           
           GH_AW_PROMPT_ae8bac670414c599_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_ae8bac670414c599_EOF'
diff --git a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
index bbab4d86c24..7a03b937ff5 100644
--- a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
+++ b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
@@ -162,7 +162,7 @@ jobs:
           
           GH_AW_PROMPT_NORM_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_NORM_EOF'
diff --git a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
index 8fe9e286a45..ea492e49053 100644
--- a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
+++ b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
@@ -162,7 +162,7 @@ jobs:
           
           GH_AW_PROMPT_NORM_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .; then
+          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
           fi
           cat << 'GH_AW_PROMPT_NORM_EOF'
diff --git a/pkg/workflow/unified_prompt_step.go b/pkg/workflow/unified_prompt_step.go
index fe9385c2b29..c568153162b 100644
--- a/pkg/workflow/unified_prompt_step.go
+++ b/pkg/workflow/unified_prompt_step.go
@@ -310,7 +310,7 @@ func (c *Compiler) collectPromptSections(data *WorkflowData) []PromptSection {
 	sections = append(sections, PromptSection{
 		Content:        skillsPromptFile,
 		IsFile:         true,
-		ShellCondition: `find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6 -print -quit 2>/dev/null | grep -q .`,
+		ShellCondition: `find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .`,
 	})
 
 	return sections

From adb065b18bbbf657166a9d4d55222108aecc31ee Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 30 Apr 2026 01:05:19 +0000
Subject: [PATCH 3/5] Remove skills_prompt.md and compilation changes; keep
 only .github/aw/skills.md

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/a272566f-16f7-4845-9527-6bfa3b69ccb2

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 .github/workflows/ace-editor.lock.yml             |  3 ---
 .../workflows/agent-performance-analyzer.lock.yml |  3 ---
 .github/workflows/agent-persona-explorer.lock.yml |  3 ---
 .github/workflows/ai-moderator.lock.yml           |  3 ---
 .github/workflows/api-consumption-report.lock.yml |  3 ---
 .github/workflows/approach-validator.lock.yml     |  3 ---
 .github/workflows/archie.lock.yml                 |  3 ---
 .github/workflows/architecture-guardian.lock.yml  |  3 ---
 .github/workflows/artifacts-summary.lock.yml      |  3 ---
 .github/workflows/audit-workflows.lock.yml        |  3 ---
 .github/workflows/auto-triage-issues.lock.yml     |  3 ---
 .../workflows/aw-failure-investigator.lock.yml    |  3 ---
 .github/workflows/blog-auditor.lock.yml           |  3 ---
 .github/workflows/bot-detection.lock.yml          |  3 ---
 .github/workflows/brave.lock.yml                  |  3 ---
 .../workflows/breaking-change-checker.lock.yml    |  3 ---
 .github/workflows/changeset.lock.yml              |  3 ---
 .github/workflows/ci-coach.lock.yml               |  3 ---
 .github/workflows/ci-doctor.lock.yml              |  3 ---
 .../claude-code-user-docs-review.lock.yml         |  3 ---
 .../workflows/cli-consistency-checker.lock.yml    |  3 ---
 .github/workflows/cli-version-checker.lock.yml    |  3 ---
 .github/workflows/cloclo.lock.yml                 |  3 ---
 .github/workflows/code-scanning-fixer.lock.yml    |  3 ---
 .github/workflows/code-simplifier.lock.yml        |  3 ---
 .../codex-github-remote-mcp-test.lock.yml         |  3 ---
 .../workflows/commit-changes-analyzer.lock.yml    |  3 ---
 .../workflows/constraint-solving-potd.lock.yml    |  3 ---
 .github/workflows/contribution-check.lock.yml     |  3 ---
 .github/workflows/copilot-agent-analysis.lock.yml |  3 ---
 .../workflows/copilot-cli-deep-research.lock.yml  |  3 ---
 .github/workflows/copilot-opt.lock.yml            |  3 ---
 .../workflows/copilot-pr-merged-report.lock.yml   |  3 ---
 .../workflows/copilot-pr-nlp-analysis.lock.yml    |  3 ---
 .../workflows/copilot-pr-prompt-analysis.lock.yml |  3 ---
 .../workflows/copilot-session-insights.lock.yml   |  3 ---
 .github/workflows/copilot-token-audit.lock.yml    |  3 ---
 .../workflows/copilot-token-optimizer.lock.yml    |  3 ---
 .github/workflows/craft.lock.yml                  |  3 ---
 .../workflows/daily-architecture-diagram.lock.yml |  3 ---
 .../workflows/daily-assign-issue-to-user.lock.yml |  3 ---
 ...ly-astrostylelite-markdown-spellcheck.lock.yml |  3 ---
 .../daily-aw-cross-repo-compile-check.lock.yml    |  3 ---
 .../daily-cache-strategy-analyzer.lock.yml        | 15 ++++++---------
 .../workflows/daily-caveman-optimizer.lock.yml    |  3 ---
 .github/workflows/daily-choice-test.lock.yml      |  3 ---
 .github/workflows/daily-cli-performance.lock.yml  |  3 ---
 .github/workflows/daily-cli-tools-tester.lock.yml |  3 ---
 .github/workflows/daily-code-metrics.lock.yml     |  3 ---
 .../daily-community-attribution.lock.yml          |  3 ---
 .github/workflows/daily-compiler-quality.lock.yml |  3 ---
 .github/workflows/daily-doc-healer.lock.yml       |  3 ---
 .github/workflows/daily-doc-updater.lock.yml      |  3 ---
 .github/workflows/daily-fact.lock.yml             | 15 ++++++---------
 .github/workflows/daily-file-diet.lock.yml        |  3 ---
 .github/workflows/daily-firewall-report.lock.yml  |  3 ---
 .github/workflows/daily-function-namer.lock.yml   |  3 ---
 .github/workflows/daily-hippo-learn.lock.yml      |  3 ---
 .github/workflows/daily-issues-report.lock.yml    |  3 ---
 .../workflows/daily-malicious-code-scan.lock.yml  |  3 ---
 .../daily-mcp-concurrency-analysis.lock.yml       |  3 ---
 .../daily-multi-device-docs-tester.lock.yml       |  3 ---
 .github/workflows/daily-news.lock.yml             |  3 ---
 .../workflows/daily-observability-report.lock.yml | 15 ++++++---------
 .../daily-otel-instrumentation-advisor.lock.yml   |  3 ---
 .../workflows/daily-performance-summary.lock.yml  |  3 ---
 .github/workflows/daily-regulatory.lock.yml       |  3 ---
 .../daily-rendering-scripts-verifier.lock.yml     |  3 ---
 .github/workflows/daily-repo-chronicle.lock.yml   |  3 ---
 .../daily-safe-output-integrator.lock.yml         |  3 ---
 .../daily-safe-output-optimizer.lock.yml          |  3 ---
 .../daily-safe-outputs-conformance.lock.yml       |  3 ---
 .github/workflows/daily-secrets-analysis.lock.yml |  3 ---
 .../daily-security-observability.lock.yml         |  3 ---
 .../workflows/daily-security-red-team.lock.yml    |  3 ---
 .github/workflows/daily-semgrep-scan.lock.yml     |  3 ---
 .github/workflows/daily-sentrux-report.lock.yml   |  3 ---
 .github/workflows/daily-skill-optimizer.lock.yml  |  3 ---
 .../workflows/daily-syntax-error-quality.lock.yml |  3 ---
 .../daily-team-evolution-insights.lock.yml        |  3 ---
 .github/workflows/daily-team-status.lock.yml      |  3 ---
 .../daily-testify-uber-super-expert.lock.yml      |  3 ---
 .../daily-token-consumption-report.lock.yml       |  3 ---
 .github/workflows/daily-workflow-updater.lock.yml |  3 ---
 .github/workflows/dead-code-remover.lock.yml      |  3 ---
 .github/workflows/deep-report.lock.yml            |  3 ---
 .github/workflows/delight.lock.yml                |  3 ---
 .github/workflows/dependabot-burner.lock.yml      |  3 ---
 .github/workflows/dependabot-go-checker.lock.yml  |  3 ---
 .github/workflows/dependabot-repair.lock.yml      |  3 ---
 .../deployment-incident-monitor.lock.yml          |  3 ---
 .github/workflows/design-decision-gate.lock.yml   |  3 ---
 .github/workflows/dev-hawk.lock.yml               |  3 ---
 .github/workflows/dev.lock.yml                    |  3 ---
 .../developer-docs-consolidator.lock.yml          |  3 ---
 .github/workflows/dictation-prompt.lock.yml       |  3 ---
 .github/workflows/discussion-task-miner.lock.yml  |  3 ---
 .github/workflows/docs-noob-tester.lock.yml       |  3 ---
 .github/workflows/draft-pr-cleanup.lock.yml       |  3 ---
 .../workflows/duplicate-code-detector.lock.yml    | 15 ++++++---------
 .../example-permissions-warning.lock.yml          |  3 ---
 .../workflows/example-workflow-analyzer.lock.yml  |  3 ---
 .github/workflows/firewall-escape.lock.yml        |  3 ---
 .github/workflows/firewall.lock.yml               |  3 ---
 .github/workflows/functional-pragmatist.lock.yml  |  3 ---
 .../github-mcp-structural-analysis.lock.yml       |  3 ---
 .../workflows/github-mcp-tools-report.lock.yml    |  3 ---
 .../github-remote-mcp-auth-test.lock.yml          |  3 ---
 .github/workflows/glossary-maintainer.lock.yml    |  3 ---
 .github/workflows/go-fan.lock.yml                 |  3 ---
 .github/workflows/go-logger.lock.yml              |  3 ---
 .github/workflows/go-pattern-detector.lock.yml    |  3 ---
 .github/workflows/gpclean.lock.yml                |  3 ---
 .github/workflows/grumpy-reviewer.lock.yml        | 15 ++++++---------
 .github/workflows/hippo-embed.lock.yml            |  3 ---
 .github/workflows/hourly-ci-cleaner.lock.yml      |  3 ---
 .github/workflows/instructions-janitor.lock.yml   |  3 ---
 .github/workflows/issue-arborist.lock.yml         | 15 ++++++---------
 .github/workflows/issue-monster.lock.yml          |  3 ---
 .github/workflows/issue-triage-agent.lock.yml     |  3 ---
 .github/workflows/jsweep.lock.yml                 |  3 ---
 .github/workflows/layout-spec-maintainer.lock.yml |  3 ---
 .github/workflows/lockfile-stats.lock.yml         |  3 ---
 .github/workflows/mcp-inspector.lock.yml          |  3 ---
 .github/workflows/mergefest.lock.yml              |  3 ---
 .github/workflows/metrics-collector.lock.yml      |  3 ---
 .github/workflows/notion-issue-summary.lock.yml   |  3 ---
 .github/workflows/org-health-report.lock.yml      |  3 ---
 .github/workflows/pdf-summary.lock.yml            |  3 ---
 .github/workflows/plan.lock.yml                   |  3 ---
 .github/workflows/poem-bot.lock.yml               |  3 ---
 .github/workflows/pr-nitpick-reviewer.lock.yml    |  3 ---
 .github/workflows/pr-triage-agent.lock.yml        |  3 ---
 .../workflows/prompt-clustering-analysis.lock.yml |  3 ---
 .github/workflows/python-data-charts.lock.yml     |  3 ---
 .github/workflows/q.lock.yml                      |  3 ---
 .github/workflows/refactoring-cadence.lock.yml    |  3 ---
 .github/workflows/refiner.lock.yml                |  3 ---
 .github/workflows/release.lock.yml                |  3 ---
 .github/workflows/repo-audit-analyzer.lock.yml    |  3 ---
 .github/workflows/repo-tree-map.lock.yml          |  3 ---
 .../repository-quality-improver.lock.yml          |  3 ---
 .github/workflows/research.lock.yml               |  3 ---
 .github/workflows/safe-output-health.lock.yml     |  3 ---
 .../workflows/schema-consistency-checker.lock.yml |  3 ---
 .../workflows/schema-feature-coverage.lock.yml    | 15 ++++++---------
 .github/workflows/scout.lock.yml                  |  3 ---
 .github/workflows/security-compliance.lock.yml    |  3 ---
 .github/workflows/security-review.lock.yml        |  3 ---
 .../workflows/semantic-function-refactor.lock.yml |  3 ---
 .github/workflows/sergo.lock.yml                  |  3 ---
 .github/workflows/slide-deck-maintainer.lock.yml  |  3 ---
 .github/workflows/smoke-agent-all-merged.lock.yml |  3 ---
 .github/workflows/smoke-agent-all-none.lock.yml   |  3 ---
 .../smoke-agent-public-approved.lock.yml          |  3 ---
 .../workflows/smoke-agent-public-none.lock.yml    |  3 ---
 .../smoke-agent-scoped-approved.lock.yml          |  3 ---
 .github/workflows/smoke-call-workflow.lock.yml    | 15 ++++++---------
 .github/workflows/smoke-ci.lock.yml               |  3 ---
 .github/workflows/smoke-claude.lock.yml           |  3 ---
 .github/workflows/smoke-codex.lock.yml            | 15 ++++++---------
 .github/workflows/smoke-copilot-arm.lock.yml      |  3 ---
 .github/workflows/smoke-copilot.lock.yml          |  3 ---
 .../workflows/smoke-create-cross-repo-pr.lock.yml |  3 ---
 .github/workflows/smoke-crush.lock.yml            |  3 ---
 .github/workflows/smoke-gemini.lock.yml           |  3 ---
 .github/workflows/smoke-multi-pr.lock.yml         |  3 ---
 .github/workflows/smoke-opencode.lock.yml         |  3 ---
 .github/workflows/smoke-project.lock.yml          |  3 ---
 .github/workflows/smoke-service-ports.lock.yml    |  3 ---
 .github/workflows/smoke-temporary-id.lock.yml     |  3 ---
 .github/workflows/smoke-test-tools.lock.yml       |  3 ---
 .../workflows/smoke-update-cross-repo-pr.lock.yml |  3 ---
 .../smoke-workflow-call-with-inputs.lock.yml      |  3 ---
 .github/workflows/smoke-workflow-call.lock.yml    |  3 ---
 .github/workflows/spec-enforcer.lock.yml          |  3 ---
 .github/workflows/spec-extractor.lock.yml         |  3 ---
 .github/workflows/spec-librarian.lock.yml         |  3 ---
 .github/workflows/stale-repo-identifier.lock.yml  |  3 ---
 .github/workflows/static-analysis-report.lock.yml |  3 ---
 .github/workflows/step-name-alignment.lock.yml    |  3 ---
 .github/workflows/sub-issue-closer.lock.yml       |  3 ---
 .github/workflows/super-linter.lock.yml           |  3 ---
 .github/workflows/technical-doc-writer.lock.yml   |  3 ---
 .github/workflows/terminal-stylist.lock.yml       |  3 ---
 .../test-create-pr-error-handling.lock.yml        |  3 ---
 .github/workflows/test-dispatcher.lock.yml        |  3 ---
 .../workflows/test-project-url-default.lock.yml   |  3 ---
 .github/workflows/test-quality-sentinel.lock.yml  |  3 ---
 .github/workflows/test-workflow.lock.yml          |  3 ---
 .github/workflows/tidy.lock.yml                   |  3 ---
 .github/workflows/typist.lock.yml                 |  3 ---
 .github/workflows/ubuntu-image-analyzer.lock.yml  |  3 ---
 .github/workflows/unbloat-docs.lock.yml           |  3 ---
 .github/workflows/update-astro.lock.yml           |  3 ---
 .github/workflows/video-analyzer.lock.yml         |  3 ---
 .../workflows/visual-regression-checker.lock.yml  |  3 ---
 .../workflows/weekly-blog-post-writer.lock.yml    |  3 ---
 .../weekly-editors-health-check.lock.yml          |  3 ---
 .github/workflows/weekly-issue-summary.lock.yml   |  3 ---
 .../weekly-safe-outputs-spec-review.lock.yml      |  3 ---
 .github/workflows/workflow-generator.lock.yml     |  3 ---
 .../workflows/workflow-health-manager.lock.yml    |  3 ---
 .github/workflows/workflow-normalizer.lock.yml    |  3 ---
 .../workflows/workflow-skill-extractor.lock.yml   |  3 ---
 actions/setup/md/skills_prompt.md                 | 15 ---------------
 pkg/workflow/prompt_constants.go                  |  1 -
 .../basic-copilot.golden                          |  3 ---
 .../with-imports.golden                           |  3 ---
 pkg/workflow/unified_prompt_step.go               |  8 --------
 pkg/workflow/unified_prompt_step_test.go          |  5 +----
 211 files changed, 55 insertions(+), 703 deletions(-)
 delete mode 100644 actions/setup/md/skills_prompt.md

diff --git a/.github/workflows/ace-editor.lock.yml b/.github/workflows/ace-editor.lock.yml
index 5ec543d6365..2aa7462d4f2 100644
--- a/.github/workflows/ace-editor.lock.yml
+++ b/.github/workflows/ace-editor.lock.yml
@@ -247,9 +247,6 @@ jobs:
           
           GH_AW_PROMPT_0571c40b9b9857c4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0571c40b9b9857c4_EOF'
           </system>
           {{#runtime-import .github/workflows/ace-editor.md}}
diff --git a/.github/workflows/agent-performance-analyzer.lock.yml b/.github/workflows/agent-performance-analyzer.lock.yml
index d922bbc96ff..624aaf00e78 100644
--- a/.github/workflows/agent-performance-analyzer.lock.yml
+++ b/.github/workflows/agent-performance-analyzer.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_75bc7f749c7339be_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_75bc7f749c7339be_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/agent-persona-explorer.lock.yml b/.github/workflows/agent-persona-explorer.lock.yml
index 8c002041848..1a92ac2cfcf 100644
--- a/.github/workflows/agent-persona-explorer.lock.yml
+++ b/.github/workflows/agent-persona-explorer.lock.yml
@@ -231,9 +231,6 @@ jobs:
           
           GH_AW_PROMPT_7a1be3299129c2b7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_7a1be3299129c2b7_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/ai-moderator.lock.yml b/.github/workflows/ai-moderator.lock.yml
index 9103438b27a..5f6493b0803 100644
--- a/.github/workflows/ai-moderator.lock.yml
+++ b/.github/workflows/ai-moderator.lock.yml
@@ -270,9 +270,6 @@ jobs:
           
           GH_AW_PROMPT_2854fab51269987e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2854fab51269987e_EOF'
           </system>
           {{#runtime-import .github/workflows/ai-moderator.md}}
diff --git a/.github/workflows/api-consumption-report.lock.yml b/.github/workflows/api-consumption-report.lock.yml
index 8cd8d92036a..7cae7a69d89 100644
--- a/.github/workflows/api-consumption-report.lock.yml
+++ b/.github/workflows/api-consumption-report.lock.yml
@@ -247,9 +247,6 @@ jobs:
           
           GH_AW_PROMPT_2a3fea36388c950d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2a3fea36388c950d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/approach-validator.lock.yml b/.github/workflows/approach-validator.lock.yml
index 6836de9da52..3183b0054e2 100644
--- a/.github/workflows/approach-validator.lock.yml
+++ b/.github/workflows/approach-validator.lock.yml
@@ -260,9 +260,6 @@ jobs:
           
           GH_AW_PROMPT_c1826eb2224aa7ae_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c1826eb2224aa7ae_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/safe-output-upload-artifact.md}}
diff --git a/.github/workflows/archie.lock.yml b/.github/workflows/archie.lock.yml
index 46d90dcad0e..03e0f225d11 100644
--- a/.github/workflows/archie.lock.yml
+++ b/.github/workflows/archie.lock.yml
@@ -275,9 +275,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_87e239b174c50a03_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/architecture-guardian.lock.yml b/.github/workflows/architecture-guardian.lock.yml
index 794e544cf04..bde8af029af 100644
--- a/.github/workflows/architecture-guardian.lock.yml
+++ b/.github/workflows/architecture-guardian.lock.yml
@@ -220,9 +220,6 @@ jobs:
           
           GH_AW_PROMPT_39c70d8a2443c5c7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_39c70d8a2443c5c7_EOF'
           </system>
           {{#runtime-import .github/workflows/architecture-guardian.md}}
diff --git a/.github/workflows/artifacts-summary.lock.yml b/.github/workflows/artifacts-summary.lock.yml
index 63e2744586b..24d690d63b6 100644
--- a/.github/workflows/artifacts-summary.lock.yml
+++ b/.github/workflows/artifacts-summary.lock.yml
@@ -217,9 +217,6 @@ jobs:
           
           GH_AW_PROMPT_0b6cabe580a9c36c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0b6cabe580a9c36c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/audit-workflows.lock.yml b/.github/workflows/audit-workflows.lock.yml
index 97af3a952f0..2f3ee1b7e5e 100644
--- a/.github/workflows/audit-workflows.lock.yml
+++ b/.github/workflows/audit-workflows.lock.yml
@@ -251,9 +251,6 @@ jobs:
           
           GH_AW_PROMPT_a48b8f0681a71fa0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a48b8f0681a71fa0_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/auto-triage-issues.lock.yml b/.github/workflows/auto-triage-issues.lock.yml
index 65e280e3a45..57efadf9622 100644
--- a/.github/workflows/auto-triage-issues.lock.yml
+++ b/.github/workflows/auto-triage-issues.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_acbbe709b3acdcf4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_acbbe709b3acdcf4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/aw-failure-investigator.lock.yml b/.github/workflows/aw-failure-investigator.lock.yml
index 7e1a75043d5..0452262e8e7 100644
--- a/.github/workflows/aw-failure-investigator.lock.yml
+++ b/.github/workflows/aw-failure-investigator.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_d2050658d4489b3f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_d2050658d4489b3f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/blog-auditor.lock.yml b/.github/workflows/blog-auditor.lock.yml
index c6403975ac8..8315564fc42 100644
--- a/.github/workflows/blog-auditor.lock.yml
+++ b/.github/workflows/blog-auditor.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_771d61fb0fb5ffad_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_771d61fb0fb5ffad_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/bot-detection.lock.yml b/.github/workflows/bot-detection.lock.yml
index 6ce537279a8..4d557484718 100644
--- a/.github/workflows/bot-detection.lock.yml
+++ b/.github/workflows/bot-detection.lock.yml
@@ -226,9 +226,6 @@ jobs:
           
           GH_AW_PROMPT_5c36ab16716f9d71_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_5c36ab16716f9d71_EOF'
           </system>
           {{#runtime-import .github/workflows/bot-detection.md}}
diff --git a/.github/workflows/brave.lock.yml b/.github/workflows/brave.lock.yml
index a15336c99a2..1aa2fcfe161 100644
--- a/.github/workflows/brave.lock.yml
+++ b/.github/workflows/brave.lock.yml
@@ -265,9 +265,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_49863381d8f5674f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/brave.md}}
diff --git a/.github/workflows/breaking-change-checker.lock.yml b/.github/workflows/breaking-change-checker.lock.yml
index e48bb7bbf1d..14b35ca92e3 100644
--- a/.github/workflows/breaking-change-checker.lock.yml
+++ b/.github/workflows/breaking-change-checker.lock.yml
@@ -220,9 +220,6 @@ jobs:
           
           GH_AW_PROMPT_323d89b4a9e41164_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_323d89b4a9e41164_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/changeset.lock.yml b/.github/workflows/changeset.lock.yml
index fa9e3bf8482..55a8f69e9c6 100644
--- a/.github/workflows/changeset.lock.yml
+++ b/.github/workflows/changeset.lock.yml
@@ -270,9 +270,6 @@ jobs:
           
           GH_AW_PROMPT_f9230b228c3ade5f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f9230b228c3ade5f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/changeset-format.md}}
diff --git a/.github/workflows/ci-coach.lock.yml b/.github/workflows/ci-coach.lock.yml
index bf3f09a9a59..cf704f303fe 100644
--- a/.github/workflows/ci-coach.lock.yml
+++ b/.github/workflows/ci-coach.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_7a2e23ba30062ebd_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/cli_proxy_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_7a2e23ba30062ebd_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/ci-data-analysis.md}}
diff --git a/.github/workflows/ci-doctor.lock.yml b/.github/workflows/ci-doctor.lock.yml
index 85bf9d4cbe7..d8d2a99c3b5 100644
--- a/.github/workflows/ci-doctor.lock.yml
+++ b/.github/workflows/ci-doctor.lock.yml
@@ -280,9 +280,6 @@ jobs:
           
           GH_AW_PROMPT_3107df830c29773c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_3107df830c29773c_EOF'
           </system>
           {{#runtime-import .github/workflows/ci-doctor.md}}
diff --git a/.github/workflows/claude-code-user-docs-review.lock.yml b/.github/workflows/claude-code-user-docs-review.lock.yml
index 78943f25810..90ded4a80a9 100644
--- a/.github/workflows/claude-code-user-docs-review.lock.yml
+++ b/.github/workflows/claude-code-user-docs-review.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_bc6f0c544c0b951b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_bc6f0c544c0b951b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/cli-consistency-checker.lock.yml b/.github/workflows/cli-consistency-checker.lock.yml
index 1ecac7f366f..9493b13909c 100644
--- a/.github/workflows/cli-consistency-checker.lock.yml
+++ b/.github/workflows/cli-consistency-checker.lock.yml
@@ -214,9 +214,6 @@ jobs:
           
           GH_AW_PROMPT_c0f2a49a3806cd0a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c0f2a49a3806cd0a_EOF'
           </system>
           {{#runtime-import .github/workflows/cli-consistency-checker.md}}
diff --git a/.github/workflows/cli-version-checker.lock.yml b/.github/workflows/cli-version-checker.lock.yml
index 02f444aa0b0..2f7f9d2e56b 100644
--- a/.github/workflows/cli-version-checker.lock.yml
+++ b/.github/workflows/cli-version-checker.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_1cb164cb4aa17a5d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1cb164cb4aa17a5d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/cloclo.lock.yml b/.github/workflows/cloclo.lock.yml
index 382de2fc38f..469b6749155 100644
--- a/.github/workflows/cloclo.lock.yml
+++ b/.github/workflows/cloclo.lock.yml
@@ -328,9 +328,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2f983bf8a8c9cb5e_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/code-scanning-fixer.lock.yml b/.github/workflows/code-scanning-fixer.lock.yml
index 5bf8cb162f3..502396a5649 100644
--- a/.github/workflows/code-scanning-fixer.lock.yml
+++ b/.github/workflows/code-scanning-fixer.lock.yml
@@ -226,9 +226,6 @@ jobs:
           
           GH_AW_PROMPT_a3b72589f6fc470c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a3b72589f6fc470c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/code-simplifier.lock.yml b/.github/workflows/code-simplifier.lock.yml
index b8a2f5e1d89..8519dcacaa6 100644
--- a/.github/workflows/code-simplifier.lock.yml
+++ b/.github/workflows/code-simplifier.lock.yml
@@ -232,9 +232,6 @@ jobs:
           
           GH_AW_PROMPT_54a4b28872c44243_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_54a4b28872c44243_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/codex-github-remote-mcp-test.lock.yml b/.github/workflows/codex-github-remote-mcp-test.lock.yml
index 7e662b2a90d..65da63214f9 100644
--- a/.github/workflows/codex-github-remote-mcp-test.lock.yml
+++ b/.github/workflows/codex-github-remote-mcp-test.lock.yml
@@ -206,9 +206,6 @@ jobs:
           
           GH_AW_PROMPT_56be9e1ef4b9261a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_56be9e1ef4b9261a_EOF'
           </system>
           {{#runtime-import .github/workflows/codex-github-remote-mcp-test.md}}
diff --git a/.github/workflows/commit-changes-analyzer.lock.yml b/.github/workflows/commit-changes-analyzer.lock.yml
index 77aa3e6a137..07f972cc332 100644
--- a/.github/workflows/commit-changes-analyzer.lock.yml
+++ b/.github/workflows/commit-changes-analyzer.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_c6ba27c7d7f9057e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c6ba27c7d7f9057e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/constraint-solving-potd.lock.yml b/.github/workflows/constraint-solving-potd.lock.yml
index 7fc6440c264..6c3995b370d 100644
--- a/.github/workflows/constraint-solving-potd.lock.yml
+++ b/.github/workflows/constraint-solving-potd.lock.yml
@@ -219,9 +219,6 @@ jobs:
           
           GH_AW_PROMPT_94e7287544da83b8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_94e7287544da83b8_EOF'
           </system>
           {{#runtime-import .github/workflows/constraint-solving-potd.md}}
diff --git a/.github/workflows/contribution-check.lock.yml b/.github/workflows/contribution-check.lock.yml
index f036f5919c9..b47a2a5a45e 100644
--- a/.github/workflows/contribution-check.lock.yml
+++ b/.github/workflows/contribution-check.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_c45bd882916329c6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c45bd882916329c6_EOF'
           </system>
           {{#runtime-import .github/workflows/contribution-check.md}}
diff --git a/.github/workflows/copilot-agent-analysis.lock.yml b/.github/workflows/copilot-agent-analysis.lock.yml
index 69fdb038ffd..49f361c7f40 100644
--- a/.github/workflows/copilot-agent-analysis.lock.yml
+++ b/.github/workflows/copilot-agent-analysis.lock.yml
@@ -244,9 +244,6 @@ jobs:
           
           GH_AW_PROMPT_e8af2cc2a2fbd6e3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_e8af2cc2a2fbd6e3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/copilot-pr-analysis-base.md}}
diff --git a/.github/workflows/copilot-cli-deep-research.lock.yml b/.github/workflows/copilot-cli-deep-research.lock.yml
index 1201e6a0f54..cd38aa39ddd 100644
--- a/.github/workflows/copilot-cli-deep-research.lock.yml
+++ b/.github/workflows/copilot-cli-deep-research.lock.yml
@@ -218,9 +218,6 @@ jobs:
           
           GH_AW_PROMPT_7d7a99f9086230e9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_7d7a99f9086230e9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/copilot-opt.lock.yml b/.github/workflows/copilot-opt.lock.yml
index f5f278c0ec2..52ff1acd69f 100644
--- a/.github/workflows/copilot-opt.lock.yml
+++ b/.github/workflows/copilot-opt.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_ae30f9b44f06bbdb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ae30f9b44f06bbdb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/copilot-pr-merged-report.lock.yml b/.github/workflows/copilot-pr-merged-report.lock.yml
index 92be674dbcc..f12a19de30c 100644
--- a/.github/workflows/copilot-pr-merged-report.lock.yml
+++ b/.github/workflows/copilot-pr-merged-report.lock.yml
@@ -197,9 +197,6 @@ jobs:
           </safe-output-tools>
           GH_AW_PROMPT_4802dcbccdc6c215_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/mcp_cli_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_4802dcbccdc6c215_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/copilot-pr-nlp-analysis.lock.yml b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
index 14a06061167..dfdb65ed3e5 100644
--- a/.github/workflows/copilot-pr-nlp-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-nlp-analysis.lock.yml
@@ -242,9 +242,6 @@ jobs:
           
           GH_AW_PROMPT_bfdc232b84fd83d9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_bfdc232b84fd83d9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/copilot-pr-analysis-base.md}}
diff --git a/.github/workflows/copilot-pr-prompt-analysis.lock.yml b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
index 04eb4da1e3e..3496d5029dc 100644
--- a/.github/workflows/copilot-pr-prompt-analysis.lock.yml
+++ b/.github/workflows/copilot-pr-prompt-analysis.lock.yml
@@ -237,9 +237,6 @@ jobs:
           
           GH_AW_PROMPT_1da7095d771f1966_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1da7095d771f1966_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/copilot-pr-analysis-base.md}}
diff --git a/.github/workflows/copilot-session-insights.lock.yml b/.github/workflows/copilot-session-insights.lock.yml
index 3389784e8aa..720b1abe384 100644
--- a/.github/workflows/copilot-session-insights.lock.yml
+++ b/.github/workflows/copilot-session-insights.lock.yml
@@ -250,9 +250,6 @@ jobs:
           
           GH_AW_PROMPT_317daefa67de4e54_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_317daefa67de4e54_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/copilot-token-audit.lock.yml b/.github/workflows/copilot-token-audit.lock.yml
index 6f7ec09a77d..038982f9ad6 100644
--- a/.github/workflows/copilot-token-audit.lock.yml
+++ b/.github/workflows/copilot-token-audit.lock.yml
@@ -243,9 +243,6 @@ jobs:
           
           GH_AW_PROMPT_ebb38a51743f7aa4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ebb38a51743f7aa4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/gh-aw.md}}
diff --git a/.github/workflows/copilot-token-optimizer.lock.yml b/.github/workflows/copilot-token-optimizer.lock.yml
index 3ba8c09084d..812704e8479 100644
--- a/.github/workflows/copilot-token-optimizer.lock.yml
+++ b/.github/workflows/copilot-token-optimizer.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_958392f59ada5f3c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/cli_proxy_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_958392f59ada5f3c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/craft.lock.yml b/.github/workflows/craft.lock.yml
index 55f11a625f0..17447eb77d6 100644
--- a/.github/workflows/craft.lock.yml
+++ b/.github/workflows/craft.lock.yml
@@ -267,9 +267,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0938d13c8e03385e_EOF'
           </system>
           {{#runtime-import .github/workflows/craft.md}}
diff --git a/.github/workflows/daily-architecture-diagram.lock.yml b/.github/workflows/daily-architecture-diagram.lock.yml
index 4446c4b4715..2a72f00aa4b 100644
--- a/.github/workflows/daily-architecture-diagram.lock.yml
+++ b/.github/workflows/daily-architecture-diagram.lock.yml
@@ -233,9 +233,6 @@ jobs:
           
           GH_AW_PROMPT_06cc9adb72460c38_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_06cc9adb72460c38_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-assign-issue-to-user.lock.yml b/.github/workflows/daily-assign-issue-to-user.lock.yml
index 194856f24ba..7dc739ce089 100644
--- a/.github/workflows/daily-assign-issue-to-user.lock.yml
+++ b/.github/workflows/daily-assign-issue-to-user.lock.yml
@@ -224,9 +224,6 @@ jobs:
           
           GH_AW_PROMPT_f5f9cbddeca39871_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f5f9cbddeca39871_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml b/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
index 24ef397365e..7a16646b4a7 100644
--- a/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
+++ b/.github/workflows/daily-astrostylelite-markdown-spellcheck.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_347d7becffeaa86e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_347d7becffeaa86e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/otel.md}}
diff --git a/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml b/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
index 45938561fb1..648839b58dd 100644
--- a/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
+++ b/.github/workflows/daily-aw-cross-repo-compile-check.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_b9b3547d7529d338_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b9b3547d7529d338_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-cache-strategy-analyzer.lock.yml b/.github/workflows/daily-cache-strategy-analyzer.lock.yml
index 21d0e32c2f2..89cf23ac063 100644
--- a/.github/workflows/daily-cache-strategy-analyzer.lock.yml
+++ b/.github/workflows/daily-cache-strategy-analyzer.lock.yml
@@ -245,9 +245,6 @@ jobs:
           
           GH_AW_PROMPT_e16b3d9f376629a0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_e16b3d9f376629a0_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
@@ -1388,18 +1385,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_85e772e89d73ed0c_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_a4c67ec6347813c0_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_85e772e89d73ed0c_EOF
+          GH_AW_MCP_CONFIG_a4c67ec6347813c0_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_fab0425f837d4865_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_5cab69f9f8c18a04_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1410,11 +1407,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_fab0425f837d4865_EOF
+          GH_AW_MCP_CONFIG_5cab69f9f8c18a04_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_8e14bf118603786e_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_ff597d2dc26b1f12_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1424,7 +1421,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_8e14bf118603786e_EOF
+          GH_AW_CODEX_SHELL_POLICY_ff597d2dc26b1f12_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-caveman-optimizer.lock.yml b/.github/workflows/daily-caveman-optimizer.lock.yml
index 21aec3e0a1d..992e120b632 100644
--- a/.github/workflows/daily-caveman-optimizer.lock.yml
+++ b/.github/workflows/daily-caveman-optimizer.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_c86040c388498857_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c86040c388498857_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/otel.md}}
diff --git a/.github/workflows/daily-choice-test.lock.yml b/.github/workflows/daily-choice-test.lock.yml
index 8d36b37d678..2f79c840330 100644
--- a/.github/workflows/daily-choice-test.lock.yml
+++ b/.github/workflows/daily-choice-test.lock.yml
@@ -232,9 +232,6 @@ jobs:
           
           GH_AW_PROMPT_cc851a8c6a90d45c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_cc851a8c6a90d45c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/daily-cli-performance.lock.yml b/.github/workflows/daily-cli-performance.lock.yml
index 1d62c7796f4..a494464b75d 100644
--- a/.github/workflows/daily-cli-performance.lock.yml
+++ b/.github/workflows/daily-cli-performance.lock.yml
@@ -260,9 +260,6 @@ jobs:
           
           GH_AW_PROMPT_93d9536c2ed70fa7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_93d9536c2ed70fa7_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/go-make.md}}
diff --git a/.github/workflows/daily-cli-tools-tester.lock.yml b/.github/workflows/daily-cli-tools-tester.lock.yml
index 0f6a40cbb20..fc787942dd9 100644
--- a/.github/workflows/daily-cli-tools-tester.lock.yml
+++ b/.github/workflows/daily-cli-tools-tester.lock.yml
@@ -237,9 +237,6 @@ jobs:
           
           GH_AW_PROMPT_7845b77019682aa9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_7845b77019682aa9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-code-metrics.lock.yml b/.github/workflows/daily-code-metrics.lock.yml
index ed9ae660c96..124ca571e5b 100644
--- a/.github/workflows/daily-code-metrics.lock.yml
+++ b/.github/workflows/daily-code-metrics.lock.yml
@@ -245,9 +245,6 @@ jobs:
           
           GH_AW_PROMPT_e45ff8a78a8305e1_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_e45ff8a78a8305e1_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/python-dataviz.md}}
diff --git a/.github/workflows/daily-community-attribution.lock.yml b/.github/workflows/daily-community-attribution.lock.yml
index 394ba36bac8..eb6155f51d1 100644
--- a/.github/workflows/daily-community-attribution.lock.yml
+++ b/.github/workflows/daily-community-attribution.lock.yml
@@ -237,9 +237,6 @@ jobs:
           
           GH_AW_PROMPT_3642021c242227f5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_3642021c242227f5_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/community-attribution.md}}
diff --git a/.github/workflows/daily-compiler-quality.lock.yml b/.github/workflows/daily-compiler-quality.lock.yml
index 63c55382a26..f25c65b31d9 100644
--- a/.github/workflows/daily-compiler-quality.lock.yml
+++ b/.github/workflows/daily-compiler-quality.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_0836f336b83a50af_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0836f336b83a50af_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-doc-healer.lock.yml b/.github/workflows/daily-doc-healer.lock.yml
index 2ec2bf3c2cf..7ce946941a2 100644
--- a/.github/workflows/daily-doc-healer.lock.yml
+++ b/.github/workflows/daily-doc-healer.lock.yml
@@ -241,9 +241,6 @@ jobs:
           
           GH_AW_PROMPT_1a6ccb96f19ae648_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1a6ccb96f19ae648_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-doc-updater.lock.yml b/.github/workflows/daily-doc-updater.lock.yml
index 9ee72a47a5b..2bad62898df 100644
--- a/.github/workflows/daily-doc-updater.lock.yml
+++ b/.github/workflows/daily-doc-updater.lock.yml
@@ -240,9 +240,6 @@ jobs:
           
           GH_AW_PROMPT_60321b637369216b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_60321b637369216b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/daily-fact.lock.yml b/.github/workflows/daily-fact.lock.yml
index ad6f3882b5b..65a5b9f689a 100644
--- a/.github/workflows/daily-fact.lock.yml
+++ b/.github/workflows/daily-fact.lock.yml
@@ -241,9 +241,6 @@ jobs:
           
           GH_AW_PROMPT_ffb32d86a97a96e6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ffb32d86a97a96e6_EOF'
           </system>
           
@@ -1399,18 +1396,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_d853212227db6d06_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_cce188da54499c73_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_d853212227db6d06_EOF
+          GH_AW_MCP_CONFIG_cce188da54499c73_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_d77e10501a9dc0b8_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_d6304b3c5d8d2391_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1421,11 +1418,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_d77e10501a9dc0b8_EOF
+          GH_AW_MCP_CONFIG_d6304b3c5d8d2391_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_4d9e89e918ed6784_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_ba7316d2c94fc5d6_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1435,7 +1432,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_4d9e89e918ed6784_EOF
+          GH_AW_CODEX_SHELL_POLICY_ba7316d2c94fc5d6_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-file-diet.lock.yml b/.github/workflows/daily-file-diet.lock.yml
index 0d4c40b3d79..e7cc64812c5 100644
--- a/.github/workflows/daily-file-diet.lock.yml
+++ b/.github/workflows/daily-file-diet.lock.yml
@@ -236,9 +236,6 @@ jobs:
           
           GH_AW_PROMPT_200f63e58c279776_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_200f63e58c279776_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-firewall-report.lock.yml b/.github/workflows/daily-firewall-report.lock.yml
index 5ef00dda4c3..9b8c389c19a 100644
--- a/.github/workflows/daily-firewall-report.lock.yml
+++ b/.github/workflows/daily-firewall-report.lock.yml
@@ -247,9 +247,6 @@ jobs:
           
           GH_AW_PROMPT_36c89e0507e45aff_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_36c89e0507e45aff_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/trending-charts-simple.md}}
diff --git a/.github/workflows/daily-function-namer.lock.yml b/.github/workflows/daily-function-namer.lock.yml
index 8e51fa42b8c..d89dce1e6d3 100644
--- a/.github/workflows/daily-function-namer.lock.yml
+++ b/.github/workflows/daily-function-namer.lock.yml
@@ -239,9 +239,6 @@ jobs:
           
           GH_AW_PROMPT_c14a880afa97f469_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c14a880afa97f469_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-hippo-learn.lock.yml b/.github/workflows/daily-hippo-learn.lock.yml
index a20efe28385..df057d90291 100644
--- a/.github/workflows/daily-hippo-learn.lock.yml
+++ b/.github/workflows/daily-hippo-learn.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_8c26d89de701feb4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_8c26d89de701feb4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/hippo-memory.md}}
diff --git a/.github/workflows/daily-issues-report.lock.yml b/.github/workflows/daily-issues-report.lock.yml
index 91522b99a59..955f5b5c95a 100644
--- a/.github/workflows/daily-issues-report.lock.yml
+++ b/.github/workflows/daily-issues-report.lock.yml
@@ -250,9 +250,6 @@ jobs:
           
           GH_AW_PROMPT_b9b7669c1673eceb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b9b7669c1673eceb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/daily-malicious-code-scan.lock.yml b/.github/workflows/daily-malicious-code-scan.lock.yml
index 60c0f7d138f..467ef1d3cf4 100644
--- a/.github/workflows/daily-malicious-code-scan.lock.yml
+++ b/.github/workflows/daily-malicious-code-scan.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_25b1dcbd4862ff19_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_25b1dcbd4862ff19_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/daily-mcp-concurrency-analysis.lock.yml b/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
index 354f5303702..63d16431e33 100644
--- a/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
+++ b/.github/workflows/daily-mcp-concurrency-analysis.lock.yml
@@ -233,9 +233,6 @@ jobs:
           
           GH_AW_PROMPT_a619b11732dded21_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a619b11732dded21_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-multi-device-docs-tester.lock.yml b/.github/workflows/daily-multi-device-docs-tester.lock.yml
index bfb189d0a8e..476199b8e3d 100644
--- a/.github/workflows/daily-multi-device-docs-tester.lock.yml
+++ b/.github/workflows/daily-multi-device-docs-tester.lock.yml
@@ -241,9 +241,6 @@ jobs:
           
           GH_AW_PROMPT_e8776210a33b59c8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_e8776210a33b59c8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/docs-server-lifecycle.md}}
diff --git a/.github/workflows/daily-news.lock.yml b/.github/workflows/daily-news.lock.yml
index d91ea5850fb..236ebe6a292 100644
--- a/.github/workflows/daily-news.lock.yml
+++ b/.github/workflows/daily-news.lock.yml
@@ -242,9 +242,6 @@ jobs:
           
           GH_AW_PROMPT_28e02fa8d0cb2ffc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_28e02fa8d0cb2ffc_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/tavily.md}}
diff --git a/.github/workflows/daily-observability-report.lock.yml b/.github/workflows/daily-observability-report.lock.yml
index 82a0ae56e15..041df02a8c9 100644
--- a/.github/workflows/daily-observability-report.lock.yml
+++ b/.github/workflows/daily-observability-report.lock.yml
@@ -244,9 +244,6 @@ jobs:
           
           GH_AW_PROMPT_5ff4c2c393419636_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_5ff4c2c393419636_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
@@ -1316,18 +1313,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_6d58d9b6c1c7f3d7_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_fe521fb64cc4ad6e_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_6d58d9b6c1c7f3d7_EOF
+          GH_AW_MCP_CONFIG_fe521fb64cc4ad6e_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_75050c2c115d2147_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_6c3f1a87ae8e2bdd_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1338,11 +1335,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_75050c2c115d2147_EOF
+          GH_AW_MCP_CONFIG_6c3f1a87ae8e2bdd_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_b88015f5abf6c71f_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_cb6057a8bee80dfa_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1352,7 +1349,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_b88015f5abf6c71f_EOF
+          GH_AW_CODEX_SHELL_POLICY_cb6057a8bee80dfa_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/daily-otel-instrumentation-advisor.lock.yml b/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
index f122a0f8c78..de32835d20e 100644
--- a/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
+++ b/.github/workflows/daily-otel-instrumentation-advisor.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_825f42c0ed6fe118_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_825f42c0ed6fe118_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-performance-summary.lock.yml b/.github/workflows/daily-performance-summary.lock.yml
index 93549f46c2e..658e025dabc 100644
--- a/.github/workflows/daily-performance-summary.lock.yml
+++ b/.github/workflows/daily-performance-summary.lock.yml
@@ -244,9 +244,6 @@ jobs:
           
           GH_AW_PROMPT_5e13b7f1cb142ce3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_5e13b7f1cb142ce3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-queries-mcp-script.md}}
diff --git a/.github/workflows/daily-regulatory.lock.yml b/.github/workflows/daily-regulatory.lock.yml
index 816fff5bb5b..c6c5afc7511 100644
--- a/.github/workflows/daily-regulatory.lock.yml
+++ b/.github/workflows/daily-regulatory.lock.yml
@@ -236,9 +236,6 @@ jobs:
           
           GH_AW_PROMPT_5633618930b71403_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_5633618930b71403_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-queries-mcp-script.md}}
diff --git a/.github/workflows/daily-rendering-scripts-verifier.lock.yml b/.github/workflows/daily-rendering-scripts-verifier.lock.yml
index a9fff714ec4..e6f562869b1 100644
--- a/.github/workflows/daily-rendering-scripts-verifier.lock.yml
+++ b/.github/workflows/daily-rendering-scripts-verifier.lock.yml
@@ -251,9 +251,6 @@ jobs:
           
           GH_AW_PROMPT_557c0faadbf09e8b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_557c0faadbf09e8b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/daily-repo-chronicle.lock.yml b/.github/workflows/daily-repo-chronicle.lock.yml
index 2406a0671e0..1479f45ed8f 100644
--- a/.github/workflows/daily-repo-chronicle.lock.yml
+++ b/.github/workflows/daily-repo-chronicle.lock.yml
@@ -236,9 +236,6 @@ jobs:
           
           GH_AW_PROMPT_8c2d3ee58b7bb859_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_8c2d3ee58b7bb859_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/trends.md}}
diff --git a/.github/workflows/daily-safe-output-integrator.lock.yml b/.github/workflows/daily-safe-output-integrator.lock.yml
index ffba1a2873a..d987db01b0b 100644
--- a/.github/workflows/daily-safe-output-integrator.lock.yml
+++ b/.github/workflows/daily-safe-output-integrator.lock.yml
@@ -230,9 +230,6 @@ jobs:
           
           GH_AW_PROMPT_b71e1da8f93008ab_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b71e1da8f93008ab_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-safe-output-optimizer.lock.yml b/.github/workflows/daily-safe-output-optimizer.lock.yml
index 5b2a7335ee9..4166ace44cc 100644
--- a/.github/workflows/daily-safe-output-optimizer.lock.yml
+++ b/.github/workflows/daily-safe-output-optimizer.lock.yml
@@ -249,9 +249,6 @@ jobs:
           
           GH_AW_PROMPT_817a63e0f68f33a6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_817a63e0f68f33a6_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/aw-logs-24h-fetch.md}}
diff --git a/.github/workflows/daily-safe-outputs-conformance.lock.yml b/.github/workflows/daily-safe-outputs-conformance.lock.yml
index 7ba4d1415a2..9904b64d85f 100644
--- a/.github/workflows/daily-safe-outputs-conformance.lock.yml
+++ b/.github/workflows/daily-safe-outputs-conformance.lock.yml
@@ -233,9 +233,6 @@ jobs:
           
           GH_AW_PROMPT_6a8f1d610d0fcade_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_6a8f1d610d0fcade_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-secrets-analysis.lock.yml b/.github/workflows/daily-secrets-analysis.lock.yml
index 35c85eabfb1..42209a31d3e 100644
--- a/.github/workflows/daily-secrets-analysis.lock.yml
+++ b/.github/workflows/daily-secrets-analysis.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_cf0ff54e475d0865_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_cf0ff54e475d0865_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-security-observability.lock.yml b/.github/workflows/daily-security-observability.lock.yml
index 01cdefdf30f..cc596f62203 100644
--- a/.github/workflows/daily-security-observability.lock.yml
+++ b/.github/workflows/daily-security-observability.lock.yml
@@ -246,9 +246,6 @@ jobs:
           
           GH_AW_PROMPT_eccc76a7aebec463_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_eccc76a7aebec463_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/python-dataviz.md}}
diff --git a/.github/workflows/daily-security-red-team.lock.yml b/.github/workflows/daily-security-red-team.lock.yml
index d5d26cf20fc..a6fe17deba1 100644
--- a/.github/workflows/daily-security-red-team.lock.yml
+++ b/.github/workflows/daily-security-red-team.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_d3d52693cea323fd_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_d3d52693cea323fd_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/daily-semgrep-scan.lock.yml b/.github/workflows/daily-semgrep-scan.lock.yml
index c2899252369..21e10b1b735 100644
--- a/.github/workflows/daily-semgrep-scan.lock.yml
+++ b/.github/workflows/daily-semgrep-scan.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_3aaf13339fe74d32_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_3aaf13339fe74d32_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/daily-sentrux-report.lock.yml b/.github/workflows/daily-sentrux-report.lock.yml
index 87dffd79f0b..b11d88dbd8a 100644
--- a/.github/workflows/daily-sentrux-report.lock.yml
+++ b/.github/workflows/daily-sentrux-report.lock.yml
@@ -236,9 +236,6 @@ jobs:
           
           GH_AW_PROMPT_719df1a6ce2b4e6a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_719df1a6ce2b4e6a_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/sentrux.md}}
diff --git a/.github/workflows/daily-skill-optimizer.lock.yml b/.github/workflows/daily-skill-optimizer.lock.yml
index 4c42b80643f..f02875a1514 100644
--- a/.github/workflows/daily-skill-optimizer.lock.yml
+++ b/.github/workflows/daily-skill-optimizer.lock.yml
@@ -232,9 +232,6 @@ jobs:
           
           GH_AW_PROMPT_f4ec88ed2b9e2a22_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f4ec88ed2b9e2a22_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/otel.md}}
diff --git a/.github/workflows/daily-syntax-error-quality.lock.yml b/.github/workflows/daily-syntax-error-quality.lock.yml
index 2209d12c219..7b4e8a83ef0 100644
--- a/.github/workflows/daily-syntax-error-quality.lock.yml
+++ b/.github/workflows/daily-syntax-error-quality.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_9d57e41cc36f359c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_9d57e41cc36f359c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-team-evolution-insights.lock.yml b/.github/workflows/daily-team-evolution-insights.lock.yml
index 5801f8b1d25..2e2706281d5 100644
--- a/.github/workflows/daily-team-evolution-insights.lock.yml
+++ b/.github/workflows/daily-team-evolution-insights.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_da76ab4822bf9782_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_da76ab4822bf9782_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-team-status.lock.yml b/.github/workflows/daily-team-status.lock.yml
index 86ae5bd8d60..7c4248dce22 100644
--- a/.github/workflows/daily-team-status.lock.yml
+++ b/.github/workflows/daily-team-status.lock.yml
@@ -245,9 +245,6 @@ jobs:
           
           GH_AW_PROMPT_2ad6e991fcd00de3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2ad6e991fcd00de3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/daily-testify-uber-super-expert.lock.yml b/.github/workflows/daily-testify-uber-super-expert.lock.yml
index 5f7977d9b9e..33b8289d823 100644
--- a/.github/workflows/daily-testify-uber-super-expert.lock.yml
+++ b/.github/workflows/daily-testify-uber-super-expert.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_863e1f99e9ceceac_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_863e1f99e9ceceac_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/daily-token-consumption-report.lock.yml b/.github/workflows/daily-token-consumption-report.lock.yml
index 15660ace720..be08cbac443 100644
--- a/.github/workflows/daily-token-consumption-report.lock.yml
+++ b/.github/workflows/daily-token-consumption-report.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_d52ca919c5c7ce90_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_d52ca919c5c7ce90_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/sentry.md}}
diff --git a/.github/workflows/daily-workflow-updater.lock.yml b/.github/workflows/daily-workflow-updater.lock.yml
index bb50a35f366..2e0011c2b2a 100644
--- a/.github/workflows/daily-workflow-updater.lock.yml
+++ b/.github/workflows/daily-workflow-updater.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_2f621c28df87af7d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2f621c28df87af7d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/dead-code-remover.lock.yml b/.github/workflows/dead-code-remover.lock.yml
index 7076bd0a6d2..ef98a015108 100644
--- a/.github/workflows/dead-code-remover.lock.yml
+++ b/.github/workflows/dead-code-remover.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_cc0d01ecb284cabe_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_cc0d01ecb284cabe_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/deep-report.lock.yml b/.github/workflows/deep-report.lock.yml
index bb58d63ca85..23682bca62e 100644
--- a/.github/workflows/deep-report.lock.yml
+++ b/.github/workflows/deep-report.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_06cf79caca093559_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_06cf79caca093559_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/delight.lock.yml b/.github/workflows/delight.lock.yml
index 269647e18fb..f10da610979 100644
--- a/.github/workflows/delight.lock.yml
+++ b/.github/workflows/delight.lock.yml
@@ -232,9 +232,6 @@ jobs:
           
           GH_AW_PROMPT_30c38f50ad21ce73_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_30c38f50ad21ce73_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/dependabot-burner.lock.yml b/.github/workflows/dependabot-burner.lock.yml
index 82fd84e8945..0a765b32ed5 100644
--- a/.github/workflows/dependabot-burner.lock.yml
+++ b/.github/workflows/dependabot-burner.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_429b41a82a28aa30_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_429b41a82a28aa30_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/dependabot-go-checker.lock.yml b/.github/workflows/dependabot-go-checker.lock.yml
index ab4e80b8278..97f7dc64f3d 100644
--- a/.github/workflows/dependabot-go-checker.lock.yml
+++ b/.github/workflows/dependabot-go-checker.lock.yml
@@ -222,9 +222,6 @@ jobs:
           
           GH_AW_PROMPT_4e8a698fd9d253b0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_4e8a698fd9d253b0_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/dependabot-repair.lock.yml b/.github/workflows/dependabot-repair.lock.yml
index 65d1b59712e..fc9721bca06 100644
--- a/.github/workflows/dependabot-repair.lock.yml
+++ b/.github/workflows/dependabot-repair.lock.yml
@@ -237,9 +237,6 @@ jobs:
           
           GH_AW_PROMPT_b11b891ab1eea9e8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b11b891ab1eea9e8_EOF'
           </system>
           {{#runtime-import .github/workflows/dependabot-repair.md}}
diff --git a/.github/workflows/deployment-incident-monitor.lock.yml b/.github/workflows/deployment-incident-monitor.lock.yml
index d30a85f97a6..aeb7e91bbd6 100644
--- a/.github/workflows/deployment-incident-monitor.lock.yml
+++ b/.github/workflows/deployment-incident-monitor.lock.yml
@@ -219,9 +219,6 @@ jobs:
           
           GH_AW_PROMPT_c23a074926bb8516_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c23a074926bb8516_EOF'
           </system>
           {{#runtime-import .github/workflows/deployment-incident-monitor.md}}
diff --git a/.github/workflows/design-decision-gate.lock.yml b/.github/workflows/design-decision-gate.lock.yml
index 3ef09a92c5d..5197f91d8cc 100644
--- a/.github/workflows/design-decision-gate.lock.yml
+++ b/.github/workflows/design-decision-gate.lock.yml
@@ -254,9 +254,6 @@ jobs:
           
           GH_AW_PROMPT_60a1e42cd1dd824e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_60a1e42cd1dd824e_EOF'
           </system>
           {{#runtime-import .github/agents/adr-writer.agent.md}}
diff --git a/.github/workflows/dev-hawk.lock.yml b/.github/workflows/dev-hawk.lock.yml
index da680322791..d5d82f3579c 100644
--- a/.github/workflows/dev-hawk.lock.yml
+++ b/.github/workflows/dev-hawk.lock.yml
@@ -231,9 +231,6 @@ jobs:
           
           GH_AW_PROMPT_c845abc30647a9b9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c845abc30647a9b9_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/dev.lock.yml b/.github/workflows/dev.lock.yml
index d793d2a038c..ba2ce6ec3e2 100644
--- a/.github/workflows/dev.lock.yml
+++ b/.github/workflows/dev.lock.yml
@@ -274,9 +274,6 @@ jobs:
           
           GH_AW_PROMPT_a3ed2e742aa6c3de_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a3ed2e742aa6c3de_EOF'
           </system>
           {{#runtime-import .github/workflows/dev.md}}
diff --git a/.github/workflows/developer-docs-consolidator.lock.yml b/.github/workflows/developer-docs-consolidator.lock.yml
index 74f9ee2148c..5d2e4864a47 100644
--- a/.github/workflows/developer-docs-consolidator.lock.yml
+++ b/.github/workflows/developer-docs-consolidator.lock.yml
@@ -246,9 +246,6 @@ jobs:
           
           GH_AW_PROMPT_c06e57c35a47e3f4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c06e57c35a47e3f4_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/dictation-prompt.lock.yml b/.github/workflows/dictation-prompt.lock.yml
index 84870458ad2..e232da064c5 100644
--- a/.github/workflows/dictation-prompt.lock.yml
+++ b/.github/workflows/dictation-prompt.lock.yml
@@ -220,9 +220,6 @@ jobs:
           
           GH_AW_PROMPT_167c42fef4e52d53_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_167c42fef4e52d53_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/discussion-task-miner.lock.yml b/.github/workflows/discussion-task-miner.lock.yml
index 5a616c675c3..567c809243c 100644
--- a/.github/workflows/discussion-task-miner.lock.yml
+++ b/.github/workflows/discussion-task-miner.lock.yml
@@ -221,9 +221,6 @@ jobs:
           
           GH_AW_PROMPT_c4ccfc574d2c382e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c4ccfc574d2c382e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/docs-noob-tester.lock.yml b/.github/workflows/docs-noob-tester.lock.yml
index bdb8f7122d0..d1fee9ce382 100644
--- a/.github/workflows/docs-noob-tester.lock.yml
+++ b/.github/workflows/docs-noob-tester.lock.yml
@@ -234,9 +234,6 @@ jobs:
           
           GH_AW_PROMPT_f108143180cedb5e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f108143180cedb5e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/docs-server-lifecycle.md}}
diff --git a/.github/workflows/draft-pr-cleanup.lock.yml b/.github/workflows/draft-pr-cleanup.lock.yml
index 7c3fe024ee8..527dd1edf01 100644
--- a/.github/workflows/draft-pr-cleanup.lock.yml
+++ b/.github/workflows/draft-pr-cleanup.lock.yml
@@ -214,9 +214,6 @@ jobs:
           
           GH_AW_PROMPT_1b5e00bf134b6a95_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1b5e00bf134b6a95_EOF'
           </system>
           {{#runtime-import .github/workflows/draft-pr-cleanup.md}}
diff --git a/.github/workflows/duplicate-code-detector.lock.yml b/.github/workflows/duplicate-code-detector.lock.yml
index 7983185b6cd..2f92bea6dcb 100644
--- a/.github/workflows/duplicate-code-detector.lock.yml
+++ b/.github/workflows/duplicate-code-detector.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_747f86d9b82bfc1b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_747f86d9b82bfc1b_EOF'
           </system>
           ## Serena Code Analysis
@@ -1270,18 +1267,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_d45070af0a51e721_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_92cc26bf34406376_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_d45070af0a51e721_EOF
+          GH_AW_MCP_CONFIG_92cc26bf34406376_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_3923d531e6d98d91_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_23dbdd7416c97335_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1292,11 +1289,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_3923d531e6d98d91_EOF
+          GH_AW_MCP_CONFIG_23dbdd7416c97335_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_12369ac77a42383e_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_45b78b8f8f1b917f_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1306,7 +1303,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_12369ac77a42383e_EOF
+          GH_AW_CODEX_SHELL_POLICY_45b78b8f8f1b917f_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/example-permissions-warning.lock.yml b/.github/workflows/example-permissions-warning.lock.yml
index 9513b27c38b..9359eb72a1c 100644
--- a/.github/workflows/example-permissions-warning.lock.yml
+++ b/.github/workflows/example-permissions-warning.lock.yml
@@ -204,9 +204,6 @@ jobs:
           
           GH_AW_PROMPT_ae3a17b862f1109e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ae3a17b862f1109e_EOF'
           </system>
           {{#runtime-import .github/workflows/example-permissions-warning.md}}
diff --git a/.github/workflows/example-workflow-analyzer.lock.yml b/.github/workflows/example-workflow-analyzer.lock.yml
index 6f09c47a11f..2db0ab5af0b 100644
--- a/.github/workflows/example-workflow-analyzer.lock.yml
+++ b/.github/workflows/example-workflow-analyzer.lock.yml
@@ -239,9 +239,6 @@ jobs:
           
           GH_AW_PROMPT_b54df4f7db1055fb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b54df4f7db1055fb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/firewall-escape.lock.yml b/.github/workflows/firewall-escape.lock.yml
index 000ca8ce419..26742c03315 100644
--- a/.github/workflows/firewall-escape.lock.yml
+++ b/.github/workflows/firewall-escape.lock.yml
@@ -244,9 +244,6 @@ jobs:
           
           GH_AW_PROMPT_4d9e57e339dbc997_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_4d9e57e339dbc997_EOF'
           </system>
           {{#runtime-import .github/workflows/firewall-escape.md}}
diff --git a/.github/workflows/firewall.lock.yml b/.github/workflows/firewall.lock.yml
index c5ea446a60d..544a034a217 100644
--- a/.github/workflows/firewall.lock.yml
+++ b/.github/workflows/firewall.lock.yml
@@ -204,9 +204,6 @@ jobs:
           
           GH_AW_PROMPT_3852c8916270385c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_3852c8916270385c_EOF'
           </system>
           {{#runtime-import .github/workflows/firewall.md}}
diff --git a/.github/workflows/functional-pragmatist.lock.yml b/.github/workflows/functional-pragmatist.lock.yml
index 571b422c385..b522688b207 100644
--- a/.github/workflows/functional-pragmatist.lock.yml
+++ b/.github/workflows/functional-pragmatist.lock.yml
@@ -226,9 +226,6 @@ jobs:
           
           GH_AW_PROMPT_2a93dd5da2776952_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2a93dd5da2776952_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/github-mcp-structural-analysis.lock.yml b/.github/workflows/github-mcp-structural-analysis.lock.yml
index 27f4696b35e..fdbaabf807b 100644
--- a/.github/workflows/github-mcp-structural-analysis.lock.yml
+++ b/.github/workflows/github-mcp-structural-analysis.lock.yml
@@ -242,9 +242,6 @@ jobs:
           
           GH_AW_PROMPT_3ba4f9c395e5bcb6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_3ba4f9c395e5bcb6_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/python-dataviz.md}}
diff --git a/.github/workflows/github-mcp-tools-report.lock.yml b/.github/workflows/github-mcp-tools-report.lock.yml
index bd5eaea59b7..bdc4fe036c8 100644
--- a/.github/workflows/github-mcp-tools-report.lock.yml
+++ b/.github/workflows/github-mcp-tools-report.lock.yml
@@ -241,9 +241,6 @@ jobs:
           
           GH_AW_PROMPT_23eab3a3b62941d3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_23eab3a3b62941d3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/github-remote-mcp-auth-test.lock.yml b/.github/workflows/github-remote-mcp-auth-test.lock.yml
index 068b2529ae8..e78fefd7f0e 100644
--- a/.github/workflows/github-remote-mcp-auth-test.lock.yml
+++ b/.github/workflows/github-remote-mcp-auth-test.lock.yml
@@ -235,9 +235,6 @@ jobs:
           
           GH_AW_PROMPT_a535e73ab33e528e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a535e73ab33e528e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/glossary-maintainer.lock.yml b/.github/workflows/glossary-maintainer.lock.yml
index d7fd8902205..06db960ec2a 100644
--- a/.github/workflows/glossary-maintainer.lock.yml
+++ b/.github/workflows/glossary-maintainer.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_df8691e1f84fbaa3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_df8691e1f84fbaa3_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/go-fan.lock.yml b/.github/workflows/go-fan.lock.yml
index 1b4016860f7..f5231244117 100644
--- a/.github/workflows/go-fan.lock.yml
+++ b/.github/workflows/go-fan.lock.yml
@@ -242,9 +242,6 @@ jobs:
           
           GH_AW_PROMPT_5464e417cd118c0e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_5464e417cd118c0e_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/go-logger.lock.yml b/.github/workflows/go-logger.lock.yml
index 431adfb791e..46145d729e1 100644
--- a/.github/workflows/go-logger.lock.yml
+++ b/.github/workflows/go-logger.lock.yml
@@ -231,9 +231,6 @@ jobs:
           
           GH_AW_PROMPT_62eba90e58c4f484_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_62eba90e58c4f484_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/go-make.md}}
diff --git a/.github/workflows/go-pattern-detector.lock.yml b/.github/workflows/go-pattern-detector.lock.yml
index f03788044a4..fb40d998138 100644
--- a/.github/workflows/go-pattern-detector.lock.yml
+++ b/.github/workflows/go-pattern-detector.lock.yml
@@ -226,9 +226,6 @@ jobs:
           
           GH_AW_PROMPT_11d1dc8414fd260f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_11d1dc8414fd260f_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/ast-grep.md}}
diff --git a/.github/workflows/gpclean.lock.yml b/.github/workflows/gpclean.lock.yml
index c704ec3e12b..e45c33b3403 100644
--- a/.github/workflows/gpclean.lock.yml
+++ b/.github/workflows/gpclean.lock.yml
@@ -226,9 +226,6 @@ jobs:
           
           GH_AW_PROMPT_fedacafa2d5987fc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_fedacafa2d5987fc_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/grumpy-reviewer.lock.yml b/.github/workflows/grumpy-reviewer.lock.yml
index 88ed15d0f66..774a05fc59a 100644
--- a/.github/workflows/grumpy-reviewer.lock.yml
+++ b/.github/workflows/grumpy-reviewer.lock.yml
@@ -282,9 +282,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ca213f2bb4c609e2_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
@@ -1330,18 +1327,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_47c2706feedaa87d_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_cd0231580ae8cb6c_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_47c2706feedaa87d_EOF
+          GH_AW_MCP_CONFIG_cd0231580ae8cb6c_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_f0963e28d24207f5_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_aa207ce3c4083fee_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1352,11 +1349,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_f0963e28d24207f5_EOF
+          GH_AW_MCP_CONFIG_aa207ce3c4083fee_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_020bd07960fef1b9_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_329e5b52cb0b2b18_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1366,7 +1363,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_020bd07960fef1b9_EOF
+          GH_AW_CODEX_SHELL_POLICY_329e5b52cb0b2b18_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/hippo-embed.lock.yml b/.github/workflows/hippo-embed.lock.yml
index 4e958b61c44..843ab2321e5 100644
--- a/.github/workflows/hippo-embed.lock.yml
+++ b/.github/workflows/hippo-embed.lock.yml
@@ -205,9 +205,6 @@ jobs:
           
           GH_AW_PROMPT_1801f836372654bc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1801f836372654bc_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/hippo-memory.md}}
diff --git a/.github/workflows/hourly-ci-cleaner.lock.yml b/.github/workflows/hourly-ci-cleaner.lock.yml
index 25b09c24b6e..e5b89b05417 100644
--- a/.github/workflows/hourly-ci-cleaner.lock.yml
+++ b/.github/workflows/hourly-ci-cleaner.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_a4c33d830034c7ff_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a4c33d830034c7ff_EOF'
           </system>
           {{#runtime-import .github/agents/ci-cleaner.agent.md}}
diff --git a/.github/workflows/instructions-janitor.lock.yml b/.github/workflows/instructions-janitor.lock.yml
index 6bccc796e67..d262f14f34f 100644
--- a/.github/workflows/instructions-janitor.lock.yml
+++ b/.github/workflows/instructions-janitor.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_c0fdee58eb98fb81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c0fdee58eb98fb81_EOF'
           </system>
           {{#runtime-import .github/workflows/instructions-janitor.md}}
diff --git a/.github/workflows/issue-arborist.lock.yml b/.github/workflows/issue-arborist.lock.yml
index f7ad1b54e13..51a9d301788 100644
--- a/.github/workflows/issue-arborist.lock.yml
+++ b/.github/workflows/issue-arborist.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_40db7ed1b5e86002_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_40db7ed1b5e86002_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
@@ -1308,18 +1305,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_1829af9aa862150e_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_abc7ae8e7434f987_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_1829af9aa862150e_EOF
+          GH_AW_MCP_CONFIG_abc7ae8e7434f987_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_27e7c4b67410b4ad_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_b3518c5a80afe2ee_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1330,11 +1327,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_27e7c4b67410b4ad_EOF
+          GH_AW_MCP_CONFIG_b3518c5a80afe2ee_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_5e73f76a0c397926_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_dcc844b7e5c765ce_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1344,7 +1341,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_5e73f76a0c397926_EOF
+          GH_AW_CODEX_SHELL_POLICY_dcc844b7e5c765ce_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/issue-monster.lock.yml b/.github/workflows/issue-monster.lock.yml
index 098c328e934..460f846b9ab 100644
--- a/.github/workflows/issue-monster.lock.yml
+++ b/.github/workflows/issue-monster.lock.yml
@@ -607,9 +607,6 @@ jobs:
           
           GH_AW_PROMPT_58ecfcf47a8787df_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_58ecfcf47a8787df_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/issue-triage-agent.lock.yml b/.github/workflows/issue-triage-agent.lock.yml
index a0fc3a7b26a..3bd217378e8 100644
--- a/.github/workflows/issue-triage-agent.lock.yml
+++ b/.github/workflows/issue-triage-agent.lock.yml
@@ -223,9 +223,6 @@ jobs:
           
           GH_AW_PROMPT_0b8d67a8d512ea81_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0b8d67a8d512ea81_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/jsweep.lock.yml b/.github/workflows/jsweep.lock.yml
index 65dc2bb14db..60e30c6eedf 100644
--- a/.github/workflows/jsweep.lock.yml
+++ b/.github/workflows/jsweep.lock.yml
@@ -231,9 +231,6 @@ jobs:
           
           GH_AW_PROMPT_45dd6562b2fb7643_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_45dd6562b2fb7643_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/layout-spec-maintainer.lock.yml b/.github/workflows/layout-spec-maintainer.lock.yml
index 3e3bd238ddf..18a28299189 100644
--- a/.github/workflows/layout-spec-maintainer.lock.yml
+++ b/.github/workflows/layout-spec-maintainer.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_ce7c1391ca7c1aa8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ce7c1391ca7c1aa8_EOF'
           </system>
           {{#runtime-import .github/workflows/layout-spec-maintainer.md}}
diff --git a/.github/workflows/lockfile-stats.lock.yml b/.github/workflows/lockfile-stats.lock.yml
index e1d1d6e53f0..5f2263bfdaa 100644
--- a/.github/workflows/lockfile-stats.lock.yml
+++ b/.github/workflows/lockfile-stats.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_61aa761659405206_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_61aa761659405206_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/mcp-inspector.lock.yml b/.github/workflows/mcp-inspector.lock.yml
index 7a44b937e3b..5b42524cc39 100644
--- a/.github/workflows/mcp-inspector.lock.yml
+++ b/.github/workflows/mcp-inspector.lock.yml
@@ -282,9 +282,6 @@ jobs:
           
           GH_AW_PROMPT_bdd5adaa4f427d0f_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_bdd5adaa4f427d0f_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/mergefest.lock.yml b/.github/workflows/mergefest.lock.yml
index f55f941e4bc..bae3f59418f 100644
--- a/.github/workflows/mergefest.lock.yml
+++ b/.github/workflows/mergefest.lock.yml
@@ -272,9 +272,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1dc0005748a496ab_EOF'
           </system>
           {{#runtime-import .github/workflows/mergefest.md}}
diff --git a/.github/workflows/metrics-collector.lock.yml b/.github/workflows/metrics-collector.lock.yml
index 42fe35b5905..466bb119f52 100644
--- a/.github/workflows/metrics-collector.lock.yml
+++ b/.github/workflows/metrics-collector.lock.yml
@@ -217,9 +217,6 @@ jobs:
           
           GH_AW_PROMPT_a700af2ab27794da_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a700af2ab27794da_EOF'
           </system>
           {{#runtime-import .github/workflows/metrics-collector.md}}
diff --git a/.github/workflows/notion-issue-summary.lock.yml b/.github/workflows/notion-issue-summary.lock.yml
index 8c4fd07e0ab..4cb84d4b4ad 100644
--- a/.github/workflows/notion-issue-summary.lock.yml
+++ b/.github/workflows/notion-issue-summary.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_825884c84f66cdde_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_825884c84f66cdde_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/notion.md}}
diff --git a/.github/workflows/org-health-report.lock.yml b/.github/workflows/org-health-report.lock.yml
index ff10fe84608..a4c752da450 100644
--- a/.github/workflows/org-health-report.lock.yml
+++ b/.github/workflows/org-health-report.lock.yml
@@ -232,9 +232,6 @@ jobs:
           
           GH_AW_PROMPT_8d94051de3622e61_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_8d94051de3622e61_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/pdf-summary.lock.yml b/.github/workflows/pdf-summary.lock.yml
index adab7ce7876..ca5af0a1f1f 100644
--- a/.github/workflows/pdf-summary.lock.yml
+++ b/.github/workflows/pdf-summary.lock.yml
@@ -298,9 +298,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b882b92635115046_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/markitdown.md}}
diff --git a/.github/workflows/plan.lock.yml b/.github/workflows/plan.lock.yml
index 55bab928f94..3812b99dbc4 100644
--- a/.github/workflows/plan.lock.yml
+++ b/.github/workflows/plan.lock.yml
@@ -271,9 +271,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2170f44eb653670d_EOF'
           </system>
           {{#runtime-import .github/workflows/plan.md}}
diff --git a/.github/workflows/poem-bot.lock.yml b/.github/workflows/poem-bot.lock.yml
index e528b58691f..3eb4649807f 100644
--- a/.github/workflows/poem-bot.lock.yml
+++ b/.github/workflows/poem-bot.lock.yml
@@ -295,9 +295,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_19ae3bb8b5c482fd_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/pr-nitpick-reviewer.lock.yml b/.github/workflows/pr-nitpick-reviewer.lock.yml
index 1028b1ed415..0fd6afd849f 100644
--- a/.github/workflows/pr-nitpick-reviewer.lock.yml
+++ b/.github/workflows/pr-nitpick-reviewer.lock.yml
@@ -277,9 +277,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_06a57a4830833cb8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/pr-code-review-config.md}}
diff --git a/.github/workflows/pr-triage-agent.lock.yml b/.github/workflows/pr-triage-agent.lock.yml
index caf7120fd8a..0bb053f41e5 100644
--- a/.github/workflows/pr-triage-agent.lock.yml
+++ b/.github/workflows/pr-triage-agent.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_253153894c917844_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_253153894c917844_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/prompt-clustering-analysis.lock.yml b/.github/workflows/prompt-clustering-analysis.lock.yml
index bce4ec317b8..b6afb34248a 100644
--- a/.github/workflows/prompt-clustering-analysis.lock.yml
+++ b/.github/workflows/prompt-clustering-analysis.lock.yml
@@ -253,9 +253,6 @@ jobs:
           
           GH_AW_PROMPT_ed5417896bdbdb8e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ed5417896bdbdb8e_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/jqschema.md}}
diff --git a/.github/workflows/python-data-charts.lock.yml b/.github/workflows/python-data-charts.lock.yml
index ebaddc00d4b..bf17ad5d5c2 100644
--- a/.github/workflows/python-data-charts.lock.yml
+++ b/.github/workflows/python-data-charts.lock.yml
@@ -232,9 +232,6 @@ jobs:
           
           GH_AW_PROMPT_130cf5488a7b6ad4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_130cf5488a7b6ad4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/charts-with-trending.md}}
diff --git a/.github/workflows/q.lock.yml b/.github/workflows/q.lock.yml
index c05f81f1ce8..f82333ec53e 100644
--- a/.github/workflows/q.lock.yml
+++ b/.github/workflows/q.lock.yml
@@ -310,9 +310,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_4fdd9801819d223c_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/refactoring-cadence.lock.yml b/.github/workflows/refactoring-cadence.lock.yml
index a9d641dac07..a733e23343b 100644
--- a/.github/workflows/refactoring-cadence.lock.yml
+++ b/.github/workflows/refactoring-cadence.lock.yml
@@ -217,9 +217,6 @@ jobs:
           
           GH_AW_PROMPT_8a1b92b889a26592_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_8a1b92b889a26592_EOF'
           </system>
           {{#runtime-import .github/workflows/refactoring-cadence.md}}
diff --git a/.github/workflows/refiner.lock.yml b/.github/workflows/refiner.lock.yml
index bb094edba25..70355a848bb 100644
--- a/.github/workflows/refiner.lock.yml
+++ b/.github/workflows/refiner.lock.yml
@@ -255,9 +255,6 @@ jobs:
           
           GH_AW_PROMPT_8bcb6566d1be6fcb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_8bcb6566d1be6fcb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/release.lock.yml b/.github/workflows/release.lock.yml
index 225cb799e6e..a287522df23 100644
--- a/.github/workflows/release.lock.yml
+++ b/.github/workflows/release.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_79342ddfec0e424b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_79342ddfec0e424b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/community-attribution.md}}
diff --git a/.github/workflows/repo-audit-analyzer.lock.yml b/.github/workflows/repo-audit-analyzer.lock.yml
index 2696f70dba7..093a4861a2e 100644
--- a/.github/workflows/repo-audit-analyzer.lock.yml
+++ b/.github/workflows/repo-audit-analyzer.lock.yml
@@ -241,9 +241,6 @@ jobs:
           
           GH_AW_PROMPT_281009734093affb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_281009734093affb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/repo-tree-map.lock.yml b/.github/workflows/repo-tree-map.lock.yml
index f3c62ce717f..65f39e04869 100644
--- a/.github/workflows/repo-tree-map.lock.yml
+++ b/.github/workflows/repo-tree-map.lock.yml
@@ -223,9 +223,6 @@ jobs:
           
           GH_AW_PROMPT_d7a36150f4488be6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_d7a36150f4488be6_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/repository-quality-improver.lock.yml b/.github/workflows/repository-quality-improver.lock.yml
index 6e31e087d82..c0ba2ed8a2a 100644
--- a/.github/workflows/repository-quality-improver.lock.yml
+++ b/.github/workflows/repository-quality-improver.lock.yml
@@ -241,9 +241,6 @@ jobs:
           
           GH_AW_PROMPT_4f44a3ac5441beb0_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_4f44a3ac5441beb0_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/research.lock.yml b/.github/workflows/research.lock.yml
index 4e123cd5d28..146474a6bd4 100644
--- a/.github/workflows/research.lock.yml
+++ b/.github/workflows/research.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_98d74baf63f8b6ad_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_98d74baf63f8b6ad_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/mcp/tavily.md}}
diff --git a/.github/workflows/safe-output-health.lock.yml b/.github/workflows/safe-output-health.lock.yml
index f5512e40904..82df160e4c7 100644
--- a/.github/workflows/safe-output-health.lock.yml
+++ b/.github/workflows/safe-output-health.lock.yml
@@ -244,9 +244,6 @@ jobs:
           
           GH_AW_PROMPT_4b0b7f84e0fb41f7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_4b0b7f84e0fb41f7_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/aw-logs-24h-fetch.md}}
diff --git a/.github/workflows/schema-consistency-checker.lock.yml b/.github/workflows/schema-consistency-checker.lock.yml
index cc5d9d0ecaa..dc5ad89c26b 100644
--- a/.github/workflows/schema-consistency-checker.lock.yml
+++ b/.github/workflows/schema-consistency-checker.lock.yml
@@ -240,9 +240,6 @@ jobs:
           
           GH_AW_PROMPT_d984ba9ebca19fc3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_d984ba9ebca19fc3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/schema-feature-coverage.lock.yml b/.github/workflows/schema-feature-coverage.lock.yml
index 00daa0d93a3..2183d34dfce 100644
--- a/.github/workflows/schema-feature-coverage.lock.yml
+++ b/.github/workflows/schema-feature-coverage.lock.yml
@@ -226,9 +226,6 @@ jobs:
           
           GH_AW_PROMPT_fae8e9bb7c978eec_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_fae8e9bb7c978eec_EOF'
           </system>
           {{#runtime-import .github/workflows/schema-feature-coverage.md}}
@@ -1198,18 +1195,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_7cfc3fb1079471e4_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_b5693f176f1ab63b_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_7cfc3fb1079471e4_EOF
+          GH_AW_MCP_CONFIG_b5693f176f1ab63b_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_d1057d47b6ca73df_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_c1f832527525cb0e_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1220,11 +1217,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_d1057d47b6ca73df_EOF
+          GH_AW_MCP_CONFIG_c1f832527525cb0e_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_b5b077b468335d61_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_7277ea4e1f2e0530_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1234,7 +1231,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_b5b077b468335d61_EOF
+          GH_AW_CODEX_SHELL_POLICY_7277ea4e1f2e0530_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/scout.lock.yml b/.github/workflows/scout.lock.yml
index d25a40ec385..8973880531f 100644
--- a/.github/workflows/scout.lock.yml
+++ b/.github/workflows/scout.lock.yml
@@ -329,9 +329,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_8272fdeb55a2370c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/security-compliance.lock.yml b/.github/workflows/security-compliance.lock.yml
index da896e300d6..e9cd8c64b72 100644
--- a/.github/workflows/security-compliance.lock.yml
+++ b/.github/workflows/security-compliance.lock.yml
@@ -234,9 +234,6 @@ jobs:
           
           GH_AW_PROMPT_e182ce1782081fe9_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_e182ce1782081fe9_EOF'
           </system>
           {{#runtime-import .github/workflows/security-compliance.md}}
diff --git a/.github/workflows/security-review.lock.yml b/.github/workflows/security-review.lock.yml
index d944c8f82bd..40ef312d3f8 100644
--- a/.github/workflows/security-review.lock.yml
+++ b/.github/workflows/security-review.lock.yml
@@ -274,9 +274,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_prompt.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ee0f70d59b920340_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/security-analysis-base.md}}
diff --git a/.github/workflows/semantic-function-refactor.lock.yml b/.github/workflows/semantic-function-refactor.lock.yml
index 978e83e623d..ddc38820c96 100644
--- a/.github/workflows/semantic-function-refactor.lock.yml
+++ b/.github/workflows/semantic-function-refactor.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_63264fecff0f6f38_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_63264fecff0f6f38_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/sergo.lock.yml b/.github/workflows/sergo.lock.yml
index ba7ec19f177..f883edf8b5b 100644
--- a/.github/workflows/sergo.lock.yml
+++ b/.github/workflows/sergo.lock.yml
@@ -241,9 +241,6 @@ jobs:
           
           GH_AW_PROMPT_4179d90e1e2bd67a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_4179d90e1e2bd67a_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/slide-deck-maintainer.lock.yml b/.github/workflows/slide-deck-maintainer.lock.yml
index 8d8c3d9d981..109cacf7d9e 100644
--- a/.github/workflows/slide-deck-maintainer.lock.yml
+++ b/.github/workflows/slide-deck-maintainer.lock.yml
@@ -240,9 +240,6 @@ jobs:
           
           GH_AW_PROMPT_f9dfff389c6d2518_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f9dfff389c6d2518_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/smoke-agent-all-merged.lock.yml b/.github/workflows/smoke-agent-all-merged.lock.yml
index 5b91e876183..f82723ceac5 100644
--- a/.github/workflows/smoke-agent-all-merged.lock.yml
+++ b/.github/workflows/smoke-agent-all-merged.lock.yml
@@ -267,9 +267,6 @@ jobs:
           
           GH_AW_PROMPT_2154fa1d6c586071_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2154fa1d6c586071_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-agent-all-none.lock.yml b/.github/workflows/smoke-agent-all-none.lock.yml
index f0a78abd24c..0853d43e876 100644
--- a/.github/workflows/smoke-agent-all-none.lock.yml
+++ b/.github/workflows/smoke-agent-all-none.lock.yml
@@ -267,9 +267,6 @@ jobs:
           
           GH_AW_PROMPT_d87d9898ea35480b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_d87d9898ea35480b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-agent-public-approved.lock.yml b/.github/workflows/smoke-agent-public-approved.lock.yml
index bc71b041fd7..764a0044f0b 100644
--- a/.github/workflows/smoke-agent-public-approved.lock.yml
+++ b/.github/workflows/smoke-agent-public-approved.lock.yml
@@ -269,9 +269,6 @@ jobs:
           
           GH_AW_PROMPT_3e689fc9bcbf861a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_3e689fc9bcbf861a_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/smoke-agent-public-none.lock.yml b/.github/workflows/smoke-agent-public-none.lock.yml
index 785012c07d8..e3ab6923918 100644
--- a/.github/workflows/smoke-agent-public-none.lock.yml
+++ b/.github/workflows/smoke-agent-public-none.lock.yml
@@ -267,9 +267,6 @@ jobs:
           
           GH_AW_PROMPT_b5f95b20ac0f0789_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b5f95b20ac0f0789_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-agent-scoped-approved.lock.yml b/.github/workflows/smoke-agent-scoped-approved.lock.yml
index 7ef750e7335..dc5b65369b7 100644
--- a/.github/workflows/smoke-agent-scoped-approved.lock.yml
+++ b/.github/workflows/smoke-agent-scoped-approved.lock.yml
@@ -268,9 +268,6 @@ jobs:
           
           GH_AW_PROMPT_b21bd306ae054208_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b21bd306ae054208_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/smoke-call-workflow.lock.yml b/.github/workflows/smoke-call-workflow.lock.yml
index acc9c1171e8..fa215ee2784 100644
--- a/.github/workflows/smoke-call-workflow.lock.yml
+++ b/.github/workflows/smoke-call-workflow.lock.yml
@@ -254,9 +254,6 @@ jobs:
           
           GH_AW_PROMPT_0bcd7ba305cfca31_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0bcd7ba305cfca31_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
@@ -1230,18 +1227,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_7cb1f239d7dcc678_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_1487b91f9210af68_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_7cb1f239d7dcc678_EOF
+          GH_AW_MCP_CONFIG_1487b91f9210af68_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_54fe6699938ad0e5_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_5140bf22f7590031_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1252,11 +1249,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_54fe6699938ad0e5_EOF
+          GH_AW_MCP_CONFIG_5140bf22f7590031_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_da706fbae40c11ac_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_3e6472240cee4829_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1266,7 +1263,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_da706fbae40c11ac_EOF
+          GH_AW_CODEX_SHELL_POLICY_3e6472240cee4829_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/smoke-ci.lock.yml b/.github/workflows/smoke-ci.lock.yml
index 8952f5fa683..9742bb35e30 100644
--- a/.github/workflows/smoke-ci.lock.yml
+++ b/.github/workflows/smoke-ci.lock.yml
@@ -250,9 +250,6 @@ jobs:
           
           GH_AW_PROMPT_06e3e19b06693820_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_06e3e19b06693820_EOF'
           </system>
           {{#runtime-import .github/workflows/smoke-ci.md}}
diff --git a/.github/workflows/smoke-claude.lock.yml b/.github/workflows/smoke-claude.lock.yml
index 48333cbf1ed..035fed59d8e 100644
--- a/.github/workflows/smoke-claude.lock.yml
+++ b/.github/workflows/smoke-claude.lock.yml
@@ -307,9 +307,6 @@ jobs:
           
           GH_AW_PROMPT_1ff941a307e33158_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1ff941a307e33158_EOF'
           </system>
           
diff --git a/.github/workflows/smoke-codex.lock.yml b/.github/workflows/smoke-codex.lock.yml
index d2618608ce4..e0f4601d181 100644
--- a/.github/workflows/smoke-codex.lock.yml
+++ b/.github/workflows/smoke-codex.lock.yml
@@ -305,9 +305,6 @@ jobs:
           
           GH_AW_PROMPT_928d68ef3e3a244b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_928d68ef3e3a244b_EOF'
           </system>
           ## Serena Code Analysis
@@ -1785,18 +1782,18 @@ jobs:
           DOCKER_SOCK_GID=$(stat -c '%g' /var/run/docker.sock 2>/dev/null || echo '0')
           export MCP_GATEWAY_DOCKER_COMMAND='docker run -i --rm --network host --add-host host.docker.internal:127.0.0.1 --user '"${MCP_GATEWAY_UID}"':'"${MCP_GATEWAY_GID}"' --group-add '"${DOCKER_SOCK_GID}"' -v /var/run/docker.sock:/var/run/docker.sock -e MCP_GATEWAY_PORT -e MCP_GATEWAY_DOMAIN -e MCP_GATEWAY_API_KEY -e MCP_GATEWAY_PAYLOAD_DIR -e MCP_GATEWAY_PAYLOAD_SIZE_THRESHOLD -e DEBUG -e MCP_GATEWAY_LOG_DIR -e GH_AW_MCP_LOG_DIR -e GH_AW_SAFE_OUTPUTS -e GH_AW_SAFE_OUTPUTS_CONFIG_PATH -e GH_AW_SAFE_OUTPUTS_TOOLS_PATH -e GH_AW_ASSETS_BRANCH -e GH_AW_ASSETS_MAX_SIZE_KB -e GH_AW_ASSETS_ALLOWED_EXTS -e DEFAULT_BRANCH -e GITHUB_MCP_SERVER_TOKEN -e GITHUB_MCP_GUARD_MIN_INTEGRITY -e GITHUB_MCP_GUARD_REPOS -e GITHUB_REPOSITORY -e GITHUB_SERVER_URL -e GITHUB_SHA -e GITHUB_WORKSPACE -e GITHUB_TOKEN -e GITHUB_RUN_ID -e GITHUB_RUN_NUMBER -e GITHUB_RUN_ATTEMPT -e GITHUB_JOB -e GITHUB_ACTION -e GITHUB_EVENT_NAME -e GITHUB_EVENT_PATH -e GITHUB_ACTOR -e GITHUB_ACTOR_ID -e GITHUB_TRIGGERING_ACTOR -e GITHUB_WORKFLOW -e GITHUB_WORKFLOW_REF -e GITHUB_WORKFLOW_SHA -e GITHUB_REF -e GITHUB_REF_NAME -e GITHUB_REF_TYPE -e GITHUB_HEAD_REF -e GITHUB_BASE_REF -e CODEX_HOME -v /tmp/gh-aw/mcp-payloads:/tmp/gh-aw/mcp-payloads:rw -v /opt:/opt:ro -v /tmp:/tmp:rw -v '"${GITHUB_WORKSPACE}"':'"${GITHUB_WORKSPACE}"':rw ghcr.io/github/gh-aw-mcpg:v0.3.1'
           
-          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_e00013f3149f4ae6_EOF
+          cat > "${RUNNER_TEMP}/gh-aw/mcp-config/config.toml" << GH_AW_MCP_CONFIG_8da66847fee653c0_EOF
           [history]
           persistence = "none"
           
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_MCP_CONFIG_e00013f3149f4ae6_EOF
+          GH_AW_MCP_CONFIG_8da66847fee653c0_EOF
           
           # Generate JSON config for MCP gateway
           GH_AW_NODE=$(which node 2>/dev/null || command -v node 2>/dev/null || echo node)
-          cat << GH_AW_MCP_CONFIG_d6631508eb0fbab1_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
+          cat << GH_AW_MCP_CONFIG_d9a327b361853328_EOF | "$GH_AW_NODE" "${RUNNER_TEMP}/gh-aw/actions/start_mcp_gateway.cjs"
           {
             "mcpServers": {
             },
@@ -1807,11 +1804,11 @@ jobs:
               "payloadDir": "${MCP_GATEWAY_PAYLOAD_DIR}"
             }
           }
-          GH_AW_MCP_CONFIG_d6631508eb0fbab1_EOF
+          GH_AW_MCP_CONFIG_d9a327b361853328_EOF
           
           # Sync converter output to writable CODEX_HOME for Codex
           mkdir -p /tmp/gh-aw/mcp-config
-          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_c6359efe5dd4c06c_EOF
+          cat > "/tmp/gh-aw/mcp-config/config.toml" << GH_AW_CODEX_SHELL_POLICY_14087ae75db9294b_EOF
           model_provider = "openai-proxy"
           [model_providers.openai-proxy]
           name = "OpenAI AWF proxy"
@@ -1821,7 +1818,7 @@ jobs:
           [shell_environment_policy]
           inherit = "core"
           include_only = ["CODEX_API_KEY", "HOME", "OPENAI_API_KEY", "PATH"]
-          GH_AW_CODEX_SHELL_POLICY_c6359efe5dd4c06c_EOF
+          GH_AW_CODEX_SHELL_POLICY_14087ae75db9294b_EOF
           awk '
             BEGIN { skip_openai_proxy = 0 }
             /^[[:space:]]*model_provider[[:space:]]*=/ { next }
diff --git a/.github/workflows/smoke-copilot-arm.lock.yml b/.github/workflows/smoke-copilot-arm.lock.yml
index 2e44e65307c..a9e82f8ad3d 100644
--- a/.github/workflows/smoke-copilot-arm.lock.yml
+++ b/.github/workflows/smoke-copilot-arm.lock.yml
@@ -300,9 +300,6 @@ jobs:
           
           GH_AW_PROMPT_e8adced155d997d7_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_e8adced155d997d7_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/smoke-copilot.lock.yml b/.github/workflows/smoke-copilot.lock.yml
index 326a011d007..7e80af598d2 100644
--- a/.github/workflows/smoke-copilot.lock.yml
+++ b/.github/workflows/smoke-copilot.lock.yml
@@ -297,9 +297,6 @@ jobs:
           
           GH_AW_PROMPT_da9cd13ddf198bed_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_da9cd13ddf198bed_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/smoke-create-cross-repo-pr.lock.yml b/.github/workflows/smoke-create-cross-repo-pr.lock.yml
index 75122119b9f..c1cdfb09b78 100644
--- a/.github/workflows/smoke-create-cross-repo-pr.lock.yml
+++ b/.github/workflows/smoke-create-cross-repo-pr.lock.yml
@@ -269,9 +269,6 @@ jobs:
           
           GH_AW_PROMPT_0420ea7924b34dcb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0420ea7924b34dcb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-crush.lock.yml b/.github/workflows/smoke-crush.lock.yml
index 36850743c21..cd46fb2d7be 100644
--- a/.github/workflows/smoke-crush.lock.yml
+++ b/.github/workflows/smoke-crush.lock.yml
@@ -275,9 +275,6 @@ jobs:
           
           GH_AW_PROMPT_b4fa4429d3aa72ae_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_b4fa4429d3aa72ae_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/smoke-gemini.lock.yml b/.github/workflows/smoke-gemini.lock.yml
index c20416e0d48..ce5df2f7013 100644
--- a/.github/workflows/smoke-gemini.lock.yml
+++ b/.github/workflows/smoke-gemini.lock.yml
@@ -290,9 +290,6 @@ jobs:
           
           GH_AW_PROMPT_46b9e9e2ca0cb2d1_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_46b9e9e2ca0cb2d1_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/smoke-multi-pr.lock.yml b/.github/workflows/smoke-multi-pr.lock.yml
index bfc53cc10ff..116c228565c 100644
--- a/.github/workflows/smoke-multi-pr.lock.yml
+++ b/.github/workflows/smoke-multi-pr.lock.yml
@@ -287,9 +287,6 @@ jobs:
           
           GH_AW_PROMPT_48a536a540ddcea8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_48a536a540ddcea8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-opencode.lock.yml b/.github/workflows/smoke-opencode.lock.yml
index 9c0b4b59184..a31811918b4 100644
--- a/.github/workflows/smoke-opencode.lock.yml
+++ b/.github/workflows/smoke-opencode.lock.yml
@@ -287,9 +287,6 @@ jobs:
           
           GH_AW_PROMPT_ce2042b8038d4875_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ce2042b8038d4875_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/gh.md}}
diff --git a/.github/workflows/smoke-project.lock.yml b/.github/workflows/smoke-project.lock.yml
index 5eb694226bc..e4cbe9d0925 100644
--- a/.github/workflows/smoke-project.lock.yml
+++ b/.github/workflows/smoke-project.lock.yml
@@ -288,9 +288,6 @@ jobs:
           
           GH_AW_PROMPT_58453f345124cba3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_58453f345124cba3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-service-ports.lock.yml b/.github/workflows/smoke-service-ports.lock.yml
index 17a9a44b35a..01ec9b0ad97 100644
--- a/.github/workflows/smoke-service-ports.lock.yml
+++ b/.github/workflows/smoke-service-ports.lock.yml
@@ -244,9 +244,6 @@ jobs:
           
           GH_AW_PROMPT_1c9fa53e6b54b6a3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_1c9fa53e6b54b6a3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-temporary-id.lock.yml b/.github/workflows/smoke-temporary-id.lock.yml
index 3876c7cab10..c830f91f815 100644
--- a/.github/workflows/smoke-temporary-id.lock.yml
+++ b/.github/workflows/smoke-temporary-id.lock.yml
@@ -283,9 +283,6 @@ jobs:
           
           GH_AW_PROMPT_f9d203436b94b03a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f9d203436b94b03a_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-test-tools.lock.yml b/.github/workflows/smoke-test-tools.lock.yml
index e1727a8a333..8ea1ebc4103 100644
--- a/.github/workflows/smoke-test-tools.lock.yml
+++ b/.github/workflows/smoke-test-tools.lock.yml
@@ -273,9 +273,6 @@ jobs:
           
           GH_AW_PROMPT_0289aca023ea6d07_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_0289aca023ea6d07_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-update-cross-repo-pr.lock.yml b/.github/workflows/smoke-update-cross-repo-pr.lock.yml
index a45244eeeec..cd0d8766293 100644
--- a/.github/workflows/smoke-update-cross-repo-pr.lock.yml
+++ b/.github/workflows/smoke-update-cross-repo-pr.lock.yml
@@ -272,9 +272,6 @@ jobs:
           
           GH_AW_PROMPT_95b80c043e2e7005_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_95b80c043e2e7005_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/observability-otlp.md}}
diff --git a/.github/workflows/smoke-workflow-call-with-inputs.lock.yml b/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
index 12074ff96b0..051c4046921 100644
--- a/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
+++ b/.github/workflows/smoke-workflow-call-with-inputs.lock.yml
@@ -273,9 +273,6 @@ jobs:
           
           GH_AW_PROMPT_f2d76cd8a1ef2de8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f2d76cd8a1ef2de8_EOF'
           </system>
           {{#runtime-import .github/workflows/smoke-workflow-call-with-inputs.md}}
diff --git a/.github/workflows/smoke-workflow-call.lock.yml b/.github/workflows/smoke-workflow-call.lock.yml
index 3dbd984a0aa..4ecaba0709a 100644
--- a/.github/workflows/smoke-workflow-call.lock.yml
+++ b/.github/workflows/smoke-workflow-call.lock.yml
@@ -277,9 +277,6 @@ jobs:
           
           GH_AW_PROMPT_022421748a24fe95_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_022421748a24fe95_EOF'
           </system>
           {{#runtime-import .github/workflows/smoke-workflow-call.md}}
diff --git a/.github/workflows/spec-enforcer.lock.yml b/.github/workflows/spec-enforcer.lock.yml
index f90ea8347ff..17de0b05fbd 100644
--- a/.github/workflows/spec-enforcer.lock.yml
+++ b/.github/workflows/spec-enforcer.lock.yml
@@ -230,9 +230,6 @@ jobs:
           
           GH_AW_PROMPT_c74a170bf37c0660_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c74a170bf37c0660_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/spec-extractor.lock.yml b/.github/workflows/spec-extractor.lock.yml
index 3524180e62f..5057392edf9 100644
--- a/.github/workflows/spec-extractor.lock.yml
+++ b/.github/workflows/spec-extractor.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_3daaac1a891d7da5_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_3daaac1a891d7da5_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/spec-librarian.lock.yml b/.github/workflows/spec-librarian.lock.yml
index a200d8538a1..ca57ca60689 100644
--- a/.github/workflows/spec-librarian.lock.yml
+++ b/.github/workflows/spec-librarian.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_2c4d45d7f39bcff2_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2c4d45d7f39bcff2_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/stale-repo-identifier.lock.yml b/.github/workflows/stale-repo-identifier.lock.yml
index 17a37235f0a..4dfdae26ef3 100644
--- a/.github/workflows/stale-repo-identifier.lock.yml
+++ b/.github/workflows/stale-repo-identifier.lock.yml
@@ -255,9 +255,6 @@ jobs:
           
           GH_AW_PROMPT_ede8520bbc966539_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ede8520bbc966539_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/static-analysis-report.lock.yml b/.github/workflows/static-analysis-report.lock.yml
index de54c48cb4b..ac63e22c904 100644
--- a/.github/workflows/static-analysis-report.lock.yml
+++ b/.github/workflows/static-analysis-report.lock.yml
@@ -231,9 +231,6 @@ jobs:
           
           GH_AW_PROMPT_a7f209ebfd14c3f4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a7f209ebfd14c3f4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/step-name-alignment.lock.yml b/.github/workflows/step-name-alignment.lock.yml
index 898051ebf47..1965e4dd182 100644
--- a/.github/workflows/step-name-alignment.lock.yml
+++ b/.github/workflows/step-name-alignment.lock.yml
@@ -224,9 +224,6 @@ jobs:
           
           GH_AW_PROMPT_651666ff422bb502_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_651666ff422bb502_EOF'
           </system>
           {{#runtime-import .github/workflows/step-name-alignment.md}}
diff --git a/.github/workflows/sub-issue-closer.lock.yml b/.github/workflows/sub-issue-closer.lock.yml
index 51fee0fefad..7bf865d1e40 100644
--- a/.github/workflows/sub-issue-closer.lock.yml
+++ b/.github/workflows/sub-issue-closer.lock.yml
@@ -221,9 +221,6 @@ jobs:
           
           GH_AW_PROMPT_5ca5aaf91141261e_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_5ca5aaf91141261e_EOF'
           </system>
           {{#runtime-import .github/workflows/sub-issue-closer.md}}
diff --git a/.github/workflows/super-linter.lock.yml b/.github/workflows/super-linter.lock.yml
index a445ad59ee3..ce9c223a713 100644
--- a/.github/workflows/super-linter.lock.yml
+++ b/.github/workflows/super-linter.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_f5b38ff132780914_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_f5b38ff132780914_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/technical-doc-writer.lock.yml b/.github/workflows/technical-doc-writer.lock.yml
index acf62a4f1f8..83c58aa9c39 100644
--- a/.github/workflows/technical-doc-writer.lock.yml
+++ b/.github/workflows/technical-doc-writer.lock.yml
@@ -234,9 +234,6 @@ jobs:
           
           GH_AW_PROMPT_2ce6bd8ddc747cbe_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2ce6bd8ddc747cbe_EOF'
           </system>
           {{#runtime-import .github/skills/documentation/SKILL.md}}
diff --git a/.github/workflows/terminal-stylist.lock.yml b/.github/workflows/terminal-stylist.lock.yml
index 31ae9ed5b70..ea5b28dc1f0 100644
--- a/.github/workflows/terminal-stylist.lock.yml
+++ b/.github/workflows/terminal-stylist.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_622a0a32a37a95cc_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_622a0a32a37a95cc_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/test-create-pr-error-handling.lock.yml b/.github/workflows/test-create-pr-error-handling.lock.yml
index 6ffde0eb0af..1672a366c15 100644
--- a/.github/workflows/test-create-pr-error-handling.lock.yml
+++ b/.github/workflows/test-create-pr-error-handling.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_2e5a2dbd67e67053_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_2e5a2dbd67e67053_EOF'
           </system>
           {{#runtime-import .github/workflows/test-create-pr-error-handling.md}}
diff --git a/.github/workflows/test-dispatcher.lock.yml b/.github/workflows/test-dispatcher.lock.yml
index 7e9db3b2c31..62794afaaa9 100644
--- a/.github/workflows/test-dispatcher.lock.yml
+++ b/.github/workflows/test-dispatcher.lock.yml
@@ -217,9 +217,6 @@ jobs:
           
           GH_AW_PROMPT_639e483721a07aa6_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_639e483721a07aa6_EOF'
           </system>
           {{#runtime-import .github/workflows/test-dispatcher.md}}
diff --git a/.github/workflows/test-project-url-default.lock.yml b/.github/workflows/test-project-url-default.lock.yml
index 1719dd0b94d..6003c3080ab 100644
--- a/.github/workflows/test-project-url-default.lock.yml
+++ b/.github/workflows/test-project-url-default.lock.yml
@@ -218,9 +218,6 @@ jobs:
           
           GH_AW_PROMPT_115a32ce3f02db9a_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_115a32ce3f02db9a_EOF'
           </system>
           {{#runtime-import .github/workflows/test-project-url-default.md}}
diff --git a/.github/workflows/test-quality-sentinel.lock.yml b/.github/workflows/test-quality-sentinel.lock.yml
index 79ec360c520..865674f14a0 100644
--- a/.github/workflows/test-quality-sentinel.lock.yml
+++ b/.github/workflows/test-quality-sentinel.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_18ecf389234a57b4_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_18ecf389234a57b4_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/test-workflow.lock.yml b/.github/workflows/test-workflow.lock.yml
index 8c558c2568f..c72ef221534 100644
--- a/.github/workflows/test-workflow.lock.yml
+++ b/.github/workflows/test-workflow.lock.yml
@@ -207,9 +207,6 @@ jobs:
           
           GH_AW_PROMPT_d2100dd9504f0ecb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_d2100dd9504f0ecb_EOF'
           </system>
           {{#runtime-import .github/workflows/test-workflow.md}}
diff --git a/.github/workflows/tidy.lock.yml b/.github/workflows/tidy.lock.yml
index d92d09c442c..0c41675faaf 100644
--- a/.github/workflows/tidy.lock.yml
+++ b/.github/workflows/tidy.lock.yml
@@ -292,9 +292,6 @@ jobs:
           if [ "$GITHUB_EVENT_NAME" = "issue_comment" ] && [ -n "$GH_AW_IS_PR_COMMENT" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review_comment" ] || [ "$GITHUB_EVENT_NAME" = "pull_request_review" ]; then
             cat "${RUNNER_TEMP}/gh-aw/prompts/pr_context_push_to_pr_branch_guidance.md"
           fi
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_68ec8859b6f02696_EOF'
           </system>
           {{#runtime-import .github/workflows/tidy.md}}
diff --git a/.github/workflows/typist.lock.yml b/.github/workflows/typist.lock.yml
index a9ebf3b876d..6ab1bba8665 100644
--- a/.github/workflows/typist.lock.yml
+++ b/.github/workflows/typist.lock.yml
@@ -238,9 +238,6 @@ jobs:
           
           GH_AW_PROMPT_05cd7a92a03dca4b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_05cd7a92a03dca4b_EOF'
           </system>
           ## Serena Code Analysis
diff --git a/.github/workflows/ubuntu-image-analyzer.lock.yml b/.github/workflows/ubuntu-image-analyzer.lock.yml
index ca1f13fee8a..a50ef8c3281 100644
--- a/.github/workflows/ubuntu-image-analyzer.lock.yml
+++ b/.github/workflows/ubuntu-image-analyzer.lock.yml
@@ -231,9 +231,6 @@ jobs:
           
           GH_AW_PROMPT_37168e83c534310c_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_37168e83c534310c_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/activation-app.md}}
diff --git a/.github/workflows/unbloat-docs.lock.yml b/.github/workflows/unbloat-docs.lock.yml
index 65c858b7224..e1516045e67 100644
--- a/.github/workflows/unbloat-docs.lock.yml
+++ b/.github/workflows/unbloat-docs.lock.yml
@@ -286,9 +286,6 @@ jobs:
           
           GH_AW_PROMPT_05157cda456dcfb3_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_05157cda456dcfb3_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/update-astro.lock.yml b/.github/workflows/update-astro.lock.yml
index c407d9730a6..8d7ccb9eabe 100644
--- a/.github/workflows/update-astro.lock.yml
+++ b/.github/workflows/update-astro.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_e761d0bef082d79d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_e761d0bef082d79d_EOF'
           </system>
           {{#runtime-import .github/workflows/update-astro.md}}
diff --git a/.github/workflows/video-analyzer.lock.yml b/.github/workflows/video-analyzer.lock.yml
index 049e97aac37..c693e9ae8f3 100644
--- a/.github/workflows/video-analyzer.lock.yml
+++ b/.github/workflows/video-analyzer.lock.yml
@@ -225,9 +225,6 @@ jobs:
           
           GH_AW_PROMPT_5e55eb320375d33b_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_5e55eb320375d33b_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/ffmpeg.md}}
diff --git a/.github/workflows/visual-regression-checker.lock.yml b/.github/workflows/visual-regression-checker.lock.yml
index 20868097df2..d7c08fa61d3 100644
--- a/.github/workflows/visual-regression-checker.lock.yml
+++ b/.github/workflows/visual-regression-checker.lock.yml
@@ -240,9 +240,6 @@ jobs:
           
           GH_AW_PROMPT_c79f5dc89b1c0500_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_c79f5dc89b1c0500_EOF'
           </system>
           {{#runtime-import .github/workflows/visual-regression-checker.md}}
diff --git a/.github/workflows/weekly-blog-post-writer.lock.yml b/.github/workflows/weekly-blog-post-writer.lock.yml
index 0d6375cabeb..2adf00a2b35 100644
--- a/.github/workflows/weekly-blog-post-writer.lock.yml
+++ b/.github/workflows/weekly-blog-post-writer.lock.yml
@@ -231,9 +231,6 @@ jobs:
           
           GH_AW_PROMPT_8291c4dfab1bd39d_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_8291c4dfab1bd39d_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/weekly-editors-health-check.lock.yml b/.github/workflows/weekly-editors-health-check.lock.yml
index babcda03c40..71b14d2c7ab 100644
--- a/.github/workflows/weekly-editors-health-check.lock.yml
+++ b/.github/workflows/weekly-editors-health-check.lock.yml
@@ -229,9 +229,6 @@ jobs:
           
           GH_AW_PROMPT_734dc520e9323e06_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_734dc520e9323e06_EOF'
           </system>
           {{#runtime-import .github/workflows/weekly-editors-health-check.md}}
diff --git a/.github/workflows/weekly-issue-summary.lock.yml b/.github/workflows/weekly-issue-summary.lock.yml
index cc1893789e2..a01e08b6231 100644
--- a/.github/workflows/weekly-issue-summary.lock.yml
+++ b/.github/workflows/weekly-issue-summary.lock.yml
@@ -244,9 +244,6 @@ jobs:
           
           GH_AW_PROMPT_508326a69dd2f474_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_508326a69dd2f474_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/weekly-safe-outputs-spec-review.lock.yml b/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
index cc590d502b1..ff9ef292475 100644
--- a/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
+++ b/.github/workflows/weekly-safe-outputs-spec-review.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_dd5ce0f0ce7b0ccb_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_dd5ce0f0ce7b0ccb_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/workflow-generator.lock.yml b/.github/workflows/workflow-generator.lock.yml
index ce89c3f2618..eb11d2633ac 100644
--- a/.github/workflows/workflow-generator.lock.yml
+++ b/.github/workflows/workflow-generator.lock.yml
@@ -260,9 +260,6 @@ jobs:
           
           GH_AW_PROMPT_a2f5a38e58a2e615_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_a2f5a38e58a2e615_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/github-guard-policy.md}}
diff --git a/.github/workflows/workflow-health-manager.lock.yml b/.github/workflows/workflow-health-manager.lock.yml
index 77bdd0cfcab..27b81aa8eba 100644
--- a/.github/workflows/workflow-health-manager.lock.yml
+++ b/.github/workflows/workflow-health-manager.lock.yml
@@ -228,9 +228,6 @@ jobs:
           
           GH_AW_PROMPT_60b97bb4586a8734_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_60b97bb4586a8734_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/workflow-normalizer.lock.yml b/.github/workflows/workflow-normalizer.lock.yml
index 99020cf767c..8b817ce7464 100644
--- a/.github/workflows/workflow-normalizer.lock.yml
+++ b/.github/workflows/workflow-normalizer.lock.yml
@@ -227,9 +227,6 @@ jobs:
           
           GH_AW_PROMPT_476e26a6aca6d1d8_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_476e26a6aca6d1d8_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/.github/workflows/workflow-skill-extractor.lock.yml b/.github/workflows/workflow-skill-extractor.lock.yml
index 617fa8f7d65..e0038807ca1 100644
--- a/.github/workflows/workflow-skill-extractor.lock.yml
+++ b/.github/workflows/workflow-skill-extractor.lock.yml
@@ -223,9 +223,6 @@ jobs:
           
           GH_AW_PROMPT_ae8bac670414c599_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_with_safeoutputs_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_ae8bac670414c599_EOF'
           </system>
           {{#runtime-import .github/workflows/shared/reporting.md}}
diff --git a/actions/setup/md/skills_prompt.md b/actions/setup/md/skills_prompt.md
deleted file mode 100644
index 33f16649b29..00000000000
--- a/actions/setup/md/skills_prompt.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<skills>
-This repository contains skill files (`SKILL.md`) that provide domain-specific knowledge and guidance. Skill files are located under `skills/` or `.github/skills/` directories.
-
-You may use skills in two ways:
-
-**1. Hint (generalist)** — When your task strategy is not fully defined, discover relevant skills at runtime and apply them:
-```bash
-find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 6
-```
-Read only the skills that are relevant to your current task. Do not load all skills indiscriminately.
-
-**2. Fusion (precise)** — When a specific skill section directly applies to your task, read only that section and integrate its guidance surgically. Do not paste the entire skill file; extract the minimum fragment needed.
-
-Prefer the **fusion approach** when you can identify the relevant skill and section upfront — it uses less context and produces more focused output.
-</skills>
diff --git a/pkg/workflow/prompt_constants.go b/pkg/workflow/prompt_constants.go
index 5f35f57c917..16a70139fc8 100644
--- a/pkg/workflow/prompt_constants.go
+++ b/pkg/workflow/prompt_constants.go
@@ -30,7 +30,6 @@ const (
 	mcpCLIToolsPromptFile                   = "mcp_cli_tools_prompt.md"
 	cliProxyPromptFile                      = "cli_proxy_prompt.md"
 	cliProxyWithSafeOutputsPromptFile       = "cli_proxy_with_safeoutputs_prompt.md"
-	skillsPromptFile                        = "skills_prompt.md"
 )
 
 // GitHub context prompt is kept embedded because it contains GitHub Actions expressions
diff --git a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
index 7a03b937ff5..a7c10c811d1 100644
--- a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
+++ b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/basic-copilot.golden
@@ -162,9 +162,6 @@ jobs:
           
           GH_AW_PROMPT_NORM_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_NORM_EOF'
           </system>
           # Mission
diff --git a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
index ea492e49053..f83c9b318ef 100644
--- a/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
+++ b/pkg/workflow/testdata/TestWasmGolden_CompileFixtures/with-imports.golden
@@ -162,9 +162,6 @@ jobs:
           
           GH_AW_PROMPT_NORM_EOF
           cat "${RUNNER_TEMP}/gh-aw/prompts/github_mcp_tools_prompt.md"
-          if find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .; then
-            cat "${RUNNER_TEMP}/gh-aw/prompts/skills_prompt.md"
-          fi
           cat << 'GH_AW_PROMPT_NORM_EOF'
           </system>
           {{#runtime-import shared/tools.md}}
diff --git a/pkg/workflow/unified_prompt_step.go b/pkg/workflow/unified_prompt_step.go
index c568153162b..c0a72b1bf7b 100644
--- a/pkg/workflow/unified_prompt_step.go
+++ b/pkg/workflow/unified_prompt_step.go
@@ -305,14 +305,6 @@ func (c *Compiler) collectPromptSections(data *WorkflowData) []PromptSection {
 		}
 	}
 
-	// 12. Skills instructions (if SKILL.md files are present in the workspace at runtime)
-	unifiedPromptLog.Print("Adding skills detection section")
-	sections = append(sections, PromptSection{
-		Content:        skillsPromptFile,
-		IsFile:         true,
-		ShellCondition: `find "${GITHUB_WORKSPACE}" -name "SKILL.md" -maxdepth 4 -print -quit 2>/dev/null | grep -q .`,
-	})
-
 	return sections
 }
 
diff --git a/pkg/workflow/unified_prompt_step_test.go b/pkg/workflow/unified_prompt_step_test.go
index 4b566b87571..dea1b3e779c 100644
--- a/pkg/workflow/unified_prompt_step_test.go
+++ b/pkg/workflow/unified_prompt_step_test.go
@@ -49,7 +49,6 @@ func TestCollectPromptSections_Order(t *testing.T) {
 	// 6. Safe outputs
 	// 7. GitHub context
 	// 8. PR context
-	// 9. Skills detection
 
 	var sectionTypes []string
 	for _, section := range sections {
@@ -60,8 +59,6 @@ func TestCollectPromptSections_Order(t *testing.T) {
 				sectionTypes = append(sectionTypes, "playwright")
 			} else if strings.Contains(section.Content, "pr_context") {
 				sectionTypes = append(sectionTypes, "pr-context")
-			} else if strings.Contains(section.Content, "skills") {
-				sectionTypes = append(sectionTypes, "skills")
 			}
 		} else {
 			if strings.Contains(section.Content, "## Note") {
@@ -79,7 +76,7 @@ func TestCollectPromptSections_Order(t *testing.T) {
 	}
 
 	// Verify expected order (not all may be present, but order should be maintained)
-	expectedOrder := []string{"temp", "playwright", "trial", "cache", "repo", "safe-outputs", "github", "pr-context", "skills"}
+	expectedOrder := []string{"temp", "playwright", "trial", "cache", "repo", "safe-outputs", "github", "pr-context"}
 
 	// Check that the sections we found appear in the expected order
 	lastIndex := -1

From 50d60477a25220ea5e48f00624d090c6ba0ae315 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 30 Apr 2026 01:16:34 +0000
Subject: [PATCH 4/5] Remove "not loaded automatically" line from skills.md per
 review feedback

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/9891e6f9-615d-41e0-9098-bd060f023ccb

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 .github/aw/skills.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/aw/skills.md b/.github/aw/skills.md
index 1d8ce023dd5..9ef887c5b56 100644
--- a/.github/aw/skills.md
+++ b/.github/aw/skills.md
@@ -6,8 +6,6 @@ description: Guide for leveraging skills (SKILL.md files) in agentic workflows 
 
 Consult this file when you want a workflow to take advantage of skills — domain-specific knowledge files (`SKILL.md`) that live in the repository under `skills/` or `.github/skills/`.
 
-Skills are **not loaded automatically**. The workflow's prompt must direct the agent to either discover and read them at runtime, or have their relevant content fused into the prompt at authoring time.
-
 ---
 
 ## Detecting Skills

From 3bc709574246680e01781a71126d0645389f4611 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 30 Apr 2026 01:22:09 +0000
Subject: [PATCH 5/5] Use grepable gh-skill-fusion identifier in fusion pattern
 comment

Agent-Logs-Url: https://github.com/github/gh-aw/sessions/0374ea98-63e8-4051-ac29-2517318ce0f9

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 .github/aw/skills.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/aw/skills.md b/.github/aw/skills.md
index 9ef887c5b56..853118c0f96 100644
--- a/.github/aw/skills.md
+++ b/.github/aw/skills.md
@@ -53,7 +53,7 @@ Extract and inline **only the specific sections** of the skill content that the
 **Pattern**:
 
 ```markdown
-<!-- From skills/github-mcp-server/SKILL.md — only the "authentication" section -->
+<!-- gh-skill-fusion: skills/github-mcp-server/SKILL.md#authentication -->
 
 When calling GitHub MCP tools, use the pre-configured token already injected into the
 environment. Never prompt the user for credentials.