diff --git a/.changeset/2269-query-commit-files-scoping.md b/.changeset/2269-query-commit-files-scoping.md
new file mode 100644
index 000000000..d1ee79434
--- /dev/null
+++ b/.changeset/2269-query-commit-files-scoping.md
@@ -0,0 +1,5 @@
+---
+type: Fixed
+pr: 2549
+---
+**`secure-phase`, `validate-phase`, and `next` workflows now scope their `query commit` calls** — all three pass `--files` with the specific artifact path, preventing the blanket `git add .planning/` default branch from sweeping unrelated staged or unstaged files into a commit whose message describes a single artifact. Previously, these three call sites (out of 65 total) were the only ones omitting `--files`, causing #2112's commit-scoping fix to never reach them. (#2269)
diff --git a/gsd-core/workflows/next.md b/gsd-core/workflows/next.md
index 7d56098cd..63b36bc5e 100644
--- a/gsd-core/workflows/next.md
+++ b/gsd-core/workflows/next.md
@@ -187,7 +187,8 @@ Choice [S]:
 ```
 2. Commit the deferral record:
 ```bash
-gsd_run query commit "docs: defer incomplete Phase {src} items to backlog"
+gsd_run query commit "docs: defer incomplete Phase {src} items to backlog" \
+  --files .planning/ROADMAP.md
 ```
 3. Continue routing to `determine_next_action` immediately — no second prompt.
 
diff --git a/gsd-core/workflows/secure-phase.md b/gsd-core/workflows/secure-phase.md
index 85e96c73d..4b2e3220f 100644
--- a/gsd-core/workflows/secure-phase.md
+++ b/gsd-core/workflows/secure-phase.md
@@ -162,7 +162,8 @@ Do NOT emit next-phase routing. Stop here.
 ## 7. Commit
 
 ```bash
-gsd_run query commit "docs(phase-${PHASE}): add/update security threat verification"
+gsd_run query commit "docs(phase-${PHASE}): add/update security threat verification" \
+  --files "${PHASE_DIR}/${PADDED_PHASE}-SECURITY.md"
 ```
 
 ## 8. Results + Routing
diff --git a/gsd-core/workflows/validate-phase.md b/gsd-core/workflows/validate-phase.md
index c4d95d056..8b397b45e 100644
--- a/gsd-core/workflows/validate-phase.md
+++ b/gsd-core/workflows/validate-phase.md
@@ -150,7 +150,8 @@ Handle return:
 git add {test_files}
 git commit -m "test(phase-${PHASE}): add Nyquist validation tests"
 
-gsd_run query commit "docs(phase-${PHASE}): add/update validation strategy"
+gsd_run query commit "docs(phase-${PHASE}): add/update validation strategy" \
+  --files "${PHASE_DIR}/${PADDED_PHASE}-VALIDATION.md"
 ```
 
 ## 8. Results + Routing
diff --git a/tests/commands.test.cjs b/tests/commands.test.cjs
index dfaccd332..9408df4cf 100644
--- a/tests/commands.test.cjs
+++ b/tests/commands.test.cjs
@@ -3551,3 +3551,37 @@ describe('feat-488: effort sync command', () => {
 });
   });
 }
+
+describe('query commit --files scoping (#2269)', () => {
+  const REPO_ROOT = path.join(__dirname, '..');
+
+  test('secure-phase.md passes --files to its query commit call', () => {
+    const content = fs.readFileSync(
+      path.join(REPO_ROOT, 'gsd-core', 'workflows', 'secure-phase.md'), 'utf-8'
+    );
+    const idx = content.indexOf('add/update security threat verification');
+    assert.notEqual(idx, -1, 'must contain the security commit message');
+    assert.match(content.slice(idx, idx + 200), /--files/);
+    assert.match(content.slice(idx, idx + 200), /SECURITY\.md/);
+  });
+
+  test('validate-phase.md passes --files to its query commit call', () => {
+    const content = fs.readFileSync(
+      path.join(REPO_ROOT, 'gsd-core', 'workflows', 'validate-phase.md'), 'utf-8'
+    );
+    const idx = content.indexOf('add/update validation strategy');
+    assert.notEqual(idx, -1, 'must contain the validation commit message');
+    assert.match(content.slice(idx, idx + 200), /--files/);
+    assert.match(content.slice(idx, idx + 200), /VALIDATION\.md/);
+  });
+
+  test('next.md passes --files to its deferral query commit call', () => {
+    const content = fs.readFileSync(
+      path.join(REPO_ROOT, 'gsd-core', 'workflows', 'next.md'), 'utf-8'
+    );
+    const idx = content.indexOf('defer incomplete Phase');
+    assert.notEqual(idx, -1, 'must contain the deferral commit message');
+    assert.match(content.slice(idx, idx + 200), /--files/);
+    assert.match(content.slice(idx, idx + 200), /ROADMAP\.md/);
+  });
+});
diff --git a/tests/fixtures/golden-install-parity/antigravity.json b/tests/fixtures/golden-install-parity/antigravity.json
index 839a21c82..94278bb24 100644
--- a/tests/fixtures/golden-install-parity/antigravity.json
+++ b/tests/fixtures/golden-install-parity/antigravity.json
@@ -279,7 +279,7 @@
   "gsd-core/workflows/new-milestone.md": "fbfbcc14973d70df",
   "gsd-core/workflows/new-project.md": "eaf48c830234bfe2",
   "gsd-core/workflows/new-workspace.md": "2310910fea2368db",
-  "gsd-core/workflows/next.md": "8beefb4335dd7c41",
+  "gsd-core/workflows/next.md": "2efc12058dee2d29",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "3ce09c0aa0a20599",
   "gsd-core/workflows/onboard.md": "af12b0573b14ce7f",
