@opengsd/gsd-core 1.7.0-rc.1 → 1.7.0-rc.3

package/gsd-core/bin/lib/roadmap-parser.cjs

@@ -22,7 +22,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const phaseIdModule = require("./phase-id.cjs");
-const { escapeRegex, phaseMarkdownRegexSource, phaseMarkdownRegexSourceExact, stripProjectCodePrefix, OPTIONAL_PROJECT_CODE_PREFIX_SOURCE, } = phaseIdModule;
+const { escapeRegex, phaseMarkdownRegexSource, phaseMarkdownRegexSourceExact, stripProjectCodePrefix, OPTIONAL_PROJECT_CODE_PREFIX_SOURCE, OPTIONAL_PHASE_TAG_SOURCE, } = phaseIdModule;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const planningWorkspace = require("./planning-workspace.cjs");
 const { planningDir } = planningWorkspace;
@@ -82,7 +82,8 @@ function extractCurrentMilestone(content, cwd) {
                 const preambleCutoff = firstMilestoneMatch ? firstMilestoneMatch.index : detailsOpenIdx;
                 const preamble = content.slice(0, preambleCutoff)
                     .replace(/<details>[\s\S]*?<\/details>/gi, '')
-                    .replace(/^#{2,4}\s*Phase\s+[\w][\w.-]*\s*:[^\n]*(?:\n(?!#{1,6}\s)[^\n]*)*\n?/gim, '')
+                    // #1729: `(?:\s*\([^)\n]*\))?` tolerates a pre-colon ( ) tag (literal mirror of OPTIONAL_PHASE_TAG_SOURCE).
+                    .replace(/^#{2,4}\s*Phase\s+[\w][\w.-]*(?:\s*\([^)\n]*\))?\s*:[^\n]*(?:\n(?!#{1,6}\s)[^\n]*)*\n?/gim, '')
                     .replace(/^#{1,4}\s*Phase Details\b[^\n]*\n?/gim, '');
                 return preamble + content.slice(detailsOpenIdx, detailsEnd);
             }
@@ -151,7 +152,8 @@ function extractCurrentMilestone(content, cwd) {
     }
     const preamble = beforeMilestones
         .replace(/<details>[\s\S]*?<\/details>/gi, '')
-        .replace(/^#{2,4}\s*Phase\s+[\w][\w.-]*\s*:[^\n]*(?:\n(?!#{1,6}\s)[^\n]*)*\n?/gim, '')
+        // #1729: `(?:\s*\([^)\n]*\))?` tolerates a pre-colon ( ) tag (literal mirror of OPTIONAL_PHASE_TAG_SOURCE).
+        .replace(/^#{2,4}\s*Phase\s+[\w][\w.-]*(?:\s*\([^)\n]*\))?\s*:[^\n]*(?:\n(?!#{1,6}\s)[^\n]*)*\n?/gim, '')
         .replace(/^#{1,4}\s*Phase Details\b[^\n]*\n?/gim, '');
     return detailsSection
         ? preamble + currentSection + '\n' + detailsSection
@@ -171,16 +173,20 @@ function replaceInCurrentMilestone(content, pattern, replacement) {
     return before + after.replace(pattern, replacement);
 }
 function findRoadmapPhaseInContent(content, phaseNum, phaseSource) {
-    const phasePattern = new RegExp(`#{2,4}\\s*(?:\\[[^\\]]+\\]\\s*)?Phase\\s+${phaseSource ?? phaseMarkdownRegexSource(phaseNum)}:\\s*([^\\n]+)`, 'i');
-    const headerMatch = content.match(phasePattern);
+    // #1729: OPTIONAL_PHASE_TAG_SOURCE after the number tolerates a pre-colon ( ) tag.
+    const headingPattern = new RegExp(`^(?:\\[[^\\]]+\\]\\s*)?Phase\\s+${phaseSource ?? phaseMarkdownRegexSource(phaseNum)}${OPTIONAL_PHASE_TAG_SOURCE}:\\s*(.+)$`, 'i');
+    const headings = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content);
+    const headingIndex = headings.findIndex((heading) => headingPattern.test(heading.text));
+    if (headingIndex === -1)
+        return null;
+    const heading = headings[headingIndex];
+    const headerMatch = heading.text.match(headingPattern);
     if (!headerMatch)
         return null;
     const phaseName = headerMatch[1].trim();
-    const headerIndex = headerMatch.index;
-    const restOfContent = content.slice(headerIndex);
-    const nextHeaderMatch = restOfContent.match(/\n#{2,4}\s+(?:\[[^\]]+\]\s*)?Phase\s+[\w]/i);
-    const sectionEnd = nextHeaderMatch ? headerIndex + nextHeaderMatch.index : content.length;
-    const section = content.slice(headerIndex, sectionEnd).trim();
+    const nextHeading = headings.slice(headingIndex + 1).find((candidate) => candidate.level <= heading.level);
+    const sectionEnd = nextHeading ? nextHeading.offset : content.length;
+    const section = content.slice(heading.offset, sectionEnd).trim();
     const goalMatch = section.match(/\*\*Goal(?:\*\*:|\*?\*?:\*\*)\s*([^\n]+)/i);
     const goal = goalMatch ? goalMatch[1].trim() : null;
     return {
@@ -209,6 +215,9 @@ function roadmapPhaseLookupSources(phaseNum) {
 function getRoadmapPhaseInternal(cwd, phaseNum) {
     if (!phaseNum)
         return null;
+    const normalizedPhase = stripProjectCodePrefix(phaseNum);
+    if (/^999(?:\.|$)/.test(normalizedPhase))
+        return null;
     const roadmapPath = node_path_1.default.join(planningDir(cwd), 'ROADMAP.md');
     if (!node_fs_1.default.existsSync(roadmapPath))
         return null;
@@ -369,7 +378,8 @@ function getMilestonePhaseFilter(cwd, versionOverride, phaseIdConvention) {
         }
         // Use tokenizeHeadings (fence-aware) instead of stripFencedLines + regex.
         // T4 seam migration: phase headings inside fences are excluded automatically.
-        const phaseHeadingPattern = /^(?:\[[^\]]+\]\s*)?Phase\s+([\w][\w.-]*)\s*:/i;
+        // #1729: `(?:\s*\([^)\n]*\))?` tolerates a pre-colon ( ) tag (literal mirror of OPTIONAL_PHASE_TAG_SOURCE).
+        const phaseHeadingPattern = /^(?:\[[^\]]+\]\s*)?Phase\s+([\w][\w.-]*)(?:\s*\([^)\n]*\))?\s*:/i;
         for (const h of (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(roadmap)) {
             if (h.level < 2 || h.level > 4)
                 continue;

package/gsd-core/bin/lib/roadmap.cjs

@@ -17,13 +17,14 @@ const ioMod = require("./io.cjs");
 const { output, error } = ioMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const phaseIdMod = require("./phase-id.cjs");
-const { escapeRegex, normalizePhaseName, phaseMarkdownRegexSource, phaseMarkdownRegexSourceExact, phaseTokenMatches } = phaseIdMod;
+const { escapeRegex, normalizePhaseName, phaseMarkdownRegexSource, phaseMarkdownRegexSourceExact, phaseTokenMatches, stripProjectCodePrefix, OPTIONAL_PHASE_TAG_SOURCE } = phaseIdMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const phaseLocatorMod = require("./phase-locator.cjs");
 const { findPhaseInternal } = phaseLocatorMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const roadmapParserModule = require("./roadmap-parser.cjs");
 const { stripShippedMilestones, extractCurrentMilestone, replaceInCurrentMilestone } = roadmapParserModule;
+const markdown_sectionizer_cjs_1 = require("./markdown-sectionizer.cjs");
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const planningWorkspace = require("./planning-workspace.cjs");
@@ -31,8 +32,14 @@ const { planningPaths, withPlanningLock, findContextMdIn } = planningWorkspace;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const scanPhasePlans = require("./plan-scan.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
+const coreUtils = require("./core-utils.cjs");
+const { countMatchedSummaries } = coreUtils;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const frontmatter = require("./frontmatter.cjs");
 const { extractFrontmatter, parseMustHavesBlock } = frontmatter;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const verificationMod = require("./verification.cjs");
+const { readVerificationStatus } = verificationMod;
 // ─── coerceTruthToString ──────────────────────────────────────────────────────
 /**
  * Coerce an arbitrary YAML scalar/object into a string for cross-cutting
@@ -94,12 +101,14 @@ function countPhasePlansAndSummaries(phaseDir) {
  * checklist-only match), or null if the phase is not present at all.
  */
 function searchPhaseInContent(content, escapedPhase, phaseNum) {
-    // Match "## Phase X:", "### Phase X:", or "#### Phase X:" with optional name
-    const phasePattern = new RegExp(`#{2,4}\\s*(?:\\[[^\\]]+\\]\\s*)?Phase\\s+${escapedPhase}:\\s*([^\\n]+)`, 'i');
-    const headerMatch = content.match(phasePattern);
+    // #1729: OPTIONAL_PHASE_TAG_SOURCE after the number tolerates a pre-colon ( ) tag.
+    const headingPattern = new RegExp(`^(?:\\[[^\\]]+\\]\\s*)?Phase\\s+${escapedPhase}${OPTIONAL_PHASE_TAG_SOURCE}:\\s*(.+)$`, 'i');
+    const headings = (0, markdown_sectionizer_cjs_1.tokenizeHeadings)(content);
+    const headingIndex = headings.findIndex((heading) => headingPattern.test(heading.text));
+    const headerMatch = headingIndex === -1 ? null : headings[headingIndex].text.match(headingPattern);
     if (!headerMatch) {
         // Fallback: check if phase exists in summary list but missing detail section
-        const checklistPattern = new RegExp(`-\\s*\\[[ x]\\]\\s*\\*\\*Phase\\s+${escapedPhase}:\\s*([^*]+)\\*\\*`, 'i');
+        const checklistPattern = new RegExp(`-\\s*\\[[ x]\\]\\s*\\*\\*Phase\\s+${escapedPhase}${OPTIONAL_PHASE_TAG_SOURCE}:\\s*([^*]+)\\*\\*`, 'i');
         const checklistMatch = content.match(checklistPattern);
         if (checklistMatch) {
             return {
@@ -113,14 +122,12 @@ function searchPhaseInContent(content, escapedPhase, phaseNum) {
         return null;
     }
     const phaseName = headerMatch[1].trim();
-    const headerIndex = headerMatch.index;
-    // Find the end of this section (next ## or ### phase header, or end of file).
-    // Also matches bracket-prefixed headings like ### [GSD] Phase 2-01:.
-    const restOfContent = content.slice(headerIndex);
-    const nextHeaderMatch = restOfContent.match(/\n#{2,4}\s+(?:\[[^\]]+\]\s*)?Phase\s+[\w][\w.-]*/i);
-    const sectionEnd = nextHeaderMatch
-        ? headerIndex + nextHeaderMatch.index
-        : content.length;
+    const headerIndex = headings[headingIndex].offset;
+    const currentHeading = headings[headingIndex];
+    const nextHeading = headings
+        .slice(headingIndex + 1)
+        .find((candidate) => candidate.level <= currentHeading.level);
+    const sectionEnd = nextHeading ? nextHeading.offset : content.length;
     const section = content.slice(headerIndex, sectionEnd).trim();
     // Extract goal if present (supports both **Goal:** and **Goal**: formats)
     const goalMatch = section.match(/\*\*Goal(?::\*\*|\*\*:)\s*([^\n]+)/i);
@@ -159,6 +166,8 @@ function searchPhaseInContent(content, escapedPhase, phaseNum) {
  * phase resolution as `roadmap.get-phase` — not a milestone-only subset.
  */
 function getRoadmapPhaseWithFallback(cwd, phaseNum) {
+    if (/^999(?:\.|$)/.test(stripProjectCodePrefix(phaseNum)))
+        return null;
     const roadmapPath = planningPaths(cwd).roadmap;
     if (!node_fs_1.default.existsSync(roadmapPath))
         return null;
@@ -185,6 +194,10 @@ function getRoadmapPhaseWithFallback(cwd, phaseNum) {
 }
 // ─── cmdRoadmapGetPhase ───────────────────────────────────────────────────────
 function cmdRoadmapGetPhase(cwd, phaseNum, raw) {
+    if (/^999(?:\.|$)/.test(stripProjectCodePrefix(phaseNum))) {
+        output({ found: false, phase_number: phaseNum }, raw, '');
+        return;
+    }
     const roadmapPath = planningPaths(cwd).roadmap;
     if (!node_fs_1.default.existsSync(roadmapPath)) {
         output({ found: false, error: 'ROADMAP.md not found' }, raw, '');
@@ -249,7 +262,8 @@ function cmdRoadmapAnalyze(cwd, raw) {
     const content = extractCurrentMilestone(rawContent, cwd);
     const phasesDir = planningPaths(cwd).phases;
     // Extract all phase headings: ## Phase N: Name or ### Phase N: Name
-    const phasePattern = /#{2,4}\s*(?:\[[^\]]+\]\s*)?Phase\s+(\d+[A-Z]?(?:[.-]\d+)*)\s*:\s*([^\n]+)/gi;
+    // #1729: `(?:\s*\([^)\n]*\))?` tolerates a pre-colon ( ) tag (literal mirror of OPTIONAL_PHASE_TAG_SOURCE).
+    const phasePattern = /#{2,4}\s*(?:\[[^\]]+\]\s*)?Phase\s+(\d+[A-Z]?(?:[.-]\d+)*)(?:\s*\([^)\n]*\))?\s*:\s*([^\n]+)/gi;
     const phases = [];
     let match;
     // Phase 0 (pre-milestone) and Phase 999 (backlog) are sentinels, not real
@@ -325,7 +339,7 @@ function cmdRoadmapAnalyze(cwd, raw) {
         // #3537: padding-tolerant fragment — the heading discovered above may use
         // a different padding than the summary-bullet checkbox below it (mixed
         // padding inside one ROADMAP is legal and seen in real projects).
-        const checkboxPattern = new RegExp(`-\\s*\\[(x| )\\]\\s*.*Phase\\s+${phaseMarkdownRegexSource(phaseNum)}[:\\s]`, 'i');
+        const checkboxPattern = new RegExp(`-\\s*\\[(x| )\\]\\s*.*Phase\\s+${phaseMarkdownRegexSource(phaseNum)}${OPTIONAL_PHASE_TAG_SOURCE}[:\\s]`, 'i');
         const checkboxMatch = content.match(checkboxPattern);
         const roadmapComplete = checkboxMatch ? checkboxMatch[1] === 'x' : false;
         // If roadmap marks phase complete, trust that over disk file structure.
@@ -402,12 +416,21 @@ function cmdRoadmapUpdatePlanProgress(cwd, phaseNum, raw) {
         error(`Phase ${phaseNum} not found`);
     }
     const planCount = phaseInfo.plans.length;
-    const summaryCount = phaseInfo.summaries.length;
+    // Count only summaries that pair with a real plan (#1988): stray non-plan
+    // summaries (30-FIX-CR02-SUMMARY.md, 30-GAPCLOSURE-SUMMARY.md, …) must not
+    // inflate summary_count and silently flip the phase to Complete.
+    const summaryCount = countMatchedSummaries(phaseInfo.plans, phaseInfo.summaries);
     if (planCount === 0) {
         output({ updated: false, reason: 'No plans found', plan_count: 0, summary_count: 0 }, raw, 'no plans');
         return;
     }
-    const isComplete = summaryCount >= planCount;
+    // Verification gate (#2022): do NOT check the phase checkbox or stamp a
+    // completion date until the phase's verification status is 'passed', matching
+    // cmdPhaseComplete's gate (phase.cts:1436). Previously the checkbox fired the
+    // moment the last plan summary landed — before gsd-verifier had verified.
+    const phaseDir = node_path_1.default.join(cwd, phaseInfo.directory);
+    const verificationPassed = readVerificationStatus(phaseDir).status === 'passed';
+    const isComplete = summaryCount >= planCount && verificationPassed;
     const status = isComplete ? 'Complete' : summaryCount > 0 ? 'In Progress' : 'Planned';
     const today = clock_cjs_1.realClock.today();
     if (!node_fs_1.default.existsSync(roadmapPath)) {
@@ -450,14 +473,14 @@ function cmdRoadmapUpdatePlanProgress(cwd, phaseNum, raw) {
         //   `**Plans**: N plans`  — bold word + outer colon (gsd-core/templates/roadmap.md)
         //   `**Plans:** N plans`  — bold "Plans:" (colon inside bold)
         //   `Plans: N plans`      — plain text header
-        const planCountPattern = new RegExp(`(#{2,4}\\s*Phase\\s+${phasePattern}(?=[:\\s])[\\s\\S]*?(?:\\*\\*Plans\\*\\*:|\\*\\*Plans:\\*\\*|(?:^|\\n)Plans:)\\s*)[^\\n]+`, 'i');
+        const planCountPattern = new RegExp(`(#{2,4}\\s*Phase\\s+${phasePattern}${OPTIONAL_PHASE_TAG_SOURCE}(?=[:\\s])[\\s\\S]*?(?:\\*\\*Plans\\*\\*:|\\*\\*Plans:\\*\\*|(?:^|\\n)Plans:)\\s*)[^\\n]+`, 'i');
         const planCountText = isComplete
             ? `${summaryCount}/${planCount} plans complete`
             : `${summaryCount}/${planCount} plans executed`;
         roadmapContent = replaceInCurrentMilestone(roadmapContent, planCountPattern, `$1${planCountText}`);
         // If complete: check checkbox
         if (isComplete) {
-            const checkboxPattern = new RegExp(`(-\\s*\\[)[ ](\\]\\s*.*Phase\\s+${phasePattern}[:\\s][^\\n]*)`, 'i');
+            const checkboxPattern = new RegExp(`(-\\s*\\[)[ ](\\]\\s*.*Phase\\s+${phasePattern}${OPTIONAL_PHASE_TAG_SOURCE}[:\\s][^\\n]*)`, 'i');
             roadmapContent = replaceInCurrentMilestone(roadmapContent, checkboxPattern, `$1x$2 (completed ${today})`);
         }
         // Mark completed plan checkboxes (e.g. "- [ ] 50-01-PLAN.md", "- [ ] 50-01:", or "- [ ] **50-01**")
@@ -507,8 +530,8 @@ function cmdRoadmapUpdatePlanProgress(cwd, phaseNum, raw) {
             //
             // Pattern A: anchor to bare `Plans:` header (preferred).
             // Pattern B: fallback to bold summary when no bare header exists.
-            const insertRowsPatternA = new RegExp(`(#{2,4}\\s*Phase\\s+${phasePattern}(?=[:\\s])[\\s\\S]*?(?:^|\\n)(?:Plans:)[^\\n]*)`, 'i');
-            const insertRowsPatternB = new RegExp(`(#{2,4}\\s*Phase\\s+${phasePattern}(?=[:\\s])[\\s\\S]*?(?:\\*\\*Plans\\*\\*:|\\*\\*Plans:\\*\\*)[^\\n]*)`, 'i');
+            const insertRowsPatternA = new RegExp(`(#{2,4}\\s*Phase\\s+${phasePattern}${OPTIONAL_PHASE_TAG_SOURCE}(?=[:\\s])[\\s\\S]*?(?:^|\\n)(?:Plans:)[^\\n]*)`, 'i');
+            const insertRowsPatternB = new RegExp(`(#{2,4}\\s*Phase\\s+${phasePattern}${OPTIONAL_PHASE_TAG_SOURCE}(?=[:\\s])[\\s\\S]*?(?:\\*\\*Plans\\*\\*:|\\*\\*Plans:\\*\\*)[^\\n]*)`, 'i');
             const sortedMissing = [...missingPlans].sort();
             const newRows = sortedMissing.map(p => `- [ ] ${p}`).join('\n');
             const inserter = (match) => `${match}\n${newRows}`;
@@ -645,7 +668,7 @@ function cmdRoadmapAnnotateDependencies(cwd, phaseNum, raw) {
         // #3537: padding-tolerant fragment so the caller's resolved padded id
         // matches un-padded ROADMAP headings.
         const phaseEscaped = phaseMarkdownRegexSource(phaseNum);
-        const phaseHeaderPattern = new RegExp(`(#{2,4}\\s*Phase\\s+${phaseEscaped}:[^\\n]*)`, 'i');
+        const phaseHeaderPattern = new RegExp(`(#{2,4}\\s*Phase\\s+${phaseEscaped}${OPTIONAL_PHASE_TAG_SOURCE}:[^\\n]*)`, 'i');
         const phaseMatch = content.match(phaseHeaderPattern);
         if (!phaseMatch)
             return;

package/gsd-core/bin/lib/runtime-hooks-surface.cjs

@@ -1039,7 +1039,7 @@ function applySettingsJsonHooks(settings, opts) {
         // Configure PreToolUse hook for prompt injection detection
         // ADR-857 phase 5f-2: drive dialect from opts.hookEvents (registry descriptor).
         // hookEvents='gemini' → BeforeTool; all others → PreToolUse.
-        // Equivalence: hookEvents='gemini' iff runtime∈{gemini,antigravity} (same as old check).
+        // Equivalence: hookEvents='gemini' iff runtime===antigravity (same as old check).
         const preToolEvent = hookEvents === 'gemini' ? 'BeforeTool' : 'PreToolUse';
         if (!settings.hooks[preToolEvent]) {
             settings.hooks[preToolEvent] = [];
@@ -1312,9 +1312,14 @@ function applySettingsJsonHooks(settings, opts) {
             }
         }
         // ── end SubagentStop / Stop / PreCompact events ────────────────────────────
-        // ── Gemini-only extended hook events (#776) ───────────────────────────────
-        // Gemini CLI exposes several hook events beyond BeforeTool/AfterTool that
-        // gsd previously did not register.  Three high-value events are added here:
+        // ── Extended hook events (#776; Gemini runtime removed #1928) ──────────────
+        // The Gemini-3-backend dialect exposes several hook events beyond
+        // BeforeTool/AfterTool. These were added for the now-removed Gemini CLI
+        // runtime (#776). No currently supported runtime declares them —
+        // Antigravity's descriptor carries `extendedHookEvents: []` — so this loop
+        // is an inert, descriptor-driven seam: it no-ops for every present runtime
+        // and re-activates automatically if a future runtime declares any of them.
+        // Three high-value events would be wired here:
         //
         //   BeforeAgent  — fires after user submits a prompt, before the agent
         //                  plans.  Wire gsd-context-monitor for context headroom
@@ -1335,15 +1340,15 @@ function applySettingsJsonHooks(settings, opts) {
         // gsd hook use case at this time; deferred to a follow-on issue.
         //
         // Guard is now descriptor-driven: only events present in extendedEvents are wired.
-        for (const geminiEvent of ['BeforeAgent', 'AfterAgent', 'BeforeModel']) {
-            if (!extendedEvents.includes(geminiEvent))
+        for (const extendedEvent of ['BeforeAgent', 'AfterAgent', 'BeforeModel']) {
+            if (!extendedEvents.includes(extendedEvent))
                 continue;
-            if (!Array.isArray(settings.hooks[geminiEvent])) {
-                settings.hooks[geminiEvent] = [];
+            if (!Array.isArray(settings.hooks[extendedEvent])) {
+                settings.hooks[extendedEvent] = [];
             }
-            const alreadyHasContextMonitor = settings.hooks[geminiEvent].some((entry) => entry.hooks && entry.hooks.some((h) => referencesHook(h, 'gsd-context-monitor')));
+            const alreadyHasContextMonitor = settings.hooks[extendedEvent].some((entry) => entry.hooks && entry.hooks.some((h) => referencesHook(h, 'gsd-context-monitor')));
             if (!alreadyHasContextMonitor && node_fs_1.default.existsSync(contextMonitorFile) && contextMonitorCommand) {
-                settings.hooks[geminiEvent].push({
+                settings.hooks[extendedEvent].push({
                     hooks: [
                         {
                             type: 'command',
@@ -1352,13 +1357,13 @@ function applySettingsJsonHooks(settings, opts) {
                         }
                     ]
                 });
-                console.log(`  ${green}✓${reset} Configured ${geminiEvent} context monitor hook (Gemini)`);
+                console.log(`  ${green}✓${reset} Configured ${extendedEvent} context monitor hook`);
             }
             else if (!alreadyHasContextMonitor && !node_fs_1.default.existsSync(contextMonitorFile)) {
-                console.warn(`  ${yellow}⚠${reset}  Skipped ${geminiEvent} hook — gsd-context-monitor.js not found at target`);
+                console.warn(`  ${yellow}⚠${reset}  Skipped ${extendedEvent} hook — gsd-context-monitor.js not found at target`);
             }
         }
-        // ── end Gemini-only extended hook events ──────────────────────────────────
+        // ── end Antigravity-only extended hook events ──────────────────────────────
         // ── FileChanged hook: hot-reload gsd config on .planning/config.json edits ─
         // Claude Code fires FileChanged when a watched file changes on disk.  Wire
         // gsd-config-reload.js to reload the gsd config context whenever the user

package/gsd-core/bin/lib/runtime-name-policy.cjs

@@ -29,7 +29,6 @@ const FALLBACK_ALIASES = {
     claude: ['claude', 'claude-code', 'claude-cli'],
     opencode: ['opencode', 'open-code', 'opencode-cli'],
     kilo: ['kilo', 'kilo-cli'],
-    gemini: ['gemini', 'gemini-cli', 'gemini-code'],
     codex: ['codex', 'codex-app', 'codex-cli', 'codex_desktop', 'codex-desktop'],
     copilot: ['copilot', 'copilot-cli', 'github-copilot'],
     antigravity: ['antigravity', 'antigravity-cli', 'antigravity-agent'],
@@ -114,7 +113,7 @@ function resolveRuntimeNameFromCandidates(...candidates) {
  *   claude                      → .claude/CLAUDE.md
  *   codex, opencode, kilo, kimi → AGENTS.md
  *   copilot                     → .github/copilot-instructions.md
- *   antigravity, gemini         → GEMINI.md
+ *   antigravity                 → GEMINI.md
  *   unknown / future runtimes   → AGENTS.md (safe cross-agent default)
  *
  * Source-of-truth references for each runtime's read path:
@@ -126,7 +125,9 @@ function resolveRuntimeNameFromCandidates(...candidates) {
  *     'copilot-instructions' writes the same `.github/copilot-instructions.md`.)
  *   - codex/opencode/kilo/kimi: AGENTS.md is the documented cross-agent
  *     instruction file (agentsmd/agents.md convention).
- *   - antigravity/gemini: GEMINI.md is Gemini CLI's contextFileName.
+ *   - antigravity: GEMINI.md is Antigravity CLI's contextFileName (the Gemini
+ *     CLI runtime that historically shared this file was removed — #1928;
+ *     Google sunset Gemini CLI 2026-06-18 and Antigravity CLI is its successor).
  *
  * Aliases are normalized via `canonicalizeRuntimeName` first, so inputs like
  * `codex-cli` resolve to `codex` → `AGENTS.md`. Replaces the prior codex-only
@@ -139,7 +140,7 @@ function getProjectInstructionFile(runtime) {
         return '.claude/CLAUDE.md';
     if (canonical === 'copilot')
         return '.github/copilot-instructions.md';
-    if (canonical === 'antigravity' || canonical === 'gemini')
+    if (canonical === 'antigravity')
         return 'GEMINI.md';
     // codex, opencode, kilo, kimi, AND unknown/future runtimes all default to
     // root AGENTS.md (the safe cross-agent instruction file).
@@ -180,7 +181,7 @@ function getDirName(runtime) {
  *
  * Voice: these are the SHORT UI labels, intentionally distinct from the
  * descriptor `title` (the long product name — e.g. "OpenAI Codex CLI",
- * "GitHub Copilot", "Gemini CLI") which serves documentation/registry display,
+ * "GitHub Copilot") which serves documentation/registry display,
  * not the install console. A future slice may relocate this to a
  * `runtime.label` descriptor field; until then this table is the source.
  *
@@ -195,7 +196,6 @@ function getDirName(runtime) {
 const RUNTIME_LABELS = {
     claude: 'Claude Code',
     opencode: 'OpenCode',
-    gemini: 'Gemini',
     kilo: 'Kilo',
     codex: 'Codex',
     copilot: 'Copilot',
@@ -231,7 +231,7 @@ function getRuntimeLabel(runtime) {
  * bin/install.js (ADR-1239 Phase B / #1679, AC2 slice 2) — the add-a-host tax:
  * a new runtime meant remembering to add a branch here. Values are preserved
  * BYTE-FOR-BYTE from the prior chain; golden install parity asserts generated
- * hook output is unchanged across all 16 runtimes.
+ * hook output is unchanged across all 15 runtimes.
  *
  * Two runtimes are intentionally absent (handled by the caller, NOT this table):
  *   - `claude`     → the default; falls through to `DEFAULT_FRAGMENT`.
@@ -244,7 +244,6 @@ const DEFAULT_CONFIG_HOME_FRAGMENT = "'.claude'";
 const GLOBAL_CONFIG_HOME_FRAGMENTS = {
     copilot: "'.copilot'",
     opencode: "'.config', 'opencode'",
-    gemini: "'.gemini'",
     kilo: "'.config', 'kilo'",
     codex: "'.codex'",
     cursor: "'.cursor'",
@@ -277,7 +276,7 @@ function getGlobalConfigHomeFragment(runtime) {
  * removes).
  */
 const RUNTIME_FLAG_IDS = Object.freeze([
-    'opencode', 'kilo', 'gemini', 'codex', 'copilot', 'antigravity', 'cursor',
+    'opencode', 'kilo', 'codex', 'copilot', 'antigravity', 'cursor',
     'windsurf', 'augment', 'trae', 'qwen', 'hermes', 'codebuddy', 'cline', 'kimi',
 ]);
 /**
@@ -303,7 +302,6 @@ function runtimeFlags(runtime) {
  */
 const DEFAULT_NEW_PROJECT_COMMAND = '/gsd-new-project';
 const RUNTIME_NEW_PROJECT_COMMANDS = {
-    gemini: '/gsd:new-project',
     codex: '$gsd-new-project',
     cursor: 'gsd-new-project (mention the skill name)',
     kimi: '/skill:gsd-new-project',

package/gsd-core/bin/lib/shell-command-projection.cjs

@@ -56,16 +56,20 @@ const node_child_process_1 = __importDefault(require("node:child_process"));
  * runtime/shell combination.
  *
  * Current evidence-backed policy:
- * - Gemini on Windows requires `& ` for quoted node/bash runners.
- * - Claude Code on Windows does NOT: its hook commands execute under bash/Git
- *   Bash and `& ` breaks there (#3413).
+ * - Claude Code on Windows does NOT need it: its hook commands execute under
+ *   bash/Git Bash and `& ` breaks there (#3413).
+ * - #1928: Gemini CLI — the ONLY runtime with a verified need for the `& `
+ *   prefix on Windows — was removed (Google sunset it 2026-06-18). No currently
+ *   supported runtime has a verified need, so this seam is now inert. It is
+ *   retained (not deleted) so a future runtime with a verified need is a
+ *   one-line re-enable, per the conservative policy below. Note: Antigravity —
+ *   the Gemini-backend successor — never matched the old `runtime === 'gemini'`
+ *   check, so its behavior (no prefix) is unchanged.
  *
  * Keep the policy conservative until another runtime has a verified need.
  */
-function hookCommandNeedsPowerShellCallOperator(opts = {}) {
-    const platform = opts.platform || process.platform;
-    const runtime = opts.runtime || 'generic';
-    return platform === 'win32' && runtime === 'gemini';
+function hookCommandNeedsPowerShellCallOperator(_opts = {}) {
+    return false;
 }
 /**
  * Project a fully-assembled hook command string for the target runtime.
@@ -121,7 +125,7 @@ function formatManagedHookScriptToken(scriptPath, opts = {}) {
 function projectLocalHookPrefix({ runtime = 'claude', dirName }) {
     if (!dirName)
         return dirName;
-    return (runtime === 'gemini' || runtime === 'antigravity')
+    return (runtime === 'antigravity')
         ? dirName
         : `"$CLAUDE_PROJECT_DIR"/${dirName}`;
 }