gsd-pi 2.13.0 → 2.14.0

package/src/resources/extensions/gsd/worktree-manager.ts

@@ -17,7 +17,7 @@
 
 import { existsSync, mkdirSync, realpathSync } from "node:fs";
 import { execSync } from "node:child_process";
-import { join, resolve } from "node:path";
+import { join, resolve, sep } from "node:path";
 
 // ─── Types ─────────────────────────────────────────────────────────────────
 
@@ -213,7 +213,11 @@ export function listWorktrees(basePath: string): WorktreeInfo[] {
 
     const entryPath = wtLine.replace("worktree ", "");
     const branch = branchLine.replace("branch refs/heads/", "");
-    const branchWorktreeName = branch.startsWith("worktree/") ? branch.slice("worktree/".length) : null;
+    const branchWorktreeName = branch.startsWith("worktree/")
+      ? branch.slice("worktree/".length)
+      : branch.startsWith("milestone/")
+        ? branch.slice("milestone/".length)
+        : null;
     const entryVariants = [resolve(entryPath)];
     if (existsSync(entryPath)) {
       entryVariants.push(realpathSync(entryPath));
@@ -272,7 +276,7 @@ export function removeWorktree(
   // If we're inside the worktree, move out first — git can't remove an in-use directory
   const cwd = process.cwd();
   const resolvedCwd = existsSync(cwd) ? realpathSync(cwd) : cwd;
-  if (resolvedCwd === resolvedWtPath || resolvedCwd.startsWith(resolvedWtPath + "/")) {
+  if (resolvedCwd === resolvedWtPath || resolvedCwd.startsWith(resolvedWtPath + sep)) {
     process.chdir(basePath);
   }
 

package/src/resources/extensions/gsd/worktree.ts

@@ -1,18 +1,15 @@
 /**
- * GSD Slice Branch Management — Thin Facade
+ * GSD Worktree Utilities
  *
- * Simple branch-per-slice workflow. No worktrees, no registry.
- * Runtime state (metrics, activity, lock, STATE.md) is gitignored
- * so branch switches are clean.
+ * Pure utility functions for worktree name detection, legacy branch name
+ * parsing, and integration branch capture.
  *
- * All git-mutation functions delegate to GitServiceImpl from git-service.ts.
  * Pure utility functions (detectWorktreeName, getSliceBranchName, parseSliceBranch,
- * SLICE_BRANCH_RE) remain standalone.
+ * SLICE_BRANCH_RE) remain standalone for backwards compatibility.
  *
- * Flow:
- *   1. ensureSliceBranch() — create + checkout slice branch
- *   2. agent does work, commits
- *   3. mergeSliceToMain() — checkout integration branch, squash-merge, delete slice branch
+ * Branchless architecture: all work commits sequentially on the milestone branch.
+ * Pure utility functions (detectWorktreeName, getSliceBranchName, parseSliceBranch,
+ * SLICE_BRANCH_RE) remain for backwards compatibility with legacy branches.
  */
 
 import { sep } from "node:path";
@@ -20,8 +17,6 @@ import { sep } from "node:path";
 import { GitServiceImpl, writeIntegrationBranch } from "./git-service.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 
-// Re-export MergeSliceResult from the canonical source (D014 — type-only re-export)
-export type { MergeSliceResult } from "./git-service.js";
 export { MergeConflictError } from "./git-service.js";
 
 // ─── Lazy GitServiceImpl Cache ─────────────────────────────────────────────
@@ -140,19 +135,6 @@ export function getCurrentBranch(basePath: string): string {
   return getService(basePath).getCurrentBranch();
 }
 
-/**
- * Ensure the slice branch exists and is checked out.
- * Creates the branch from the current branch if it's not a slice branch,
- * otherwise from main. This preserves planning artifacts (CONTEXT, ROADMAP,
- * etc.) that were committed on the working branch — which may differ from
- * the repo's default branch (e.g. `developer` vs `main`).
- * When inside a worktree, the branch is namespaced to avoid conflicts.
- * Returns true if the branch was newly created.
- */
-export function ensureSliceBranch(basePath: string, milestoneId: string, sliceId: string): boolean {
-  return getService(basePath).ensureSliceBranch(milestoneId, sliceId);
-}
-
 /**
  * Auto-commit any dirty files in the current working tree.
  * Returns the commit message used, or null if already clean.
@@ -163,44 +145,4 @@ export function autoCommitCurrentBranch(
   return getService(basePath).autoCommit(unitType, unitId);
 }
 
-/**
- * Switch to the integration branch, auto-committing any dirty files on the current branch first.
- */
-export function switchToMain(basePath: string): void {
-  getService(basePath).switchToMain();
-}
 
-/**
- * Squash-merge a completed slice branch into the integration branch.
- * Expects to already be on the integration branch (call switchToMain first).
- * Deletes the slice branch after merge.
- */
-export function mergeSliceToMain(
-  basePath: string, milestoneId: string, sliceId: string, sliceTitle: string,
-): import("./git-service.ts").MergeSliceResult {
-  return getService(basePath).mergeSliceToMain(milestoneId, sliceId, sliceTitle);
-}
-
-// ─── Query Functions (delegate to GitServiceImpl) ──────────────────────────
-
-/**
- * Check if we're currently on a slice branch (not main).
- * Handles both plain (gsd/M001/S01) and worktree-namespaced (gsd/wt/M001/S01) branches.
- */
-export function isOnSliceBranch(basePath: string): boolean {
-  const current = getCurrentBranch(basePath);
-  return SLICE_BRANCH_RE.test(current);
-}
-
-/**
- * Get the active slice branch name, or null if on main.
- * Handles both plain and worktree-namespaced branch patterns.
- */
-export function getActiveSliceBranch(basePath: string): string | null {
-  try {
-    const current = getCurrentBranch(basePath);
-    return SLICE_BRANCH_RE.test(current) ? current : null;
-  } catch {
-    return null;
-  }
-}

package/src/resources/extensions/search-the-web/command-search-provider.ts

@@ -90,8 +90,10 @@ export function registerSearchProviderCommand(pi: ExtensionAPI): void {
 
       setSearchProviderPreference(chosen)
       const effective = resolveSearchProvider()
+      const isAnthropic = ctx.model?.provider === 'anthropic'
+      const nativeNote = isAnthropic ? '\nNote: Native Anthropic web search is also active (automatic, no API key needed).' : ''
       ctx.ui.notify(
-        `Search provider set to ${chosen}. Effective provider: ${effective ?? 'none (no API keys)'}`,
+        `Search provider set to ${chosen}. Effective provider: ${effective ?? 'none (no API keys)'}${nativeNote}`,
         'info',
       )
     },

package/dist/resources/extensions/gsd/tests/auto-worktree-merge.test.ts

@@ -1,282 +0,0 @@
-/**
- * auto-worktree-merge.test.ts — Integration tests for mergeSliceToMilestone.
- *
- * Covers: --no-ff merge topology, rich commit messages, slice branch deletion,
- * zero-commit error, real code conflicts, .gsd/ non-conflict in worktree mode.
- * All tests use real git operations in temp repos.
- */
-
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync, existsSync, realpathSync } from "node:fs";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { execSync } from "node:child_process";
-
-import {
-  createAutoWorktree,
-  teardownAutoWorktree,
-  mergeSliceToMilestone,
-} from "../auto-worktree.ts";
-import { MergeConflictError } from "../git-service.ts";
-import { getSliceBranchName } from "../worktree.ts";
-
-import { createTestContext } from "./test-helpers.ts";
-
-const { assertEq, assertTrue, assertMatch, report } = createTestContext();
-
-function run(cmd: string, cwd: string): string {
-  return execSync(cmd, { cwd, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" }).trim();
-}
-
-function createTempRepo(): string {
-  const dir = realpathSync(mkdtempSync(join(tmpdir(), "wt-merge-test-")));
-  run("git init", dir);
-  run("git config user.email test@test.com", dir);
-  run("git config user.name Test", dir);
-  writeFileSync(join(dir, "README.md"), "# test\n");
-  mkdirSync(join(dir, ".gsd"), { recursive: true });
-  writeFileSync(join(dir, ".gsd", "STATE.md"), "# State\n");
-  run("git add .", dir);
-  run("git commit -m init", dir);
-  run("git branch -M main", dir);
-  return dir;
-}
-
-/** Create a slice branch in the worktree, add commits, return branch name. */
-function setupSliceBranch(
-  wtPath: string,
-  milestoneId: string,
-  sliceId: string,
-  commits: Array<{ file: string; content: string; message: string }>,
-): string {
-  // Detect worktree name for branch naming
-  const normalizedPath = wtPath.replaceAll("\\", "/");
-  const marker = "/.gsd/worktrees/";
-  const idx = normalizedPath.indexOf(marker);
-  const worktreeName = idx !== -1 ? normalizedPath.slice(idx + marker.length).split("/")[0] : null;
-  const sliceBranch = getSliceBranchName(milestoneId, sliceId, worktreeName);
-
-  run(`git checkout -b ${sliceBranch}`, wtPath);
-  for (const c of commits) {
-    writeFileSync(join(wtPath, c.file), c.content);
-    run("git add .", wtPath);
-    run(`git commit -m "${c.message}"`, wtPath);
-  }
-  return sliceBranch;
-}
-
-async function main(): Promise<void> {
-  const savedCwd = process.cwd();
-  const tempDirs: string[] = [];
-
-  function freshRepo(): string {
-    const d = createTempRepo();
-    tempDirs.push(d);
-    return d;
-  }
-
-  try {
-    // ─── Test 1: Single slice --no-ff merge ────────────────────────────
-    console.log("\n=== single slice --no-ff merge ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      const sliceBranch = setupSliceBranch(wtPath, "M003", "S01", [
-        { file: "a.ts", content: "const a = 1;\n", message: "add a.ts" },
-        { file: "b.ts", content: "const b = 2;\n", message: "add b.ts" },
-        { file: "c.ts", content: "const c = 3;\n", message: "add c.ts" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-
-      const result = mergeSliceToMilestone(repo, "M003", "S01", "Add core files");
-
-      // Verify we're back on milestone branch
-      const branch = run("git branch --show-current", wtPath);
-      assertEq(branch, "milestone/M003", "back on milestone branch after merge");
-
-      // Verify merge topology via git log --graph
-      const log = run("git log --oneline --graph", wtPath);
-      assertTrue(log.includes("*   "), "merge commit visible in graph (asterisk with two parents)");
-      assertTrue(log.includes("add a.ts"), "slice commit 'add a.ts' visible");
-      assertTrue(log.includes("add b.ts"), "slice commit 'add b.ts' visible");
-      assertTrue(log.includes("add c.ts"), "slice commit 'add c.ts' visible");
-
-      // Verify commit message format
-      assertMatch(result.mergedCommitMessage, /feat\(M003\/S01\)/, "commit message has conventional format");
-      assertTrue(result.mergedCommitMessage.includes("Add core files"), "commit message includes slice title");
-
-      // Verify slice branch deleted
-      assertTrue(result.deletedBranch, "slice branch deleted");
-      const branches = run("git branch", wtPath);
-      assertTrue(!branches.includes(sliceBranch), "slice branch no longer in git branch list");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 2: Two sequential slices ─────────────────────────────────
-    console.log("\n=== two sequential slices ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // Slice S01
-      setupSliceBranch(wtPath, "M003", "S01", [
-        { file: "s1.ts", content: "export const s1 = 1;\n", message: "s1 work" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-      mergeSliceToMilestone(repo, "M003", "S01", "First slice");
-
-      // Slice S02
-      setupSliceBranch(wtPath, "M003", "S02", [
-        { file: "s2.ts", content: "export const s2 = 2;\n", message: "s2 work" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-      mergeSliceToMilestone(repo, "M003", "S02", "Second slice");
-
-      // Verify two merge boundaries
-      const log = run("git log --oneline --graph", wtPath);
-      const mergeLines = log.split("\n").filter(l => l.includes("*   "));
-      assertTrue(mergeLines.length >= 2, "two distinct merge commits in graph");
-      assertTrue(log.includes("s1 work"), "S01 commit visible");
-      assertTrue(log.includes("s2 work"), "S02 commit visible");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 3: Zero commits throws ───────────────────────────────────
-    console.log("\n=== zero commits throws ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // Create slice branch with no commits ahead
-      const normalizedPath = wtPath.replaceAll("\\", "/");
-      const marker = "/.gsd/worktrees/";
-      const idx = normalizedPath.indexOf(marker);
-      const worktreeName = idx !== -1 ? normalizedPath.slice(idx + marker.length).split("/")[0] : null;
-      const sliceBranch = getSliceBranchName("M003", "S01", worktreeName);
-      run(`git checkout -b ${sliceBranch}`, wtPath);
-      // No commits — immediately try to merge
-      run(`git checkout milestone/M003`, wtPath);
-
-      let threw = false;
-      try {
-        mergeSliceToMilestone(repo, "M003", "S01", "Empty slice");
-      } catch (err) {
-        threw = true;
-        assertTrue(
-          err instanceof Error && err.message.includes("no commits ahead"),
-          "error message mentions no commits ahead",
-        );
-      }
-      assertTrue(threw, "mergeSliceToMilestone throws on zero commits");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 4: Real code conflict throws MergeConflictError ──────────
-    console.log("\n=== real code conflict throws MergeConflictError ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // Add a file on milestone branch
-      writeFileSync(join(wtPath, "shared.ts"), "// version 1\n");
-      run("git add .", wtPath);
-      run('git commit -m "add shared.ts"', wtPath);
-
-      // Create slice branch, modify same file differently
-      const normalizedPath = wtPath.replaceAll("\\", "/");
-      const marker = "/.gsd/worktrees/";
-      const idx = normalizedPath.indexOf(marker);
-      const worktreeName = idx !== -1 ? normalizedPath.slice(idx + marker.length).split("/")[0] : null;
-      const sliceBranch = getSliceBranchName("M003", "S01", worktreeName);
-      run(`git checkout -b ${sliceBranch}`, wtPath);
-      writeFileSync(join(wtPath, "shared.ts"), "// slice version\nexport const x = 1;\n");
-      run("git add .", wtPath);
-      run('git commit -m "slice edit shared.ts"', wtPath);
-
-      // Modify same file on milestone branch
-      run("git checkout milestone/M003", wtPath);
-      writeFileSync(join(wtPath, "shared.ts"), "// milestone version\nexport const y = 2;\n");
-      run("git add .", wtPath);
-      run('git commit -m "milestone edit shared.ts"', wtPath);
-
-      // Go back to milestone branch for merge call
-      run("git checkout milestone/M003", wtPath);
-
-      let caught: MergeConflictError | null = null;
-      try {
-        mergeSliceToMilestone(repo, "M003", "S01", "Conflicting slice");
-      } catch (err) {
-        if (err instanceof MergeConflictError) {
-          caught = err;
-        } else {
-          throw err;
-        }
-      }
-
-      assertTrue(caught !== null, "MergeConflictError thrown on conflict");
-      if (caught) {
-        assertTrue(caught.conflictedFiles.includes("shared.ts"), "conflictedFiles includes shared.ts");
-        assertEq(caught.strategy, "merge", "strategy is merge");
-        assertTrue(caught.branch.includes("S01"), "branch includes S01");
-      }
-
-      // Clean up conflict state before teardown
-      run("git merge --abort || true", wtPath);
-      run("git checkout milestone/M003", wtPath);
-      teardownAutoWorktree(repo, "M003");
-    }
-
-    // ─── Test 5: .gsd/ changes don't conflict ─────────────────────────
-    console.log("\n=== .gsd/ changes don't conflict ===");
-    {
-      const repo = freshRepo();
-      const wtPath = createAutoWorktree(repo, "M003");
-
-      // The .gsd/ directory in worktrees is local — it's not shared via git
-      // between the main repo and the worktree. So modifications to .gsd/
-      // files in both branches shouldn't cause conflicts because .gsd/ is
-      // in the main repo's tree but the worktree has its own working copy.
-      //
-      // In the worktree, .gsd/ IS tracked (inherited from main). But since
-      // slice branches diverge from milestone branch, .gsd/ changes on both
-      // can conflict. The key insight: in real auto-mode, .gsd/ changes only
-      // happen on the milestone branch (planning artifacts), not on slice
-      // branches (which only have code changes). So we test that code-only
-      // slice commits merge cleanly even when milestone has .gsd/ changes.
-
-      // Add a .gsd/ change on milestone branch
-      writeFileSync(join(wtPath, ".gsd", "STATE.md"), "# Updated State\nactive: M003\n");
-      run("git add .", wtPath);
-      run('git commit -m "update .gsd/STATE.md on milestone"', wtPath);
-
-      // Create slice branch with code-only changes
-      setupSliceBranch(wtPath, "M003", "S01", [
-        { file: "feature.ts", content: "export const feature = true;\n", message: "add feature" },
-      ]);
-      run("git checkout milestone/M003", wtPath);
-
-      // Merge should succeed — no .gsd/ conflict since slice didn't touch .gsd/
-      const result = mergeSliceToMilestone(repo, "M003", "S01", "Feature slice");
-      assertTrue(result.branch.includes("S01"), ".gsd/ no-conflict merge succeeded");
-      assertTrue(result.deletedBranch, "slice branch deleted after .gsd/-safe merge");
-
-      // Verify feature file exists after merge
-      assertTrue(existsSync(join(wtPath, "feature.ts")), "feature.ts present after merge");
-
-      teardownAutoWorktree(repo, "M003");
-    }
-
-  } finally {
-    process.chdir(savedCwd);
-    for (const d of tempDirs) {
-      if (existsSync(d)) rmSync(d, { recursive: true, force: true });
-    }
-  }
-
-  report();
-}
-
-main();

package/dist/resources/extensions/gsd/tests/isolation-resolver.test.ts

@@ -1,107 +0,0 @@
-/**
- * isolation-resolver.test.ts -- Tests for shouldUseWorktreeIsolation resolver.
- *
- * Tests three resolution paths:
- *  1. Explicit git.isolation preference overrides everything
- *  2. Legacy detection: existing gsd/*\/* branches = branch mode
- *  3. Default: new project = worktree mode
- */
-
-import { mkdtempSync, writeFileSync, rmSync, realpathSync } from "node:fs";
-import { join } from "node:path";
-import { tmpdir } from "node:os";
-import { execSync } from "node:child_process";
-
-import { shouldUseWorktreeIsolation } from "../auto-worktree.ts";
-import { createTestContext } from "./test-helpers.ts";
-
-const { assertEq, report } = createTestContext();
-
-function run(command: string, cwd: string): string {
-  return execSync(command, { cwd, stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" }).trim();
-}
-
-function createTempRepo(): string {
-  const dir = realpathSync(mkdtempSync(join(tmpdir(), "iso-resolver-test-")));
-  run("git init", dir);
-  run("git config user.email test@test.com", dir);
-  run("git config user.name Test", dir);
-  writeFileSync(join(dir, "README.md"), "# test\n");
-  run("git add .", dir);
-  run("git commit -m init", dir);
-  run("git branch -M main", dir);
-  return dir;
-}
-
-async function main(): Promise<void> {
-  const savedCwd = process.cwd();
-
-  console.log("\n=== shouldUseWorktreeIsolation ===");
-
-  // Test 1: New project with no gsd branches → defaults to worktree (true)
-  {
-    const dir = createTempRepo();
-    try {
-      const result = shouldUseWorktreeIsolation(dir);
-      assertEq(result, true, "new project defaults to worktree isolation");
-    } finally {
-      process.chdir(savedCwd);
-      rmSync(dir, { recursive: true, force: true });
-    }
-  }
-
-  // Test 2: Legacy project with gsd/*/* branches → returns false (branch mode)
-  {
-    const dir = createTempRepo();
-    try {
-      // Create a legacy gsd/*/* branch
-      run("git checkout -b gsd/M001/S01", dir);
-      writeFileSync(join(dir, "slice.md"), "# S01\n");
-      run("git add .", dir);
-      run("git commit -m 'slice work'", dir);
-      run("git checkout main", dir);
-
-      const result = shouldUseWorktreeIsolation(dir);
-      assertEq(result, false, "legacy project with gsd branches → branch mode");
-    } finally {
-      process.chdir(savedCwd);
-      rmSync(dir, { recursive: true, force: true });
-    }
-  }
-
-  // Test 3: Explicit preference override -- isolation: "worktree"
-  {
-    const dir = createTempRepo();
-    try {
-      // Create legacy branches that would normally trigger branch mode
-      run("git checkout -b gsd/M001/S01", dir);
-      writeFileSync(join(dir, "slice.md"), "# S01\n");
-      run("git add .", dir);
-      run("git commit -m 'slice work'", dir);
-      run("git checkout main", dir);
-
-      const result = shouldUseWorktreeIsolation(dir, { isolation: "worktree" });
-      assertEq(result, true, "explicit isolation: worktree overrides legacy detection");
-    } finally {
-      process.chdir(savedCwd);
-      rmSync(dir, { recursive: true, force: true });
-    }
-  }
-
-  // Test 4: Explicit preference override -- isolation: "branch"
-  {
-    const dir = createTempRepo();
-    try {
-      // No legacy branches -- would normally default to worktree
-      const result = shouldUseWorktreeIsolation(dir, { isolation: "branch" });
-      assertEq(result, false, "explicit isolation: branch overrides default");
-    } finally {
-      process.chdir(savedCwd);
-      rmSync(dir, { recursive: true, force: true });
-    }
-  }
-
-  report();
-}
-
-main();