gsd-pi 2.41.0-dev.0acbce9 → 2.41.0-dev.3557dc4

package/src/resources/extensions/gsd/tests/tool-naming.test.ts

@@ -0,0 +1,117 @@
+// tool-naming — Verifies canonical + alias tool registration for GSD DB tools.
+//
+// Each of the 4 DB tools must register under its canonical gsd_concept_action name
+// AND under the old gsd_action_concept name as a backward-compatible alias.
+// The alias must share the exact same execute function reference as the canonical tool.
+
+import { createTestContext } from './test-helpers.ts';
+import { registerDbTools } from '../bootstrap/db-tools.ts';
+
+const { assertEq, assertTrue, report } = createTestContext();
+
+// ─── Mock PI ──────────────────────────────────────────────────────────────────
+
+function makeMockPi() {
+  const tools: any[] = [];
+  return {
+    registerTool: (tool: any) => tools.push(tool),
+    tools,
+  } as any;
+}
+
+// ─── Rename map ───────────────────────────────────────────────────────────────
+
+const RENAME_MAP: Array<{ canonical: string; alias: string }> = [
+  { canonical: "gsd_decision_save", alias: "gsd_save_decision" },
+  { canonical: "gsd_requirement_update", alias: "gsd_update_requirement" },
+  { canonical: "gsd_summary_save", alias: "gsd_save_summary" },
+  { canonical: "gsd_milestone_generate_id", alias: "gsd_generate_milestone_id" },
+];
+
+// ─── Registration count ──────────────────────────────────────────────────────
+
+console.log('\n── Tool naming: registration count ──');
+
+const pi = makeMockPi();
+registerDbTools(pi);
+
+assertEq(pi.tools.length, 8, 'Should register exactly 8 tools (4 canonical + 4 aliases)');
+
+// ─── Both names exist for each pair ──────────────────────────────────────────
+
+console.log('\n── Tool naming: canonical and alias names exist ──');
+
+for (const { canonical, alias } of RENAME_MAP) {
+  const canonicalTool = pi.tools.find((t: any) => t.name === canonical);
+  const aliasTool = pi.tools.find((t: any) => t.name === alias);
+
+  assertTrue(canonicalTool !== undefined, `Canonical tool "${canonical}" should be registered`);
+  assertTrue(aliasTool !== undefined, `Alias tool "${alias}" should be registered`);
+}
+
+// ─── Execute function identity ───────────────────────────────────────────────
+
+console.log('\n── Tool naming: execute function identity (===) ──');
+
+for (const { canonical, alias } of RENAME_MAP) {
+  const canonicalTool = pi.tools.find((t: any) => t.name === canonical);
+  const aliasTool = pi.tools.find((t: any) => t.name === alias);
+
+  if (canonicalTool && aliasTool) {
+    assertTrue(
+      canonicalTool.execute === aliasTool.execute,
+      `"${canonical}" and "${alias}" should share the same execute function reference`,
+    );
+  }
+}
+
+// ─── Alias descriptions include "(alias for ...)" ───────────────────────────
+
+console.log('\n── Tool naming: alias descriptions ──');
+
+for (const { canonical, alias } of RENAME_MAP) {
+  const aliasTool = pi.tools.find((t: any) => t.name === alias);
+
+  if (aliasTool) {
+    assertTrue(
+      aliasTool.description.includes(`alias for ${canonical}`),
+      `Alias "${alias}" description should include "alias for ${canonical}"`,
+    );
+  }
+}
+
+// ─── Canonical tools have proper promptGuidelines ────────────────────────────
+
+console.log('\n── Tool naming: canonical promptGuidelines use canonical name ──');
+
+for (const { canonical } of RENAME_MAP) {
+  const canonicalTool = pi.tools.find((t: any) => t.name === canonical);
+
+  if (canonicalTool) {
+    const guidelinesText = canonicalTool.promptGuidelines.join(' ');
+    assertTrue(
+      guidelinesText.includes(canonical),
+      `Canonical tool "${canonical}" promptGuidelines should reference its own name`,
+    );
+  }
+}
+
+// ─── Alias promptGuidelines direct to canonical ──────────────────────────────
+
+console.log('\n── Tool naming: alias promptGuidelines redirect to canonical ──');
+
+for (const { canonical, alias } of RENAME_MAP) {
+  const aliasTool = pi.tools.find((t: any) => t.name === alias);
+
+  if (aliasTool) {
+    const guidelinesText = aliasTool.promptGuidelines.join(' ');
+    assertTrue(
+      guidelinesText.includes(`Alias for ${canonical}`),
+      `Alias "${alias}" promptGuidelines should say "Alias for ${canonical}"`,
+    );
+  }
+}
+
+// ═══════════════════════════════════════════════════════════════════════════
+
+report();

