lee-spec-kit 0.8.4 → 0.8.5

package/dist/index.js

@@ -1299,7 +1299,7 @@ Before taking the next workflow step:
 9. In standalone mode, use the project repo through its managed feature worktree under the shared workspace \`.worktrees/\` root instead of checking the feature branch out in the main project repo
 10. In standalone mode, do not hand-write \`git worktree add\`; run the exact \`nextAction.command\` from \`workflow-stage\` so the managed workspace path, stale directory cleanup, and \`.env\` / \`.env.*\` copy step stay consistent
 11. Keep docs and code synchronized; if code changes materially, update the active feature docs in the same turn before stopping
-12. When docs are synced to code, refresh an explicit marker like \`<!-- lee-spec-kit:workflow-sync 2026-04-16T12:34:56.789Z -->\` in the active feature docs (prefer \`tasks.md\` or \`decisions.md\`) so \`workflow-audit\` can prove the sync happened after the latest code change
+12. When docs are synced to code, keep exactly one explicit marker like \`<!-- lee-spec-kit:workflow-sync 2026-04-16T12:34:56.789Z -->\` in a single active feature doc (prefer \`tasks.md\` or \`decisions.md\`): replace an existing marker timestamp or remove duplicates instead of appending another marker, so \`workflow-audit\` can prove the sync happened after the latest code change
 
 Approval and remote actions:
 
@@ -1314,7 +1314,7 @@ Approval and remote actions:
 Validation:
 
 - Prefer \`npx lee-spec-kit commit-audit --json\` for commit-time staged docs path validation
-- Prefer \`npx lee-spec-kit workflow-audit --json\` as the default docs-sync validator for Codex hooks and end-of-turn checks; it expects the active feature docs to carry a fresh \`lee-spec-kit:workflow-sync\` marker after meaningful code/doc sync
+- Prefer \`npx lee-spec-kit workflow-audit --json\` as the default docs-sync validator for Codex hooks and end-of-turn checks; it expects the active feature docs to carry one fresh \`lee-spec-kit:workflow-sync\` marker after meaningful code/doc sync
 `;
 function renderManagedSegment(lang, docsRepo) {
   return `${LEE_SPEC_KIT_AGENTS_BEGIN}
@@ -7887,7 +7887,7 @@ function buildPostMergeCleanupCommand(state) {
   }
   if (state.worktreePath) {
     commandParts.push(
-      `if [ -d "${state.worktreePath}" ]; then git -C "${state.projectRootGitCwd}" worktree remove "${state.worktreePath}"; fi`
+      `if [ -d "${state.worktreePath}" ]; then if git -C "${state.worktreePath}" rev-parse --is-inside-work-tree >/dev/null 2>&1; then meaningful_changes=$(git -C "${state.worktreePath}" status --porcelain --untracked-files=normal 2>/dev/null || true); if [ -n "$meaningful_changes" ]; then printf '%s\\n' "Managed worktree has tracked or meaningful untracked changes; refusing cleanup: ${state.worktreePath}" >&2; exit 1; fi; git -C "${state.projectRootGitCwd}" worktree remove --force "${state.worktreePath}" || { git -C "${state.projectRootGitCwd}" worktree prune; rm -rf "${state.worktreePath}"; }; else leftover_meaningful=$(find "${state.worktreePath}" -mindepth 1 \\( -name ".next" -o -name "node_modules" -o -name "storybook-static" -o -name "dist" -o -name "build" -o -name "coverage" -o -name ".turbo" -o -name ".cache" \\) -prune -o -print -quit); if [ -n "$leftover_meaningful" ]; then printf '%s\\n' "Managed worktree leftover has files outside generated artifact directories; refusing cleanup: ${state.worktreePath}" >&2; exit 1; fi; git -C "${state.projectRootGitCwd}" worktree prune; rm -rf "${state.worktreePath}"; fi; fi`
     );
   }
   if (state.headBranch) {
@@ -7896,7 +7896,7 @@ function buildPostMergeCleanupCommand(state) {
     );
     if (state.hasOriginRemote) {
       commandParts.push(
-        `if git -C "${state.projectRootGitCwd}" show-ref --verify --quiet "refs/remotes/origin/${state.headBranch}"; then git -C "${state.projectRootGitCwd}" push origin --delete "${state.headBranch}"; fi`
+        `if git -C "${state.projectRootGitCwd}" show-ref --verify --quiet "refs/remotes/origin/${state.headBranch}"; then HUSKY=0 git -C "${state.projectRootGitCwd}" push origin --delete "${state.headBranch}"; fi`
       );
       commandParts.push(
         `git -C "${state.projectRootGitCwd}" fetch --prune origin`
@@ -8100,14 +8100,15 @@ function resolveCurrentReviewState(tasks, prDraft, remoteReviewState) {
   }
   return "unknown";
 }
-function buildCodeReviewActionOptions(reviewState) {
+function buildCodeReviewActionOptions(reviewState, reviewSyncCommand = null) {
   if (reviewState === "merged") {
     return [
       buildStageOption(
         "A",
         "A",
         "review_sync_approved",
-        "Sync the already-merged PR state into tasks.md and pr.md before closing the feature."
+        "Sync the already-merged PR state into tasks.md and pr.md before closing the feature.",
+        reviewSyncCommand
       ),
       buildStageOption(
         "B",
@@ -8123,7 +8124,8 @@ function buildCodeReviewActionOptions(reviewState) {
         "A",
         "A",
         "review_sync_approved",
-        "Sync the approved PR review state into tasks.md and pr.md, then continue to the merge gate."
+        "Sync the approved PR review state into tasks.md and pr.md, then continue to the merge gate.",
+        reviewSyncCommand
       ),
       buildStageOption(
         "B",
@@ -8672,7 +8674,8 @@ Task commit boundary warning: ${describeTaskCommitGateFailure(committedTaskGate)
   if (requirements.requireReview && (!reviewApprovedInDocs || currentReviewState !== "approved")) {
     const reviewFixAllowed = currentReviewState === "changes_requested";
     const reviewApprovalRequired = !reviewFixAllowed;
-    const reviewActionOptions = reviewApprovalRequired ? buildCodeReviewActionOptions(currentReviewState) : void 0;
+    const reviewSyncCommand = currentReviewState === "merged" ? `npx lee-spec-kit github pr ${buildFeatureArgs(feature)} --merge --confirm OK` : null;
+    const reviewActionOptions = reviewApprovalRequired ? buildCodeReviewActionOptions(currentReviewState, reviewSyncCommand) : void 0;
     const reviewSummary = currentReviewState === "approved" ? "Record the approved PR review state in tasks.md and pr.md before proceeding to merge." : currentReviewState === "merged" ? "Sync the already-merged PR state into tasks.md and pr.md before marking the workflow as complete." : currentReviewState === "changes_requested" ? "Address the requested review changes and update the PR review evidence/decision before continuing." : currentReviewState === "review_pending_latest_commit" ? "Wait for a fresh review on the latest PR commit before taking the next review action." : currentReviewState === "review_rate_limited" ? "Wait for the current CodeRabbit review rate limit to clear, then re-check the latest PR review state before continuing." : currentReviewState === "draft" ? "Resolve the draft PR state before continuing to the merge boundary." : currentReviewState === "merge_blocked" ? "Resolve the current PR merge blocker before continuing to merge." : "Wait for PR review or inspect the current review state before taking the next review action.";
     return {
       status: "ok",
@@ -8683,7 +8686,8 @@ Task commit boundary warning: ${describeTaskCommitGateFailure(committedTaskGate)
       nextAction: buildAction(
         "code_review",
         reviewSummary,
-        reviewApprovalRequired
+        reviewApprovalRequired,
+        reviewSyncCommand
       ),
       approvalRequired: reviewApprovalRequired,
       implementationAllowed: reviewFixAllowed,
@@ -9105,7 +9109,20 @@ async function collectWorkflowAudit(cwd) {
   const allMeaningfulFeatureDocPaths = meaningfulChangedFeatureDocPaths;
   const latestCodeChangeAt = await getLatestMtimeIso(combinedChangedCodePaths);
   const latestFeatureDocSyncAt = await getLatestWorkflowSyncMarkerAt(activeFeature);
+  const duplicateWorkflowSyncMarkerPaths = await collectDuplicateWorkflowSyncMarkerPaths(activeFeature);
   if (combinedChangedCodePaths.length === 0) {
+    if (duplicateWorkflowSyncMarkerPaths.length > 0) {
+      return {
+        status: "needs_sync",
+        reasonCode: "DUPLICATE_WORKFLOW_SYNC_MARKERS",
+        docsDir: config.docsDir,
+        activeFeatureRef,
+        changedCodePaths: [],
+        changedFeatureDocPaths: duplicateWorkflowSyncMarkerPaths,
+        latestCodeChangeAt: null,
+        latestFeatureDocSyncAt
+      };
+    }
     return {
       status: "ok",
       reasonCode: "WORKFLOW_IN_SYNC",
@@ -9117,6 +9134,18 @@ async function collectWorkflowAudit(cwd) {
       latestFeatureDocSyncAt
     };
   }
+  if (duplicateWorkflowSyncMarkerPaths.length > 0) {
+    return {
+      status: "needs_sync",
+      reasonCode: "DUPLICATE_WORKFLOW_SYNC_MARKERS",
+      docsDir: config.docsDir,
+      activeFeatureRef,
+      changedCodePaths: combinedChangedCodePaths.map((item) => item.relativeToRepo),
+      changedFeatureDocPaths: duplicateWorkflowSyncMarkerPaths,
+      latestCodeChangeAt,
+      latestFeatureDocSyncAt
+    };
+  }
   if (!activeFeatureRef) {
     return {
       status: "needs_sync",
@@ -9242,6 +9271,23 @@ async function getLatestWorkflowSyncMarkerAt(activeFeature) {
   }
   return latest > 0 ? new Date(latest).toISOString() : null;
 }
+async function collectDuplicateWorkflowSyncMarkerPaths(activeFeature) {
+  if (!activeFeature) return [];
+  const canonicalFiles = ["spec.md", "plan.md", "tasks.md", "decisions.md", "issue.md", "pr.md"];
+  const markerPaths = [];
+  let markerCount = 0;
+  for (const fileName of canonicalFiles) {
+    const absolutePath = path8.join(activeFeature.path, fileName);
+    if (!await fs.pathExists(absolutePath)) continue;
+    const content = await fs.readFile(absolutePath, "utf-8");
+    const matches = [...content.matchAll(WORKFLOW_SYNC_MARKER_PATTERN)];
+    if (matches.length > 0) {
+      markerCount += matches.length;
+      markerPaths.push(normalizeSlashes2(path8.relative(activeFeature.path, absolutePath)));
+    }
+  }
+  return markerCount > 1 ? markerPaths : [];
+}
 function extractWorkflowSyncMarkerTimes(content, nowMs, fileMtimeMs) {
   const values = [];
   for (const match of content.matchAll(WORKFLOW_SYNC_MARKER_PATTERN)) {