@@ -301,7 +301,7 @@
   "gsd-core/workflows/resume-project.md": "98e2cf8908e73a52",
   "gsd-core/workflows/review.md": "cb4ed7b2b77bba35",
   "gsd-core/workflows/scan.md": "46c5a73f6f682023",
-  "gsd-core/workflows/secure-phase.md": "c2d2c8fbcb0f075b",
+  "gsd-core/workflows/secure-phase.md": "9564c529052d1d36",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "6d25100a9de15b31",
   "gsd-core/workflows/settings-integrations.md": "e1fda52e8c9afa5f",
@@ -322,7 +322,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "d8e92b0b7214eba6",
   "gsd-core/workflows/undo.md": "a2c65d90d5761f71",
   "gsd-core/workflows/update.md": "61e8f7c4f63444ae",
-  "gsd-core/workflows/validate-phase.md": "abb15e224972a28c",
+  "gsd-core/workflows/validate-phase.md": "e9132dd11931c17a",
   "gsd-core/workflows/verify-phase.md": "913acaef091797d7",
   "gsd-core/workflows/verify-work.md": "85a9049781916dd2",
   "hooks/gsd-check-update-worker.js": "fa301e6366270d5f",
diff --git a/tests/fixtures/golden-install-parity/augment.json b/tests/fixtures/golden-install-parity/augment.json
index 521b906a3..64d643659 100644
--- a/tests/fixtures/golden-install-parity/augment.json
+++ b/tests/fixtures/golden-install-parity/augment.json
@@ -350,7 +350,7 @@
   "gsd-core/workflows/new-milestone.md": "b0a1fd443cd87be9",
   "gsd-core/workflows/new-project.md": "898e223f4f734b86",
   "gsd-core/workflows/new-workspace.md": "bbeb706c7a697617",
-  "gsd-core/workflows/next.md": "13fb800f2472d970",
+  "gsd-core/workflows/next.md": "4e1eb6b46d15798d",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "5a99eb396c744619",
   "gsd-core/workflows/onboard.md": "f29c4fbef3b473fd",
@@ -372,7 +372,7 @@
   "gsd-core/workflows/resume-project.md": "f28da1200e4545f4",
   "gsd-core/workflows/review.md": "d4f26b05b3eff7f6",
   "gsd-core/workflows/scan.md": "e1c12d542e61720d",
-  "gsd-core/workflows/secure-phase.md": "d013bdacbff2e83f",
+  "gsd-core/workflows/secure-phase.md": "fda2361739e511ee",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "effcef778d4a855f",
@@ -393,7 +393,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0fb8291153e3937d",
   "gsd-core/workflows/undo.md": "1712417bade30b30",
   "gsd-core/workflows/update.md": "947c8b421de2eb59",
-  "gsd-core/workflows/validate-phase.md": "4567a344b82943f0",
+  "gsd-core/workflows/validate-phase.md": "f0d668993e788ca4",
   "gsd-core/workflows/verify-phase.md": "d26a2c3269340caf",
   "gsd-core/workflows/verify-work.md": "2d54aaa040086f12",
   "hooks/gsd-check-update-worker.js": "cc1ef5f840f9dfc9",
diff --git a/tests/fixtures/golden-install-parity/claude-local.json b/tests/fixtures/golden-install-parity/claude-local.json
index 8b23c2aaa..7134aa466 100644
--- a/tests/fixtures/golden-install-parity/claude-local.json
+++ b/tests/fixtures/golden-install-parity/claude-local.json
@@ -349,7 +349,7 @@
   "gsd-core/workflows/new-milestone.md": "2353977cd96cb9c0",
   "gsd-core/workflows/new-project.md": "027ab5ac84a1be74",
   "gsd-core/workflows/new-workspace.md": "8ec67b5bc4c3f95a",
-  "gsd-core/workflows/next.md": "1193222c5618d3db",
+  "gsd-core/workflows/next.md": "cbb891feeeff0c5f",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "a2cc926854a5666c",
   "gsd-core/workflows/onboard.md": "f7d0dbcfd94ab130",
@@ -371,7 +371,7 @@
   "gsd-core/workflows/resume-project.md": "af9761bcec0f6fe9",
   "gsd-core/workflows/review.md": "9eb81c7c61cfe50e",
   "gsd-core/workflows/scan.md": "686e787d3704db90",
-  "gsd-core/workflows/secure-phase.md": "befd6baf34910bf1",
+  "gsd-core/workflows/secure-phase.md": "a7272ff8163a61ac",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "94d61da368e9f85b",
   "gsd-core/workflows/settings-integrations.md": "9e0108e01e78832c",
@@ -392,7 +392,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "b926ba7e4de0c76d",
   "gsd-core/workflows/undo.md": "71ee46d4ab85e5c4",
   "gsd-core/workflows/update.md": "0e01b1dc9a2c61fa",
-  "gsd-core/workflows/validate-phase.md": "b4ee295d2102f138",
+  "gsd-core/workflows/validate-phase.md": "7ac06d80f4696d5e",
   "gsd-core/workflows/verify-phase.md": "90773de32a966c85",
   "gsd-core/workflows/verify-work.md": "02b5c5a85e82da82",
   "hooks/gsd-check-update-worker.js": "a530efdb5fdc0da3",
