gsd-pi 2.65.0-dev.5c8557b → 2.65.0-dev.6cc5110

package/src/resources/extensions/gsd/tests/verify-artifact-tightened.test.ts

@@ -0,0 +1,89 @@
+/**
+ * Regression test for #3607 — tighten verifyExpectedArtifact legacy branch
+ *
+ * The legacy (pre-migration) fallback in verifyExpectedArtifact previously
+ * accepted either a heading match (### T01 --) or a checked checkbox as proof
+ * that gsd_complete_task ran. A heading alone does not prove completion —
+ * it could result from a rogue write.
+ *
+ * The fix removes the hdRe heading regex and requires only a checked checkbox
+ * (cbRe) in the legacy branch, ensuring that only actual tool-completed tasks
+ * are treated as verified.
+ */
+
+import { describe, it } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
+
+const src = readFileSync(
+  resolve(process.cwd(), 'src', 'resources', 'extensions', 'gsd', 'auto-recovery.ts'),
+  'utf-8',
+)
+
+describe('verifyExpectedArtifact legacy branch tightened (#3607)', () => {
+  it('legacy branch does NOT define hdRe heading regex', () => {
+    // Find the legacy fallback section
+    const legacyIdx = src.indexOf('LEGACY: Pre-migration fallback')
+    assert.ok(legacyIdx !== -1, 'LEGACY comment must exist')
+
+    // Check the code within a reasonable window after the LEGACY comment
+    const legacyBlock = src.slice(legacyIdx, legacyIdx + 600)
+
+    assert.ok(
+      !legacyBlock.includes('hdRe'),
+      'hdRe heading regex must NOT exist in legacy branch — heading alone is not proof of completion',
+    )
+  })
+
+  it('legacy branch requires checked checkbox via cbRe', () => {
+    const legacyIdx = src.indexOf('LEGACY: Pre-migration fallback')
+    assert.ok(legacyIdx !== -1)
+
+    const legacyBlock = src.slice(legacyIdx, legacyIdx + 600)
+
+    assert.ok(
+      legacyBlock.includes('cbRe'),
+      'cbRe checked-checkbox regex must exist in legacy branch',
+    )
+
+    // cbRe must match checked checkboxes [x] or [X]
+    assert.ok(
+      legacyBlock.includes('[xX]'),
+      'cbRe must match both [x] and [X] checkbox variants',
+    )
+  })
+
+  it('legacy branch returns false when no plan file exists', () => {
+    const legacyIdx = src.indexOf('LEGACY: Pre-migration fallback')
+    assert.ok(legacyIdx !== -1)
+
+    const legacyBlock = src.slice(legacyIdx, legacyIdx + 1000)
+
+    // The else branch: no plan file means cannot verify
+    assert.ok(
+      legacyBlock.includes('no plan file'),
+      'missing plan file must be handled with return false',
+    )
+  })
+
+  it('DB available but task not found returns false', () => {
+    const legacyIdx = src.indexOf('LEGACY: Pre-migration fallback')
+    assert.ok(legacyIdx !== -1)
+
+    const legacyBlock = src.slice(legacyIdx, legacyIdx + 1000)
+
+    assert.ok(
+      legacyBlock.includes('DB available but task row not found'),
+      'must handle case where DB is available but task row is missing',
+    )
+
+    // The comment should be followed by a return false
+    const commentIdx = legacyBlock.indexOf('DB available but task row not found')
+    const afterComment = legacyBlock.slice(commentIdx, commentIdx + 200)
+    assert.ok(
+      afterComment.includes('return false'),
+      'missing task row when DB available must return false',
+    )
+  })
+})

package/src/resources/extensions/gsd/tests/wave1-critical-regressions.test.ts

