diff --git a/.changeset/2017-context7-plugin-grant-prefix.md b/.changeset/2017-context7-plugin-grant-prefix.md
new file mode 100644
index 000000000..91eb0250b
--- /dev/null
+++ b/.changeset/2017-context7-plugin-grant-prefix.md
@@ -0,0 +1,5 @@
+---
+type: Fixed
+pr: 2029
+---
+**context7 now works for plugin-marketplace installs (8 agents regained doc lookup)** — the agents granted only `mcp__context7__*`, which matches a standalone context7 MCP server but not the official Claude Code plugin-marketplace install (`context7@claude-plugins-official`), whose tools are named `mcp__plugin_context7_context7__*`. The grant never matched, so advisor/ai/domain/phase/project/ui-researcher + planner + executor silently lost documentation lookup and fell back to WebSearch. All 8 agents now grant both forms, the researcher profile table is updated, and a parity guard asserts no agent grants the standalone form without the plugin form. (#2017)
diff --git a/agents/gsd-advisor-researcher.md b/agents/gsd-advisor-researcher.md
index b6fcf61c7..62d84bc7e 100644
--- a/agents/gsd-advisor-researcher.md
+++ b/agents/gsd-advisor-researcher.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-advisor-researcher
 description: Researches a single gray area decision and returns a structured comparison table with rationale. Spawned by discuss-phase advisor mode.
-tools: Read, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*
+tools: Read, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*
 color: cyan
 ---
 
diff --git a/agents/gsd-ai-researcher.md b/agents/gsd-ai-researcher.md
index e9df2d44b..9c9a66db3 100644
--- a/agents/gsd-ai-researcher.md
+++ b/agents/gsd-ai-researcher.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-ai-researcher
 description: Researches a chosen AI framework's official docs to produce implementation-ready guidance — best practices, syntax, core patterns, and pitfalls distilled for the specific use case. Writes the Framework Quick Reference and Implementation Guidance sections of AI-SPEC.md. Spawned by /gsd:ai-integration-phase orchestrator.
-tools: Read, Write, Edit, Bash, Grep, Glob, WebFetch, WebSearch, mcp__context7__*
+tools: Read, Write, Edit, Bash, Grep, Glob, WebFetch, WebSearch, mcp__context7__*, mcp__plugin_context7_context7__*
 color: green
 # hooks:
 #   PostToolUse:
diff --git a/agents/gsd-domain-researcher.md b/agents/gsd-domain-researcher.md
index 3b355b57a..701cb4022 100644
--- a/agents/gsd-domain-researcher.md
+++ b/agents/gsd-domain-researcher.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-domain-researcher
 description: Researches the business domain and real-world application context of the AI system being built. Surfaces domain expert evaluation criteria, industry-specific failure modes, regulatory context, and what "good" looks like for practitioners in this field — before the eval-planner turns it into measurable rubrics. Spawned by /gsd:ai-integration-phase orchestrator.
-tools: Read, Write, Edit, Bash, Grep, Glob, WebSearch, WebFetch, mcp__context7__*
+tools: Read, Write, Edit, Bash, Grep, Glob, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*
 color: purple
 # hooks:
 #   PostToolUse:
diff --git a/agents/gsd-executor.md b/agents/gsd-executor.md
index cfbe3b08b..6f4ecc5fd 100644
--- a/agents/gsd-executor.md
+++ b/agents/gsd-executor.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-executor
 description: Executes GSD plans with atomic commits, deviation handling, checkpoint protocols, and state management. Spawned by execute-phase orchestrator or execute-plan command.
-tools: Read, Write, Edit, Bash, Grep, Glob, Skill, mcp__context7__*
+tools: Read, Write, Edit, Bash, Grep, Glob, Skill, mcp__context7__*, mcp__plugin_context7_context7__*
 color: yellow
 # hooks:
 #   PostToolUse:
@@ -24,7 +24,7 @@ Your job: Execute the plan completely, commit each task, create SUMMARY.md, upda
 <documentation_lookup>
 When you need library or framework documentation, check in this order:
 
-1. If Context7 MCP tools (`mcp__context7__*`) are available in your environment, use them:
+1. If Context7 MCP tools (`mcp__context7__*, mcp__plugin_context7_context7__*`) are available in your environment, use them:
    - Resolve library ID: `mcp__context7__resolve-library-id` with `libraryName`
    - Fetch docs: `mcp__context7__get-library-docs` with `context7CompatibleLibraryId` and `topic`
 
diff --git a/agents/gsd-phase-researcher.md b/agents/gsd-phase-researcher.md
index aeec0d9bf..00bd8ff21 100644
--- a/agents/gsd-phase-researcher.md
+++ b/agents/gsd-phase-researcher.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-phase-researcher
 description: Researches how to implement a phase before planning. Produces RESEARCH.md consumed by gsd-planner. Spawned by /gsd:plan-phase orchestrator.
-tools: Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*
+tools: Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*
 color: cyan
 # hooks:
 #   PostToolUse:
diff --git a/agents/gsd-planner.md b/agents/gsd-planner.md
index 3c8ece56e..18a792769 100644
--- a/agents/gsd-planner.md
+++ b/agents/gsd-planner.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-planner
 description: Creates executable phase plans with task breakdown, dependency analysis, and goal-backward verification. Spawned by /gsd:plan-phase orchestrator.
-tools: Read, Write, Edit, Bash, Glob, Grep, Skill, WebFetch, mcp__context7__*
+tools: Read, Write, Edit, Bash, Glob, Grep, Skill, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*
 color: green
 # hooks:
 #   PostToolUse:
diff --git a/agents/gsd-project-researcher.md b/agents/gsd-project-researcher.md
index adfa391b5..c3123e915 100644
--- a/agents/gsd-project-researcher.md
+++ b/agents/gsd-project-researcher.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-project-researcher
 description: Researches domain ecosystem before roadmap creation. Produces files in .planning/research/ consumed during roadmap creation. Spawned by /gsd:new-project or /gsd:new-milestone orchestrators.
-tools: Read, Write, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*
+tools: Read, Write, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*
 color: cyan
 # hooks:
 #   PostToolUse:
diff --git a/agents/gsd-ui-researcher.md b/agents/gsd-ui-researcher.md
index c75a54982..f48b1fb0c 100644
--- a/agents/gsd-ui-researcher.md
+++ b/agents/gsd-ui-researcher.md
@@ -1,7 +1,7 @@
 ---
 name: gsd-ui-researcher
 description: Produces UI-SPEC.md design contract for frontend phases. Reads upstream artifacts, detects design system state, asks only unanswered questions. Spawned by /gsd:ui-phase orchestrator.
-tools: Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*
+tools: Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*
 color: purple
 # hooks:
 #   PostToolUse:
diff --git a/scripts/research-profiles.cjs b/scripts/research-profiles.cjs
index 4d1c2ba72..ab879bab8 100644
--- a/scripts/research-profiles.cjs
+++ b/scripts/research-profiles.cjs
@@ -24,7 +24,7 @@ const PROFILES = [
       'Researches domain ecosystem before roadmap creation. Produces files in .planning/research/ consumed during roadmap creation. Spawned by /gsd:new-project or /gsd:new-milestone orchestrators.',
     color: 'cyan',
     tools:
-      'Read, Write, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*',
+      'Read, Write, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*',
     requiredIncludes: [
       '@~/.claude/gsd-core/references/research-documentation-lookup.md',
       '@~/.claude/gsd-core/references/research-philosophy.md',
@@ -46,7 +46,7 @@ const PROFILES = [
       'Researches how to implement a phase before planning. Produces RESEARCH.md consumed by gsd-planner. Spawned by /gsd:plan-phase orchestrator.',
     color: 'cyan',
     tools:
-      'Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*',
+      'Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*, mcp__perplexity__*',
     requiredIncludes: [
       '@~/.claude/gsd-core/references/research-documentation-lookup.md',
       '@~/.claude/gsd-core/references/research-philosophy.md',
@@ -68,7 +68,7 @@ const PROFILES = [
     description:
       'Researches a single gray area decision and returns a structured comparison table with rationale. Spawned by discuss-phase advisor mode.',
     color: 'cyan',
-    tools: 'Read, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*',
+    tools: 'Read, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*',
     requiredIncludes: [
       '@~/.claude/gsd-core/references/research-documentation-lookup.md',
     ],
@@ -84,7 +84,7 @@ const PROFILES = [
       'Researches a chosen AI framework\'s official docs to produce implementation-ready guidance — best practices, syntax, core patterns, and pitfalls distilled for the specific use case. Writes the Framework Quick Reference and Implementation Guidance sections of AI-SPEC.md. Spawned by /gsd:ai-integration-phase orchestrator.',
     color: 'green',
     tools:
-      'Read, Write, Edit, Bash, Grep, Glob, WebFetch, WebSearch, mcp__context7__*',
+      'Read, Write, Edit, Bash, Grep, Glob, WebFetch, WebSearch, mcp__context7__*, mcp__plugin_context7_context7__*',
     requiredIncludes: [
       '@~/.claude/gsd-core/references/research-documentation-lookup.md',
     ],
@@ -101,7 +101,7 @@ const PROFILES = [
       'Researches the business domain and real-world application context of the AI system being built. Surfaces domain expert evaluation criteria, industry-specific failure modes, regulatory context, and what "good" looks like for practitioners in this field — before the eval-planner turns it into measurable rubrics. Spawned by /gsd:ai-integration-phase orchestrator.',
     color: 'purple',
     tools:
-      'Read, Write, Edit, Bash, Grep, Glob, WebSearch, WebFetch, mcp__context7__*',
+      'Read, Write, Edit, Bash, Grep, Glob, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*',
     requiredIncludes: [
       '@~/.claude/gsd-core/references/research-documentation-lookup.md',
     ],
@@ -117,7 +117,7 @@ const PROFILES = [
       'Produces UI-SPEC.md design contract for frontend phases. Reads upstream artifacts, detects design system state, asks only unanswered questions. Spawned by /gsd:ui-phase orchestrator.',
     color: 'purple',
     tools:
-      'Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*',
+      'Read, Write, Edit, Bash, Grep, Glob, Skill, WebSearch, WebFetch, mcp__context7__*, mcp__plugin_context7_context7__*, mcp__firecrawl__*, mcp__exa__*, mcp__tavily__*, mcp__ref__*, mcp__jina__*',
     requiredIncludes: [
       '@~/.claude/gsd-core/references/research-documentation-lookup.md',
     ],
diff --git a/tests/agent-size-baseline.json b/tests/agent-size-baseline.json
index 09622cc3b..81abeeb01 100644
--- a/tests/agent-size-baseline.json
+++ b/tests/agent-size-baseline.json
@@ -1,6 +1,6 @@
 {
-  "gsd-advisor-researcher.md": 4693,
-  "gsd-ai-researcher.md": 5909,
+  "gsd-advisor-researcher.md": 4727,
+  "gsd-ai-researcher.md": 5943,
   "gsd-assumptions-analyzer.md": 4646,
   "gsd-code-fixer.md": 36640,
   "gsd-code-reviewer.md": 16870,
@@ -11,26 +11,26 @@
   "gsd-doc-synthesizer.md": 9782,
   "gsd-doc-verifier.md": 12403,
   "gsd-doc-writer.md": 38924,
-  "gsd-domain-researcher.md": 6998,
+  "gsd-domain-researcher.md": 7032,
   "gsd-eval-auditor.md": 12496,
   "gsd-eval-planner.md": 7008,
-  "gsd-executor.md": 43539,
+  "gsd-executor.md": 43607,
   "gsd-framework-selector.md": 6778,
   "gsd-integration-checker.md": 15238,
   "gsd-intel-updater.md": 18166,
   "gsd-mempalace-curator.md": 4325,
   "gsd-nyquist-auditor.md": 7345,
   "gsd-pattern-mapper.md": 12487,
-  "gsd-phase-researcher.md": 40832,
+  "gsd-phase-researcher.md": 40866,
   "gsd-plan-checker.md": 44780,
-  "gsd-planner.md": 48157,
-  "gsd-project-researcher.md": 22208,
+  "gsd-planner.md": 48191,
+  "gsd-project-researcher.md": 22242,
   "gsd-research-synthesizer.md": 13847,
   "gsd-roadmapper.md": 22273,
   "gsd-security-auditor.md": 8981,
   "gsd-ui-auditor.md": 17249,
   "gsd-ui-checker.md": 11178,
-  "gsd-ui-researcher.md": 19466,
+  "gsd-ui-researcher.md": 19500,
   "gsd-user-profiler.md": 8516,
   "gsd-verifier.md": 49147
 }
diff --git a/tests/context7-plugin-grant-parity.test.cjs b/tests/context7-plugin-grant-parity.test.cjs
new file mode 100644
index 000000000..fe3d7d577
--- /dev/null
+++ b/tests/context7-plugin-grant-parity.test.cjs
@@ -0,0 +1,35 @@
+'use strict';
+
+// Regression guard for #2017 — agent `mcp__context7__*` grants only match a
+// standalone context7 MCP server; the Claude Code plugin-marketplace install
+// (`context7@claude-plugins-official`) names tools `mcp__plugin_context7_context7__*`,
+// so every agent that uses context7 must grant BOTH forms or silently lose
+// documentation lookup (falls back to WebSearch with no error).
+
+const { describe, test } = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('fs');
+const path = require('path');
+
+const AGENTS_DIR = path.join(__dirname, '..', 'agents');
+
+function agentFiles() {
+  return fs.readdirSync(AGENTS_DIR).filter((f) => f.endsWith('.md')).map((f) => path.join(AGENTS_DIR, f));
+}
+
+describe('#2017 — context7 plugin-marketplace grant parity', () => {
+  const STANDALONE = 'mcp__context7__*';
+  const PLUGIN = 'mcp__plugin_context7_context7__*';
+
+  for (const file of agentFiles()) {
+    const name = path.basename(file);
+    const content = fs.readFileSync(file, 'utf8');
+    const toolsLine = (content.split(/\r?\n/).find((l) => /^tools:/.test(l)) || '');
+
+    test(`${name}: standalone context7 grant implies the plugin-marketplace grant`, () => {
+      if (!toolsLine.includes(STANDALONE)) return; // agent doesn't use context7 — skip
+      assert.ok(toolsLine.includes(PLUGIN),
+        `${name} grants ${STANDALONE} but not ${PLUGIN} (plugin-marketplace installs silently lose doc lookup — #2017)`);
+    });
+  }
+});
diff --git a/tests/fixtures/golden-install-parity/antigravity.json b/tests/fixtures/golden-install-parity/antigravity.json
index 02b686cf5..0789647ed 100644
--- a/tests/fixtures/golden-install-parity/antigravity.json
+++ b/tests/fixtures/golden-install-parity/antigravity.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "1db46cac3f4d9889",
   "agents/gsd-eval-auditor.md": "1b8391f1aafb067f",
   "agents/gsd-eval-planner.md": "3d10fd11147f6857",
-  "agents/gsd-executor.md": "e5b95acff5989d80",
+  "agents/gsd-executor.md": "152ca51a10b99ff8",
   "agents/gsd-framework-selector.md": "daa62c79619c76bf",
   "agents/gsd-integration-checker.md": "0643cd2d779b131c",
   "agents/gsd-intel-updater.md": "26c1f1e028c6346a",
diff --git a/tests/fixtures/golden-install-parity/augment.json b/tests/fixtures/golden-install-parity/augment.json
index 7b479cd81..709d168ea 100644
--- a/tests/fixtures/golden-install-parity/augment.json
+++ b/tests/fixtures/golden-install-parity/augment.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "671c9ea949889c4a",
   "agents/gsd-eval-auditor.md": "fcaec7b00f94c435",
   "agents/gsd-eval-planner.md": "a4a5b4b3f7828ba3",
-  "agents/gsd-executor.md": "060c6de9f618c2ea",
+  "agents/gsd-executor.md": "46f911cd211034b0",
   "agents/gsd-framework-selector.md": "4b77eebbe9288d80",
   "agents/gsd-integration-checker.md": "fa53e2d78be1de74",
   "agents/gsd-intel-updater.md": "fa40e685d7441ace",
diff --git a/tests/fixtures/golden-install-parity/claude.json b/tests/fixtures/golden-install-parity/claude.json
index 1879d2098..fe2c991b9 100644
--- a/tests/fixtures/golden-install-parity/claude.json
+++ b/tests/fixtures/golden-install-parity/claude.json
@@ -1,7 +1,7 @@
 {
   ".gsd-profile": "0e716a5fef4e6dc1",
-  "agents/gsd-advisor-researcher.md": "7cdfe98e2baf606e",
-  "agents/gsd-ai-researcher.md": "fa68db1fb2c6ee8a",
+  "agents/gsd-advisor-researcher.md": "6f1f17e206e2c0c4",
+  "agents/gsd-ai-researcher.md": "e2236ee7b717c925",
   "agents/gsd-assumptions-analyzer.md": "f94fdd67f70b4a5d",
   "agents/gsd-code-fixer.md": "3d5f67cfd24ac452",
   "agents/gsd-code-reviewer.md": "d626a828e8de3648",
@@ -12,26 +12,26 @@
   "agents/gsd-doc-synthesizer.md": "135bbdfb9053cbd8",
   "agents/gsd-doc-verifier.md": "4232dcf9076e3566",
   "agents/gsd-doc-writer.md": "8cb62907c6458111",
-  "agents/gsd-domain-researcher.md": "f8be56555689a970",
+  "agents/gsd-domain-researcher.md": "5f7d366251b957fe",
   "agents/gsd-eval-auditor.md": "fea2759beff0a642",
   "agents/gsd-eval-planner.md": "112f6730f23854e3",
-  "agents/gsd-executor.md": "1a0fccbf7a1051cd",
+  "agents/gsd-executor.md": "22fc2f17098a4d14",
   "agents/gsd-framework-selector.md": "c350ee693cb1aa4e",
   "agents/gsd-integration-checker.md": "c8b4e65dee89c8ea",
   "agents/gsd-intel-updater.md": "5b41e05f90ce89d9",
   "agents/gsd-mempalace-curator.md": "77b53f1b155242b4",
   "agents/gsd-nyquist-auditor.md": "0bc0cdad7b3a0013",
   "agents/gsd-pattern-mapper.md": "b45b5e106775bec1",
-  "agents/gsd-phase-researcher.md": "529a4573230b104e",
+  "agents/gsd-phase-researcher.md": "85217c69c1ed2ac6",
   "agents/gsd-plan-checker.md": "c70134c61b969589",
-  "agents/gsd-planner.md": "d42aa2d1bc51edb4",
-  "agents/gsd-project-researcher.md": "e572c285002ba02e",
+  "agents/gsd-planner.md": "aa68af11f852ecfd",
+  "agents/gsd-project-researcher.md": "f468e96f8339d1e0",
   "agents/gsd-research-synthesizer.md": "7be02e47f4fd901b",
   "agents/gsd-roadmapper.md": "8a7f1f1256a6aed5",
   "agents/gsd-security-auditor.md": "4f9fc3f654af4944",
   "agents/gsd-ui-auditor.md": "40c0dcc15bcfb9fb",
   "agents/gsd-ui-checker.md": "6e94b43fd459e10e",
-  "agents/gsd-ui-researcher.md": "48bc161ca5a858b9",
+  "agents/gsd-ui-researcher.md": "5e561130434efdb2",
   "agents/gsd-user-profiler.md": "003276f85792cfda",
   "agents/gsd-verifier.md": "2271174b5aa20e31",
   "gsd-core/VERSION": "ef0deccd81a6723c",
diff --git a/tests/fixtures/golden-install-parity/cline.json b/tests/fixtures/golden-install-parity/cline.json
index 8ed577fb5..29676a00f 100644
--- a/tests/fixtures/golden-install-parity/cline.json
+++ b/tests/fixtures/golden-install-parity/cline.json
@@ -19,7 +19,7 @@
   "agents/gsd-domain-researcher.md": "0fecdaea86466a56",
   "agents/gsd-eval-auditor.md": "36c44303085df2f8",
   "agents/gsd-eval-planner.md": "3ddea88a69b4da3f",
-  "agents/gsd-executor.md": "b662b48bbacda431",
+  "agents/gsd-executor.md": "441e624e9685e505",
   "agents/gsd-framework-selector.md": "564669d479433f15",
   "agents/gsd-integration-checker.md": "1bbbdd3d420b994e",
   "agents/gsd-intel-updater.md": "42c40fffbc720d0b",
diff --git a/tests/fixtures/golden-install-parity/codebuddy.json b/tests/fixtures/golden-install-parity/codebuddy.json
index 6516e362d..bcfa031ea 100644
--- a/tests/fixtures/golden-install-parity/codebuddy.json
+++ b/tests/fixtures/golden-install-parity/codebuddy.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "1c1a800108a2b225",
   "agents/gsd-eval-auditor.md": "99012004b14ea602",
   "agents/gsd-eval-planner.md": "4ebdd7fe9cbb0cfe",
-  "agents/gsd-executor.md": "28872f650cb8b46d",
+  "agents/gsd-executor.md": "d0bfc88c01a63181",
   "agents/gsd-framework-selector.md": "7726fccc86bfeb50",
   "agents/gsd-integration-checker.md": "2d8339790bbb2dc3",
   "agents/gsd-intel-updater.md": "c51339956197cbd3",
diff --git a/tests/fixtures/golden-install-parity/codex.json b/tests/fixtures/golden-install-parity/codex.json
index f0b003b85..b9c054582 100644
--- a/tests/fixtures/golden-install-parity/codex.json
+++ b/tests/fixtures/golden-install-parity/codex.json
@@ -1,9 +1,9 @@
 {
   ".gsd-profile": "0e716a5fef4e6dc1",
   ".gsd/defaults.json": "560664b045e645cb",
-  "agents/gsd-advisor-researcher.md": "3995e081531dd043",
+  "agents/gsd-advisor-researcher.md": "eea6d1604aaf305c",
   "agents/gsd-advisor-researcher.toml": "144f037c79aa9c26",
-  "agents/gsd-ai-researcher.md": "9deaf29ae170faff",
+  "agents/gsd-ai-researcher.md": "303be751c91da4c8",
   "agents/gsd-ai-researcher.toml": "5a16e952628fdeb0",
   "agents/gsd-assumptions-analyzer.md": "21ee3cd4095f7cf8",
   "agents/gsd-assumptions-analyzer.toml": "9460360826f33ab1",
@@ -25,14 +25,14 @@
   "agents/gsd-doc-verifier.toml": "c0b7ac150730b954",
   "agents/gsd-doc-writer.md": "0a3557268f169722",
   "agents/gsd-doc-writer.toml": "d21d67f9ba074156",
-  "agents/gsd-domain-researcher.md": "bafef7d698ccb928",
+  "agents/gsd-domain-researcher.md": "fbd2f916f265c106",
   "agents/gsd-domain-researcher.toml": "a49ddec9005b4bf5",
   "agents/gsd-eval-auditor.md": "2810917e02e5547c",
   "agents/gsd-eval-auditor.toml": "9b81d61b3c5f722d",
   "agents/gsd-eval-planner.md": "73f2ad2ff2797a51",
   "agents/gsd-eval-planner.toml": "09468ad1a34ac468",
-  "agents/gsd-executor.md": "3c4556be34749bde",
-  "agents/gsd-executor.toml": "4730b30e5bb48e7e",
+  "agents/gsd-executor.md": "93a05c1436bc4458",
+  "agents/gsd-executor.toml": "f5a55d4eacd8613c",
   "agents/gsd-framework-selector.md": "ebae32430887d2e0",
   "agents/gsd-framework-selector.toml": "637e4e021b7ec380",
   "agents/gsd-integration-checker.md": "9cc875676cf7d741",
@@ -45,13 +45,13 @@
   "agents/gsd-nyquist-auditor.toml": "b3d7214b42fb67fa",
   "agents/gsd-pattern-mapper.md": "efbcfa7c5de4027f",
   "agents/gsd-pattern-mapper.toml": "48a17baa3d7d142c",
-  "agents/gsd-phase-researcher.md": "a8876e9ca2e40d2f",
+  "agents/gsd-phase-researcher.md": "87d74324e7708ea0",
   "agents/gsd-phase-researcher.toml": "44a3d510cd0ce3bd",
   "agents/gsd-plan-checker.md": "e7f02c10ea788aee",
   "agents/gsd-plan-checker.toml": "6f8ceb421d0ad721",
-  "agents/gsd-planner.md": "0e92e8d74894a56b",
+  "agents/gsd-planner.md": "5d638a2e37b63731",
   "agents/gsd-planner.toml": "50cec2af6b45a61c",
-  "agents/gsd-project-researcher.md": "787697faf68ad1a5",
+  "agents/gsd-project-researcher.md": "959f2e57c3d69ed8",
   "agents/gsd-project-researcher.toml": "f395e8e8c4baf1ed",
   "agents/gsd-research-synthesizer.md": "497f85adf53259ef",
   "agents/gsd-research-synthesizer.toml": "053616d4941a1458",
@@ -63,7 +63,7 @@
   "agents/gsd-ui-auditor.toml": "5e9dd62a12a16a1e",
   "agents/gsd-ui-checker.md": "bf7bf8cc301c65a1",
   "agents/gsd-ui-checker.toml": "d0a084e82a9ae52d",
-  "agents/gsd-ui-researcher.md": "cab148fcbfff7e4d",
+  "agents/gsd-ui-researcher.md": "2befca69af55e44a",
   "agents/gsd-ui-researcher.toml": "b55270666066e501",
   "agents/gsd-user-profiler.md": "1bf5033c929181c1",
   "agents/gsd-user-profiler.toml": "b9c244bb8fbf8140",
diff --git a/tests/fixtures/golden-install-parity/copilot.json b/tests/fixtures/golden-install-parity/copilot.json
index dbcca6f03..1587338a1 100644
--- a/tests/fixtures/golden-install-parity/copilot.json
+++ b/tests/fixtures/golden-install-parity/copilot.json
@@ -1,8 +1,8 @@
 {
   ".gsd-profile": "0e716a5fef4e6dc1",
   ".gsd/defaults.json": "560664b045e645cb",
-  "agents/gsd-advisor-researcher.agent.md": "ecd72019cd5634c4",
-  "agents/gsd-ai-researcher.agent.md": "65c846c74f17a74b",
+  "agents/gsd-advisor-researcher.agent.md": "1fb10242ff7fb1c9",
+  "agents/gsd-ai-researcher.agent.md": "8e9c3a2ddd179bb1",
   "agents/gsd-assumptions-analyzer.agent.md": "cdabed4777a842fe",
   "agents/gsd-code-fixer.agent.md": "8f39aacb760aab57",
   "agents/gsd-code-reviewer.agent.md": "fa1e7c421c78eae1",
@@ -13,26 +13,26 @@
   "agents/gsd-doc-synthesizer.agent.md": "16cebf04d8998356",
   "agents/gsd-doc-verifier.agent.md": "0230208ae7ab1a08",
   "agents/gsd-doc-writer.agent.md": "37ea4932a4b80355",
-  "agents/gsd-domain-researcher.agent.md": "b06738b093df1cb9",
+  "agents/gsd-domain-researcher.agent.md": "d603239b3e9fe428",
   "agents/gsd-eval-auditor.agent.md": "3c03009564de55c8",
   "agents/gsd-eval-planner.agent.md": "14751876fc2b5f16",
-  "agents/gsd-executor.agent.md": "ff6d1fc07a0ff6e7",
+  "agents/gsd-executor.agent.md": "0058082fef5a4985",
   "agents/gsd-framework-selector.agent.md": "cafeec0b3489be45",
   "agents/gsd-integration-checker.agent.md": "30439b804927acc7",
   "agents/gsd-intel-updater.agent.md": "238c1a886f35a25c",
   "agents/gsd-mempalace-curator.agent.md": "9e5290ea4c4ac211",
   "agents/gsd-nyquist-auditor.agent.md": "6463a50d90ada125",
   "agents/gsd-pattern-mapper.agent.md": "b1f488b0fa6a2395",
-  "agents/gsd-phase-researcher.agent.md": "fc6062a07152951b",
+  "agents/gsd-phase-researcher.agent.md": "03cfb510a766fe93",
   "agents/gsd-plan-checker.agent.md": "c50a5b008ddcbfad",
-  "agents/gsd-planner.agent.md": "5a1d56ee3dae82a9",
-  "agents/gsd-project-researcher.agent.md": "39007b6fcb854032",
+  "agents/gsd-planner.agent.md": "d40d16eced1c6463",
+  "agents/gsd-project-researcher.agent.md": "d73bdbe986ffa8a6",
   "agents/gsd-research-synthesizer.agent.md": "f03eed4aa89e47c5",
   "agents/gsd-roadmapper.agent.md": "322048cf8ddcb4e5",
   "agents/gsd-security-auditor.agent.md": "6f6a88b35dc2a24b",
   "agents/gsd-ui-auditor.agent.md": "92f50549e84ef482",
   "agents/gsd-ui-checker.agent.md": "c9958f2587b24156",
-  "agents/gsd-ui-researcher.agent.md": "a9c6a2f0e9975df6",
+  "agents/gsd-ui-researcher.agent.md": "d24301cc182be33e",
   "agents/gsd-user-profiler.agent.md": "ae16a248e18dd42b",
   "agents/gsd-verifier.agent.md": "87a8e3238e838a39",
   "copilot-instructions.md": "1fb04111759f1645",
diff --git a/tests/fixtures/golden-install-parity/cursor.json b/tests/fixtures/golden-install-parity/cursor.json
index f1774e92b..8703f0963 100644
--- a/tests/fixtures/golden-install-parity/cursor.json
+++ b/tests/fixtures/golden-install-parity/cursor.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "56395dbdabf076f6",
   "agents/gsd-eval-auditor.md": "ad2840fd5cd76172",
   "agents/gsd-eval-planner.md": "2049dac060d00eda",
-  "agents/gsd-executor.md": "7e39d497c77b7c5a",
+  "agents/gsd-executor.md": "1fb2c778178cfa1c",
   "agents/gsd-framework-selector.md": "4b77eebbe9288d80",
   "agents/gsd-integration-checker.md": "5da30584d06b878c",
   "agents/gsd-intel-updater.md": "b8971c5d96e63b38",
diff --git a/tests/fixtures/golden-install-parity/hermes.json b/tests/fixtures/golden-install-parity/hermes.json
index a97c2d2be..44bbdba23 100644
--- a/tests/fixtures/golden-install-parity/hermes.json
+++ b/tests/fixtures/golden-install-parity/hermes.json
@@ -1,8 +1,8 @@
 {
   ".gsd-profile": "0e716a5fef4e6dc1",
   ".gsd/defaults.json": "560664b045e645cb",
-  "agents/gsd-advisor-researcher.md": "f3f0a55854689045",
-  "agents/gsd-ai-researcher.md": "72f67082f35c9da1",
+  "agents/gsd-advisor-researcher.md": "f1c4a47d3d8cea72",
+  "agents/gsd-ai-researcher.md": "08847faf5494ff08",
   "agents/gsd-assumptions-analyzer.md": "f11a80795163bb5d",
   "agents/gsd-code-fixer.md": "94628312f25decb5",
   "agents/gsd-code-reviewer.md": "5ef947ca5baed775",
@@ -13,26 +13,26 @@
   "agents/gsd-doc-synthesizer.md": "8e6fb8220f777022",
   "agents/gsd-doc-verifier.md": "d3d8457bdd44bf10",
   "agents/gsd-doc-writer.md": "2858a8335170e85c",
-  "agents/gsd-domain-researcher.md": "d4c07520f650ffd5",
+  "agents/gsd-domain-researcher.md": "412cdbb05ba252ea",
   "agents/gsd-eval-auditor.md": "4ffb265063c318e5",
   "agents/gsd-eval-planner.md": "03448fc9c5774b56",
-  "agents/gsd-executor.md": "0667b16c383d033c",
+  "agents/gsd-executor.md": "18365948be7c2dff",
   "agents/gsd-framework-selector.md": "ea9981d65d6b3429",
   "agents/gsd-integration-checker.md": "35b4f2969d279871",
   "agents/gsd-intel-updater.md": "5fe5edfae2719cb8",
   "agents/gsd-mempalace-curator.md": "399e90e473b33814",
   "agents/gsd-nyquist-auditor.md": "8bfde4a9a36318aa",
   "agents/gsd-pattern-mapper.md": "cea092600aeb3978",
-  "agents/gsd-phase-researcher.md": "1c73b638d891363e",
+  "agents/gsd-phase-researcher.md": "2bd0402f33d757ca",
   "agents/gsd-plan-checker.md": "4b4e2b475bf5b5c3",
-  "agents/gsd-planner.md": "08e85102869630b4",
-  "agents/gsd-project-researcher.md": "97711cda03fdc9c0",
+  "agents/gsd-planner.md": "018542e335a983fa",
+  "agents/gsd-project-researcher.md": "425a7df7f37a5c06",
   "agents/gsd-research-synthesizer.md": "9d31c87fc2c87ffa",
   "agents/gsd-roadmapper.md": "64dce5d5f9fa5654",
   "agents/gsd-security-auditor.md": "e4d35ada4ea67d7f",
   "agents/gsd-ui-auditor.md": "86797e85f718dfac",
   "agents/gsd-ui-checker.md": "c56fa63fb94ded5f",
-  "agents/gsd-ui-researcher.md": "daa5ef704ff55753",
+  "agents/gsd-ui-researcher.md": "25ffa7fa83c32a69",
   "agents/gsd-user-profiler.md": "ca3bf75581f211a0",
   "agents/gsd-verifier.md": "82d3e9015ed04017",
   "gsd-core/VERSION": "ef0deccd81a6723c",
diff --git a/tests/fixtures/golden-install-parity/kilo.json b/tests/fixtures/golden-install-parity/kilo.json
index 9394242a9..302dc5bb1 100644
--- a/tests/fixtures/golden-install-parity/kilo.json
+++ b/tests/fixtures/golden-install-parity/kilo.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "a3874d80bcbc7380",
   "agents/gsd-eval-auditor.md": "630d4cd3bd6ea195",
   "agents/gsd-eval-planner.md": "3db12cde12aeb2c1",
-  "agents/gsd-executor.md": "41575d10fe41e36a",
+  "agents/gsd-executor.md": "c9aca9129bd4cab3",
   "agents/gsd-framework-selector.md": "ad5f2c6b9bec6270",
   "agents/gsd-integration-checker.md": "c503e2f4a3d8ec05",
   "agents/gsd-intel-updater.md": "231393da62a45b2e",
diff --git a/tests/fixtures/golden-install-parity/kimi.json b/tests/fixtures/golden-install-parity/kimi.json
index 99b174f6a..b289f7ae0 100644
--- a/tests/fixtures/golden-install-parity/kimi.json
+++ b/tests/fixtures/golden-install-parity/kimi.json
@@ -33,7 +33,7 @@
   "agents/subagents/gsd-eval-auditor.yaml": "e3d868bd5fefe938",
   "agents/subagents/gsd-eval-planner.md": "70f8c5727bfb9876",
   "agents/subagents/gsd-eval-planner.yaml": "df8499f7af297ec2",
-  "agents/subagents/gsd-executor.md": "5ad0e1b4c9cd5c7e",
+  "agents/subagents/gsd-executor.md": "278a569a7306244c",
   "agents/subagents/gsd-executor.yaml": "e29422986636fd64",
   "agents/subagents/gsd-framework-selector.md": "a15b7aa1e0576e16",
   "agents/subagents/gsd-framework-selector.yaml": "fb52c31cde27b0e3",
diff --git a/tests/fixtures/golden-install-parity/opencode.json b/tests/fixtures/golden-install-parity/opencode.json
index edf5af8c4..de87b3b82 100644
--- a/tests/fixtures/golden-install-parity/opencode.json
+++ b/tests/fixtures/golden-install-parity/opencode.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "71250e759ca9e723",
   "agents/gsd-eval-auditor.md": "c88890105f32ace6",
   "agents/gsd-eval-planner.md": "60bddb70a937f796",
-  "agents/gsd-executor.md": "70fddc081560944d",
+  "agents/gsd-executor.md": "b091b0126895ae03",
   "agents/gsd-framework-selector.md": "1c0a10355e787675",
   "agents/gsd-integration-checker.md": "a9de5928e5a5c649",
   "agents/gsd-intel-updater.md": "493e07482fa6198a",
diff --git a/tests/fixtures/golden-install-parity/qwen.json b/tests/fixtures/golden-install-parity/qwen.json
index c2f3eb0b6..f81102328 100644
--- a/tests/fixtures/golden-install-parity/qwen.json
+++ b/tests/fixtures/golden-install-parity/qwen.json
@@ -1,8 +1,8 @@
 {
   ".gsd-profile": "0e716a5fef4e6dc1",
   ".gsd/defaults.json": "560664b045e645cb",
-  "agents/gsd-advisor-researcher.md": "f3f0a55854689045",
-  "agents/gsd-ai-researcher.md": "72f67082f35c9da1",
+  "agents/gsd-advisor-researcher.md": "f1c4a47d3d8cea72",
+  "agents/gsd-ai-researcher.md": "08847faf5494ff08",
   "agents/gsd-assumptions-analyzer.md": "f11a80795163bb5d",
   "agents/gsd-code-fixer.md": "5660b5d7a912dbac",
   "agents/gsd-code-reviewer.md": "f70ee630a166fec8",
@@ -13,26 +13,26 @@
   "agents/gsd-doc-synthesizer.md": "8e6fb8220f777022",
   "agents/gsd-doc-verifier.md": "3767850df78f4a36",
   "agents/gsd-doc-writer.md": "10962b6bd4212379",
-  "agents/gsd-domain-researcher.md": "d4c07520f650ffd5",
+  "agents/gsd-domain-researcher.md": "412cdbb05ba252ea",
   "agents/gsd-eval-auditor.md": "2d121dbec93fd4ce",
   "agents/gsd-eval-planner.md": "03448fc9c5774b56",
-  "agents/gsd-executor.md": "7c8fe1370531a609",
+  "agents/gsd-executor.md": "0735dcf053be7c76",
   "agents/gsd-framework-selector.md": "ea9981d65d6b3429",
   "agents/gsd-integration-checker.md": "33fd537b862eb944",
   "agents/gsd-intel-updater.md": "699dacdc0a1f2478",
   "agents/gsd-mempalace-curator.md": "399e90e473b33814",
   "agents/gsd-nyquist-auditor.md": "7fb0ecf639c1cdfe",
   "agents/gsd-pattern-mapper.md": "9ab071c3ffc1cf46",
-  "agents/gsd-phase-researcher.md": "b064bc7bb4881443",
+  "agents/gsd-phase-researcher.md": "ecb365e5f62aaafc",
   "agents/gsd-plan-checker.md": "ca47fdf6d4a36849",
-  "agents/gsd-planner.md": "358edac30c2edf06",
-  "agents/gsd-project-researcher.md": "b0f23dcd0f383907",
+  "agents/gsd-planner.md": "7cb18e515bab3c05",
+  "agents/gsd-project-researcher.md": "d38509cab69224d9",
   "agents/gsd-research-synthesizer.md": "6d64fce8b06b7a62",
   "agents/gsd-roadmapper.md": "604b25c6687811f4",
   "agents/gsd-security-auditor.md": "f85447e5b5300feb",
   "agents/gsd-ui-auditor.md": "cc46d104cbc49079",
   "agents/gsd-ui-checker.md": "8f140c80fc193e13",
-  "agents/gsd-ui-researcher.md": "c2e93ad96d0a93e1",
+  "agents/gsd-ui-researcher.md": "623cb59aa6dbe146",
   "agents/gsd-user-profiler.md": "ca3bf75581f211a0",
   "agents/gsd-verifier.md": "45c450b6d7cc5f0d",
   "gsd-core/VERSION": "ef0deccd81a6723c",
diff --git a/tests/fixtures/golden-install-parity/trae.json b/tests/fixtures/golden-install-parity/trae.json
index 2debe0ec7..89e5f358f 100644
--- a/tests/fixtures/golden-install-parity/trae.json
+++ b/tests/fixtures/golden-install-parity/trae.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "b80f76874c04e515",
   "agents/gsd-eval-auditor.md": "470bf16303ec4d2e",
   "agents/gsd-eval-planner.md": "22334fde85723c9d",
-  "agents/gsd-executor.md": "a918ba64279d1a8c",
+  "agents/gsd-executor.md": "45eeb443a6e6dbe8",
   "agents/gsd-framework-selector.md": "7726fccc86bfeb50",
   "agents/gsd-integration-checker.md": "7cd2072984411c7f",
   "agents/gsd-intel-updater.md": "83de6ba9172891c3",
diff --git a/tests/fixtures/golden-install-parity/windsurf.json b/tests/fixtures/golden-install-parity/windsurf.json
index af04dbed3..32a327a0a 100644
--- a/tests/fixtures/golden-install-parity/windsurf.json
+++ b/tests/fixtures/golden-install-parity/windsurf.json
@@ -16,7 +16,7 @@
   "agents/gsd-domain-researcher.md": "56395dbdabf076f6",
   "agents/gsd-eval-auditor.md": "fb64fc5acf359747",
   "agents/gsd-eval-planner.md": "2049dac060d00eda",
-  "agents/gsd-executor.md": "56ad34feb3cf5f12",
+  "agents/gsd-executor.md": "406fdcc0597bea77",
   "agents/gsd-framework-selector.md": "4b77eebbe9288d80",
   "agents/gsd-integration-checker.md": "4ffb37fb230c2b90",
   "agents/gsd-intel-updater.md": "a81d77c143c02108",