package/src/resources/extensions/gsd/tests/triage-dispatch.test.ts

@@ -15,6 +15,7 @@ import { fileURLToPath } from "node:url";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const hooksPath = join(__dirname, "..", "post-unit-hooks.ts");
+const registryPath = join(__dirname, "..", "rule-registry.ts");
 const autoPromptsPath = join(__dirname, "..", "auto-prompts.ts");
 
 // After decomposition, triage/dispatch logic lives in auto-post-unit.ts
@@ -25,7 +26,11 @@ const autoSrc = [
   postUnitSrc,
   readFileSync(join(__dirname, "..", "auto-start.ts"), "utf-8"),
 ].join("\n");
-const hooksSrc = readFileSync(hooksPath, "utf-8");
+// Hook exclusion logic lives in the rule-registry (facade delegates there)
+const hooksSrc = [
+  readFileSync(hooksPath, "utf-8"),
+  readFileSync(registryPath, "utf-8"),
+].join("\n");
 const autoPromptsSrc = (() => { try { return readFileSync(autoPromptsPath, "utf-8"); } catch { return autoSrc; } })();
 
 // ─── Hook exclusion ──────────────────────────────────────────────────────────

package/src/resources/extensions/gsd/tests/windows-path-normalization.test.ts

@@ -0,0 +1,99 @@
+/**
+ * windows-path-normalization.test.ts — Verify Windows backslash paths are
+ * normalised to forward slashes before embedding in bash command strings.
+ *
+ * Regression test for #1436: on Windows, `cd C:\Users\user\project` in bash
+ * strips backslashes (escape characters), producing `C:Usersuserproject`.
+ */
+
+import { createTestContext } from "./test-helpers.ts";
+
+const { assertEq, assertTrue, report } = createTestContext();
+
+// ─── shellEscape + path normalization ──────────────────────────────────────
+
+// Replicate the shellEscape helper from cmux/index.ts
+function shellEscape(value: string): string {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+
+// The bashPath pattern used in subagent/index.ts
+function bashPath(p: string): string {
+  return shellEscape(p.replaceAll("\\", "/"));
+}
+
+console.log("\n=== Windows backslash path normalization (#1436) ===");
+
+// Backslash paths are converted to forward slashes
+assertEq(
+  bashPath("C:\\Users\\user\\project"),
+  "'C:/Users/user/project'",
+  "backslash path normalised to forward slashes in shell-escaped string",
+);
+
+// Unix paths pass through unchanged
+assertEq(
+  bashPath("/home/user/project"),
+  "'/home/user/project'",
+  "Unix path unchanged",
+);
+
+// Mixed separators are normalised
+assertEq(
+  bashPath("C:\\Users/user\\project/src"),
+  "'C:/Users/user/project/src'",
+  "mixed separators normalised",
+);
+
+// Paths with single quotes are still properly escaped
+assertEq(
+  bashPath("C:\\Users\\o'brien\\project"),
+  "'C:/Users/o'\\''brien/project'",
+  "single quote in path is escaped after normalisation",
+);
+
+// UNC paths
+assertEq(
+  bashPath("\\\\server\\share\\dir"),
+  "'//server/share/dir'",
+  "UNC path normalised",
+);
+
+// Empty string
+assertEq(
+  bashPath(""),
+  "''",
+  "empty string handled",
+);
+
+// ─── cd command construction ───────────────────────────────────────────────
+
+console.log("\n=== cd command construction with normalised paths ===");
+
+const windowsCwd = "C:\\Users\\user\\project\\.gsd\\worktrees\\M001";
+const cdCommand = `cd ${bashPath(windowsCwd)}`;
+assertEq(
+  cdCommand,
+  "cd 'C:/Users/user/project/.gsd/worktrees/M001'",
+  "cd command uses forward slashes for Windows worktree path",
+);
+
+// Verify the mangled form from #1436 is NOT produced
+assertTrue(
+  !cdCommand.includes("C:Users"),
+  "mangled path C:Usersuserproject must not appear",
+);
+
+// ─── Worktree teardown orphan detection ────────────────────────────────────
+
+console.log("\n=== teardown orphan warning path formatting ===");
+
+const windowsWtDir = "C:\\Users\\user\\project\\.gsd\\worktrees\\M001";
+const helpCommand = `rm -rf "${windowsWtDir.replaceAll("\\", "/")}"`;
+assertEq(
+  helpCommand,
+  'rm -rf "C:/Users/user/project/.gsd/worktrees/M001"',
+  "orphan cleanup help command uses forward slashes",
+);
+
+report();

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

@@ -138,6 +138,7 @@ async function main(): Promise<void> {
         choice: "reconcile on merge",
         rationale: "test coverage",
         revisable: "no",
+        made_by: 'agent',
         superseded_by: null,
       });
       closeDatabase();

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

