mandrel 1.94.0 → 2.1.0

package/.agents/scripts/lib/orchestration/single-story-close/phases/auto-merge.js

@@ -1,7 +1,7 @@
 /**
  * phases/auto-merge.js — enable GitHub native auto-merge on the PR.
  *
- * Mirrors the epic-deliver finalize call shape: squash strategy, delete
+ * Mirrors the v2 `single-story-close.js` finalize call shape: squash strategy, delete
  * the branch on merge. Non-fatal — returns `{ enabled: false, reason }`
  * on any failure so the caller can fall back to the operator-merges-button
  * path.
@@ -28,6 +28,30 @@
 import { gh as defaultGh } from '../../../gh-exec.js';
 import { resolveAutoMergeArmCwd } from '../../auto-merge-cwd.js';
 
+/**
+ * Arm reasons that mean **the operator deliberately owns the merge** — the PR
+ * was never armed because it was asked not to be, not because arming failed.
+ *
+ * The distinction is load-bearing: an un-armed-by-request PR has nothing for
+ * close to land, so `resolveWaitForMerge` (`./options.js`) resolves
+ * `waitForMerge` to `false` for these reasons and the Story rests at
+ * `agent::closing` for the human. Every *other* falsy arm outcome
+ * (`pr-number-unparseable`, an `enableAutoMerge` failure) is a genuine fault
+ * and still routes through the merge-unlanded block path.
+ */
+const OPERATOR_MERGE_ARM_REASONS = Object.freeze([
+  'disabled-by-flag',
+  'disabled-by-policy-strict',
+]);
+
+/**
+ * @param {string|null|undefined} reason
+ * @returns {boolean}
+ */
+export function isOperatorMergeReason(reason) {
+  return OPERATOR_MERGE_ARM_REASONS.includes(reason);
+}
+
 /**
  * Enable GitHub native auto-merge on the PR. Non-fatal.
  *

package/.agents/scripts/lib/orchestration/single-story-close/phases/base-sync.js

@@ -18,7 +18,11 @@
 import { syncBranchFromBase } from '../../../git/sync-from-base.js';
 import { Logger } from '../../../Logger.js';
 import { AGENT_LABELS } from '../../../label-constants.js';
-import { upsertStructuredComment } from '../../ticketing/state.js';
+import {
+  STATE_LABELS,
+  transitionTicketState,
+  upsertStructuredComment,
+} from '../../ticketing.js';
 
 /**
  * Orchestrate the pre-push base-sync step: run `syncBranchFromBase`
@@ -76,7 +80,7 @@ export async function runBaseSyncPhase({
           : syncResult.stderr
             ? `: ${syncResult.stderr.slice(0, 200)}`
             : '') +
-        `. Story transitioned to ${AGENT_LABELS.BLOCKED}; resolve in ${syncCwd} and re-run \`/single-story-deliver\`.`,
+        `. Story transitioned to ${AGENT_LABELS.BLOCKED}; resolve in ${syncCwd} and re-run \`/deliver ${storyId}\`.`,
     );
   }
   progress('SYNC', `✅ Synced from origin/${baseBranch} (${syncResult.kind}).`);
@@ -126,13 +130,11 @@ export async function handleSyncFailure({
     );
   }
 
+  // Story #4539 — the canonical mutator, not a direct label write: a bare
+  // `provider.updateTicket` skips the Projects v2 column sync (Story
+  // #2548) and strands the board on the Story's prior status.
   try {
-    await provider.updateTicket(storyId, {
-      labels: {
-        add: [AGENT_LABELS.BLOCKED],
-        remove: [AGENT_LABELS.EXECUTING, AGENT_LABELS.READY, AGENT_LABELS.DONE],
-      },
-    });
+    await transitionTicketState(provider, storyId, STATE_LABELS.BLOCKED, {});
     progress('SYNC', `🚧 Flipped Story #${storyId} → ${AGENT_LABELS.BLOCKED}.`);
   } catch (err) {
     Logger.warn?.(
@@ -164,7 +166,7 @@ export function buildSyncFailureCommentBody({
   const lines = [
     `### ${heading}`,
     '',
-    '`/single-story-deliver` close-validation passed, but the pre-push',
+    '`/deliver` close-validation passed, but the pre-push',
     `sync against \`origin/${baseBranch}\` could not complete. The Story has`,
     `been transitioned to \`agent::blocked\`. To resume:`,
     '',

package/.agents/scripts/lib/orchestration/single-story-close/phases/close-validation.js

@@ -8,7 +8,7 @@
  *
  * Standalone evidence keyspace (Story #4250). Standalone Stories have no
  * parent Epic, so they cannot scope a `validation-evidence.json` under a
- * `temp/epic-<id>/` tree. Rather than feed a null `epicId` into the
+ * `temp/run-<id>/` tree. Rather than feed a null `epicId` into the
  * Epic-keyed path (which structurally disabled the evidence cache and
  * forced every re-run — base-sync conflict, review remediation, baseline
  * absorb — to re-execute ALL gates including the coverage suite), the
@@ -45,7 +45,7 @@ import { runScopedFormatAutofix as defaultRunScopedFormatAutofix } from '../../s
  *
  * Gates are built from the canonical resolved config (`buildDefaultGates`
  * reads `project.commands` and `delivery.quality.gates.crap.enabled`); the
- * `baseBranch` is forwarded as the gate `epicBranch` so the format gate's
+ * `baseBranch` is forwarded as the gate `baseBranch` so the format gate's
  * changed-file scope anchors on it. `standalone: true` routes the evidence
  * cache to the storyId-anchored keyspace.
  *
@@ -92,7 +92,7 @@ export async function runCloseValidationPhase({
         cwd,
         worktreePath,
         storyId,
-        epicBranch: baseBranch,
+        baseBranch,
         storyBranch,
         config,
         logger: Logger,
@@ -127,7 +127,7 @@ export async function runCloseValidationPhase({
     worktreePath,
     gates: buildDefaultGates({
       config,
-      epicBranch: baseBranch,
+      baseBranch,
       cwd: worktreePath || cwd,
       log: (m) => Logger.info(m),
     }),

package/.agents/scripts/lib/orchestration/single-story-close/phases/code-review.js

@@ -21,9 +21,10 @@
  * the caller raises that to a thrown error so auto-merge is not enabled.
  *
  * Delegates the `runCodeReview` invocation to `runStoryReviewCore`
- * (exported from `story-close/phases/code-review.js`) so both the
- * Epic-attached and standalone close paths share a single invocation
- * pattern (Story #3653).
+ * (exported from `story-close/phases/code-review.js`) so the close path
+ * shares a single invocation pattern (Story #3653). Review depth needs no
+ * input here: it is derived from this Story's own diff inside `runCodeReview`
+ * (Story #4542).
  */
 
 import { parsePrNumberFromUrl } from '../../../github-url.js';
