@opengsd/gsd-pi 1.1.1-dev.b2556262 → 1.2.0-dev.4813ead6

package/dist/resources/extensions/gsd/auto-worktree.js

@@ -10,26 +10,28 @@
 import { existsSync, cpSync, readFileSync, readdirSync, mkdirSync, realpathSync, rmSync, unlinkSync, lstatSync as lstatSyncFn, } from "node:fs";
 import { dirname, isAbsolute, join, relative, resolve, sep as pathSep } from "node:path";
 import { GSDError, GSD_IO_ERROR, GSD_GIT_ERROR } from "./errors.js";
-import { reconcileWorktreeDb, isDbAvailable, getMilestone, getMilestoneSlices, getSliceTasks, closeDatabase, openDatabase, getDbPath, } from "./gsd-db.js";
+import { reconcileWorktreeDb, isDbAvailable, getMilestone, getMilestoneSlices, getSliceTasks, } from "./gsd-db.js";
+import { closeWorkflowDatabase, getWorkflowDatabasePath, openWorkflowDatabasePath, } from "./db-workspace.js";
 import { execFileSync } from "node:child_process";
 import { gsdRoot, resolveGsdPathContract } from "./paths.js";
 import { createWorktree, removeWorktree, resolveGitDir, worktreePath, isInsideWorktreesDir, } from "./worktree-manager.js";
 import { detectWorktreeName, nudgeGitBranchCache, } from "./worktree.js";
 import { isGsdWorktreePath, normalizeWorktreePathForCompare, resolveWorktreeProjectRoot, } from "./worktree-root.js";
 import { autoResolveSafeConflictPaths } from "./git-conflict-resolve.js";
-import { MergeConflictError, createDraftPR, readIntegrationBranch, resolveMilestoneIntegrationBranch, RUNTIME_EXCLUSION_PATHS } from "./git-service.js";
-import { buildPrEvidence } from "./pr-evidence.js";
+import { MergeConflictError, readIntegrationBranch, resolveMilestoneIntegrationBranch, RUNTIME_EXCLUSION_PATHS } from "./git-service.js";
+import { buildPullRequestEvidence, createDraftPullRequestFromEvidence, } from "./pull-request-process.js";
 import { debugLog } from "./debug-logger.js";
 import { logWarning, logError } from "./workflow-logger.js";
 import { loadEffectiveGSDPreferences } from "./preferences.js";
 import { MILESTONE_ID_RE } from "./milestone-ids.js";
 import { runWorktreePostCreateHook } from "./worktree-post-create-hook.js";
 import { classifyProject } from "./detection.js";
-import { nativeGetCurrentBranch, nativeDetectMainBranch, nativeWorkingTreeStatus, nativeAddAllWithExclusions, nativeCommit, nativeCheckoutBranch, nativeMergeSquash, nativeConflictFiles, nativeAddPaths, nativeRmForce, nativeBranchDelete, nativeBranchForceReset, nativeBranchExists, nativeDiffNumstat, nativeUpdateRef, nativeIsAncestor, nativeMergeAbort, nativeWorktreeList, nativeLsFiles, } from "./native-git-bridge.js";
-import { CLOSEOUT_CONSISTENCY_BLOCKED_REASON, checkCloseoutConsistencyGate, formatCloseoutConsistencyBlock, } from "./closeout-consistency-gate.js";
+import { nativeGetCurrentBranch, nativeDetectMainBranch, nativeWorkingTreeStatus, nativeAddAllWithExclusions, nativeCommit, nativeCheckoutBranch, nativeMergeSquash, nativeMergeRegular, nativeConflictFiles, nativeAddPaths, nativeRmForce, nativeBranchDelete, nativeBranchForceReset, nativeBranchExists, nativeDiffNumstat, nativeUpdateRef, nativeIsAncestor, nativeMergeAbort, nativeWorktreeList, nativeLsFiles, } from "./native-git-bridge.js";
+import { CLOSEOUT_CONSISTENCY_BLOCKED_REASON, } from "./closeout-consistency-gate.js";
+import { formatCloseoutProofBlock, proveMilestoneCloseout, } from "./milestone-closeout-proof.js";
 import { gsdHome } from "./gsd-home.js";
 import { createWorkspace } from "./workspace.js";