diff --git a/tests/fixtures/golden-install-parity/claude.json b/tests/fixtures/golden-install-parity/claude.json
index cca3f9da6..73f12b434 100644
--- a/tests/fixtures/golden-install-parity/claude.json
+++ b/tests/fixtures/golden-install-parity/claude.json
@@ -278,7 +278,7 @@
   "gsd-core/workflows/new-milestone.md": "2c282e8f89286132",
   "gsd-core/workflows/new-project.md": "a99d35ce56607add",
   "gsd-core/workflows/new-workspace.md": "63ab4cb51ad88df4",
-  "gsd-core/workflows/next.md": "ef30b829a6d5c5f6",
+  "gsd-core/workflows/next.md": "f6aeff5f3f9fea15",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "42b66686b2c102cb",
   "gsd-core/workflows/onboard.md": "0f0af11294d31715",
@@ -300,7 +300,7 @@
   "gsd-core/workflows/resume-project.md": "7f8dc986f0f35d96",
   "gsd-core/workflows/review.md": "bba666ebc5e13130",
   "gsd-core/workflows/scan.md": "a71e3009998cfc57",
-  "gsd-core/workflows/secure-phase.md": "dcc409271014a9c9",
+  "gsd-core/workflows/secure-phase.md": "ba807b4862d7f3c9",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "339def28c34b0797",
   "gsd-core/workflows/settings-integrations.md": "9c9db643112b2371",
@@ -321,7 +321,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "328664400a001fd5",
   "gsd-core/workflows/undo.md": "894deb5d28769ac9",
   "gsd-core/workflows/update.md": "aad041e79d84b189",
-  "gsd-core/workflows/validate-phase.md": "70df7690c9266ec6",
+  "gsd-core/workflows/validate-phase.md": "f61fd88b2ef36747",
   "gsd-core/workflows/verify-phase.md": "b8cca6ef3be502b9",
   "gsd-core/workflows/verify-work.md": "a89e17c8e0838aaa",
   "hooks/gsd-check-update-worker.js": "a530efdb5fdc0da3",
diff --git a/tests/fixtures/golden-install-parity/cline.json b/tests/fixtures/golden-install-parity/cline.json
index ab3f8ae7f..4e6eff4e0 100644
--- a/tests/fixtures/golden-install-parity/cline.json
+++ b/tests/fixtures/golden-install-parity/cline.json
@@ -282,7 +282,7 @@
   "gsd-core/workflows/new-milestone.md": "3b3c9609f5c7a806",
   "gsd-core/workflows/new-project.md": "a2e6de4be78c4e10",
   "gsd-core/workflows/new-workspace.md": "dc67033c5ad37f97",
-  "gsd-core/workflows/next.md": "3f8b61a35587a021",
+  "gsd-core/workflows/next.md": "090a6db8989952dd",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "5a99eb396c744619",
   "gsd-core/workflows/onboard.md": "f29c4fbef3b473fd",
@@ -304,7 +304,7 @@
   "gsd-core/workflows/resume-project.md": "e23981178fa37b3d",
   "gsd-core/workflows/review.md": "b1c5ebc05398ca45",
   "gsd-core/workflows/scan.md": "f0bd2f64f5530598",
-  "gsd-core/workflows/secure-phase.md": "788b97bfac1a20a2",
+  "gsd-core/workflows/secure-phase.md": "1a2e389991fc6263",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "69f3a19bf2c61160",
   "gsd-core/workflows/settings-integrations.md": "a2682897e663fec4",
@@ -325,7 +325,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "ceff456b1e9d94d8",
   "gsd-core/workflows/undo.md": "8de0e036f58d9b17",
   "gsd-core/workflows/update.md": "387f9721372101a0",
-  "gsd-core/workflows/validate-phase.md": "511bde302dfef8d4",
+  "gsd-core/workflows/validate-phase.md": "45d3f0b681c347bf",
   "gsd-core/workflows/verify-phase.md": "a8b3c15e7ef9c394",
   "gsd-core/workflows/verify-work.md": "d777343a22a84c38",
   "scripts/changeset/README.md": "86ff89331dfd94b2",
diff --git a/tests/fixtures/golden-install-parity/codebuddy.json b/tests/fixtures/golden-install-parity/codebuddy.json
index d4897073f..dfa13918e 100644
--- a/tests/fixtures/golden-install-parity/codebuddy.json
+++ b/tests/fixtures/golden-install-parity/codebuddy.json
@@ -350,7 +350,7 @@
   "gsd-core/workflows/new-milestone.md": "b0a1fd443cd87be9",
   "gsd-core/workflows/new-project.md": "284629ee1f4b702e",
   "gsd-core/workflows/new-workspace.md": "bbeb706c7a697617",
-  "gsd-core/workflows/next.md": "13fb800f2472d970",
+  "gsd-core/workflows/next.md": "4e1eb6b46d15798d",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "5a99eb396c744619",
   "gsd-core/workflows/onboard.md": "f29c4fbef3b473fd",
@@ -372,7 +372,7 @@
   "gsd-core/workflows/resume-project.md": "f28da1200e4545f4",
   "gsd-core/workflows/review.md": "d4f26b05b3eff7f6",
   "gsd-core/workflows/scan.md": "e1c12d542e61720d",
-  "gsd-core/workflows/secure-phase.md": "d013bdacbff2e83f",
+  "gsd-core/workflows/secure-phase.md": "fda2361739e511ee",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "effcef778d4a855f",
@@ -393,7 +393,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0fb8291153e3937d",
   "gsd-core/workflows/undo.md": "1712417bade30b30",
   "gsd-core/workflows/update.md": "94e31cb2aa350edd",
-  "gsd-core/workflows/validate-phase.md": "4567a344b82943f0",
+  "gsd-core/workflows/validate-phase.md": "f0d668993e788ca4",
   "gsd-core/workflows/verify-phase.md": "d26a2c3269340caf",
   "gsd-core/workflows/verify-work.md": "2d54aaa040086f12",
   "hooks/gsd-check-update-worker.js": "bdc9324a2f080ddd",
