lee-spec-kit 0.6.30 → 0.6.32

package/dist/index.js

@@ -514,8 +514,8 @@ var ko = {
     reviewFixCommitIssueGuidance: "PR \uB9AC\uBDF0 \uC218\uC815 \uCEE4\uBC0B\uC744 \uC9C4\uD589\uD558\uC138\uC694. \uB9AC\uBDF0 \uBC18\uC601 \uD30C\uC77C\uB9CC \uC2A4\uD14C\uC774\uC9D5\uD55C \uB4A4 `fix(#{issueNumber}): <review-fix-summary>` \uD615\uC2DD\uC73C\uB85C \uCEE4\uBC0B\uD558\uC138\uC694. `<review-fix-summary>`\uC5D0\uB294 \uC774\uBC88 \uCEE4\uBC0B\uC5D0\uC11C \uC2E4\uC81C\uB85C \uD574\uACB0\uD55C \uB9AC\uBDF0 \uD56D\uBAA9 \uC694\uC57D\uC744 \uC791\uC131\uD558\uC138\uC694. (\uD0DC\uC2A4\uD06C \uC81C\uBAA9 \uC7AC\uC0AC\uC6A9 \uAE08\uC9C0)",
     reviewFixCommitGuidance: "PR \uB9AC\uBDF0 \uC218\uC815 \uCEE4\uBC0B\uC744 \uC9C4\uD589\uD558\uC138\uC694. \uB9AC\uBDF0 \uBC18\uC601 \uD30C\uC77C\uB9CC \uC2A4\uD14C\uC774\uC9D5\uD55C \uB4A4 `fix(review): <review-fix-summary>` \uD615\uC2DD\uC73C\uB85C \uCEE4\uBC0B\uD558\uC138\uC694. `<review-fix-summary>`\uC5D0\uB294 \uC774\uBC88 \uCEE4\uBC0B\uC5D0\uC11C \uC2E4\uC81C\uB85C \uD574\uACB0\uD55C \uB9AC\uBDF0 \uD56D\uBAA9 \uC694\uC57D\uC744 \uC791\uC131\uD558\uC138\uC694. (\uD0DC\uC2A4\uD06C \uC81C\uBAA9 \uC7AC\uC0AC\uC6A9 \uAE08\uC9C0)",
     standaloneNeedsProjectRoot: "standalone \uBAA8\uB4DC\uC5D0\uC11C\uB294 projectRoot \uC124\uC815\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. (npx lee-spec-kit config --project-root ...)",
-    createBranch: 'cd "{projectGitCwd}" && mkdir -p .worktrees && (git worktree add ".worktrees/feat-{issueNumber}-{slug}" "feat/{issueNumber}-{slug}" || git worktree add -b "feat/{issueNumber}-{slug}" ".worktrees/feat-{issueNumber}-{slug}") && echo "worktree: {projectGitCwd}/.worktrees/feat-{issueNumber}-{slug}"',
-    worktreeCleanupCommand: 'cd "{projectGitCwd}" && git worktree remove "{worktreePath}" && git worktree prune && CURRENT_BRANCH=$(git branch --show-current) && DEFAULT_BRANCH=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null | cut -d/ -f2-) && TARGET_BRANCH="${DEFAULT_BRANCH:-$CURRENT_BRANCH}" && if [ -n "$TARGET_BRANCH" ]; then git checkout "$TARGET_BRANCH" >/dev/null 2>&1 || true; fi && if git rev-parse --abbrev-ref --symbolic-full-name "@{u}" >/dev/null 2>&1 && [ -z "$(git status --porcelain)" ]; then git pull --ff-only || true; fi',
+    createBranch: 'cd "{projectGitCwd}" && mkdir -p .worktrees && (git worktree add ".worktrees/feat-{issueNumber}-{slug}" "feat/{issueNumber}-{slug}" || git worktree add -b "feat/{issueNumber}-{slug}" ".worktrees/feat-{issueNumber}-{slug}") && WT="{projectGitCwd}/.worktrees/feat-{issueNumber}-{slug}" && for f in .env .env.local .env.development .env.development.local .env.test .env.test.local .env.production .env.production.local; do [ -f "{projectGitCwd}/$f" ] && [ ! -e "$WT/$f" ] && cp "{projectGitCwd}/$f" "$WT/$f" || true; done && echo "worktree: {projectGitCwd}/.worktrees/feat-{issueNumber}-{slug}"',
+    worktreeCleanupCommand: 'cd "{projectGitCwd}" && WT="{worktreePath}" && ROOT="$(pwd)" && case "$WT" in "$ROOT"/.worktrees/*) if git worktree list --porcelain | grep -Fxq "worktree $WT"; then git worktree remove --force "$WT" || true; fi; [ -d "$WT" ] && rm -rf "$WT" || true ;; *) echo "skip unsafe worktree path: $WT" ;; esac && git worktree prune && CURRENT_BRANCH=$(git branch --show-current) && DEFAULT_BRANCH=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null | cut -d/ -f2-) && TARGET_BRANCH="${DEFAULT_BRANCH:-$CURRENT_BRANCH}" && if [ -n "$TARGET_BRANCH" ]; then git checkout "$TARGET_BRANCH" >/dev/null 2>&1 || true; fi && if git rev-parse --abbrev-ref --symbolic-full-name "@{u}" >/dev/null 2>&1 && [ -z "$(git status --porcelain)" ]; then git pull --ff-only || true; fi',
     tasksAllDoneButNoChecklist: '\uC644\uB8CC \uC870\uAC74 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8\uB97C \uC791\uC131\uD558\uC138\uC694. tasks.md\uC758 "\uC644\uB8CC \uC870\uAC74" \uC139\uC158\uC5D0 \uAC80\uC99D \uD56D\uBAA9\uC744 \uCD94\uAC00\uD558\uACE0, \uC0AC\uC6A9\uC790\uC640 \uD655\uC778 \uD6C4 \uCDA9\uC871 \uD56D\uBAA9\uC744 [x]\uB85C \uCCB4\uD06C\uD558\uC138\uC694. \uCD5C\uC885 \uC2B9\uC778(OK)\uB3C4 \uBC18\uC601\uD558\uC138\uC694.',
     tasksAllDoneButChecklist: "\uC644\uB8CC \uC870\uAC74 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8\uC758 \uB0A8\uC740 \uD56D\uBAA9\uC744 \uC9C4\uD589\uD558\uC138\uC694. \uD604\uC7AC \uC9C4\uD589: ({checked}/{total}) \uC0AC\uC6A9\uC790\uC640 \uD655\uC778 \uD6C4 \uCDA9\uC871 \uD56D\uBAA9\uC744 [x]\uB85C \uCCB4\uD06C\uD558\uACE0 \uCD5C\uC885 \uC2B9\uC778(OK)\uC744 \uBC18\uC601\uD558\uC138\uC694.",
     finishDoingTask: '\uD604\uC7AC DOING/REVIEW \uD0DC\uC2A4\uD06C\uB97C \uC218\uD589\uD558\uC138\uC694: "{title}" ({done}/{total}) \uC644\uB8CC \uC2DC \uACB0\uACFC/\uAC80\uC99D\uC744 \uACF5\uC720\uD558\uACE0 DONE \uCC98\uB9AC',
@@ -1025,8 +1025,8 @@ var en = {
     reviewFixCommitIssueGuidance: "Commit PR review fixes. Stage only review-fix files, then commit with `fix(#{issueNumber}): <review-fix-summary>`. `<review-fix-summary>` must describe review comments resolved in this commit (do not reuse task titles).",
     reviewFixCommitGuidance: "Commit PR review fixes. Stage only review-fix files, then commit with `fix(review): <review-fix-summary>`. `<review-fix-summary>` must describe review comments resolved in this commit (do not reuse task titles).",
     standaloneNeedsProjectRoot: "Standalone mode requires projectRoot. (npx lee-spec-kit config --project-root ...)",
-    createBranch: 'cd "{projectGitCwd}" && mkdir -p .worktrees && (git worktree add ".worktrees/feat-{issueNumber}-{slug}" "feat/{issueNumber}-{slug}" || git worktree add -b "feat/{issueNumber}-{slug}" ".worktrees/feat-{issueNumber}-{slug}") && echo "worktree: {projectGitCwd}/.worktrees/feat-{issueNumber}-{slug}"',
-    worktreeCleanupCommand: 'cd "{projectGitCwd}" && git worktree remove "{worktreePath}" && git worktree prune && CURRENT_BRANCH=$(git branch --show-current) && DEFAULT_BRANCH=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null | cut -d/ -f2-) && TARGET_BRANCH="${DEFAULT_BRANCH:-$CURRENT_BRANCH}" && if [ -n "$TARGET_BRANCH" ]; then git checkout "$TARGET_BRANCH" >/dev/null 2>&1 || true; fi && if git rev-parse --abbrev-ref --symbolic-full-name "@{u}" >/dev/null 2>&1 && [ -z "$(git status --porcelain)" ]; then git pull --ff-only || true; fi',
+    createBranch: 'cd "{projectGitCwd}" && mkdir -p .worktrees && (git worktree add ".worktrees/feat-{issueNumber}-{slug}" "feat/{issueNumber}-{slug}" || git worktree add -b "feat/{issueNumber}-{slug}" ".worktrees/feat-{issueNumber}-{slug}") && WT="{projectGitCwd}/.worktrees/feat-{issueNumber}-{slug}" && for f in .env .env.local .env.development .env.development.local .env.test .env.test.local .env.production .env.production.local; do [ -f "{projectGitCwd}/$f" ] && [ ! -e "$WT/$f" ] && cp "{projectGitCwd}/$f" "$WT/$f" || true; done && echo "worktree: {projectGitCwd}/.worktrees/feat-{issueNumber}-{slug}"',
+    worktreeCleanupCommand: 'cd "{projectGitCwd}" && WT="{worktreePath}" && ROOT="$(pwd)" && case "$WT" in "$ROOT"/.worktrees/*) if git worktree list --porcelain | grep -Fxq "worktree $WT"; then git worktree remove --force "$WT" || true; fi; [ -d "$WT" ] && rm -rf "$WT" || true ;; *) echo "skip unsafe worktree path: $WT" ;; esac && git worktree prune && CURRENT_BRANCH=$(git branch --show-current) && DEFAULT_BRANCH=$(git symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null | cut -d/ -f2-) && TARGET_BRANCH="${DEFAULT_BRANCH:-$CURRENT_BRANCH}" && if [ -n "$TARGET_BRANCH" ]; then git checkout "$TARGET_BRANCH" >/dev/null 2>&1 || true; fi && if git rev-parse --abbrev-ref --symbolic-full-name "@{u}" >/dev/null 2>&1 && [ -z "$(git status --porcelain)" ]; then git pull --ff-only || true; fi',
     tasksAllDoneButNoChecklist: 'Create the completion checklist. Add verification items to the tasks.md "Completion Criteria" section, then mark satisfied items as [x] after user confirmation. Record final approval (OK) as well.',
     tasksAllDoneButChecklist: "Proceed with remaining completion checklist items. Current progress: ({checked}/{total}) Mark items as [x] only after user confirmation and real verification. Record final approval (OK) as well.",
     finishDoingTask: 'Continue working on the current DOING/REVIEW task: "{title}" ({done}/{total}) After it is complete, share outcome/verification and mark it DONE',
@@ -2951,13 +2951,15 @@ function resolveWorkflowPolicy(workflow) {
     requireIssue: false,
     requireBranch: false,
     requirePr: false,
-    requireReview: false
+    requireReview: false,
+    requireMerge: false
   } : {
     mode,
     requireIssue: true,
     requireBranch: true,
     requirePr: true,
-    requireReview: true
+    requireReview: true,
+    requireMerge: true
   };
   if (typeof workflow?.requireIssue === "boolean") {
     policy.requireIssue = workflow.requireIssue;
@@ -2971,13 +2973,20 @@ function resolveWorkflowPolicy(workflow) {
   if (typeof workflow?.requireReview === "boolean") {
     policy.requireReview = workflow.requireReview;
   }
+  if (typeof workflow?.requireMerge === "boolean") {
+    policy.requireMerge = workflow.requireMerge;
+  }
   if (!policy.requireIssue) {
     policy.requireBranch = false;
   }
   if (!policy.requirePr) {
     policy.requireReview = false;
+    policy.requireMerge = false;
   } else if (policy.requireReview) {
     policy.requirePr = true;
+    policy.requireMerge = true;
+  } else if (policy.requireMerge) {
+    policy.requirePr = true;
   }
   return policy;
 }
@@ -3076,7 +3085,7 @@ function isPrePrReviewSatisfied(feature, prePrReviewPolicy) {
   return true;
 }
 function isFeatureDone(feature, workflowPolicy, prePrReviewPolicy) {
-  return feature.specStatus === "Approved" && feature.planStatus === "Approved" && !feature.git.docsHasUncommittedChanges && !feature.git.projectHasUncommittedChanges && feature.docs.tasksExists && feature.tasks.total > 0 && feature.tasks.total === feature.tasks.done && isCompletionChecklistDone(feature) && isTasksDocApproved(feature) && (!workflowPolicy.requireIssue || !!feature.issueNumber) && (!workflowPolicy.requirePr || isPrMetadataConfigured(feature) && !!feature.pr.link) && (!workflowPolicy.requireReview || feature.pr.status === "Approved") && isPrePrReviewSatisfied(feature, prePrReviewPolicy);
+  return feature.specStatus === "Approved" && feature.planStatus === "Approved" && !feature.git.docsHasUncommittedChanges && !feature.git.projectHasUncommittedChanges && feature.docs.tasksExists && feature.tasks.total > 0 && feature.tasks.total === feature.tasks.done && isCompletionChecklistDone(feature) && isTasksDocApproved(feature) && (!workflowPolicy.requireIssue || !!feature.issueNumber) && (!workflowPolicy.requirePr || isPrMetadataConfigured(feature) && !!feature.pr.link) && (!workflowPolicy.requireMerge || feature.pr.status === "Approved") && isPrePrReviewSatisfied(feature, prePrReviewPolicy);
 }
 function getPrReviewRemoteBlockReasons(feature, lang) {
   const remote = feature.pr.remote;
@@ -3981,10 +3990,10 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
       step: 14,
       name: tr(lang, "steps", "codeReview"),
       checklist: {
-        done: (f) => !workflowPolicy.requireReview || isPrMetadataConfigured(f) && f.pr.status === "Approved"
+        done: (f) => !workflowPolicy.requireMerge || isPrMetadataConfigured(f) && f.pr.status === "Approved"
       },
       current: {
-        when: (f) => workflowPolicy.requireReview && isPrMetadataConfigured(f) && !!f.pr.link && f.pr.status !== "Approved",
+        when: (f) => workflowPolicy.requireMerge && isPrMetadataConfigured(f) && !!f.pr.link && f.pr.status !== "Approved",
         actions: (f) => {
           if (!f.pr.status) {
             return [
@@ -3998,7 +4007,7 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
             ];
           }
           if (f.pr.status === "Review") {
-            if (f.pr.remote?.available && f.pr.remote.isMerged) {
+            if (workflowPolicy.requireReview && f.pr.remote?.available && f.pr.remote.isMerged) {
               return [
                 {
                   type: "instruction",
@@ -4009,7 +4018,7 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
                 }
               ];
             }
-            if (!f.docs.prReviewEvidenceFieldExists) {
+            if (workflowPolicy.requireReview && !f.docs.prReviewEvidenceFieldExists) {
               return [
                 {
                   type: "instruction",
@@ -4020,7 +4029,7 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
                 }
               ];
             }
-            if (!f.prReview.evidenceProvided) {
+            if (workflowPolicy.requireReview && !f.prReview.evidenceProvided) {
               return [
                 {
                   type: "instruction",
@@ -4031,7 +4040,7 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
                 }
               ];
             }
-            if (!f.docs.prReviewDecisionFieldExists) {
+            if (workflowPolicy.requireReview && !f.docs.prReviewDecisionFieldExists) {
               return [
                 {
                   type: "instruction",
@@ -4042,7 +4051,7 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
                 }
               ];
             }
-            if (!f.prReview.decisionProvided) {
+            if (workflowPolicy.requireReview && !f.prReview.decisionProvided) {
               return [
                 {
                   type: "instruction",
@@ -4055,15 +4064,16 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
             }
             const remoteBlockReasons = getPrReviewRemoteBlockReasons(f, lang);
             const remoteUnavailable = workflowPolicy.mode === "github" && !!f.pr.link && (!f.pr.remote || !f.pr.remote.available);
-            const actions = [
-              {
+            const actions = [];
+            if (workflowPolicy.requireReview) {
+              actions.push({
                 type: "instruction",
                 category: "code_review",
                 requiresUserCheck: true,
                 uiDetailKey: "context.actionDetail.codeReviewResolve",
                 message: tr(lang, "messages", "prReviewResolve")
-              }
-            ];
+              });
+            }
             if (!f.git.projectGitCwd) {
               actions.push({
                 type: "instruction",
@@ -4121,7 +4131,18 @@ ${tr(lang, "messages", "taskCommitGateWarnProceed", {
                 })
               });
             }
-            return actions;
+            if (actions.length > 0) return actions;
+            return [
+              {
+                type: "instruction",
+                category: "code_review",
+                requiresUserCheck: true,
+                uiDetailKey: "context.actionDetail.codeReviewMergeAfterOk",
+                message: tr(lang, "messages", "prReviewMerge", {
+                  featureRef: f.id || f.folderName
+                })
+              }
+            ];
           }
           return [
             {
@@ -5331,7 +5352,7 @@ async function parseFeature(featurePath, type, context, options) {
     prDocPrFieldExists = hasAnySpecKey(content, ["PR", "Pull Request"]);
     prDocReviewStatusFieldExists = hasAnySpecKey(content, ["PR \uC0C1\uD0DC", "PR Status"]);
   }
-  if (workflowPolicy.requireReview && prStatus === "Review" && prLink && effectiveProjectGitCwd) {
+  if (workflowPolicy.requireMerge && prStatus === "Review" && prLink && effectiveProjectGitCwd) {
     prRemote = resolvePrRemoteStatus(prLink, effectiveProjectGitCwd) || void 0;
   }
   const warnings = [];
@@ -5473,7 +5494,7 @@ async function parseFeature(featurePath, type, context, options) {
   }
   const tasksDocApproved = !tasksDocStatusFieldExists || tasksDocStatus === "Approved";
   const implementationDone = tasksExists && tasksSummary.total > 0 && tasksSummary.total === tasksSummary.done && isCompletionChecklistDone2({ completionChecklist }) && tasksDocApproved;
-  const workflowDone = implementationDone && !docsHasUncommittedChanges && !projectHasUncommittedChanges && specStatus === "Approved" && planStatus === "Approved" && (!workflowPolicy.requireIssue || !!issueNumber) && (!workflowPolicy.requirePr || isPrMetadataConfigured2({ docs: { prFieldExists, prStatusFieldExists } }) && !!prLink) && (!workflowPolicy.requireReview || prStatus === "Approved") && isPrePrReviewSatisfied2(
+  const workflowDone = implementationDone && !docsHasUncommittedChanges && !projectHasUncommittedChanges && specStatus === "Approved" && planStatus === "Approved" && (!workflowPolicy.requireIssue || !!issueNumber) && (!workflowPolicy.requirePr || isPrMetadataConfigured2({ docs: { prFieldExists, prStatusFieldExists } }) && !!prLink) && (!workflowPolicy.requireMerge || prStatus === "Approved") && isPrePrReviewSatisfied2(
     {
       docs: {
         prePrReviewFieldExists,
@@ -5504,11 +5525,11 @@ async function parseFeature(featurePath, type, context, options) {
     }
     if (workflowPolicy.requirePr && prFieldExists && prStatusFieldExists) {
       if (!prLink) warnings.push(tr(lang, "warnings", "workflowPrLinkMissing"));
-      if (workflowPolicy.requireReview) {
+      if (workflowPolicy.requireMerge) {
         if (!prStatus) warnings.push(tr(lang, "warnings", "workflowPrStatusMissing"));
         if (prStatus && prStatus !== "Approved") {
           warnings.push(tr(lang, "warnings", "workflowPrStatusNotApproved"));
-          if (prStatus === "Review") {
+          if (workflowPolicy.requireReview && prStatus === "Review") {
             if (!prReviewEvidenceFieldExists || !prReviewEvidenceProvided) {
               warnings.push(tr(lang, "warnings", "workflowPrReviewEvidenceMissing"));
             }
@@ -6756,6 +6777,9 @@ function detectFromBranch(branchName, features) {
     (f) => f.slug.toLowerCase() === detected.toLowerCase() || f.folderName.toLowerCase() === detected.toLowerCase()
   );
 }
+function detectFromExpectedFeatureBranch(features) {
+  return features.filter((feature) => feature.git.onExpectedBranch);
+}
 function toSelectionStatus(features, selectionMode, openFeatures, targetFeatures) {
   const isNoOpen = selectionMode === "open" && features.length > 0 && openFeatures.length === 0;
   if (features.length === 0) return "no_features";
@@ -6792,7 +6816,12 @@ async function resolveContextSelection(config, featureName, options) {
     );
     selectionMode = "explicit";
   } else {
-    if (config.projectType === "single") {
+    const expectedBranchMatches = detectFromExpectedFeatureBranch(scopedFeatures);
+    if (expectedBranchMatches.length === 1) {
+      targetFeatures = expectedBranchMatches;
+      selectionMode = "branch";
+      selectionFallback = "none";
+    } else if (config.projectType === "single") {
       const branchName = branches.project.single || "";
       targetFeatures = detectFromBranch(branchName, scopedFeatures);
     } else if (selectedComponent) {
@@ -6863,16 +6892,6 @@ async function resolveContextSelection(config, featureName, options) {
 }
 
 // src/utils/context/approval-reply.ts
-function isAffirmativeApprovalReply(input) {
-  const raw = input.trim();
-  if (!raw) return false;
-  if (/\b(?:no|don'?t|do not|stop|cancel|hold|wait|아니|취소|중지|보류)\b/i.test(raw)) {
-    return false;
-  }
-  return /(?:^|[\s`"'([{<])(?:ok|okay|yes|y|go|proceed|continue|run|execute|approve(?:d)?|진행(?:해|하세요)?|수행(?:해|하세요)?|실행(?:해|하세요)?|승인(?:해|하세요)?|해줘|해주세요|오케이)(?:$|[\s`"')\]}>.!?,])/i.test(
-    raw
-  );
-}
 function normalizeRequestText(raw) {
   return raw.replace(/^[\s,;:]+/, "").trim();
 }
@@ -6895,9 +6914,6 @@ function parseApprovalReply(input, validLabels) {
   for (const token of tokens) {
     if (validSet.has(token)) return { label: token };
   }
-  if (normalizedLabels.length === 1 && isAffirmativeApprovalReply(input)) {
-    return { label: normalizedLabels[0] };
-  }
   return null;
 }
 var LEGACY_APPROVAL_TICKET_FILENAME = ".lee-spec-kit.approval-tickets.json";
@@ -7263,9 +7279,10 @@ function buildAgentOrchestrationPolicy(actionOptions, autoRunAvailable, autoRunC
   const delegation = shouldDelegateCurrentAction(actionOptions);
   const primaryOption = actionOptions[0];
   const delegatedCommandOption = primaryOption && primaryOption.action.type === "command" && delegation.shouldDelegate ? primaryOption : null;
-  const handoffMode = delegatedCommandOption ? "command" : autoRunAvailable ? "auto_run" : null;
-  const handoffCwd = delegatedCommandOption?.action.cwd || (autoRunAvailable ? process.cwd() : null);
-  const handoffCmd = delegatedCommandOption?.action.cmd || (autoRunAvailable ? autoRunCommand : null);
+  const shouldDelegateAutoRunNow = autoRunAvailable && actionOptions.length === 0;
+  const handoffMode = delegatedCommandOption ? "command" : shouldDelegateAutoRunNow ? "auto_run" : null;
+  const handoffCwd = delegatedCommandOption?.action.cwd || (shouldDelegateAutoRunNow ? process.cwd() : null);
+  const handoffCmd = delegatedCommandOption?.action.cmd || (shouldDelegateAutoRunNow ? autoRunCommand : null);
   const handoffRequired = !!handoffMode && !!handoffCwd && !!handoffCmd;
   const verifyCacheKey = handoffRequired ? createHash("sha1").update(
     [
@@ -7283,7 +7300,8 @@ function buildAgentOrchestrationPolicy(actionOptions, autoRunAvailable, autoRunC
     fallbackToMainAgentWhenSubAgentUnavailable: true,
     longRunningCategories: [...LONG_RUNNING_DELEGATION_CATEGORIES],
     currentActionShouldDelegate: delegation.shouldDelegate,
-    autoRunShouldDelegate: autoRunAvailable,
+    autoRunDelegationAvailable: autoRunAvailable,
+    autoRunShouldDelegate: shouldDelegateAutoRunNow,
     currentActionCategory: delegation.category,
     mainAgentResponsibilities: [
       "Keep user conversation state and approval boundaries",
@@ -7311,7 +7329,7 @@ function buildAgentOrchestrationPolicy(actionOptions, autoRunAvailable, autoRunC
       required: handoffRequired,
       mode: handoffMode,
       featureRef,
-      category: delegation.category,
+      category: handoffMode === "command" ? delegation.category : null,
       cwd: handoffCwd,
       cmd: handoffCmd,
       verify: handoffRequired ? {
@@ -7661,16 +7679,16 @@ function getListLabel(f, stepsMap, lang, workflowPolicy, prePrReviewPolicy) {
     if (workflowPolicy.requirePr && !f.pr.link) {
       return tr(lang, "cli", "context.list.recordPrLink");
     }
-    if (workflowPolicy.requireReview && !f.pr.status) {
+    if (workflowPolicy.requireMerge && !f.pr.status) {
       return tr(lang, "cli", "context.list.setPrStatus");
     }
-    if (workflowPolicy.requireReview && f.pr.status === "Review" && (!f.docs.prReviewEvidenceFieldExists || !f.prReview.evidenceProvided)) {
+    if (workflowPolicy.requireMerge && workflowPolicy.requireReview && f.pr.status === "Review" && (!f.docs.prReviewEvidenceFieldExists || !f.prReview.evidenceProvided)) {
       return tr(lang, "cli", "context.list.addPrReviewEvidence");
     }
-    if (workflowPolicy.requireReview && f.pr.status === "Review" && (!f.docs.prReviewDecisionFieldExists || !f.prReview.decisionProvided)) {
+    if (workflowPolicy.requireMerge && workflowPolicy.requireReview && f.pr.status === "Review" && (!f.docs.prReviewDecisionFieldExists || !f.prReview.decisionProvided)) {
       return tr(lang, "cli", "context.list.addPrReviewDecision");
     }
-    if (workflowPolicy.requireReview && f.pr.status !== "Approved") {
+    if (workflowPolicy.requireMerge && f.pr.status !== "Approved") {
       return tr(lang, "cli", "context.list.prStatusToApproved", {
         status: f.pr.status
       });
@@ -8035,7 +8053,7 @@ async function runContext(featureName, options) {
           "actionOptions[].detail",
           "actionOptions[].approvalPrompt"
         ] : [],
-        recommendation: "Before asking for approval, show only `actionOptions[].approvalPrompt` lines and `approvalRequest.finalPrompt` to the user. Keep `requiredDocs`, `checkPolicy`, and raw execution commands as internal guidance. For commit actions, include scope (`docs`/`project`) and commit message in the visible prompt. User replies should include the label token (e.g. `A`, `A OK`, `A proceed`, `A \uC9C4\uD589\uD574`). For command execution, prefer one-shot `npx lee-spec-kit flow <featureRef> --approve <LABEL> --execute` to avoid session mismatch after context compression/reset. Use ticket-based `context --execute --ticket` only when explicitly needed. Use main-agent orchestration: keep short steps in main agent, and delegate only long-running command/auto loops to sub-agents.",
+        recommendation: 'Before asking for approval, show only `actionOptions[].approvalPrompt` lines and `approvalRequest.finalPrompt` to the user. Keep `requiredDocs`, `checkPolicy`, and raw execution commands as internal guidance. For commit actions, include scope (`docs`/`project`) and commit message in the visible prompt. User replies should include the label token (e.g. `A`, `A OK`, `A proceed`, `A \uC9C4\uD589\uD574`). For command execution, prefer one-shot `npx lee-spec-kit flow <featureRef> --approve <LABEL> --execute` to avoid session mismatch after context compression/reset. Use ticket-based `context --execute --ticket` only when explicitly needed. Use main-agent orchestration: keep short steps in main agent. Delegate command runs only when `agentOrchestration.currentActionShouldDelegate=true`, and delegate auto-run only when `agentOrchestration.subAgentHandoff.required=true` with `mode="auto_run"`.',
         oneApprovalPerAction: approvalRequired,
         requireFreshContext: true,
         contextVersion: state.contextVersion,
@@ -8049,10 +8067,10 @@ async function runContext(featureName, options) {
         command: autoRunPlan.command,
         untilCategories: autoRunPlan.untilCategories,
         unknownCategories: autoRunPlan.unknownCategories,
-        guidance: "Use auto-run only when `autoRun.available=true`. Stop and request approval when `approvalRequest.required=true` or when auto mode reaches configured gate categories."
+        guidance: 'Use auto-run only when `autoRun.available=true`. Do not treat `autoRun.available` alone as a delegation trigger; use `agentOrchestration.subAgentHandoff.required` + `mode="auto_run"` for actual delegation. Stop and request approval when `approvalRequest.required=true` or when auto mode reaches configured gate categories.'
       },
       approvalRequest: {
-        guidance: "User-facing output must include only approval prompts (`A: ...`) and `finalPrompt`. Do not expose `requiredDocs`, `checkPolicy`, or raw `cmd` unless explicitly requested. For approved command actions, prefer one-shot `flow --approve <LABEL> --execute`. Keep short steps in main agent and delegate only long-running command/auto loops to sub-agents.",
+        guidance: 'User-facing output must include only approval prompts (`A: ...`) and `finalPrompt`. Do not expose `requiredDocs`, `checkPolicy`, or raw `cmd` unless explicitly requested. For approved command actions, prefer one-shot `flow --approve <LABEL> --execute`. Keep short steps in main agent. Delegate command runs only when `agentOrchestration.currentActionShouldDelegate=true`, and delegate auto-run only when `agentOrchestration.subAgentHandoff.required=true` with `mode="auto_run"`.',
         required: approvalRequired,
         finalPrompt: finalApprovalPrompt,
         userFacingLines: approvalUserFacingLines,
@@ -8310,12 +8328,14 @@ async function runContext(featureName, options) {
   const actionOptions = state.actionOptions;
   const hasCommandOption = actionOptions.some((option) => option.action.type === "command");
   const longRunningDelegation = shouldDelegateCurrentAction(actionOptions);
+  const showOptionLabels = hasCheckAction;
   console.log(chalk6.green(chalk6.bold("\u{1F449} Next Options (Atomic):")));
   let hasDocsCommand = false;
   actionOptions.forEach((option) => {
     const requiresCheck = option.action.requiresUserCheck;
     const detail = option.detail;
-    console.log(`   ${option.label}. ${checkTag(requiresCheck)}${detail}`);
+    const prefix = showOptionLabels ? `${option.label}. ` : "- ";
+    console.log(`   ${prefix}${checkTag(requiresCheck)}${detail}`);
     if (option.action.type === "command" && option.action.scope === "docs") {
       hasDocsCommand = true;
     }
@@ -10808,8 +10828,14 @@ function runGhJson2(args, cwd, lang) {
 }
 function ensureSections(body, sections, kind, lang) {
   const hasHeading = (sectionHeading) => {
-    const re = new RegExp(`^##\\s+${escapeRegExp3(sectionHeading)}\\s*$`, "m");
-    return re.test(body);
+    const target = normalizeHeading(sectionHeading);
+    const lines = body.split("\n");
+    for (const line of lines) {
+      const match = line.match(/^\s*##\s+(.+?)\s*$/);
+      if (!match) continue;
+      if (normalizeHeading(match[1]) === target) return true;
+    }
+    return false;
   };
   const hasMetadataField = (field) => {
     const re = new RegExp(`^\\s*-\\s*\\*\\*${escapeRegExp3(field)}\\*\\*\\s*:`, "m");
@@ -10970,7 +10996,13 @@ function getFeatureDocPaths(feature) {
   };
 }
 function normalizeHeading(value) {
-  return value.trim().replace(/\s+/g, " ").toLowerCase();
+  let normalized = value.trim();
+  for (; ; ) {
+    const next = normalized.replace(/\s*\([^)]*\)\s*$/, "").replace(/\s*（[^）]*）\s*$/, "").trim();
+    if (next === normalized) break;
+    normalized = next;
+  }
+  return normalized.replace(/\s+/g, " ").toLowerCase();
 }
 function extractMarkdownByHeadings(content, headings, levels) {
   const targets = new Set(headings.map((heading) => normalizeHeading(heading)));