@@ -0,0 +1,49 @@
+// GSD State Machine — Wave 1 Critical Regression Tests
+// Validates fixes for event log format mismatch, skipped milestone status,
+// dead code removal, and replan disk-file fallback.
+
+import { describe, test } from "node:test";
+import assert from "node:assert/strict";
+import { extractEntityKey } from "../workflow-reconcile.js";
+import { isClosedStatus } from "../status-guards.js";
+import type { WorkflowEvent } from "../workflow-events.js";
+
+// ── Fix 1: Event log cmd format — hyphens and underscores both accepted ──
+
+describe("extractEntityKey normalizes cmd format", () => {
+  const baseEvent = { params: {}, ts: "", hash: "", actor: "agent" as const, session_id: "" };
+
+  test("accepts hyphenated complete-task", () => {
+    const event: WorkflowEvent = { ...baseEvent, cmd: "complete-task", params: { taskId: "T01" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "task", id: "T01" });
+  });
+
+  test("accepts underscored complete_task (legacy)", () => {
+    const event: WorkflowEvent = { ...baseEvent, cmd: "complete_task", params: { taskId: "T01" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "task", id: "T01" });
+  });
+
+  test("accepts hyphenated complete-slice", () => {
+    const event: WorkflowEvent = { ...baseEvent, cmd: "complete-slice", params: { sliceId: "S01" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "slice", id: "S01" });
+  });
+
+  test("accepts hyphenated complete-milestone", () => {
+    const event: WorkflowEvent = { ...baseEvent, cmd: "complete-milestone", params: { milestoneId: "M001" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "milestone", id: "M001" });
+  });
+});
+
+// ── Fix 3: getActiveMilestoneId must skip "skipped" milestones ──
+
+describe("isClosedStatus includes skipped", () => {
+  test("complete is closed", () => assert.ok(isClosedStatus("complete")));
+  test("done is closed", () => assert.ok(isClosedStatus("done")));
+  test("skipped is closed", () => assert.ok(isClosedStatus("skipped")));
+  test("pending is not closed", () => assert.ok(!isClosedStatus("pending")));
+  test("active is not closed", () => assert.ok(!isClosedStatus("active")));
+});

package/src/resources/extensions/gsd/tests/wave2-events-regressions.test.ts

@@ -0,0 +1,48 @@
+// GSD State Machine — Wave 2 Event Log Regression Tests
+// Validates fixes for appendEvent isolation, entity replay handlers,
+// and post-reconcile cache invalidation.
+
+import { describe, test } from "node:test";
+import assert from "node:assert/strict";
+import { extractEntityKey } from "../workflow-reconcile.js";
+import type { WorkflowEvent } from "../workflow-events.js";
+
+const base = { params: {}, ts: "", hash: "", actor: "agent" as const, session_id: "" };
+
+// ── Fix 8: New entity event types handled by extractEntityKey ──
+
+describe("extractEntityKey handles plan events", () => {
+  test("plan-milestone → milestone type", () => {
+    const event: WorkflowEvent = { ...base, cmd: "plan-milestone", params: { milestoneId: "M001" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "milestone", id: "M001" });
+  });
+
+  test("plan-task → task type", () => {
+    const event: WorkflowEvent = { ...base, cmd: "plan-task", params: { taskId: "T01" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "task", id: "T01" });
+  });
+
+  test("plan-slice preserves slice_plan type (conflict isolation)", () => {
+    const event: WorkflowEvent = { ...base, cmd: "plan-slice", params: { sliceId: "S01" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "slice_plan", id: "S01" });
+  });
+
+  test("replan-slice → slice type", () => {
+    const event: WorkflowEvent = { ...base, cmd: "replan-slice", params: { sliceId: "S01" } };
+    const key = extractEntityKey(event);
+    assert.deepStrictEqual(key, { type: "slice", id: "S01" });
+  });
+});
+
+// ── Fix 8b: Unknown commands return null (don't crash) ──
+
+describe("extractEntityKey handles unknown commands gracefully", () => {
+  test("unknown-command returns null", () => {
+    const event: WorkflowEvent = { ...base, cmd: "unknown-future-cmd", params: { foo: "bar" } };
+    const key = extractEntityKey(event);
+    assert.strictEqual(key, null);
+  });
+});

package/src/resources/extensions/gsd/tests/wave3-session-regressions.test.ts