@@ -71,6 +72,73 @@ export function buildStoryReviewCrossRefBody({
   );
 }
 
+async function invokeStoryReviewCore({
+  storyId,
+  storyBranch,
+  baseBranch,
+  prNumber,
+  provider,
+  runCodeReviewFn,
+  runLocalLensReviewFn,
+  progress,
+}) {
+  return runStoryReviewCore({
+    storyId,
+    baseRef: baseBranch,
+    headRef: storyBranch,
+    commentTargetId: prNumber,
+    provider,
+    progress,
+    progressTag: 'REVIEW',
+    runCodeReviewFn,
+    // Forward the seam only when the caller injects it; otherwise
+    // `runStoryReviewCore` uses its default local-lens pass. `undefined`
+    // deep-merges to the default via the destructuring default there.
+    ...(runLocalLensReviewFn ? { runLocalLensReviewFn } : {}),
+  });
+}
+
+async function postStoryReviewCrossRef({
+  provider,
+  storyId,
+  prUrl,
+  prNumber,
+  result,
+  severity,
+  progress,
+}) {
+  if (result.posted && Number.isInteger(result.postedCommentId)) {
+    const commentUrl = `${prUrl}#issuecomment-${result.postedCommentId}`;
+    const body = buildStoryReviewCrossRefBody({
+      prUrl,
+      prNumber,
+      commentUrl,
+      severity,
+    });
+    try {
+      await postStructuredComment(provider, storyId, 'notification', body);
+      progress(
+        'REVIEW',
+        `📝 Cross-reference comment posted on Story #${storyId} → ${commentUrl}`,
+      );
+      return true;
+    } catch (err) {
+      progress(
+        'REVIEW',
+        `⚠️ Failed to post Story cross-reference comment: ${err?.message ?? err}`,
+      );
+      return false;
+    }
+  }
+  if (!result.posted) {
+    progress(
+      'REVIEW',
+      '⚠️ Skipping Story cross-reference comment: PR-side review comment did not post.',
+    );
+  }
+  return false;
+}
+
 /**
  * Run the Story-scope code review against `main`, post the structured
  * findings comment to the PR, and add a one-line cross-reference comment
@@ -132,19 +200,15 @@ export async function runStoryScopeReview({
     `Running Story-scope code review for Story #${storyId} (${baseBranch}...${storyBranch}) → PR #${prNumber}...`,
   );
 
-  const result = await runStoryReviewCore({
+  const result = await invokeStoryReviewCore({
     storyId,
-    baseRef: baseBranch,
-    headRef: storyBranch,
-    commentTargetId: prNumber,
+    storyBranch,
+    baseBranch,
+    prNumber,
     provider,
-    progress,
-    progressTag: 'REVIEW',
     runCodeReviewFn,
-    // Forward the seam only when the caller injects it; otherwise
-    // `runStoryReviewCore` uses its default local-lens pass. `undefined`
-    // deep-merges to the default via the destructuring default there.
-    ...(runLocalLensReviewFn ? { runLocalLensReviewFn } : {}),
+    runLocalLensReviewFn,
+    progress,
   });
 
   const sev = result.severity ?? {
@@ -158,34 +222,15 @@ export async function runStoryScopeReview({
     `Findings — critical:${sev.critical} high:${sev.high} medium:${sev.medium} suggestion:${sev.suggestion}. Posted to PR #${prNumber}: ${result.posted}.`,
   );
 
-  let crossRefPosted = false;
-  if (result.posted && Number.isInteger(result.postedCommentId)) {
-    const commentUrl = `${prUrl}#issuecomment-${result.postedCommentId}`;
-    const body = buildStoryReviewCrossRefBody({
-      prUrl,
-      prNumber,
-      commentUrl,
-      severity: sev,
-    });
-    try {
-      await postStructuredComment(provider, storyId, 'notification', body);
-      crossRefPosted = true;
-      progress(
-        'REVIEW',
-        `📝 Cross-reference comment posted on Story #${storyId} → ${commentUrl}`,
-      );
-    } catch (err) {
-      progress(
-        'REVIEW',
-        `⚠️ Failed to post Story cross-reference comment: ${err?.message ?? err}`,
-      );
-    }
-  } else if (!result.posted) {
-    progress(
-      'REVIEW',
-      '⚠️ Skipping Story cross-reference comment: PR-side review comment did not post.',
-    );
-  }
+  const crossRefPosted = await postStoryReviewCrossRef({
+    provider,
+    storyId,
+    prUrl,
+    prNumber,
+    result,
+    severity: sev,
+    progress,
+  });
 
   return {
     halted: !!result.halted,