diff --git a/tests/fixtures/golden-install-parity/codex.json b/tests/fixtures/golden-install-parity/codex.json
index 2edf5e83f..50df5bcfb 100644
--- a/tests/fixtures/golden-install-parity/codex.json
+++ b/tests/fixtures/golden-install-parity/codex.json
@@ -385,7 +385,7 @@
   "gsd-core/workflows/new-milestone.md": "1adcd8cb6e5869d8",
   "gsd-core/workflows/new-project.md": "9d88a3fb0a572d31",
   "gsd-core/workflows/new-workspace.md": "2d9dc09dd7739921",
-  "gsd-core/workflows/next.md": "7097a9607a981086",
+  "gsd-core/workflows/next.md": "19dceee48dbf6e34",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "664da466ab989f9d",
   "gsd-core/workflows/onboard.md": "f022a379ede13512",
@@ -407,7 +407,7 @@
   "gsd-core/workflows/resume-project.md": "9965f87eb278f7f8",
   "gsd-core/workflows/review.md": "6c74f7151f41df8b",
   "gsd-core/workflows/scan.md": "dcd6aac25ef39251",
-  "gsd-core/workflows/secure-phase.md": "77d6184e2aed9582",
+  "gsd-core/workflows/secure-phase.md": "3ba89719288dd3f3",
   "gsd-core/workflows/session-report.md": "dd8fa011c9394075",
   "gsd-core/workflows/settings-advanced.md": "2431433811616f76",
   "gsd-core/workflows/settings-integrations.md": "d6d222af8690d09b",
@@ -428,7 +428,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0bafc2af27be4591",
   "gsd-core/workflows/undo.md": "bd29a3a4fbc3fdc2",
   "gsd-core/workflows/update.md": "d5323ffe252f8ed2",
-  "gsd-core/workflows/validate-phase.md": "080d4e5abdd26668",
+  "gsd-core/workflows/validate-phase.md": "286b88bb87c5050c",
   "gsd-core/workflows/verify-phase.md": "ce508f9c2242b91f",
   "gsd-core/workflows/verify-work.md": "618068315b712d29",
   "hooks/gsd-check-update.js": "ef48957eb6ac6a10",
diff --git a/tests/fixtures/golden-install-parity/copilot.json b/tests/fixtures/golden-install-parity/copilot.json
index a07486518..ce3c3042f 100644
--- a/tests/fixtures/golden-install-parity/copilot.json
+++ b/tests/fixtures/golden-install-parity/copilot.json
@@ -280,7 +280,7 @@
   "gsd-core/workflows/new-milestone.md": "2fb2e8a092aaa7af",
   "gsd-core/workflows/new-project.md": "01c30ebee8897375",
   "gsd-core/workflows/new-workspace.md": "a609b382e83c2f10",
-  "gsd-core/workflows/next.md": "81c08abb34b2da88",
+  "gsd-core/workflows/next.md": "752cb4ce1e5d31a5",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "4a5ee74cf2fc1f54",
   "gsd-core/workflows/onboard.md": "357b7ae1367560dd",
@@ -302,7 +302,7 @@
   "gsd-core/workflows/resume-project.md": "40db7f350f5866d8",
   "gsd-core/workflows/review.md": "31d6ec81b8c8dddc",
   "gsd-core/workflows/scan.md": "76aad4e70281c364",
-  "gsd-core/workflows/secure-phase.md": "a5defb907f49a219",
+  "gsd-core/workflows/secure-phase.md": "d60aa4053154e52f",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "230a658de9c017a6",
   "gsd-core/workflows/settings-integrations.md": "58acee11162b4a4e",
@@ -323,7 +323,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "7217c34dc9eaf7bb",
   "gsd-core/workflows/undo.md": "e168c2eb8f7e105c",
   "gsd-core/workflows/update.md": "c0cf121daaaa75a7",
-  "gsd-core/workflows/validate-phase.md": "27113058947d0e56",
+  "gsd-core/workflows/validate-phase.md": "4de97bc2304d8c5b",
   "gsd-core/workflows/verify-phase.md": "3fcc54a0c46e5e2f",
   "gsd-core/workflows/verify-work.md": "d9b3ee5f1166a43f",
   "hooks/gsd-session.json": "3382597f61e3a559",
diff --git a/tests/fixtures/golden-install-parity/cursor.json b/tests/fixtures/golden-install-parity/cursor.json
index 672b2783e..68d7588d7 100644
--- a/tests/fixtures/golden-install-parity/cursor.json
+++ b/tests/fixtures/golden-install-parity/cursor.json
@@ -350,7 +350,7 @@
   "gsd-core/workflows/new-milestone.md": "c81c93dcc6297739",
   "gsd-core/workflows/new-project.md": "8e6b0899b82a8156",
   "gsd-core/workflows/new-workspace.md": "4da5355de8f19485",
-  "gsd-core/workflows/next.md": "174356dcfd7c6c32",
+  "gsd-core/workflows/next.md": "8ddf186b8970df72",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "1c1e466c764e3deb",
   "gsd-core/workflows/onboard.md": "7d0c7449b84c7997",
@@ -372,7 +372,7 @@
   "gsd-core/workflows/resume-project.md": "7f8dc986f0f35d96",
   "gsd-core/workflows/review.md": "28a82741e3e8616d",
   "gsd-core/workflows/scan.md": "a71e3009998cfc57",