@@ -0,0 +1,47 @@
+// GSD State Machine — Wave 3 Session Regression Tests
+// Validates tri-state hasImplementationArtifacts and AutoSession.consecutiveCompleteBootstraps.
+
+import { describe, test } from "node:test";
+import assert from "node:assert/strict";
+import { hasImplementationArtifacts } from "../auto-recovery.js";
+import { AutoSession } from "../auto/session.js";
+
+// ── Fix 9: hasImplementationArtifacts returns tri-state ──
+
+describe("hasImplementationArtifacts tri-state return", () => {
+  test("returns 'unknown' for non-git directory", () => {
+    const result = hasImplementationArtifacts("/tmp/not-a-git-repo-" + Date.now());
+    assert.strictEqual(result, "unknown");
+  });
+
+  test("return type is one of present/absent/unknown", () => {
+    const result = hasImplementationArtifacts(process.cwd());
+    assert.ok(
+      result === "present" || result === "absent" || result === "unknown",
+      `Expected present/absent/unknown, got: ${result}`,
+    );
+  });
+});
+
+// ── Fix 11: consecutiveCompleteBootstraps is per-session ──
+
+describe("AutoSession.consecutiveCompleteBootstraps", () => {
+  test("initial value is 0", () => {
+    const s = new AutoSession();
+    assert.strictEqual(s.consecutiveCompleteBootstraps, 0);
+  });
+
+  test("reset() clears the counter", () => {
+    const s = new AutoSession();
+    s.consecutiveCompleteBootstraps = 5;
+    s.reset();
+    assert.strictEqual(s.consecutiveCompleteBootstraps, 0);
+  });
+
+  test("two sessions have independent counters", () => {
+    const s1 = new AutoSession();
+    const s2 = new AutoSession();
+    s1.consecutiveCompleteBootstraps = 3;
+    assert.strictEqual(s2.consecutiveCompleteBootstraps, 0);
+  });
+});

package/src/resources/extensions/gsd/tests/wave4-write-safety-regressions.test.ts

@@ -0,0 +1,70 @@
+// GSD State Machine — Wave 4 Write Safety Regression Tests
+// Validates randomized tmp suffix in json-persistence and atomic writes.
+
+import { describe, test } from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, readFileSync, readdirSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { saveJsonFile, loadJsonFile } from "../json-persistence.js";
+
+// ── Fix 15: json-persistence uses randomized tmp suffix ──
+
+describe("saveJsonFile atomic write", () => {
+  test("writes JSON file correctly", () => {
+    const tmp = mkdtempSync(join(tmpdir(), "gsd-json-test-"));
+    try {
+      const file = join(tmp, "test.json");
+      saveJsonFile(file, { key: "value" });
+      const content = JSON.parse(readFileSync(file, "utf-8"));
+      assert.deepStrictEqual(content, { key: "value" });
+    } finally {
+      rmSync(tmp, { recursive: true, force: true });
+    }
+  });
+
+  test("no .tmp file left after successful write", () => {
+    const tmp = mkdtempSync(join(tmpdir(), "gsd-json-test-"));
+    try {
+      const file = join(tmp, "test.json");
+      saveJsonFile(file, { data: 123 });
+      const files = readdirSync(tmp);
+      const tmpFiles = files.filter((f: string) => f.includes(".tmp"));
+      assert.strictEqual(tmpFiles.length, 0, "No .tmp files should remain after write");
+    } finally {
+      rmSync(tmp, { recursive: true, force: true });
+    }
+  });
+
+  test("concurrent writes don't corrupt data", () => {
+    const tmp = mkdtempSync(join(tmpdir(), "gsd-json-test-"));
+    try {
+      const file = join(tmp, "shared.json");
+      // Write two different values rapidly — both should succeed without corruption
+      saveJsonFile(file, { writer: "first" });
+      saveJsonFile(file, { writer: "second" });
+      const content = JSON.parse(readFileSync(file, "utf-8"));
+      assert.strictEqual(content.writer, "second");
+    } finally {
+      rmSync(tmp, { recursive: true, force: true });
+    }
+  });
+
+  test("round-trip through loadJsonFile", () => {
+    const tmp = mkdtempSync(join(tmpdir(), "gsd-json-test-"));
+    try {
+      const file = join(tmp, "roundtrip.json");
+      const data = { items: [1, 2, 3], name: "test" };
+      saveJsonFile(file, data);
+      const loaded = loadJsonFile(
+        file,
+        (d): d is typeof data => typeof d === "object" && d !== null && "items" in d,
+        () => ({ items: [], name: "" }),
+      );
+      assert.deepStrictEqual(loaded.items, [1, 2, 3]);
+      assert.strictEqual(loaded.name, "test");
+    } finally {
+      rmSync(tmp, { recursive: true, force: true });
+    }
+  });
+});