-import { _finalizeProjectionForMergeImpl, _projectRootToWorktreeImpl, _projectWorktreeToRootImpl, } from "./worktree-state-projection.js";
+import { WorktreeStateProjection } from "./worktree-state-projection.js";
 const PROJECT_PREFERENCES_FILE = "PREFERENCES.md";
 const LEGACY_PROJECT_PREFERENCES_FILE = "preferences.md";
 const LEGACY_DEEP_SETUP_RUNTIME_UNIT_FILES = new Set([
@@ -438,16 +440,17 @@ function removeMergeStateFiles(basePath, contextLabel) {
         logError("worktree", `${contextLabel} merge state cleanup failed: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
-function cleanupSquashConflictState(basePath) {
-    // `git merge --squash` conflicts can leave unmerged index entries without
-    // MERGE_HEAD, so merge-abort alone is not enough. Reset the merge index, then
-    // remove merge message files that native/libgit2 paths may have created.
+function cleanupConflictState(basePath) {
+    // Merge conflicts can leave unmerged index entries; merge-abort alone is not
+    // enough for squash merges (MERGE_HEAD is never written). Reset the merge
+    // index, then remove merge message files that native/libgit2 paths may have
+    // created.
     try {
         nativeMergeAbort(basePath);
     }
     catch (err) {
-        // Expected for squash conflicts when MERGE_HEAD was never written.
-        debugLog("squash-conflict-cleanup:merge-abort-skipped", {
+        // MERGE_HEAD absent (squash merge path) — abort is a no-op, which is fine.
+        debugLog("conflict-cleanup:merge-abort-skipped", {
             error: err instanceof Error ? err.message : String(err),
         });
     }
@@ -459,9 +462,9 @@ function cleanupSquashConflictState(basePath) {
         });
     }
     catch (err) {
-        logError("worktree", `git reset --merge failed after squash conflict: ${err instanceof Error ? err.message : String(err)}`);
+        logError("worktree", `git reset --merge failed after merge conflict: ${err instanceof Error ? err.message : String(err)}`);
     }
-    removeMergeStateFiles(basePath, "squash conflict");
+    removeMergeStateFiles(basePath, "conflict");
 }
 // ─── Dispatch-Level Sync (project root ↔ worktree) ──────────────────────────
 /**
@@ -478,7 +481,7 @@ function cleanupSquashConflictState(basePath) {
  * the bodies with raw paths.
  */
 export function syncProjectRootToWorktree(projectRoot, worktreePath_, milestoneId) {
-    _projectRootToWorktreeImpl(projectRoot, worktreePath_, milestoneId);
+    new WorktreeStateProjection().projectRootToWorktreePaths(projectRoot, worktreePath_, milestoneId);
 }
 /**
  * Path-string entry point to WorktreeStateProjection.projectWorktreeToRoot.
@@ -486,7 +489,7 @@ export function syncProjectRootToWorktree(projectRoot, worktreePath_, milestoneI
  * the projection-invariant tests can exercise the body with raw paths.
  */
 export function syncStateToProjectRoot(worktreePath_, projectRoot, milestoneId) {
-    _projectWorktreeToRootImpl(worktreePath_, projectRoot, milestoneId);
+    new WorktreeStateProjection().projectWorktreeToRootPaths(worktreePath_, projectRoot, milestoneId);
 }
 // ─── Resource Staleness ───────────────────────────────────────────────────
 /**
@@ -828,7 +831,7 @@ export function syncGsdStateToWorktree(mainBasePath, worktreePath_) {
  * the shared project DB or the pre-upgrade DB reconciliation path above.
  */
 export function syncWorktreeStateBack(mainBasePath, worktreePath, milestoneId) {
-    return _finalizeProjectionForMergeImpl(mainBasePath, worktreePath, milestoneId);
+    return new WorktreeStateProjection().finalizeProjectionForMergePaths(mainBasePath, worktreePath, milestoneId);
 }
 export { runWorktreePostCreateHook } from "./worktree-post-create-hook.js";
 // ─── Auto-Worktree Branch Naming ───────────────────────────────────────────
@@ -1518,10 +1521,10 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
         const worktreeDbPath = join(contract.worktreeGsd ?? join(worktreeCwd, ".gsd"), "gsd.db");
         const mainDbPath = contract.projectDb;
         try {
-            const activeDbPath = getDbPath();
+            const activeDbPath = getWorkflowDatabasePath();
             if (activeDbPath && _shouldReconcileWorktreeDb(activeDbPath, mainDbPath)) {
-                closeDatabase();
-                if (!openDatabase(mainDbPath)) {
+                closeWorkflowDatabase();
+                if (!openWorkflowDatabasePath(mainDbPath)) {
                     throw new Error(`cannot open project DB at ${mainDbPath}`);
                 }
             }
@@ -1534,9 +1537,9 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             logError("worktree", message);
             throw new GSDError(GSD_GIT_ERROR, `${message}. Recovery reason: ${CLOSEOUT_CONSISTENCY_BLOCKED_REASON}.`);
         }
-        const closeoutGate = checkCloseoutConsistencyGate(milestoneId);
-        if (!closeoutGate.ok) {
-            throw new GSDError(GSD_GIT_ERROR, formatCloseoutConsistencyBlock(closeoutGate));
+        const closeoutProof = proveMilestoneCloseout(milestoneId);
+        if (!closeoutProof.ok) {
+            throw new GSDError(GSD_GIT_ERROR, formatCloseoutProofBlock(closeoutProof));
         }
     }
     // 2. Get completed slices for commit message
@@ -1839,10 +1842,10 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
     // stashing so Windows releases the handles; reopen after. No-op on
     // POSIX, where advisory locks don't block git.
     const needsDbCycle = process.platform === "win32" && isDbAvailable();
-    const dbPathToReopen = needsDbCycle ? getDbPath() : null;
+    const dbPathToReopen = needsDbCycle ? getWorkflowDatabasePath() : null;
     if (needsDbCycle) {
         try {
-            closeDatabase();
+            closeWorkflowDatabase();
         }
         catch (err) {
             logWarning("worktree", `pre-stash db close failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -1871,17 +1874,23 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
         // report the dirty tree if it fails.
         logWarning("worktree", `git stash failed: ${err instanceof Error ? err.message : String(err)}`);
     }
-    // 7b. Clean up stale merge state before attempting squash merge (#2912).
+    // 7b. Clean up stale merge state before attempting the merge (#2912).
     // A leftover MERGE_HEAD (from a previous failed merge, libgit2 native path,
-    // or interrupted operation) causes `git merge --squash` to refuse with
+    // or interrupted operation) causes git merge to refuse with
     // "fatal: You have not concluded your merge (MERGE_HEAD exists)".
     // Defensively remove merge artifacts before starting.
     removeMergeStateFiles(originalBasePath_, "pre-merge");
-    // 8. Squash merge — auto-resolve .gsd/ state file conflicts (#530)
-    const mergeResult = nativeMergeSquash(originalBasePath_, milestoneBranch);
+    // 8. Merge — respect merge_strategy preference (#549).
+    // "squash" (default): stages changes without a merge commit; caller commits.
+    // "merge": --no-ff --no-commit so caller can supply the commit message while
+    // git records a real merge commit (MERGE_HEAD present when nativeCommit runs).
+    const effectiveStrategy = prefs.merge_strategy === "merge" ? "merge" : "squash";
+    const mergeResult = effectiveStrategy === "merge"
+        ? nativeMergeRegular(originalBasePath_, milestoneBranch)
+        : nativeMergeSquash(originalBasePath_, milestoneBranch);
     if (needsDbCycle && dbPathToReopen) {
         try {
-            openDatabase(dbPathToReopen);
+            openWorkflowDatabasePath(dbPathToReopen);
         }
         catch (err) {
             logWarning("worktree", `post-merge db reopen failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -1912,7 +1921,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             const fileList = mergeResult.dirtyFiles?.length
                 ? `Dirty files:\n${mergeResult.dirtyFiles.map((f) => `  ${f}`).join("\n")}`
                 : `Check \`git status\` in the project root for details.`;
-            throw new GSDError(GSD_GIT_ERROR, `Squash merge of ${milestoneBranch} rejected: working tree has dirty or untracked files ` +
+            throw new GSDError(GSD_GIT_ERROR, `${effectiveStrategy === "merge" ? "Merge" : "Squash merge"} of ${milestoneBranch} rejected: working tree has dirty or untracked files ` +
                 `that conflict with the merge. ${fileList}`);
         }
         // Check for conflicts — use merge result first, fall back to nativeConflictFiles
@@ -1930,7 +1939,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
             }
             // If there are still real code conflicts, escalate
             if (codeConflicts.length > 0) {
-                cleanupSquashConflictState(originalBasePath_);
+                cleanupConflictState(originalBasePath_);
                 // Pop stash before throwing so local work is not lost (#2151).
                 if (stashed) {
                     try {
@@ -1947,7 +1956,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                 // causing autoCommitDirtyState to commit unrelated milestone files to
                 // the integration branch (#2929).
                 process.chdir(previousCwd);
-                throw new MergeConflictError(codeConflicts, "squash", milestoneBranch, mainBranch);
+                throw new MergeConflictError(codeConflicts, effectiveStrategy, milestoneBranch, mainBranch);
             }
         }
         // No conflicts detected — possibly "already up to date", fall through to commit
@@ -2096,7 +2105,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
         if (codeChanges.length > 0) {
             // Milestone has unanchored code changes — abort teardown.
             process.chdir(previousCwd);
-            throw new GSDError(GSD_GIT_ERROR, `Squash merge produced nothing to commit but milestone branch "${milestoneBranch}" ` +
+            throw new GSDError(GSD_GIT_ERROR, `${effectiveStrategy === "merge" ? "Merge" : "Squash merge"} produced nothing to commit but milestone branch "${milestoneBranch}" ` +
                 `has ${codeChanges.length} code file(s) not on "${mainBranch}". ` +
                 `Aborting worktree teardown to prevent data loss.`);
         }
@@ -2206,7 +2215,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                         stdio: ["ignore", "pipe", "pipe"],
                         encoding: "utf-8",
                     });
-                    const prEvidence = buildPrEvidence({
+                    const prEvidence = buildPullRequestEvidence({
                         milestoneId,
                         milestoneTitle,
                         changeType: "feat",
@@ -2215,7 +2224,7 @@ export function mergeMilestoneToMain(originalBasePath_, milestoneId, roadmapCont
                         rollbackNotes: ["Close the draft PR or revert the merge commit if review finds a behavior regression."],
                         how: "Generated by git.auto_pr after the milestone branch was pushed and merged locally.",
                     });
-                    const prUrl = createDraftPR(originalBasePath_, milestoneId, prEvidence.title, prEvidence.body, {
+                    const prUrl = createDraftPullRequestFromEvidence(originalBasePath_, milestoneId, prEvidence, {
                         head: milestoneBranch,
                         base: prTarget,
                     });