@lumenflow/core 2.20.1 → 2.21.1

package/dist/wu-done-merged-worktree.js

@@ -0,0 +1,195 @@
+/**
+ * WU-1746: Already-merged worktree recovery for wu:done
+ *
+ * When a WU branch has been manually merged to main and the worktree
+ * deleted (or nuked by git), wu:done normally cannot complete because
+ * it expects a live worktree. This module detects the "branch already
+ * merged, worktree gone" scenario and completes stamping and state
+ * updates gracefully without a live worktree.
+ *
+ * Detection logic:
+ * 1. If the lane branch still exists: check if branch tip === merge-base
+ *    (meaning all branch commits are reachable from main HEAD)
+ * 2. If the lane branch has been deleted: check if completion commits
+ *    are reachable from HEAD via git log search
+ *
+ * Completion logic:
+ * - Create stamp file (.lumenflow/stamps/WU-{id}.done)
+ * - Update WU YAML status to 'done'
+ * - Update backlog.md and status.md
+ * - Emit state store 'complete' event (if state store is available)
+ *
+ * All operations are non-fatal individually; partial completion is
+ * reported via the result object.
+ */
+import { existsSync } from 'node:fs';
+import { getGitForCwd } from './git-adapter.js';
+import { createStamp } from './stamp-utils.js';
+import { readWU, writeWU } from './wu-yaml.js';
+import { WU_PATHS } from './wu-paths.js';
+import { moveWUToDoneBacklog } from './wu-backlog-updater.js';
+import { updateStatusRemoveInProgress, addToStatusCompleted } from './wu-status-updater.js';
+import { BRANCHES, LOG_PREFIX, EMOJI, WU_STATUS } from './wu-constants.js';
+import { getErrorMessage } from './error-handler.js';
+// ──────────────────────────────────────────────
+// Detection
+// ──────────────────────────────────────────────
+/**
+ * Detect whether a WU's branch commits are already merged to main
+ * and the worktree no longer exists on disk.
+ *
+ * This is the entry point for the "already-merged resilience" path
+ * in wu:done. Returns a detection result that the caller can use
+ * to decide whether to proceed with stamping/cleanup without a
+ * live worktree.
+ *
+ * @param params - Detection parameters
+ * @returns Detection result
+ */
+export async function detectAlreadyMergedNoWorktree(params) {
+    const { laneBranch, worktreePath } = params;
+    // Check if worktree exists on disk
+    const worktreeExists = worktreePath ? existsSync(worktreePath) : false;
+    const gitAdapter = getGitForCwd();
+    try {
+        // Check if branch still exists
+        const branchStillExists = await gitAdapter.branchExists(laneBranch);
+        if (branchStillExists) {
+            // Branch exists: check if tip === merge-base (fully merged)
+            const branchTip = (await gitAdapter.getCommitHash(laneBranch)).trim();
+            const mergeBase = (await gitAdapter.mergeBase(BRANCHES.MAIN, laneBranch)).trim();
+            const isMerged = branchTip === mergeBase;
+            return {
+                merged: isMerged,
+                branchExists: true,
+                worktreeExists,
+            };
+        }
+        // Branch does not exist: check if WU commits are reachable from HEAD
+        // Search for completion commits mentioning the WU ID in the main history
+        if (!worktreeExists) {
+            try {
+                const logOutput = await gitAdapter.raw([
+                    'log',
+                    '--oneline',
+                    '--all',
+                    '--grep',
+                    params.wuId,
+                    '-1',
+                    BRANCHES.MAIN,
+                ]);
+                const commitFound = logOutput.trim().length > 0;
+                return {
+                    merged: commitFound,
+                    branchExists: false,
+                    worktreeExists: false,
+                };
+            }
+            catch {
+                // If git log fails, fall through to safe default
+            }
+        }
+        return {
+            merged: false,
+            branchExists: false,
+            worktreeExists,
+        };
+    }
+    catch {
+        // Fail-safe: on any git error, return false to avoid incorrect completion
+        return {
+            merged: false,
+            branchExists: false,
+            worktreeExists,
+        };
+    }
+}
+// ──────────────────────────────────────────────
+// Completion
+// ──────────────────────────────────────────────
+/**
+ * Execute completion operations for a WU whose branch is already
+ * merged to main but was never stamped/finalized.
+ *
+ * This performs all the state cleanup that wu:done normally does
+ * during its worktree completion path, but without requiring a
+ * live worktree.
+ *
+ * Operations are individually non-fatal: if stamp creation succeeds
+ * but backlog update fails, the result captures both outcomes.
+ *
+ * @param params - Completion parameters
+ * @returns Completion result with per-operation status
+ */
+export async function executeAlreadyMergedCompletion(params) {
+    const { id, title, lane: _lane } = params;
+    const errors = [];
+    let stamped = false;
+    let yamlUpdated = false;
+    let backlogUpdated = false;
+    console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} WU-1746: Branch already merged to main, worktree gone.`);
+    console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Completing stamping and state cleanup without worktree...`);
+    // Step 1: Create stamp file
+    try {
+        const stampResult = createStamp({ id, title });
+        stamped = true;
+        if (stampResult.created) {
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Created stamp: ${stampResult.path}`);
+        }
+        else {
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.INFO} Stamp already exists: ${stampResult.path}`);
+        }
+    }
+    catch (err) {
+        errors.push(`Stamp creation failed: ${getErrorMessage(err)}`);
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Stamp creation failed: ${getErrorMessage(err)}`);
+    }
+    // Step 2: Update WU YAML status to done
+    try {
+        const wuPath = WU_PATHS.WU(id);
+        const doc = readWU(wuPath, id);
+        if (doc && typeof doc === 'object') {
+            const updatedDoc = {
+                ...doc,
+                status: WU_STATUS.DONE,
+                completed_at: new Date().toISOString().split('T')[0],
+            };
+            writeWU(wuPath, updatedDoc);
+            yamlUpdated = true;
+            console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Updated WU YAML status to done`);
+        }
+    }
+    catch (err) {
+        errors.push(`WU YAML update failed: ${getErrorMessage(err)}`);
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} WU YAML update failed: ${getErrorMessage(err)}`);
+    }
+    // Step 3: Update backlog and status files
+    try {
+        const backlogPath = WU_PATHS.BACKLOG();
+        await moveWUToDoneBacklog(backlogPath, id, title);
+        const statusPath = WU_PATHS.STATUS();
+        updateStatusRemoveInProgress(statusPath, id);
+        addToStatusCompleted(statusPath, id, title);
+        backlogUpdated = true;
+        console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} Updated backlog and status files`);
+    }
+    catch (err) {
+        errors.push(`Backlog/status update failed: ${getErrorMessage(err)}`);
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} Backlog/status update failed: ${getErrorMessage(err)}`);
+    }
+    const success = errors.length === 0;
+    if (success) {
+        console.log(`${LOG_PREFIX.DONE} ${EMOJI.SUCCESS} WU-1746: Already-merged completion finished successfully`);
+    }
+    else {
+        console.warn(`${LOG_PREFIX.DONE} ${EMOJI.WARNING} WU-1746: Completed with ${errors.length} error(s)`);
+    }
+    return {
+        success,
+        stamped,
+        yamlUpdated,
+        backlogUpdated,
+        errors,
+    };
+}
+//# sourceMappingURL=wu-done-merged-worktree.js.map

package/dist/wu-done-merged-worktree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wu-done-merged-worktree.js","sourceRoot":"","sources":["../src/wu-done-merged-worktree.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lumenflow/core",
-  "version": "2.20.1",
+  "version": "2.21.1",
   "description": "Core WU lifecycle tools for LumenFlow workflow framework",
   "keywords": [
     "lumenflow",
@@ -51,6 +51,7 @@
     "./wu-claim-helpers": "./dist/wu-claim-helpers.js",
     "./wu-done-machine": "./dist/wu-done-machine.js",
     "./wu-done-worktree": "./dist/wu-done-worktree.js",
+    "./wu-done-merged-worktree": "./dist/wu-done-merged-worktree.js",
     "./wu-done-validators": "./dist/wu-done-validators.js",
     "./dependency-guard": "./dist/dependency-guard.js",
     "./worktree-scanner": "./dist/worktree-scanner.js",
@@ -159,33 +160,33 @@
     "change-case": "^5.4.4",
     "cli-progress": "^3.12.0",
     "cli-table3": "^0.6.5",
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "date-fns": "^4.1.0",
     "fast-glob": "^3.3.3",
-    "glob": "^11.0.0",
+    "glob": "^13.0.3",
     "gray-matter": "^4.0.3",
     "micromatch": "^4.0.8",
-    "minimatch": "^10.1.2",
+    "minimatch": "^10.2.0",
     "ms": "^2.1.3",
-    "p-retry": "^6.2.1",
+    "p-retry": "^7.1.1",
     "picocolors": "^1.1.1",
     "pretty-ms": "^9.2.0",
-    "ps-list": "^8.1.1",
-    "simple-git": "^3.30.0",
+    "ps-list": "^9.0.0",
+    "simple-git": "^3.31.1",
     "tiktoken": "^1.0.21",
     "xstate": "^5.28.0",
     "yaml": "^2.8.2",
-    "zod": "^4.3.5"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^4.0.17",
+    "@vitest/coverage-v8": "^4.0.18",
     "memfs": "^4.17.0",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.17"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
-    "@lumenflow/memory": "2.20.1"
+    "@lumenflow/memory": "2.21.1"
   },
   "peerDependenciesMeta": {
     "@lumenflow/memory": {