package/src/resources/extensions/gsd/tests/worker-model-override.test.ts

@@ -0,0 +1,48 @@
+/**
+ * Worker model override — tests for parallel.worker_model preference.
+ *
+ * Verifies validation, resolveParallelConfig pass-through, and type definitions.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+const typesSrc = readFileSync(join(__dirname, "..", "types.ts"), "utf-8");
+const validationSrc = readFileSync(join(__dirname, "..", "preferences-validation.ts"), "utf-8");
+const preferencesSrc = readFileSync(join(__dirname, "..", "preferences.ts"), "utf-8");
+
+// ─── Type definition ──────────────────────────────────────────────────────
+
+test("ParallelConfig includes worker_model optional field", () => {
+  assert.ok(
+    typesSrc.includes("worker_model?: string"),
+    "ParallelConfig should have optional worker_model field",
+  );
+});
+
+// ─── Validation ───────────────────────────────────────────────────────────
+
+test("validatePreferences accepts valid worker_model string", () => {
+  assert.ok(
+    validationSrc.includes("p.worker_model"),
+    "validation should check parallel.worker_model",
+  );
+  assert.ok(
+    validationSrc.includes('parallel.worker_model must be a non-empty string'),
+    "validation should reject invalid worker_model",
+  );
+});
+
+// ─── resolveParallelConfig ────────────────────────────────────────────────
+
+test("resolveParallelConfig passes through worker_model", () => {
+  assert.ok(
+    preferencesSrc.includes("worker_model: prefs?.parallel?.worker_model"),
+    "resolveParallelConfig should pass through worker_model",
+  );
+});

package/src/resources/extensions/gsd/tests/workflow-logger-audit.test.ts

@@ -90,18 +90,21 @@ describe("workflow-logger audit persistence", () => {
     assert.ok(ctx, "context should exist");
     assert.equal(ctx.fn, "saveDecisionToDb");
     assert.equal(ctx.tool, "gsd_decision_save");
-    assert.equal(ctx.error, undefined, "error key must be stripped from persisted context");
+    assert.equal(ctx.error, "SQLITE_BUSY: database is locked", "error key should be preserved in persisted context");
     assert.equal(ctx.file, undefined, "file key must be stripped from persisted context");
   });
 
-  test("persisted errors omit context when no safe keys present", () => {
+  test("persisted errors preserve error key but strip other unsafe keys", () => {
     logError("bootstrap", "ensureDbOpen failed", {
       error: "ENOENT",
       cwd: "/home/user/project",
     });
     const lines = readAuditLines(tmp);
     assert.equal(lines.length, 1);
-    assert.equal(lines[0].context, undefined, "context should be omitted when no safe keys match");
+    const ctx = lines[0].context as Record<string, string>;
+    assert.ok(ctx, "context should exist when error key is present");
+    assert.equal(ctx.error, "ENOENT", "error key should be preserved");
+    assert.equal(ctx.cwd, undefined, "cwd key must be stripped");
   });
 
   test("mixed warnings and errors only persist errors", () => {

package/src/resources/extensions/gsd/tests/worktree-expected-warnings.test.ts

@@ -0,0 +1,38 @@
+/**
+ * worktree-expected-warnings.test.ts — #3665
+ *
+ * Verify that auto-worktree.ts and worktree-manager.ts suppress expected
+ * ENOENT and EISDIR conditions instead of logging misleading warnings.
+ */
+
+import { describe, test } from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const autoWorktreeFile = join(__dirname, "..", "auto-worktree.ts");
+const worktreeManagerFile = join(__dirname, "..", "worktree-manager.ts");
+
+describe("worktree expected-condition warning suppression (#3665)", () => {
+  const autoSource = readFileSync(autoWorktreeFile, "utf-8");
+
+  test("auto-worktree.ts checks for ENOENT before logging unlink warning", () => {
+    assert.match(autoSource, /code\s*!==\s*["']ENOENT["']/);
+  });
+
+  test("auto-worktree.ts checks for EISDIR before logging unlink warning", () => {
+    assert.match(autoSource, /code\s*!==\s*["']EISDIR["']/);
+  });
+
+  test("auto-worktree.ts references issue #3597", () => {
+    assert.match(autoSource, /#3597/);
+  });
+
+  const managerSource = readFileSync(worktreeManagerFile, "utf-8");
+
+  test("worktree-manager.ts checks isDirectory() before reading .git file", () => {
+    assert.match(managerSource, /lstatSync\(gitPath\)\.isDirectory\(\)/);
+  });
+});

package/src/resources/extensions/gsd/tests/worktree-integration.test.ts

@@ -26,9 +26,11 @@ import {
   getSliceBranchName,
   autoCommitCurrentBranch,
   SLICE_BRANCH_RE,
+  _resetServiceCache,
 } from "../worktree.ts";
 
 import { deriveState } from "../state.ts";
+import { _clearGsdRootCache } from "../paths.ts";
 import { describe, test } from 'node:test';
 import assert from 'node:assert/strict';
 
@@ -74,6 +76,14 @@ run("git add .", base);
 run('git commit -m "chore: init"', base);
 
 describe('worktree-integration', async () => {
+  // Isolate from user's global preferences (which may have git.main_branch set).
+  // Reset caches so getService() creates a fresh instance with empty preferences.
+  const originalHome = process.env.HOME;
+  const fakeHome = mkdtempSync(join(tmpdir(), "gsd-fake-home-"));
+  process.env.HOME = fakeHome;
+  _clearGsdRootCache();
+  _resetServiceCache();
+
   // ── Verify main tree baseline ──────────────────────────────────────────────
 
   console.log("\n=== Main tree baseline ===");
@@ -197,4 +207,10 @@ describe('worktree-integration', async () => {
   assert.deepStrictEqual(listWorktrees(base).length, 0, "all worktrees removed");
 
   rmSync(base, { recursive: true, force: true });
+
+  // Restore HOME and reset caches
+  process.env.HOME = originalHome;
+  _clearGsdRootCache();
+  _resetServiceCache();
+  rmSync(fakeHome, { recursive: true, force: true });
 });

package/src/resources/extensions/gsd/tests/worktree-main-branch.test.ts

@@ -0,0 +1,20 @@
+/**
+ * Regression test for #3461: createAutoWorktree must use git.main_branch
+ * preference when META.json integration branch is absent.
+ */
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+
+test("auto-worktree.ts includes main_branch preference in startPoint fallback (#3461)", () => {
+  const src = readFileSync(
+    join(import.meta.dirname, "..", "auto-worktree.ts"),
+    "utf-8",
+  );
+  // The fix adds gitPrefs?.main_branch to the startPoint fallback chain
+  assert.ok(
+    src.includes("gitPrefs?.main_branch") || src.includes("prefs.main_branch"),
+    "createAutoWorktree must check git.main_branch preference before falling back to nativeDetectMainBranch",
+  );
+});

package/src/resources/extensions/gsd/tests/worktree-sync-milestones.test.ts

@@ -221,7 +221,8 @@ describe('worktree-sync-milestones', async () => {
 
     try {
       // Build worktree milestone structure with slice-level and task-level files
-      const wtSliceDir = join(wtBase, '.gsd', 'milestones', 'M001', 'slices', 'S01');
+      // Use M002 as the milestone to sync, M001 as the "current" being merged (skipped)
+      const wtSliceDir = join(wtBase, '.gsd', 'milestones', 'M002', 'slices', 'S01');
       const wtTasksDir = join(wtSliceDir, 'tasks');
       mkdirSync(wtTasksDir, { recursive: true });
       writeFileSync(join(wtSliceDir, 'S01-SUMMARY.md'), '# S01 Summary');
@@ -229,11 +230,12 @@ describe('worktree-sync-milestones', async () => {
       writeFileSync(join(wtTasksDir, 'T02-SUMMARY.md'), '# T02 Summary');
 
       // Main project root starts with only the milestone directory (no slices yet)
-      mkdirSync(join(mainBase, '.gsd', 'milestones', 'M001'), { recursive: true });
+      mkdirSync(join(mainBase, '.gsd', 'milestones', 'M002'), { recursive: true });
 
+      // Pass M001 as milestoneId (the one being merged/skipped), M002 should still sync
       const { synced } = syncWorktreeStateBack(mainBase, wtBase, 'M001');
 
-      const mainSliceDir = join(mainBase, '.gsd', 'milestones', 'M001', 'slices', 'S01');
+      const mainSliceDir = join(mainBase, '.gsd', 'milestones', 'M002', 'slices', 'S01');
       const mainTasksDir = join(mainSliceDir, 'tasks');
 
       assert.ok(
@@ -341,16 +343,16 @@ describe('worktree-sync-milestones', async () => {
         'M002 missing in main before sync',
       );
 
-      // Sync with milestoneId = M001 (the current milestone)
+      // Sync with milestoneId = M001 (the current milestone being merged — skipped)
       const { synced } = syncWorktreeStateBack(mainBase, wtBase, 'M001');
 
-      // M001 should be synced (current milestone — always synced)
+      // M001 should be SKIPPED (current milestone being merged — #3641)
       assert.ok(
-        existsSync(join(mainBase, '.gsd', 'milestones', 'M001', 'M001-SUMMARY.md')),
-        'M001 SUMMARY synced to main',
+        !existsSync(join(mainBase, '.gsd', 'milestones', 'M001', 'M001-SUMMARY.md')),
+        'M001 SUMMARY NOT synced (current milestone skipped to prevent merge conflicts)',
       );
 
-      // M002 should ALSO be synced (next milestone — the fix)
+      // M002 should be synced (other milestone — not skipped)
       assert.ok(
         existsSync(join(mainBase, '.gsd', 'milestones', 'M002-abc123', 'M002-abc123-CONTEXT.md')),
         'M002 CONTEXT synced to main (next-milestone fix)',
@@ -407,20 +409,17 @@ describe('worktree-sync-milestones', async () => {
       writeFileSync(join(wtBase, '.gsd', 'REQUIREMENTS.md'), '# Requirements\n## R001-R089\n## R090 — SCIM\n## R091 — WebAuthn');
       writeFileSync(join(wtBase, '.gsd', 'PROJECT.md'), '# Project\nMilestones: M001-M007');
 
-      // Sync with milestoneId = M006 (the completing milestone)
+      // Sync with milestoneId = M006 (the completing milestone — skipped by sync)
       const { synced } = syncWorktreeStateBack(mainBase, wtBase, 'M006-589wvh');
 
-      // Verify M006 artifacts synced
-      assert.ok(
-        existsSync(join(mainBase, '.gsd', 'milestones', 'M006-589wvh', 'M006-589wvh-SUMMARY.md')),
-        'M006 SUMMARY synced',
-      );
+      // M006 is the current milestone being merged — it should be SKIPPED (#3641)
+      // Its files are already in the milestone branch and would conflict with squash merge.
       assert.ok(
-        existsSync(join(mainBase, '.gsd', 'milestones', 'M006-589wvh', 'slices', 'S01', 'S01-SUMMARY.md')),
-        'M006 S01 SUMMARY synced',
+        !existsSync(join(mainBase, '.gsd', 'milestones', 'M006-589wvh', 'M006-589wvh-SUMMARY.md')),
+        'M006 SUMMARY NOT synced (current milestone skipped)',
       );
 
-      // Verify M007 artifacts synced (the critical fix)
+      // Verify M007 artifacts synced (the critical fix — other milestones still sync)
       assert.ok(
         existsSync(join(mainBase, '.gsd', 'milestones', 'M007-wortc8', 'M007-wortc8-CONTEXT.md')),
         'M007 CONTEXT synced to main (next-milestone)',

package/src/resources/extensions/gsd/tests/worktree-sync-tasks.test.ts

@@ -47,7 +47,8 @@ function writeFile(dir: string, relativePath: string, content: string): void {
 test("syncWorktreeStateBack copies task summaries from tasks/ subdirectory (#1678)", () => {
   const mainBase = makeTempDir("main");
   const wtBase = makeTempDir("wt");
-  const mid = "M001";
+  const currentMid = "M000"; // milestone being merged (skipped by sync)
+  const mid = "M001";        // other milestone that should be synced
 
   try {
     // Set up worktree with milestone, slice, and task files
@@ -64,8 +65,8 @@ test("syncWorktreeStateBack copies task summaries from tasks/ subdirectory (#167
     // Set up main with empty .gsd
     mkdirSync(join(mainBase, ".gsd"), { recursive: true });
 
-    // Run sync
-    const result = syncWorktreeStateBack(mainBase, wtBase, mid);
+    // Run sync — currentMid is skipped, mid (M001) should be synced
+    const result = syncWorktreeStateBack(mainBase, wtBase, currentMid);
 
     // Verify milestone-level files synced
     assert.ok(
@@ -126,7 +127,8 @@ test("syncWorktreeStateBack copies task summaries from tasks/ subdirectory (#167
 test("syncWorktreeStateBack handles multiple slices with tasks (#1678)", () => {
   const mainBase = makeTempDir("main");
   const wtBase = makeTempDir("wt");
-  const mid = "M002";
+  const currentMid = "M000"; // milestone being merged (skipped)
+  const mid = "M002";        // other milestone that should be synced
 
   try {
     // Set up two slices with tasks
@@ -139,7 +141,7 @@ test("syncWorktreeStateBack handles multiple slices with tasks (#1678)", () => {
 
     mkdirSync(join(mainBase, ".gsd"), { recursive: true });
 
-    const result = syncWorktreeStateBack(mainBase, wtBase, mid);
+    const result = syncWorktreeStateBack(mainBase, wtBase, currentMid);
 
     // All task summaries from both slices should be synced
     assert.ok(existsSync(join(mainBase, `.gsd/milestones/${mid}/slices/S01/tasks/T01-SUMMARY.md`)));
@@ -160,7 +162,8 @@ test("syncWorktreeStateBack handles multiple slices with tasks (#1678)", () => {
 test("syncWorktreeStateBack handles slices without tasks/ directory", () => {
   const mainBase = makeTempDir("main");
   const wtBase = makeTempDir("wt");
-  const mid = "M003";
+  const currentMid = "M000"; // milestone being merged (skipped)
+  const mid = "M003";        // other milestone that should be synced
 
   try {
     // Slice with no tasks/ subdirectory (legitimate case: pre-planning)
@@ -168,7 +171,7 @@ test("syncWorktreeStateBack handles slices without tasks/ directory", () => {
 
     mkdirSync(join(mainBase, ".gsd"), { recursive: true });
 
-    const result = syncWorktreeStateBack(mainBase, wtBase, mid);
+    const result = syncWorktreeStateBack(mainBase, wtBase, currentMid);
 
     // Should sync the slice file without errors
     assert.ok(existsSync(join(mainBase, `.gsd/milestones/${mid}/slices/S01/S01-RESEARCH.md`)));
@@ -183,7 +186,8 @@ test("syncWorktreeStateBack handles slices without tasks/ directory", () => {
 test("syncWorktreeStateBack ignores non-md files in tasks/", () => {
   const mainBase = makeTempDir("main");
   const wtBase = makeTempDir("wt");
-  const mid = "M004";
+  const currentMid = "M000"; // milestone being merged (skipped)
+  const mid = "M004";        // other milestone that should be synced
 
   try {
     writeFile(wtBase, `.gsd/milestones/${mid}/slices/S01/S01-PLAN.md`, "# Plan\n");
@@ -194,7 +198,7 @@ test("syncWorktreeStateBack ignores non-md files in tasks/", () => {
 
     mkdirSync(join(mainBase, ".gsd"), { recursive: true });
 
-    const result = syncWorktreeStateBack(mainBase, wtBase, mid);
+    const result = syncWorktreeStateBack(mainBase, wtBase, currentMid);
 
     // Only .md files should be synced
     assert.ok(existsSync(join(mainBase, `.gsd/milestones/${mid}/slices/S01/tasks/T01-SUMMARY.md`)));