lee-spec-kit 0.6.31 → 0.6.32

package/dist/index.js

@@ -6777,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";
@@ -6813,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) {
@@ -6884,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();
 }
@@ -6916,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";
@@ -7284,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(
     [
@@ -7304,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",
@@ -7332,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 ? {
@@ -7682,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
       });
@@ -8056,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,
@@ -8070,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,
@@ -8331,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;
     }