-  "gsd-core/workflows/secure-phase.md": "503a309cc310f133",
+  "gsd-core/workflows/secure-phase.md": "b008216148d2afac",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "bf8ea69c8f7ae019",
   "gsd-core/workflows/settings-integrations.md": "37d4212d83664224",
@@ -393,7 +393,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "466e01d65c350ef6",
   "gsd-core/workflows/undo.md": "052c99f02bb5eb0a",
   "gsd-core/workflows/update.md": "9e38bc073162bb65",
-  "gsd-core/workflows/validate-phase.md": "7ebaf5a0d25ed8e9",
+  "gsd-core/workflows/validate-phase.md": "d7bb40be38f21e83",
   "gsd-core/workflows/verify-phase.md": "b8cca6ef3be502b9",
   "gsd-core/workflows/verify-work.md": "559c919ebcb1102c",
   "hooks/gsd-cursor-post-tool.js": "019d503aee8b4a3f",
diff --git a/tests/fixtures/golden-install-parity/hermes.json b/tests/fixtures/golden-install-parity/hermes.json
index 14bf4486b..331691643 100644
--- a/tests/fixtures/golden-install-parity/hermes.json
+++ b/tests/fixtures/golden-install-parity/hermes.json
@@ -279,7 +279,7 @@
   "gsd-core/workflows/new-milestone.md": "e0a223e3a3281bae",
   "gsd-core/workflows/new-project.md": "dc9c9bea455ac096",
   "gsd-core/workflows/new-workspace.md": "5e4ace6da343b8a8",
-  "gsd-core/workflows/next.md": "8e1fa29751d96564",
+  "gsd-core/workflows/next.md": "55002eb30ab4193e",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "42b66686b2c102cb",
   "gsd-core/workflows/onboard.md": "0f0af11294d31715",
@@ -301,7 +301,7 @@
   "gsd-core/workflows/resume-project.md": "a0443839f1f83c2d",
   "gsd-core/workflows/review.md": "9a7fd3c1c2bd617d",
   "gsd-core/workflows/scan.md": "5c2370d6a8118b6c",
-  "gsd-core/workflows/secure-phase.md": "385d7d6547f21af5",
+  "gsd-core/workflows/secure-phase.md": "c087131f1dd12901",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "49be159144d7f426",
   "gsd-core/workflows/settings-integrations.md": "75405795c8462a8a",
@@ -322,7 +322,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0d103bf2622436f7",
   "gsd-core/workflows/undo.md": "0a03405c0345fcf7",
   "gsd-core/workflows/update.md": "06e3a9996f1e6d32",
-  "gsd-core/workflows/validate-phase.md": "0157b8e4d5f49287",
+  "gsd-core/workflows/validate-phase.md": "a35b1b47667347a6",
   "gsd-core/workflows/verify-phase.md": "42f0fba74d069537",
   "gsd-core/workflows/verify-work.md": "7cc10ba031a32465",
   "hooks/gsd-check-update-worker.js": "7989cc2bedd1138d",
diff --git a/tests/fixtures/golden-install-parity/kilo.json b/tests/fixtures/golden-install-parity/kilo.json
index 0cf6c169a..f565f317a 100644
--- a/tests/fixtures/golden-install-parity/kilo.json
+++ b/tests/fixtures/golden-install-parity/kilo.json
@@ -350,7 +350,7 @@
   "gsd-core/workflows/new-milestone.md": "156a0b20596f0032",
   "gsd-core/workflows/new-project.md": "ccbeff3be8b665f9",
   "gsd-core/workflows/new-workspace.md": "00162d8c32428d55",
-  "gsd-core/workflows/next.md": "888297a0b21888ea",
+  "gsd-core/workflows/next.md": "7cf4607dc8138d1f",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "f8c2842a2217f776",
   "gsd-core/workflows/onboard.md": "c8d9795021d4fce6",
@@ -372,7 +372,7 @@
   "gsd-core/workflows/resume-project.md": "7f8dc986f0f35d96",
   "gsd-core/workflows/review.md": "9299d96d44252a8a",
   "gsd-core/workflows/scan.md": "c039d3e40d26b606",
-  "gsd-core/workflows/secure-phase.md": "dc542d529fbd0772",
+  "gsd-core/workflows/secure-phase.md": "5a8fbf603d218100",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "edd858cd6cfddaf1",
   "gsd-core/workflows/settings-integrations.md": "3ec4f77c421b87b4",
@@ -393,7 +393,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "29245758b8497fa0",
   "gsd-core/workflows/undo.md": "774615a01c20e4a3",
   "gsd-core/workflows/update.md": "af593557256e1f84",
-  "gsd-core/workflows/validate-phase.md": "ea0c6d44e3e79e19",
+  "gsd-core/workflows/validate-phase.md": "f7e33b52f1af1bfc",
   "gsd-core/workflows/verify-phase.md": "b8cca6ef3be502b9",
   "gsd-core/workflows/verify-work.md": "156b5d5245e5ce05",
   "hooks/gsd-check-update-worker.js": "c992bbad91d0e994",
diff --git a/tests/fixtures/golden-install-parity/kimi-code.json b/tests/fixtures/golden-install-parity/kimi-code.json
index da2fc3f31..4dddfe074 100644
--- a/tests/fixtures/golden-install-parity/kimi-code.json
+++ b/tests/fixtures/golden-install-parity/kimi-code.json
@@ -307,7 +307,7 @@
   "gsd-core/workflows/new-milestone.md": "b0a1fd443cd87be9",
   "gsd-core/workflows/new-project.md": "d07531f488577651",
   "gsd-core/workflows/new-workspace.md": "bbeb706c7a697617",