@@ -47,6 +47,7 @@ function seedMainDb(dbPath: string): void {
     choice: 'node:sqlite',
     rationale: 'Built-in',
     revisable: 'yes',
+    made_by: 'agent',
     superseded_by: null,
   });
   insertRequirement({
@@ -182,6 +183,7 @@ console.log('\n=== worktree-db: reconcileWorktreeDb ===');
     choice: 'WAL',
     rationale: 'Performance',
     revisable: 'yes',
+    made_by: 'agent',
     superseded_by: null,
   });
   closeDatabase();
@@ -357,6 +359,7 @@ console.log('\n=== worktree-db: reconcileWorktreeDb ===');
     choice: 'yes',
     rationale: 'Robustness',
     revisable: 'no',
+    made_by: 'agent',
     superseded_by: null,
   });
   closeDatabase();
@@ -395,6 +398,7 @@ console.log('\n=== worktree-db: reconcileWorktreeDb ===');
     choice: 'works',
     rationale: 'Verify DETACH cleanup',
     revisable: 'no',
+    made_by: 'agent',
     superseded_by: null,
   });
 

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

@@ -0,0 +1,178 @@
+/**
+ * worktree-health-dispatch.test.ts — Regression tests for the worktree health
+ * check in auto/phases.ts (#1833, #1843).
+ *
+ * Verifies that the pre-dispatch health check recognises non-JS project types
+ * (Rust, Go, Python, etc.) via the shared PROJECT_FILES list from detection.ts,
+ * rather than hard-coding package.json / src/ only.
+ */
+
+import test from "node:test";
+import assert from "node:assert/strict";
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { tmpdir } from "node:os";
+import { execSync } from "node:child_process";
+
+import { PROJECT_FILES } from "../detection.js";
+
+// ─── Helpers ─────────────────────────────────────────────────────────────────
+
+/** Create a minimal git repo and return its path. */
+function createGitRepo(): string {
+  const dir = mkdtempSync(join(tmpdir(), "wt-dispatch-test-"));
+  // All execSync calls use hardcoded strings only — no user input, no injection risk.
+  execSync("git init", { cwd: dir, stdio: "ignore" });
+  execSync("git config user.email test@test.com", { cwd: dir, stdio: "ignore" });
+  execSync("git config user.name Test", { cwd: dir, stdio: "ignore" });
+  writeFileSync(join(dir, "README.md"), "# test\n");
+  execSync("git add . && git commit -m init", { cwd: dir, stdio: "ignore" });
+  return dir;
+}
+
+/**
+ * Simulate the health check logic from auto/phases.ts.
+ *
+ * Returns true when the directory would PASS the health check (dispatch
+ * proceeds), false when it would FAIL (dispatch blocked).
+ *
+ * This mirrors the fixed logic: .git must exist, AND at least one
+ * PROJECT_FILES entry or a src/ directory must exist.
+ */
+function wouldPassHealthCheck(basePath: string, existsSyncFn: (p: string) => boolean): boolean {
+  const hasGit = existsSyncFn(join(basePath, ".git"));
+  if (!hasGit) return false;
+
+  for (const file of PROJECT_FILES) {
+    if (existsSyncFn(join(basePath, file))) return true;
+  }
+  if (existsSyncFn(join(basePath, "src"))) return true;
+
+  return false;
+}
+
+import { existsSync } from "node:fs";
+
+// ─── Tests ───────────────────────────────────────────────────────────────────
+
+test("PROJECT_FILES is exported and contains expected multi-ecosystem entries", () => {
+  assert.ok(Array.isArray(PROJECT_FILES), "PROJECT_FILES is an array");
+  assert.ok(PROJECT_FILES.length >= 17, `expected >= 17 entries, got ${PROJECT_FILES.length}`);
+  // Spot-check key ecosystems
+  assert.ok(PROJECT_FILES.includes("Cargo.toml"), "includes Rust marker");
+  assert.ok(PROJECT_FILES.includes("go.mod"), "includes Go marker");
+  assert.ok(PROJECT_FILES.includes("pyproject.toml"), "includes Python marker");
+  assert.ok(PROJECT_FILES.includes("package.json"), "includes JS marker");
+  assert.ok(PROJECT_FILES.includes("pom.xml"), "includes Java marker");
+  assert.ok(PROJECT_FILES.includes("Package.swift"), "includes Swift marker");
+});
+
+test("health check passes for Rust project (Cargo.toml, no package.json)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "Cargo.toml"), "[package]\nname = \"test\"\n");
+    mkdirSync(join(dir, "crates"), { recursive: true });
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "Rust project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for Go project (go.mod, no package.json)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "go.mod"), "module example.com/test\n\ngo 1.21\n");
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "Go project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for Python project (pyproject.toml, no package.json)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "pyproject.toml"), "[project]\nname = \"test\"\n");
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "Python project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for Java project (pom.xml, no package.json)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "pom.xml"), "<project></project>\n");
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "Java project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for Swift project (Package.swift, no package.json)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "Package.swift"), "// swift-tools-version:5.7\n");
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "Swift project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for C/C++ project (CMakeLists.txt, no package.json)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "CMakeLists.txt"), "cmake_minimum_required(VERSION 3.20)\n");
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "C/C++ project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for Elixir project (mix.exs, no package.json)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "mix.exs"), "defmodule Test.MixProject do\nend\n");
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "Elixir project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for JS project (package.json, backward compat)", () => {
+  const dir = createGitRepo();
+  try {
+    writeFileSync(join(dir, "package.json"), '{"name":"test"}\n');
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "JS project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check passes for src/-only project (backward compat)", () => {
+  const dir = createGitRepo();
+  try {
+    mkdirSync(join(dir, "src"), { recursive: true });
+    assert.ok(wouldPassHealthCheck(dir, existsSync), "src/-only project should pass health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check fails for directory with no .git", () => {
+  const dir = mkdtempSync(join(tmpdir(), "wt-dispatch-test-nogit-"));
+  try {
+    writeFileSync(join(dir, "Cargo.toml"), "[package]\nname = \"test\"\n");
+    assert.ok(!wouldPassHealthCheck(dir, existsSync), "no-git directory should fail health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test("health check fails for empty git repo with no project files", () => {
+  const dir = createGitRepo();
+  try {
+    assert.ok(!wouldPassHealthCheck(dir, existsSync), "empty git repo should fail health check");
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
+  }
+});

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

@@ -52,7 +52,7 @@ function makeDeps(
         fn: "mergeMilestoneToMain",
         args: [basePath, milestoneId, roadmapContent],
       });
-      return { pushed: false };
+      return { pushed: false, codeFilesChanged: true };
     },
     syncWorktreeStateBack: (
       mainBasePath: string,
@@ -424,7 +424,7 @@ test("mergeAndExit in worktree mode shows pushed status", () => {
   const deps = makeDeps({
     isInAutoWorktree: () => true,
     getIsolationMode: () => "worktree",
-    mergeMilestoneToMain: () => ({ pushed: true }),
+    mergeMilestoneToMain: () => ({ pushed: true, codeFilesChanged: true }),
   });
   const ctx = makeNotifyCtx();
   const resolver = new WorktreeResolver(s, deps);
@@ -659,6 +659,81 @@ test("mergeAndExit in none mode is a no-op", () => {
   assert.equal(ctx.messages.length, 0);
 });
 
+// ─── #1906 — metadata-only merge warning ────────────────────────────────────
+
+test("mergeAndExit warns when merge contains no code changes (#1906)", () => {
+  const s = makeSession({
+    basePath: "/project/.gsd/worktrees/M001",
+    originalBasePath: "/project",
+  });
+  const deps = makeDeps({
+    isInAutoWorktree: () => true,
+    getIsolationMode: () => "worktree",
+    mergeMilestoneToMain: () => ({ pushed: false, codeFilesChanged: false }),
+  });
+  const ctx = makeNotifyCtx();
+  const resolver = new WorktreeResolver(s, deps);
+
+  resolver.mergeAndExit("M001", ctx);
+
+  assert.ok(
+    ctx.messages.some((m) => m.msg.includes("NO code changes") && m.level === "warning"),
+    "must emit warning when only .gsd/ metadata was merged",
+  );
+  assert.ok(
+    !ctx.messages.some((m) => m.msg.includes("merged to main") && m.level === "info"),
+    "must NOT emit success-style info notification for metadata-only merge",
+  );
+});
+
+test("mergeAndExit emits info when merge contains code changes (#1906)", () => {
+  const s = makeSession({
+    basePath: "/project/.gsd/worktrees/M001",
+    originalBasePath: "/project",
+  });
+  const deps = makeDeps({
+    isInAutoWorktree: () => true,
+    getIsolationMode: () => "worktree",
+    mergeMilestoneToMain: () => ({ pushed: false, codeFilesChanged: true }),
+  });
+  const ctx = makeNotifyCtx();
+  const resolver = new WorktreeResolver(s, deps);
+
+  resolver.mergeAndExit("M001", ctx);
+
+  assert.ok(
+    ctx.messages.some((m) => m.msg.includes("merged to main") && m.level === "info"),
+    "must emit info notification when code files were merged",
+  );
+  assert.ok(
+    !ctx.messages.some((m) => m.msg.includes("NO code changes")),
+    "must NOT emit metadata-only warning when code files were merged",
+  );
+});
+
+test("mergeAndExit branch mode warns when merge contains no code changes (#1906)", () => {
+  const s = makeSession({
+    basePath: "/project",
+    originalBasePath: "/project",
+  });
+  const deps = makeDeps({
+    isInAutoWorktree: () => false,
+    getIsolationMode: () => "branch",
+    getCurrentBranch: () => "milestone/M001",
+    autoWorktreeBranch: () => "milestone/M001",
+    mergeMilestoneToMain: () => ({ pushed: false, codeFilesChanged: false }),
+  });
+  const ctx = makeNotifyCtx();
+  const resolver = new WorktreeResolver(s, deps);
+
+  resolver.mergeAndExit("M001", ctx);
+
+  assert.ok(
+    ctx.messages.some((m) => m.msg.includes("NO code changes") && m.level === "warning"),
+    "branch mode must emit warning when only .gsd/ metadata was merged",
+  );
+});
+
 // ─── mergeAndEnterNext Tests ─────────────────────────────────────────────────
 
 test("mergeAndEnterNext calls mergeAndExit then enterMilestone", () => {
@@ -677,7 +752,7 @@ test("mergeAndEnterNext calls mergeAndExit then enterMilestone", () => {
       _roadmap: string,
     ) => {
       callOrder.push(`merge:${milestoneId}`);
-      return { pushed: false };
+      return { pushed: false, codeFilesChanged: true };
     },
     getAutoWorktreePath: () => null,
     createAutoWorktree: (basePath: string, milestoneId: string) => {