gsd-pi 2.10.12 → 2.12.0

package/dist/resources/extensions/gsd/{worktree.js → worktree.ts}

@@ -14,34 +14,44 @@
  *   2. agent does work, commits
  *   3. mergeSliceToMain() — checkout integration branch, squash-merge, delete slice branch
  */
+
 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 ─────────────────────────────────────────────
-let cachedService = null;
-let cachedBasePath = null;
+
+let cachedService: GitServiceImpl | null = null;
+let cachedBasePath: string | null = null;
+
 /**
  * Get or create a GitServiceImpl for the given basePath.
  * Resets the cache if basePath changes between calls.
  * Lazy construction: only instantiated at call-time, never at module-evaluation.
  */
-function getService(basePath) {
-    if (cachedService === null || cachedBasePath !== basePath) {
-        const loaded = loadEffectiveGSDPreferences();
-        const gitPrefs = loaded?.preferences?.git ?? {};
-        cachedService = new GitServiceImpl(basePath, gitPrefs);
-        cachedBasePath = basePath;
-    }
-    return cachedService;
+function getService(basePath: string): GitServiceImpl {
+  if (cachedService === null || cachedBasePath !== basePath) {
+    const loaded = loadEffectiveGSDPreferences();
+    const gitPrefs = loaded?.preferences?.git ?? {};
+    cachedService = new GitServiceImpl(basePath, gitPrefs);
+    cachedBasePath = basePath;
+  }
+  return cachedService;
 }
+
 /**
  * Set the active milestone ID on the cached GitServiceImpl.
  * This enables integration branch resolution in getMainBranch().
  */
-export function setActiveMilestoneId(basePath, milestoneId) {
-    getService(basePath).setMilestoneId(milestoneId);
+export function setActiveMilestoneId(basePath: string, milestoneId: string | null): void {
+  getService(basePath).setMilestoneId(milestoneId);
 }
+
 /**
  * Record the current branch as the integration branch for a milestone.
  * Called once when auto-mode starts — captures where slice branches should
@@ -49,25 +59,28 @@ export function setActiveMilestoneId(basePath, milestoneId) {
  * record when the user starts from a different branch (#300). Always a no-op
  * if on a GSD slice branch.
  */
-export function captureIntegrationBranch(basePath, milestoneId) {
-    const svc = getService(basePath);
-    const current = svc.getCurrentBranch();
-    writeIntegrationBranch(basePath, milestoneId, current);
+export function captureIntegrationBranch(basePath: string, milestoneId: string): void {
+  const svc = getService(basePath);
+  const current = svc.getCurrentBranch();
+  writeIntegrationBranch(basePath, milestoneId, current);
 }
+
 // ─── Pure Utility Functions (unchanged) ────────────────────────────────────
+
 /**
  * Detect the active worktree name from the current working directory.
  * Returns null if not inside a GSD worktree (.gsd/worktrees/<name>/).
  */
-export function detectWorktreeName(basePath) {
-    const marker = `${sep}.gsd${sep}worktrees${sep}`;
-    const idx = basePath.indexOf(marker);
-    if (idx === -1)
-        return null;
-    const afterMarker = basePath.slice(idx + marker.length);
-    const name = afterMarker.split(sep)[0] ?? afterMarker.split("/")[0];
-    return name || null;
+export function detectWorktreeName(basePath: string): string | null {
+  const normalizedPath = basePath.replaceAll("\\", "/");
+  const marker = "/.gsd/worktrees/";
+  const idx = normalizedPath.indexOf(marker);
+  if (idx === -1) return null;
+  const afterMarker = normalizedPath.slice(idx + marker.length);
+  const name = afterMarker.split("/")[0];
+  return name || null;
 }
+
 /**
  * Get the slice branch name, namespaced by worktree when inside one.
  *
@@ -78,29 +91,36 @@ export function detectWorktreeName(basePath) {
  * same milestone/slice IDs — git doesn't allow a branch to be checked
  * out in more than one worktree simultaneously.
  */
-export function getSliceBranchName(milestoneId, sliceId, worktreeName) {
-    if (worktreeName) {
-        return `gsd/${worktreeName}/${milestoneId}/${sliceId}`;
-    }
-    return `gsd/${milestoneId}/${sliceId}`;
+export function getSliceBranchName(milestoneId: string, sliceId: string, worktreeName?: string | null): string {
+  if (worktreeName) {
+    return `gsd/${worktreeName}/${milestoneId}/${sliceId}`;
+  }
+  return `gsd/${milestoneId}/${sliceId}`;
 }
+
 /** Regex that matches both plain and worktree-namespaced slice branches. */
 export const SLICE_BRANCH_RE = /^gsd\/(?:([a-zA-Z0-9_-]+)\/)?(M\d+(?:-[a-z0-9]{6})?)\/(S\d+)$/;
+
 /**
  * Parse a slice branch name into its components.
  * Handles both `gsd/M001/S01` and `gsd/myworktree/M001/S01`.
  */
-export function parseSliceBranch(branchName) {
-    const match = branchName.match(SLICE_BRANCH_RE);
-    if (!match)
-        return null;
-    return {
-        worktreeName: match[1] ?? null,
-        milestoneId: match[2],
-        sliceId: match[3],
-    };
+export function parseSliceBranch(branchName: string): {
+  worktreeName: string | null;
+  milestoneId: string;
+  sliceId: string;
+} | null {
+  const match = branchName.match(SLICE_BRANCH_RE);
+  if (!match) return null;
+  return {
+    worktreeName: match[1] ?? null,
+    milestoneId: match[2]!,
+    sliceId: match[3]!,
+  };
 }
+
 // ─── Git-Mutation Functions (delegate to GitServiceImpl) ───────────────────
+
 /**
  * Get the "main" branch for GSD slice operations.
  *
@@ -112,12 +132,14 @@ export function parseSliceBranch(branchName) {
  * branch, and the worktree branch later merges into the real main via
  * /worktree merge.
  */
-export function getMainBranch(basePath) {
-    return getService(basePath).getMainBranch();
+export function getMainBranch(basePath: string): string {
+  return getService(basePath).getMainBranch();
 }
-export function getCurrentBranch(basePath) {
-    return getService(basePath).getCurrentBranch();
+
+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,
@@ -127,49 +149,58 @@ export function getCurrentBranch(basePath) {
  * When inside a worktree, the branch is namespaced to avoid conflicts.
  * Returns true if the branch was newly created.
  */
-export function ensureSliceBranch(basePath, milestoneId, sliceId) {
-    return getService(basePath).ensureSliceBranch(milestoneId, sliceId);
+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.
  */
-export function autoCommitCurrentBranch(basePath, unitType, unitId) {
-    return getService(basePath).autoCommit(unitType, unitId);
+export function autoCommitCurrentBranch(
+  basePath: string, unitType: string, unitId: string,
+): string | null {
+  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) {
-    getService(basePath).switchToMain();
+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, milestoneId, sliceId, sliceTitle) {
-    return getService(basePath).mergeSliceToMain(milestoneId, sliceId, sliceTitle);
+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) {
-    const current = getCurrentBranch(basePath);
-    return SLICE_BRANCH_RE.test(current);
+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) {
-    try {
-        const current = getCurrentBranch(basePath);
-        return SLICE_BRANCH_RE.test(current) ? current : null;
-    }
-    catch {
-        return null;
-    }
+export function getActiveSliceBranch(basePath: string): string | null {
+  try {
+    const current = getCurrentBranch(basePath);
+    return SLICE_BRANCH_RE.test(current) ? current : null;
+  } catch {
+    return null;
+  }
 }