-  "gsd-core/workflows/next.md": "13fb800f2472d970",
+  "gsd-core/workflows/next.md": "4e1eb6b46d15798d",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "5a99eb396c744619",
   "gsd-core/workflows/onboard.md": "f29c4fbef3b473fd",
@@ -329,7 +329,7 @@
   "gsd-core/workflows/resume-project.md": "f28da1200e4545f4",
   "gsd-core/workflows/review.md": "d4f26b05b3eff7f6",
   "gsd-core/workflows/scan.md": "e1c12d542e61720d",
-  "gsd-core/workflows/secure-phase.md": "d013bdacbff2e83f",
+  "gsd-core/workflows/secure-phase.md": "fda2361739e511ee",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "effcef778d4a855f",
@@ -350,7 +350,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0fb8291153e3937d",
   "gsd-core/workflows/undo.md": "1712417bade30b30",
   "gsd-core/workflows/update.md": "eab6ce95ff7bdee1",
-  "gsd-core/workflows/validate-phase.md": "4567a344b82943f0",
+  "gsd-core/workflows/validate-phase.md": "f0d668993e788ca4",
   "gsd-core/workflows/verify-phase.md": "d26a2c3269340caf",
   "gsd-core/workflows/verify-work.md": "2d54aaa040086f12",
   "scripts/changeset/README.md": "86ff89331dfd94b2",
diff --git a/tests/fixtures/golden-install-parity/kimi.json b/tests/fixtures/golden-install-parity/kimi.json
index 3c9d06a11..1b8a321dd 100644
--- a/tests/fixtures/golden-install-parity/kimi.json
+++ b/tests/fixtures/golden-install-parity/kimi.json
@@ -343,7 +343,7 @@
   "gsd-core/workflows/new-milestone.md": "b0a1fd443cd87be9",
   "gsd-core/workflows/new-project.md": "d07531f488577651",
   "gsd-core/workflows/new-workspace.md": "bbeb706c7a697617",
-  "gsd-core/workflows/next.md": "13fb800f2472d970",
+  "gsd-core/workflows/next.md": "4e1eb6b46d15798d",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "5a99eb396c744619",
   "gsd-core/workflows/onboard.md": "f29c4fbef3b473fd",
@@ -365,7 +365,7 @@
   "gsd-core/workflows/resume-project.md": "f28da1200e4545f4",
   "gsd-core/workflows/review.md": "d4f26b05b3eff7f6",
   "gsd-core/workflows/scan.md": "e1c12d542e61720d",
-  "gsd-core/workflows/secure-phase.md": "d013bdacbff2e83f",
+  "gsd-core/workflows/secure-phase.md": "fda2361739e511ee",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "effcef778d4a855f",
@@ -386,7 +386,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0fb8291153e3937d",
   "gsd-core/workflows/undo.md": "1712417bade30b30",
   "gsd-core/workflows/update.md": "eab6ce95ff7bdee1",
-  "gsd-core/workflows/validate-phase.md": "4567a344b82943f0",
+  "gsd-core/workflows/validate-phase.md": "f0d668993e788ca4",
   "gsd-core/workflows/verify-phase.md": "d26a2c3269340caf",
   "gsd-core/workflows/verify-work.md": "2d54aaa040086f12",
   "scripts/changeset/README.md": "86ff89331dfd94b2",
diff --git a/tests/fixtures/golden-install-parity/opencode.json b/tests/fixtures/golden-install-parity/opencode.json
index 4b356bc4b..d7c0ac008 100644
--- a/tests/fixtures/golden-install-parity/opencode.json
+++ b/tests/fixtures/golden-install-parity/opencode.json
@@ -350,7 +350,7 @@
   "gsd-core/workflows/new-milestone.md": "372aa3a92916398e",
   "gsd-core/workflows/new-project.md": "b04ffce6846ab6b7",
   "gsd-core/workflows/new-workspace.md": "53f8abf8baca9345",
-  "gsd-core/workflows/next.md": "6719a37b8ce2ac4f",
+  "gsd-core/workflows/next.md": "8975ad00f87f90dc",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "0d1374f2a2257858",
   "gsd-core/workflows/onboard.md": "ca3a59a2e36b829a",
@@ -372,7 +372,7 @@
   "gsd-core/workflows/resume-project.md": "ad9f06a10bab8cc0",
   "gsd-core/workflows/review.md": "a2c5d053c8ef6e27",
   "gsd-core/workflows/scan.md": "cbfb79df855e5e61",
-  "gsd-core/workflows/secure-phase.md": "903d3974a525fa68",
+  "gsd-core/workflows/secure-phase.md": "ef09f40dfd4d2424",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "252b0d3edc315339",
   "gsd-core/workflows/settings-integrations.md": "1c3997dc6953e7eb",
@@ -393,7 +393,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "f4bad8de3fdb49fa",
   "gsd-core/workflows/undo.md": "bbb91a18ee896975",
   "gsd-core/workflows/update.md": "7af09036dc7b5f98",
-  "gsd-core/workflows/validate-phase.md": "a886359f009405ed",
+  "gsd-core/workflows/validate-phase.md": "2dc5eca30bf7a6c6",
   "gsd-core/workflows/verify-phase.md": "73025aa5d8bf7bd5",
   "gsd-core/workflows/verify-work.md": "11c352fbb54b1f81",
   "hooks/gsd-check-update-worker.js": "385fb7c67810baf6",
diff --git a/tests/fixtures/golden-install-parity/pi.json b/tests/fixtures/golden-install-parity/pi.json
index 03305acb5..434d04554 100644
--- a/tests/fixtures/golden-install-parity/pi.json
+++ b/tests/fixtures/golden-install-parity/pi.json
@@ -246,7 +246,7 @@
   "gsd-core/workflows/new-milestone.md": "b0a1fd443cd87be9",
   "gsd-core/workflows/new-project.md": "422a46888410ace6",
   "gsd-core/workflows/new-workspace.md": "bbeb706c7a697617",
