Two more diagnostic passes (clusters J: residuals in already-touched files,
K: 12 untouched files) plus a production-code path fix and a new
ratchet-style lint guard.
## Test-only fixes (14 files)
bug-1736, bug-2248, bug-2698 — replace inline 1s-budget rmSync with the
shared cleanup() helper (5s budget, 20×250ms retries). The earlier
inline maxRetries:10 / retryDelay:100 wasn't enough to absorb Windows
Defender's deferred-scan handle hold on cold runners.
bug-2256, skill-manifest — also override USERPROFILE alongside HOME in
beforeEach/runGsdTools calls. os.homedir() reads USERPROFILE on win32,
so HOME-only stubs leak the runner's real home into the SUT.
bug-2784, bug-3608, enh-2500, enh-2790, few-shot-calibration,
gsd-settings-advanced — CRLF tolerance: literal \n in regexes against
file content (frontmatter anchors, bash-fence regex, multi-line
numbered-list captures, awk-block extractors) becomes \r?\n; split('\n')
becomes split(/\r?\n/). Windows checkout with autocrlf=true puts \r
before every \n; .+ doesn't match \r in JS regex by default.
bug-2966 — three-part fix to extractStepRun (CRLF split), awk regex
(\r?\n), and conflict-marker parser (rawLine + \r$ strip).
bug-2969, config — normalize separators on test assertions where the
SUT correctly emits \ on win32 but the test compares against /.
prompt-injection-scan — normalize relPath via replace(/\\/g, '/') before
ALLOWLIST.has() lookup. ALLOWLIST keys are POSIX; path.relative returns
backslashes on win32 → falsely scans allowlisted security module → trips
the boundary-tag detector on its own legitimate detection code.
prune-orphaned-worktrees — use the existing canonicalPath +
listedWorktreePaths(repoDir).has(...) helpers instead of substring
matching the raw path. git stores long-form canonical paths
(runneradmin), but mkdtempSync returns 8.3 short-form (RUNNER~1) on
Windows runners; plain string compare misses every entry.
## Production-code fix (1 file)
get-shit-done/bin/lib/init.cjs — bug-3491 in_nested_subdir computation
canonicalizes both worktreeRoot and cwd via fs.realpathSync.native +
path.relative before declaring "nested." Windows runner cwd (8.3 short
name) vs git's --show-toplevel (long form, forward slashes) made the
raw string compare always say true even at the worktree root, breaking
the "init new-project at worktree root" subtest.
## New ratchet lint guard
tests/windows-test-parity-guard.test.cjs — scans tests/ for 7
anti-patterns that drove the Windows failure clusters. Each rule has a
baseline count snapshot from this PR; the test fails when a new
occurrence appears (count grows above baseline), ratcheting down as
existing offenders are fixed. Patterns covered:
G1 split('\n') after readFileSync (use /\r?\n/)
G2 ```bash\n fence regex (use ```bash\r?\n)
G3 ^---\n frontmatter anchor (use ^---\r?\n)
G4 hardcoded "/tmp/..." literal passed to fs.* (use os.tmpdir())
G5 bare 'npm' to execFileSync without {shell:true} on win32
G6 process.env.HOME stub with no USERPROFILE
G7 fs.rmSync({recursive,force}) without maxRetries
Future Windows-parity regressions get caught at PR time rather than
five iterations into a CI loop.
Validated: holodeck (ubuntu docker) 11232/0 pass (count +8 = the 7
new ratchet tests + parent describe).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
197 lines
7.3 KiB
JavaScript
197 lines
7.3 KiB
JavaScript
/**
|
|
* Tests for pruneOrphanedWorktrees()
|
|
*
|
|
* Uses real temporary git repos (no mocks).
|
|
* All 4 tests must fail (RED) before implementation is added.
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
const { describe, test, beforeEach, afterEach } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const fs = require('fs');
|
|
const path = require('path');
|
|
const { execSync } = require('child_process');
|
|
const { createTempDir, cleanup } = require('./helpers.cjs');
|
|
|
|
// Lazy-loaded so tests can fail clearly when the export doesn't exist yet.
|
|
function getPruneOrphanedWorktrees() {
|
|
const { pruneOrphanedWorktrees } = require('../get-shit-done/bin/lib/core.cjs');
|
|
return pruneOrphanedWorktrees;
|
|
}
|
|
|
|
// Create a minimal git repo with an initial commit on main.
|
|
function canonicalPath(p) {
|
|
try {
|
|
return fs.realpathSync.native(path.resolve(p));
|
|
} catch {
|
|
return path.resolve(p);
|
|
}
|
|
}
|
|
|
|
function listedWorktreePaths(repoDir) {
|
|
const out = execSync('git worktree list --porcelain', { cwd: repoDir, encoding: 'utf8' });
|
|
return new Set(
|
|
out
|
|
.split('\n')
|
|
.filter((line) => line.startsWith('worktree '))
|
|
.map((line) => canonicalPath(line.slice('worktree '.length).trim()))
|
|
);
|
|
}
|
|
|
|
function createGitRepo(dir) {
|
|
fs.mkdirSync(dir, { recursive: true });
|
|
execSync('git init', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git config user.email "test@test.com"', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git config user.name "Test"', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git config commit.gpgsign false', { cwd: dir, stdio: 'pipe' });
|
|
fs.writeFileSync(path.join(dir, 'README.md'), '# Test\n');
|
|
execSync('git add -A', { cwd: dir, stdio: 'pipe' });
|
|
execSync('git commit -m "initial commit"', { cwd: dir, stdio: 'pipe' });
|
|
// Rename to main if it isn't already (handles older git defaults)
|
|
try {
|
|
execSync('git branch -m master main', { cwd: dir, stdio: 'pipe' });
|
|
} catch { /* already named main */ }
|
|
}
|
|
|
|
// --- Test suite ---------------------------------------------------------------
|
|
|
|
describe('pruneOrphanedWorktrees', () => {
|
|
let tmpBase;
|
|
|
|
beforeEach(() => {
|
|
tmpBase = createTempDir('prune-wt-test-');
|
|
});
|
|
|
|
afterEach(() => {
|
|
cleanup(tmpBase);
|
|
});
|
|
|
|
// Test 1: keeps a merged worktree (destructive removal disabled by default)
|
|
test('keeps a worktree whose branch is merged into main', () => {
|
|
const repoDir = path.join(tmpBase, 'repo');
|
|
const worktreeDir = path.join(tmpBase, 'wt-merged');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create worktree on a new branch (main is checked out in repoDir)
|
|
execSync('git worktree add "' + worktreeDir + '" -b fix/old-work', { cwd: repoDir, stdio: 'pipe' });
|
|
assert.ok(fs.existsSync(worktreeDir), 'worktree dir should exist before prune');
|
|
|
|
// Add a commit in the worktree
|
|
fs.writeFileSync(path.join(worktreeDir, 'feature.txt'), 'work\n');
|
|
execSync('git add -A', { cwd: worktreeDir, stdio: 'pipe' });
|
|
execSync('git commit -m "old work"', { cwd: worktreeDir, stdio: 'pipe' });
|
|
|
|
// Merge the branch into main from repoDir
|
|
execSync('git merge fix/old-work --no-ff -m "merge old-work"', { cwd: repoDir, stdio: 'pipe' });
|
|
|
|
// Act
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
pruneOrphanedWorktrees(repoDir);
|
|
|
|
// Assert: worktree directory still exists
|
|
assert.ok(
|
|
fs.existsSync(worktreeDir),
|
|
'merged worktree should not be removed by default: ' + worktreeDir
|
|
);
|
|
|
|
// Assert: git worktree list still shows it
|
|
const listed = listedWorktreePaths(repoDir);
|
|
assert.ok(
|
|
listed.has(canonicalPath(worktreeDir)),
|
|
'git worktree list should still reference merged worktree'
|
|
);
|
|
});
|
|
|
|
// Test 2: keeps a worktree whose branch has unmerged commits
|
|
test('keeps a worktree whose branch has unmerged commits', () => {
|
|
const repoDir = path.join(tmpBase, 'repo2');
|
|
const worktreeDir = path.join(tmpBase, 'wt-active');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create the worktree on a new branch (main is checked out in repoDir)
|
|
execSync('git worktree add "' + worktreeDir + '" -b fix/active-work', { cwd: repoDir, stdio: 'pipe' });
|
|
|
|
// Add a commit in the worktree (NOT merged into main)
|
|
fs.writeFileSync(path.join(worktreeDir, 'active.txt'), 'active\n');
|
|
execSync('git add -A', { cwd: worktreeDir, stdio: 'pipe' });
|
|
execSync('git commit -m "active work"', { cwd: worktreeDir, stdio: 'pipe' });
|
|
// main stays at its original commit — no merge
|
|
|
|
// Act
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
pruneOrphanedWorktrees(repoDir);
|
|
|
|
// Assert: worktree directory still exists
|
|
assert.ok(
|
|
fs.existsSync(worktreeDir),
|
|
'worktree directory should NOT have been removed: ' + worktreeDir
|
|
);
|
|
});
|
|
|
|
// Test 3: never removes the worktree at process.cwd()
|
|
test('never removes the worktree at process.cwd()', () => {
|
|
const repoDir = path.join(tmpBase, 'repo3');
|
|
const wtDir = path.join(tmpBase, 'wt-cwd-test');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create a worktree, add a commit, merge it into main
|
|
execSync('git worktree add "' + wtDir + '" -b fix/another-merged', { cwd: repoDir, stdio: 'pipe' });
|
|
fs.writeFileSync(path.join(wtDir, 'more.txt'), 'more\n');
|
|
execSync('git add -A', { cwd: wtDir, stdio: 'pipe' });
|
|
execSync('git commit -m "another merged"', { cwd: wtDir, stdio: 'pipe' });
|
|
execSync('git checkout main', { cwd: repoDir, stdio: 'pipe' });
|
|
execSync('git merge fix/another-merged --no-ff -m "merge another"', { cwd: repoDir, stdio: 'pipe' });
|
|
|
|
// Run pruning
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
const pruned = pruneOrphanedWorktrees(repoDir);
|
|
|
|
// No destructive removals are performed by default
|
|
assert.deepStrictEqual(pruned, []);
|
|
|
|
// The main worktree (repoDir) itself must still exist
|
|
assert.ok(
|
|
fs.existsSync(repoDir),
|
|
'main repo dir should still exist: ' + repoDir
|
|
);
|
|
});
|
|
|
|
// Test 4: runs git worktree prune to clear stale references
|
|
test('runs git worktree prune to clear stale references', () => {
|
|
const repoDir = path.join(tmpBase, 'repo4');
|
|
const worktreeDir = path.join(tmpBase, 'wt-stale');
|
|
|
|
createGitRepo(repoDir);
|
|
|
|
// Create a worktree
|
|
execSync('git worktree add "' + worktreeDir + '" -b fix/stale-ref', { cwd: repoDir, stdio: 'pipe' });
|
|
assert.ok(fs.existsSync(worktreeDir), 'worktree dir should exist before manual deletion');
|
|
|
|
// Use the canonicalPath helper so Windows 8.3 short-name (RUNNER~1) vs
|
|
// long-form (runneradmin) and slash-direction differences both collapse
|
|
// to the same key before comparison. git stores the long-form path in
|
|
// its administrative files; substring matching on the raw path fails.
|
|
// Capture the canonical key BEFORE deletion since canonicalPath calls
|
|
// realpathSync.native which fails on missing paths.
|
|
const wantedKey = canonicalPath(worktreeDir);
|
|
assert.ok(listedWorktreePaths(repoDir).has(wantedKey), 'worktree should appear in list before deletion');
|
|
|
|
// Manually delete the worktree directory (simulate orphan)
|
|
fs.rmSync(worktreeDir, { recursive: true, force: true });
|
|
|
|
// Act
|
|
const pruneOrphanedWorktrees = getPruneOrphanedWorktrees();
|
|
pruneOrphanedWorktrees(repoDir);
|
|
|
|
// Assert: git worktree list no longer shows the stale entry.
|
|
assert.ok(
|
|
!listedWorktreePaths(repoDir).has(wantedKey),
|
|
'git worktree list still shows stale entry after prune'
|
|
);
|
|
});
|
|
});
|