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>
This commit is contained in:
Tom Boucher
225
sdk/src/query/helpers.test.ts
Normal file
225
sdk/src/query/helpers.test.ts
Normal file
@@ -0,0 +1,225 @@
|
||||
/**
|
||||
* Unit tests for shared query helpers.
|
||||
*/
|
||||
|
||||
import { describe, it, expect } from 'vitest';
|
||||
import {
|
||||
escapeRegex,
|
||||
normalizePhaseName,
|
||||
comparePhaseNum,
|
||||
extractPhaseToken,
|
||||
phaseTokenMatches,
|
||||
toPosixPath,
|
||||
stateExtractField,
|
||||
planningPaths,
|
||||
normalizeMd,
|
||||
} from './helpers.js';
|
||||
|
||||
// ─── escapeRegex ────────────────────────────────────────────────────────────
|
||||
|
||||
describe('escapeRegex', () => {
|
||||
it('escapes dots', () => {
|
||||
expect(escapeRegex('foo.bar')).toBe('foo\\.bar');
|
||||
});
|
||||
|
||||
it('escapes brackets', () => {
|
||||
expect(escapeRegex('test[0]')).toBe('test\\[0\\]');
|
||||
});
|
||||
|
||||
it('escapes all regex special characters', () => {
|
||||
expect(escapeRegex('a.*+?^${}()|[]\\')).toBe('a\\.\\*\\+\\?\\^\\$\\{\\}\\(\\)\\|\\[\\]\\\\');
|
||||
});
|
||||
|
||||
it('returns plain strings unchanged', () => {
|
||||
expect(escapeRegex('hello')).toBe('hello');
|
||||
});
|
||||
});
|
||||
|
||||
// ─── normalizePhaseName ─────────────────────────────────────────────────────
|
||||
|
||||
describe('normalizePhaseName', () => {
|
||||
it('pads single digit to 2 digits', () => {
|
||||
expect(normalizePhaseName('9')).toBe('09');
|
||||
});
|
||||
|
||||
it('strips project code prefix', () => {
|
||||
expect(normalizePhaseName('CK-01')).toBe('01');
|
||||
});
|
||||
|
||||
it('preserves letter suffix', () => {
|
||||
expect(normalizePhaseName('12A')).toBe('12A');
|
||||
});
|
||||
|
||||
it('preserves decimal parts', () => {
|
||||
expect(normalizePhaseName('12.1')).toBe('12.1');
|
||||
});
|
||||
|
||||
it('strips project code and normalizes numeric part', () => {
|
||||
// PROJ-42 -> strip PROJ- prefix -> 42 -> pad to 42
|
||||
expect(normalizePhaseName('PROJ-42')).toBe('42');
|
||||
});
|
||||
|
||||
it('handles already-padded numbers', () => {
|
||||
expect(normalizePhaseName('01')).toBe('01');
|
||||
});
|
||||
});
|
||||
|
||||
// ─── comparePhaseNum ────────────────────────────────────────────────────────
|
||||
|
||||
describe('comparePhaseNum', () => {
|
||||
it('compares numeric phases', () => {
|
||||
expect(comparePhaseNum('01-foo', '02-bar')).toBeLessThan(0);
|
||||
});
|
||||
|
||||
it('compares letter suffixes', () => {
|
||||
expect(comparePhaseNum('12A-foo', '12B-bar')).toBeLessThan(0);
|
||||
});
|
||||
|
||||
it('sorts no-decimal before decimal', () => {
|
||||
expect(comparePhaseNum('12-foo', '12.1-bar')).toBeLessThan(0);
|
||||
});
|
||||
|
||||
it('returns 0 for equal phases', () => {
|
||||
expect(comparePhaseNum('01-name', '01-other')).toBe(0);
|
||||
});
|
||||
|
||||
it('falls back to string comparison for custom IDs', () => {
|
||||
const result = comparePhaseNum('AUTH-name', 'PROJ-name');
|
||||
expect(typeof result).toBe('number');
|
||||
});
|
||||
});
|
||||
|
||||
// ─── extractPhaseToken ──────────────────────────────────────────────────────
|
||||
|
||||
describe('extractPhaseToken', () => {
|
||||
it('extracts plain numeric token', () => {
|
||||
expect(extractPhaseToken('01-foundation')).toBe('01');
|
||||
});
|
||||
|
||||
it('extracts project-code-prefixed token', () => {
|
||||
expect(extractPhaseToken('CK-01-name')).toBe('CK-01');
|
||||
});
|
||||
|
||||
it('extracts letter suffix token', () => {
|
||||
expect(extractPhaseToken('12A-name')).toBe('12A');
|
||||
});
|
||||
|
||||
it('extracts decimal token', () => {
|
||||
expect(extractPhaseToken('999.6-name')).toBe('999.6');
|
||||
});
|
||||
});
|
||||
|
||||
// ─── phaseTokenMatches ──────────────────────────────────────────────────────
|
||||
|
||||
describe('phaseTokenMatches', () => {
|
||||
it('matches normalized numeric phase', () => {
|
||||
expect(phaseTokenMatches('09-foundation', '09')).toBe(true);
|
||||
});
|
||||
|
||||
it('matches after stripping project code', () => {
|
||||
expect(phaseTokenMatches('CK-01-name', '01')).toBe(true);
|
||||
});
|
||||
|
||||
it('does not match different phases', () => {
|
||||
expect(phaseTokenMatches('09-foundation', '10')).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
// ─── toPosixPath ────────────────────────────────────────────────────────────
|
||||
|
||||
describe('toPosixPath', () => {
|
||||
it('converts backslashes to forward slashes', () => {
|
||||
expect(toPosixPath('a\\b\\c')).toBe('a/b/c');
|
||||
});
|
||||
|
||||
it('preserves already-posix paths', () => {
|
||||
expect(toPosixPath('a/b/c')).toBe('a/b/c');
|
||||
});
|
||||
});
|
||||
|
||||
// ─── stateExtractField ──────────────────────────────────────────────────────
|
||||
|
||||
describe('stateExtractField', () => {
|
||||
it('extracts bold field value', () => {
|
||||
const content = '**Phase:** 10\n**Plan:** 1';
|
||||
expect(stateExtractField(content, 'Phase')).toBe('10');
|
||||
});
|
||||
|
||||
it('extracts plain field value', () => {
|
||||
const content = 'Status: executing\nPlan: 1';
|
||||
expect(stateExtractField(content, 'Status')).toBe('executing');
|
||||
});
|
||||
|
||||
it('returns null for missing field', () => {
|
||||
expect(stateExtractField('no fields here', 'Missing')).toBeNull();
|
||||
});
|
||||
|
||||
it('is case-insensitive', () => {
|
||||
const content = '**phase:** 10';
|
||||
expect(stateExtractField(content, 'Phase')).toBe('10');
|
||||
});
|
||||
});
|
||||
|
||||
// ─── planningPaths ──────────────────────────────────────────────────────────
|
||||
|
||||
describe('planningPaths', () => {
|
||||
it('returns all expected keys', () => {
|
||||
const paths = planningPaths('/proj');
|
||||
expect(paths).toHaveProperty('planning');
|
||||
expect(paths).toHaveProperty('state');
|
||||
expect(paths).toHaveProperty('roadmap');
|
||||
expect(paths).toHaveProperty('project');
|
||||
expect(paths).toHaveProperty('config');
|
||||
expect(paths).toHaveProperty('phases');
|
||||
expect(paths).toHaveProperty('requirements');
|
||||
});
|
||||
|
||||
it('uses posix paths', () => {
|
||||
const paths = planningPaths('/proj');
|
||||
expect(paths.state).toContain('.planning/STATE.md');
|
||||
expect(paths.config).toContain('.planning/config.json');
|
||||
});
|
||||
});
|
||||
|
||||
// ─── normalizeMd ───────────────────────────────────────────────────────────
|
||||
|
||||
describe('normalizeMd', () => {
|
||||
it('converts CRLF to LF', () => {
|
||||
const result = normalizeMd('line1\r\nline2\r\n');
|
||||
expect(result).not.toContain('\r');
|
||||
expect(result).toContain('line1\nline2');
|
||||
});
|
||||
|
||||
it('ensures terminal newline', () => {
|
||||
const result = normalizeMd('no trailing newline');
|
||||
expect(result).toMatch(/\n$/);
|
||||
});
|
||||
|
||||
it('collapses 3+ consecutive blank lines to 2', () => {
|
||||
const result = normalizeMd('a\n\n\n\nb');
|
||||
// Should have at most 2 consecutive newlines (1 blank line between)
|
||||
expect(result).not.toContain('\n\n\n');
|
||||
});
|
||||
|
||||
it('preserves content inside code fences', () => {
|
||||
const input = '```\n code with trailing spaces \n```\n';
|
||||
const result = normalizeMd(input);
|
||||
expect(result).toContain(' code with trailing spaces ');
|
||||
});
|
||||
|
||||
it('adds blank line before headings when missing', () => {
|
||||
const result = normalizeMd('some text\n# Heading\n');
|
||||
expect(result).toContain('some text\n\n# Heading');
|
||||
});
|
||||
|
||||
it('returns empty-ish content unchanged', () => {
|
||||
expect(normalizeMd('')).toBe('');
|
||||
expect(normalizeMd(null as unknown as string)).toBe(null);
|
||||
});
|
||||
|
||||
it('handles normal markdown without changes', () => {
|
||||
const input = '# Title\n\nSome text.\n\n## Section\n\nMore text.\n';
|
||||
const result = normalizeMd(input);
|
||||
expect(result).toBe(input);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user