-  "gsd-core/workflows/next.md": "13fb800f2472d970",
+  "gsd-core/workflows/next.md": "4e1eb6b46d15798d",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "5a99eb396c744619",
   "gsd-core/workflows/onboard.md": "f29c4fbef3b473fd",
@@ -268,7 +268,7 @@
   "gsd-core/workflows/resume-project.md": "f28da1200e4545f4",
   "gsd-core/workflows/review.md": "d4f26b05b3eff7f6",
   "gsd-core/workflows/scan.md": "e1c12d542e61720d",
-  "gsd-core/workflows/secure-phase.md": "d013bdacbff2e83f",
+  "gsd-core/workflows/secure-phase.md": "fda2361739e511ee",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "effcef778d4a855f",
@@ -289,7 +289,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0fb8291153e3937d",
   "gsd-core/workflows/undo.md": "1712417bade30b30",
   "gsd-core/workflows/update.md": "2873b4beea839838",
-  "gsd-core/workflows/validate-phase.md": "4567a344b82943f0",
+  "gsd-core/workflows/validate-phase.md": "f0d668993e788ca4",
   "gsd-core/workflows/verify-phase.md": "d26a2c3269340caf",
   "gsd-core/workflows/verify-work.md": "2d54aaa040086f12",
   "hooks/gsd-check-update-worker.js": "55376b5b9335a580",
diff --git a/tests/fixtures/golden-install-parity/qwen.json b/tests/fixtures/golden-install-parity/qwen.json
index 4b0d98709..bcb3b3349 100644
--- a/tests/fixtures/golden-install-parity/qwen.json
+++ b/tests/fixtures/golden-install-parity/qwen.json
@@ -279,7 +279,7 @@
   "gsd-core/workflows/new-milestone.md": "cdd87db7f6f4f9c2",
   "gsd-core/workflows/new-project.md": "244e9f9fa7095778",
   "gsd-core/workflows/new-workspace.md": "0b93348ced44810e",
-  "gsd-core/workflows/next.md": "c13515a80c20d37d",
+  "gsd-core/workflows/next.md": "0899cbefaefda97b",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "42b66686b2c102cb",
   "gsd-core/workflows/onboard.md": "0f0af11294d31715",
@@ -301,7 +301,7 @@
   "gsd-core/workflows/resume-project.md": "7f20769f302e5427",
   "gsd-core/workflows/review.md": "5b59389282a276fc",
   "gsd-core/workflows/scan.md": "b7efd0d381a3b8a5",
-  "gsd-core/workflows/secure-phase.md": "015fdb01932bd3f5",
+  "gsd-core/workflows/secure-phase.md": "f7bfa7175102af31",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "5e05212fb5cba531",
   "gsd-core/workflows/settings-integrations.md": "c9fb71d26fd93527",
@@ -322,7 +322,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "49921383982474e0",
   "gsd-core/workflows/undo.md": "c433a552dab136dc",
   "gsd-core/workflows/update.md": "ef757d600e333764",
-  "gsd-core/workflows/validate-phase.md": "47c1de5fdc673e8d",
+  "gsd-core/workflows/validate-phase.md": "a21893dfba484e61",
   "gsd-core/workflows/verify-phase.md": "7d8e241350136ca0",
   "gsd-core/workflows/verify-work.md": "596ad334cb1f066c",
   "hooks/gsd-check-update-worker.js": "4bb354044e0dff91",
diff --git a/tests/fixtures/golden-install-parity/trae.json b/tests/fixtures/golden-install-parity/trae.json
index b3f0fea41..78a5cb048 100644
--- a/tests/fixtures/golden-install-parity/trae.json
+++ b/tests/fixtures/golden-install-parity/trae.json
@@ -279,7 +279,7 @@
   "gsd-core/workflows/new-milestone.md": "45a240055c9edffc",
   "gsd-core/workflows/new-project.md": "7826a26bc45c18d1",
   "gsd-core/workflows/new-workspace.md": "89e5df89d54a2f47",
-  "gsd-core/workflows/next.md": "2163195861877de5",
+  "gsd-core/workflows/next.md": "259c8c42c4ce622b",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "acc9130fb1e94f0b",
   "gsd-core/workflows/onboard.md": "015695a7e9cf59bc",
@@ -301,7 +301,7 @@
   "gsd-core/workflows/resume-project.md": "f242e4c8aba18ea2",
   "gsd-core/workflows/review.md": "2e10545b307c867c",
   "gsd-core/workflows/scan.md": "3b14bcb51d3a4de8",
-  "gsd-core/workflows/secure-phase.md": "df77cf37478bf67c",
+  "gsd-core/workflows/secure-phase.md": "267393d5b02b5334",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "39e66386f6c48025",
   "gsd-core/workflows/settings-integrations.md": "8bb1c2bdebbc56e6",
@@ -322,7 +322,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "77b58ef8af5209bd",
   "gsd-core/workflows/undo.md": "0222476f90d97de3",
   "gsd-core/workflows/update.md": "a633cf9f44595c58",
-  "gsd-core/workflows/validate-phase.md": "10acdd407cc3d95b",
+  "gsd-core/workflows/validate-phase.md": "4478ea061bf5b6bd",
   "gsd-core/workflows/verify-phase.md": "101bf5a6e15f0b04",
   "gsd-core/workflows/verify-work.md": "fbfbc94d06d82312",
   "scripts/changeset/README.md": "86ff89331dfd94b2",
