fix(2137): skip worktree isolation when .gitmodules detected (#2144)

* feat(sdk): add typed query foundation and gsd-sdk query (Phase 1) Add sdk/src/query registry and handlers with tests, GSDQueryError, CLI query wiring, and supporting type/tool-scoping hooks. Update CHANGELOG. Vitest 4 constructor mock fixes in milestone-runner tests. Made-with: Cursor * fix(2137): skip worktree isolation when .gitmodules detected When a project contains git submodules, worktree isolation cannot correctly handle submodule commits — three separate gaps exist in worktree setup, executor commit protocol, and merge-back. Rather than patch each gap individually, detect .gitmodules at phase start and fall back to sequential execution, which handles submodules transparently (Option B). Affected workflows: execute-phase.md, quick.md --------- Co-authored-by: David Sienkowski <dave@sienkowski.com>
2026-04-12 08:33:04 -04:00
parent 58632e0718
commit 002bcf2a8a
63 changed files with 17872 additions and 23 deletions
--- a/sdk/src/query/frontmatter.ts
+++ b/sdk/src/query/frontmatter.ts
@@ -0,0 +1,353 @@
+/**
+ * Frontmatter parser and query handler.
+ *
+ * Ported from get-shit-done/bin/lib/frontmatter.cjs and state.cjs.
+ * Provides YAML frontmatter extraction from .planning/ artifacts.
+ *
+ * @example
+ * ```typescript
+ * import { extractFrontmatter, frontmatterGet } from './frontmatter.js';
+ *
+ * const fm = extractFrontmatter('---\nphase: 10\nplan: 01\n---\nbody');
+ * // { phase: '10', plan: '01' }
+ *
+ * const result = await frontmatterGet(['STATE.md'], '/project');
+ * // { data: { gsd_state_version: '1.0', milestone: 'v3.0', ... } }
+ * ```
+ */
+
+import { readFile } from 'node:fs/promises';
+import { join, isAbsolute } from 'node:path';
+import { GSDError, ErrorClassification } from '../errors.js';
+import type { QueryHandler } from './utils.js';
+import { escapeRegex } from './helpers.js';
+
+// ─── splitInlineArray ───────────────────────────────────────────────────────
+
+/**
+ * Quote-aware CSV splitting for inline YAML arrays.
+ *
+ * Handles both single and double quotes, preserving commas inside quotes.
+ *
+ * @param body - The content inside brackets, e.g. 'a, "b, c", d'
+ * @returns Array of trimmed values
+ */
+export function splitInlineArray(body: string): string[] {
+  const items: string[] = [];
+  let current = '';
+  let inQuote: string | null = null;
+
+  for (let i = 0; i < body.length; i++) {
+    const ch = body[i];
+    if (inQuote) {
+      if (ch === inQuote) {
+        inQuote = null;
+      } else {
+        current += ch;
+      }
+    } else if (ch === '"' || ch === "'") {
+      inQuote = ch;
+    } else if (ch === ',') {
+      const trimmed = current.trim();
+      if (trimmed) items.push(trimmed);
+      current = '';
+    } else {
+      current += ch;
+    }
+  }
+  const trimmed = current.trim();
+  if (trimmed) items.push(trimmed);
+  return items;
+}
+
+// ─── extractFrontmatter ─────────────────────────────────────────────────────
+
+/**
+ * Parse YAML frontmatter from file content.
+ *
+ * Full stack-based parser supporting:
+ * - Simple key: value pairs
+ * - Nested objects via indentation
+ * - Inline arrays: key: [a, b, c]
+ * - Dash arrays with auto-conversion from empty objects
+ * - Multiple stacked blocks (uses the LAST match)
+ * - CRLF line endings
+ * - Quoted value stripping
+ *
+ * @param content - File content potentially containing frontmatter
+ * @returns Parsed frontmatter as a record, or empty object if none found
+ */
+export function extractFrontmatter(content: string): Record<string, unknown> {
+  const frontmatter: Record<string, unknown> = {};
+  // Find ALL frontmatter blocks. Use the LAST one (corruption recovery).
+  const allBlocks = [...content.matchAll(/(?:^|\n)\s*---\r?\n([\s\S]+?)\r?\n---/g)];
+  const match = allBlocks.length > 0 ? allBlocks[allBlocks.length - 1] : null;
+  if (!match) return frontmatter;
+
+  const yaml = match[1];
+  const lines = yaml.split(/\r?\n/);
+
+  // Stack to track nested objects: [{obj, key, indent}]
+  const stack: Array<{ obj: Record<string, unknown> | unknown[]; key: string | null; indent: number }> = [
+    { obj: frontmatter, key: null, indent: -1 },
+  ];
+
+  for (const line of lines) {
+    // Skip empty lines
+    if (line.trim() === '') continue;
+
+    // Calculate indentation (number of leading spaces)
+    const indentMatch = line.match(/^(\s*)/);
+    const indent = indentMatch ? indentMatch[1].length : 0;
+
+    // Pop stack back to appropriate level
+    while (stack.length > 1 && indent <= stack[stack.length - 1].indent) {
+      stack.pop();
+    }
+
+    const current = stack[stack.length - 1];
+
+    // Check for key: value pattern
+    const keyMatch = line.match(/^(\s*)([a-zA-Z0-9_-]+):\s*(.*)/);
+    if (keyMatch) {
+      const key = keyMatch[2];
+      const value = keyMatch[3].trim();
+
+      if (value === '' || value === '[') {
+        // Key with no value or opening bracket -- could be nested object or array
+        (current.obj as Record<string, unknown>)[key] = value === '[' ? [] : {};
+        current.key = null;
+        // Push new context for potential nested content
+        stack.push({ obj: (current.obj as Record<string, unknown>)[key] as Record<string, unknown>, key: null, indent });
+      } else if (value.startsWith('[') && value.endsWith(']')) {
+        // Inline array: key: [a, b, c]
+        (current.obj as Record<string, unknown>)[key] = splitInlineArray(value.slice(1, -1));
+        current.key = null;
+      } else {
+        // Simple key: value -- strip surrounding quotes
+        (current.obj as Record<string, unknown>)[key] = value.replace(/^["']|["']$/g, '');
+        current.key = null;
+      }
+    } else if (line.trim().startsWith('- ')) {
+      // Array item
+      const itemValue = line.trim().slice(2).replace(/^["']|["']$/g, '');
+
+      // If current context is an empty object, convert to array
+      if (typeof current.obj === 'object' && !Array.isArray(current.obj) && Object.keys(current.obj).length === 0) {
+        // Find the key in parent that points to this object and convert it
+        const parent = stack.length > 1 ? stack[stack.length - 2] : null;
+        if (parent && !Array.isArray(parent.obj)) {
+          for (const k of Object.keys(parent.obj as Record<string, unknown>)) {
+            if ((parent.obj as Record<string, unknown>)[k] === current.obj) {
+              (parent.obj as Record<string, unknown>)[k] = [itemValue];
+              current.obj = (parent.obj as Record<string, unknown>)[k] as unknown[];
+              break;
+            }
+          }
+        }
+      } else if (Array.isArray(current.obj)) {
+        current.obj.push(itemValue);
+      }
+    }
+  }
+
+  return frontmatter;
+}
+
+// ─── stripFrontmatter ───────────────────────────────────────────────────────
+
+/**
+ * Strip all frontmatter blocks from the start of content.
+ *
+ * Handles CRLF line endings and multiple stacked blocks (corruption recovery).
+ * Greedy: keeps stripping ---...--- blocks separated by optional whitespace.
+ *
+ * @param content - File content with potential frontmatter
+ * @returns Content with frontmatter removed
+ */
+export function stripFrontmatter(content: string): string {
+  let result = content;
+  // eslint-disable-next-line no-constant-condition
+  while (true) {
+    const stripped = result.replace(/^\s*---\r?\n[\s\S]*?\r?\n---\s*/, '');
+    if (stripped === result) break;
+    result = stripped;
+  }
+  return result;
+}
+
+// ─── parseMustHavesBlock ────────────────────────────────────────────────────
+
+/**
+ * Result of parsing a must_haves block from frontmatter.
+ */
+export interface MustHavesBlockResult {
+  items: unknown[];
+  warnings: string[];
+}
+
+/**
+ * Parse a named block from must_haves in raw frontmatter YAML.
+ *
+ * Port of `parseMustHavesBlock` from `get-shit-done/bin/lib/frontmatter.cjs` lines 195-301.
+ * Handles 3-level nesting: `must_haves > blockName > [{key: value, ...}]`.
+ * Supports simple string items, structured objects with key-value pairs,
+ * and nested arrays within items.
+ *
+ * @param content - File content with frontmatter
+ * @param blockName - Block name under must_haves (e.g. 'artifacts', 'key_links', 'truths')
+ * @returns Structured result with items array and warnings
+ */
+export function parseMustHavesBlock(content: string, blockName: string): MustHavesBlockResult {
+  const warnings: string[] = [];
+
+  // Extract raw YAML from first ---\n...\n--- block
+  const fmMatch = content.match(/^---\r?\n([\s\S]+?)\r?\n---/);
+  if (!fmMatch) return { items: [], warnings };
+
+  const yaml = fmMatch[1];
+
+  // Find must_haves: at its indentation level
+  const mustHavesMatch = yaml.match(/^(\s*)must_haves:\s*$/m);
+  if (!mustHavesMatch) return { items: [], warnings };
+  const mustHavesIndent = mustHavesMatch[1].length;
+
+  // Find the block (e.g., "artifacts:", "key_links:") under must_haves
+  const blockPattern = new RegExp(`^(\\s+)${escapeRegex(blockName)}:\\s*$`, 'm');
+  const blockMatch = yaml.match(blockPattern);
+  if (!blockMatch) return { items: [], warnings };
+
+  const blockIndent = blockMatch[1].length;
+  // The block must be nested under must_haves (more indented)
+  if (blockIndent <= mustHavesIndent) return { items: [], warnings };
+
+  // Find where the block starts in the yaml string
+  const blockStart = yaml.indexOf(blockMatch[0]);
+  if (blockStart === -1) return { items: [], warnings };
+
+  const afterBlock = yaml.slice(blockStart);
+  const blockLines = afterBlock.split(/\r?\n/).slice(1); // skip the header line
+
+  // List items are indented one level deeper than blockIndent
+  // Continuation KVs are indented one level deeper than list items
+  const items: unknown[] = [];
+  let current: Record<string, unknown> | string | null = null;
+  let listItemIndent = -1; // detected from first "- " line
+
+  for (const line of blockLines) {
+    // Skip empty lines
+    if (line.trim() === '') continue;
+    const indentMatch = line.match(/^(\s*)/);
+    const indent = indentMatch ? indentMatch[1].length : 0;
+    // Stop at same or lower indent level than the block header
+    if (indent <= blockIndent && line.trim() !== '') break;
+
+    const trimmed = line.trim();
+
+    if (trimmed.startsWith('- ')) {
+      // Detect list item indent from the first occurrence
+      if (listItemIndent === -1) listItemIndent = indent;
+
+      // Only treat as a top-level list item if at the expected indent
+      if (indent === listItemIndent) {
+        if (current !== null) items.push(current);
+        const afterDash = trimmed.slice(2);
+        // Check if it's a simple string item (no colon means not a key-value)
+        if (!afterDash.includes(':')) {
+          current = afterDash.replace(/^["']|["']$/g, '');
+        } else {
+          // Key-value on same line as dash: "- path: value"
+          const kvMatch = afterDash.match(/^(\w+):\s*"?([^"]*)"?\s*$/);
+          if (kvMatch) {
+            current = {} as Record<string, unknown>;
+            current[kvMatch[1]] = kvMatch[2];
+          } else {
+            current = {} as Record<string, unknown>;
+          }
+        }
+        continue;
+      }
+    }
+
+    if (current !== null && typeof current === 'object' && indent > listItemIndent) {
+      // Continuation key-value or nested array item
+      if (trimmed.startsWith('- ')) {
+        // Array item under a key
+        const arrVal = trimmed.slice(2).replace(/^["']|["']$/g, '');
+        const keys = Object.keys(current);
+        const lastKey = keys[keys.length - 1];
+        if (lastKey && !Array.isArray(current[lastKey])) {
+          current[lastKey] = current[lastKey] ? [current[lastKey]] : [];
+        }
+        if (lastKey) (current[lastKey] as unknown[]).push(arrVal);
+      } else {
+        const kvMatch = trimmed.match(/^(\w+):\s*"?([^"]*)"?\s*$/);
+        if (kvMatch) {
+          const val = kvMatch[2];
+          // Try to parse as number
+          current[kvMatch[1]] = /^\d+$/.test(val) ? parseInt(val, 10) : val;
+        }
+      }
+    }
+  }
+  if (current !== null) items.push(current);
+
+  // Diagnostic warning when block has content lines but parsed 0 items
+  if (items.length === 0 && blockLines.length > 0) {
+    const nonEmptyLines = blockLines.filter(l => l.trim() !== '').length;
+    if (nonEmptyLines > 0) {
+      warnings.push(
+        `must_haves.${blockName} block has ${nonEmptyLines} content lines but parsed 0 items. ` +
+        `Possible YAML formatting issue.`
+      );
+    }
+  }
+
+  return { items, warnings };
+}
+
+// ─── frontmatterGet ─────────────────────────────────────────────────────────
+
+/**
+ * Query handler for frontmatter.get command.
+ *
+ * Reads a file, extracts frontmatter, and optionally returns a single field.
+ * Rejects null bytes in path (security: path traversal guard).
+ *
+ * @param args - args[0]: file path, args[1]: optional field name
+ * @param projectDir - Project root directory
+ * @returns QueryResult with parsed frontmatter or single field value
+ */
+export const frontmatterGet: QueryHandler = async (args, projectDir) => {
+  const filePath = args[0];
+  if (!filePath) {
+    throw new GSDError('file path required', ErrorClassification.Validation);
+  }
+
+  // Path traversal guard: reject null bytes
+  if (filePath.includes('\0')) {
+    throw new GSDError('file path contains null bytes', ErrorClassification.Validation);
+  }
+
+  const fullPath = isAbsolute(filePath) ? filePath : join(projectDir, filePath);
+
+  let content: string;
+  try {
+    content = await readFile(fullPath, 'utf-8');
+  } catch {
+    return { data: { error: 'File not found', path: filePath } };
+  }
+
+  const fm = extractFrontmatter(content);
+  const field = args[1];
+
+  if (field) {
+    const value = fm[field];
+    if (value === undefined) {
+      return { data: { error: 'Field not found', field } };
+    }
+    return { data: { [field]: value } };
+  }
+
+  return { data: fm };
+};