From cd5971fd3f246d1235252241e82191b2964e4aa1 Mon Sep 17 00:00:00 2001
From: Jeremy McSpadden <jeremy@fluxlabs.net>
Date: Fri, 3 Jul 2026 15:12:07 -0500
Subject: [PATCH] no-mistakes(review): Fix onboard skip handoffs

---
 gsd-core/workflows/onboard.md  | 24 ++++++++++++++++++++++--
 tests/onboard-command.test.cjs | 16 ++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/gsd-core/workflows/onboard.md b/gsd-core/workflows/onboard.md
index d955e3048..f1896fbfe 100644
--- a/gsd-core/workflows/onboard.md
+++ b/gsd-core/workflows/onboard.md
@@ -72,7 +72,17 @@ Run from worktree root {ONBOARDING_ROOT}:
 Then rerun /gsd:onboard from the same worktree root.
 ```
 
-Exit. If the user skips mapping, continue with a warning.
+Exit. If the user skips mapping, print:
+
+```text
+Skipping codebase mapping may give /gsd:new-project weaker context.
+
+Run from worktree root {ONBOARDING_ROOT}:
+
+/gsd:new-project
+```
+
+Exit.
 
 ### `ingest-docs`
 
@@ -107,7 +117,17 @@ Run from worktree root {ONBOARDING_ROOT}:
 Then rerun /gsd:onboard from the same worktree root.
 ```
 
-Exit. If the user skips docs ingest, continue to the new-project handoff below.
+Exit. If the user skips docs ingest, print:
+
+```text
+Skipping docs ingest may omit existing ADR/PRD/SPEC/RFC context from /gsd:new-project.
+
+Run from worktree root {ONBOARDING_ROOT}:
+
+/gsd:new-project
+```
+
+Exit.
 
 ### `complete-map-before-new-project`
 
diff --git a/tests/onboard-command.test.cjs b/tests/onboard-command.test.cjs
index 563a87967..10851d5e5 100644
--- a/tests/onboard-command.test.cjs
+++ b/tests/onboard-command.test.cjs
@@ -362,6 +362,22 @@ describe('/gsd:onboard command contract', () => {
 
     assert.ok(content.includes('AskUserQuestion'), 'workflow must still support interactive choices');
     assert.ok(content.includes('--text'), 'workflow must document text-mode fallback');
+    assert.ok(
+      content.includes('Exit. If the user skips mapping, print:'),
+      'skip mapping must hand off explicitly instead of falling through to summary creation',
+    );
+    assert.ok(
+      content.includes('Skipping codebase mapping may give /gsd:new-project weaker context.'),
+      'skip mapping must warn about weaker context',
+    );
+    assert.ok(
+      content.includes('Exit. If the user skips docs ingest, print:'),
+      'skip docs ingest must hand off explicitly instead of falling through to summary creation',
+    );
+    assert.ok(
+      content.includes('Skipping docs ingest may omit existing ADR/PRD/SPEC/RFC context from /gsd:new-project.'),
+      'skip docs ingest must warn about omitted docs context',
+    );
     assert.match(content, /do not overwrite/i, 'workflow must protect existing summary/planning');
     assert.match(content, /query commit "docs: create onboarding summary" --files \.planning\/onboarding\/SUMMARY\.md/);
     assert.ok(!content.includes('execute-phase'), 'onboarding must not execute implementation phases');