diff --git a/tests/fixtures/golden-install-parity/windsurf.json b/tests/fixtures/golden-install-parity/windsurf.json
index 8c3029f75..5a4b6fcac 100644
--- a/tests/fixtures/golden-install-parity/windsurf.json
+++ b/tests/fixtures/golden-install-parity/windsurf.json
@@ -279,7 +279,7 @@
   "gsd-core/workflows/new-milestone.md": "2c6fbe3ba116fff1",
   "gsd-core/workflows/new-project.md": "6bfa8b2635fd09b3",
   "gsd-core/workflows/new-workspace.md": "b503e947ab08ab96",
-  "gsd-core/workflows/next.md": "d48cea140a5153cb",
+  "gsd-core/workflows/next.md": "727392fe9b42cea8",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "1c1e466c764e3deb",
   "gsd-core/workflows/onboard.md": "7d0c7449b84c7997",
@@ -301,7 +301,7 @@
   "gsd-core/workflows/resume-project.md": "82cfe1b8cb17c085",
   "gsd-core/workflows/review.md": "ac0c02f11e2ae1dc",
   "gsd-core/workflows/scan.md": "4a910da5e34f2685",
-  "gsd-core/workflows/secure-phase.md": "820b9daf356b8840",
+  "gsd-core/workflows/secure-phase.md": "d5d811bc468ce7f2",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "2f86ec7b998f9485",
   "gsd-core/workflows/settings-integrations.md": "159d0ae32b511129",
@@ -322,7 +322,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "53b77a8edf60acd0",
   "gsd-core/workflows/undo.md": "733189fb34cc026b",
   "gsd-core/workflows/update.md": "0c02d18be2ccd04d",
-  "gsd-core/workflows/validate-phase.md": "34b5558eceb84a2a",
+  "gsd-core/workflows/validate-phase.md": "037e8d2b226e010f",
   "gsd-core/workflows/verify-phase.md": "382490481d794ed5",
   "gsd-core/workflows/verify-work.md": "0fb2519e1a0b47f4",
   "hooks/gsd-windsurf-pre-command.js": "7467a8a63e354aad",
diff --git a/tests/fixtures/golden-install-parity/zcode.json b/tests/fixtures/golden-install-parity/zcode.json
index b8ba49aba..dc09c534e 100644
--- a/tests/fixtures/golden-install-parity/zcode.json
+++ b/tests/fixtures/golden-install-parity/zcode.json
@@ -350,7 +350,7 @@
   "gsd-core/workflows/new-milestone.md": "b0a1fd443cd87be9",
   "gsd-core/workflows/new-project.md": "52897d77d7349d42",
   "gsd-core/workflows/new-workspace.md": "bbeb706c7a697617",
-  "gsd-core/workflows/next.md": "13fb800f2472d970",
+  "gsd-core/workflows/next.md": "4e1eb6b46d15798d",
   "gsd-core/workflows/node-repair.md": "07a1628e5a1ff96b",
   "gsd-core/workflows/note.md": "5a99eb396c744619",
   "gsd-core/workflows/onboard.md": "f29c4fbef3b473fd",
@@ -372,7 +372,7 @@
   "gsd-core/workflows/resume-project.md": "f28da1200e4545f4",
   "gsd-core/workflows/review.md": "d4f26b05b3eff7f6",
   "gsd-core/workflows/scan.md": "e1c12d542e61720d",
-  "gsd-core/workflows/secure-phase.md": "d013bdacbff2e83f",
+  "gsd-core/workflows/secure-phase.md": "fda2361739e511ee",
   "gsd-core/workflows/session-report.md": "2e5b1205324ddefa",
   "gsd-core/workflows/settings-advanced.md": "414db4dbea97ba44",
   "gsd-core/workflows/settings-integrations.md": "effcef778d4a855f",
@@ -393,7 +393,7 @@
   "gsd-core/workflows/ultraplan-phase.md": "0fb8291153e3937d",
   "gsd-core/workflows/undo.md": "1712417bade30b30",
   "gsd-core/workflows/update.md": "3573b340820d7d4d",
-  "gsd-core/workflows/validate-phase.md": "4567a344b82943f0",
+  "gsd-core/workflows/validate-phase.md": "f0d668993e788ca4",
   "gsd-core/workflows/verify-phase.md": "d26a2c3269340caf",
   "gsd-core/workflows/verify-work.md": "2d54aaa040086f12",
   "scripts/changeset/README.md": "86ff89331dfd94b2",
diff --git a/tests/workflow-size-baseline.json b/tests/workflow-size-baseline.json
index 5664c3630..d603aafbb 100644
--- a/tests/workflow-size-baseline.json
+++ b/tests/workflow-size-baseline.json
@@ -47,7 +47,7 @@
   "new-milestone.md": 38667,
   "new-project.md": 67055,
   "new-workspace.md": 11584,
-  "next.md": 20138,
+  "next.md": 20171,
   "node-repair.md": 4173,
   "note.md": 6563,
   "onboard.md": 8877,
@@ -66,7 +66,7 @@
   "resume-project.md": 17270,
   "review.md": 51210,
   "scan.md": 8314,
-  "secure-phase.md": 14572,
+  "secure-phase.md": 14627,
   "session-report.md": 4044,
   "settings-advanced.md": 40019,
   "settings-integrations.md": 16257,
@@ -87,7 +87,7 @@
   "ultraplan-phase.md": 10512,
   "undo.md": 15323,
   "update.md": 21178,
-  "validate-phase.md": 11799,
+  "validate-phase.md": 11856,
   "verify-phase.md": 40949,
   "verify-work.md": 41318
 }