@jonit-dev/night-watch-cli 1.8.8-beta.10 → 1.8.8-beta.11

package/dist/cli.js

@@ -319,6 +319,38 @@ var init_job_registry = __esm({
           targetColumn: "Draft",
           analysisPrompt: ""
         }
+      },
+      {
+        id: "merger",
+        name: "Merge Orchestrator",
+        description: "Repo-wide PR merge coordinator \u2014 scans, rebases, and merges in FIFO order",
+        cliCommand: "merge",
+        logName: "merger",
+        lockSuffix: "-merger.lock",
+        queuePriority: 45,
+        envPrefix: "NW_MERGER",
+        extraFields: [
+          {
+            name: "mergeMethod",
+            type: "enum",
+            enumValues: ["squash", "merge", "rebase"],
+            defaultValue: "squash"
+          },
+          { name: "minReviewScore", type: "number", defaultValue: 80 },
+          { name: "branchPatterns", type: "string[]", defaultValue: [] },
+          { name: "rebaseBeforeMerge", type: "boolean", defaultValue: true },
+          { name: "maxPrsPerRun", type: "number", defaultValue: 0 }
+        ],
+        defaultConfig: {
+          enabled: false,
+          schedule: "55 */4 * * *",
+          maxRuntime: 1800,
+          mergeMethod: "squash",
+          minReviewScore: 80,
+          branchPatterns: [],
+          rebaseBeforeMerge: true,
+          maxPrsPerRun: 0
+        }
       }
     ];
     JOB_MAP = new Map(JOB_REGISTRY.map((job) => [job.id, job]));
@@ -339,7 +371,7 @@ function resolveProviderBucketKey(provider, providerEnv) {
     return `claude-proxy:${baseUrl}`;
   }
 }
-var DEFAULT_DEFAULT_BRANCH, DEFAULT_PRD_DIR, DEFAULT_SUMMARY_WINDOW_HOURS, DEFAULT_MAX_RUNTIME, DEFAULT_REVIEWER_MAX_RUNTIME, DEFAULT_CRON_SCHEDULE, DEFAULT_REVIEWER_SCHEDULE, DEFAULT_CRON_SCHEDULE_OFFSET, DEFAULT_MAX_RETRIES, DEFAULT_REVIEWER_MAX_RETRIES, DEFAULT_REVIEWER_RETRY_DELAY, DEFAULT_REVIEWER_MAX_PRS_PER_RUN, DEFAULT_BRANCH_PREFIX, DEFAULT_BRANCH_PATTERNS, DEFAULT_MIN_REVIEW_SCORE, DEFAULT_MAX_LOG_SIZE, DEFAULT_PROVIDER, DEFAULT_EXECUTOR_ENABLED, DEFAULT_REVIEWER_ENABLED, DEFAULT_PROVIDER_ENV, DEFAULT_FALLBACK_ON_RATE_LIMIT, DEFAULT_CLAUDE_MODEL, DEFAULT_PRIMARY_FALLBACK_MODEL, DEFAULT_SECONDARY_FALLBACK_MODEL, VALID_CLAUDE_MODELS, CLAUDE_MODEL_IDS, DEFAULT_NOTIFICATIONS, DEFAULT_PRD_PRIORITY, DEFAULT_SLICER_SCHEDULE, DEFAULT_SLICER_MAX_RUNTIME, DEFAULT_ROADMAP_SCANNER, DEFAULT_TEMPLATES_DIR, DEFAULT_BOARD_PROVIDER, DEFAULT_LOCAL_BOARD_INFO, DEFAULT_AUTO_MERGE, DEFAULT_AUTO_MERGE_METHOD, VALID_MERGE_METHODS, DEFAULT_QA_ENABLED, DEFAULT_QA_SCHEDULE, DEFAULT_QA_MAX_RUNTIME, DEFAULT_QA_ARTIFACTS, DEFAULT_QA_SKIP_LABEL, DEFAULT_QA_AUTO_INSTALL_PLAYWRIGHT, DEFAULT_QA_VALIDATED_LABEL, DEFAULT_QA, QA_LOG_NAME, DEFAULT_AUDIT_ENABLED, DEFAULT_AUDIT_SCHEDULE, DEFAULT_AUDIT_MAX_RUNTIME, DEFAULT_AUDIT, DEFAULT_ANALYTICS_ENABLED, DEFAULT_ANALYTICS_SCHEDULE, DEFAULT_ANALYTICS_MAX_RUNTIME, DEFAULT_ANALYTICS_LOOKBACK_DAYS, DEFAULT_ANALYTICS_TARGET_COLUMN, DEFAULT_ANALYTICS_PROMPT, DEFAULT_ANALYTICS, DEFAULT_PR_RESOLVER_ENABLED, DEFAULT_PR_RESOLVER_SCHEDULE, DEFAULT_PR_RESOLVER_MAX_RUNTIME, DEFAULT_PR_RESOLVER_MAX_PRS_PER_RUN, DEFAULT_PR_RESOLVER_PER_PR_TIMEOUT, DEFAULT_PR_RESOLVER_AI_CONFLICT_RESOLUTION, DEFAULT_PR_RESOLVER_AI_REVIEW_RESOLUTION, DEFAULT_PR_RESOLVER_READY_LABEL, DEFAULT_PR_RESOLVER, AUDIT_LOG_NAME, PLANNER_LOG_NAME, ANALYTICS_LOG_NAME, PR_RESOLVER_LOG_NAME, VALID_PROVIDERS, VALID_JOB_TYPES, DEFAULT_JOB_PROVIDERS, DEFAULT_PROVIDER_SCHEDULE_OVERRIDES, BUILT_IN_PRESETS, BUILT_IN_PRESET_IDS, PROVIDER_COMMANDS, CONFIG_FILE_NAME, LOCK_FILE_PREFIX, LOG_DIR, CLAIM_FILE_EXTENSION, EXECUTOR_LOG_NAME, REVIEWER_LOG_NAME, EXECUTOR_LOG_FILE, REVIEWER_LOG_FILE, LOG_FILE_NAMES, GLOBAL_CONFIG_DIR, REGISTRY_FILE_NAME, HISTORY_FILE_NAME, PRD_STATES_FILE_NAME, STATE_DB_FILE_NAME, GLOBAL_NOTIFICATIONS_FILE_NAME, MAX_HISTORY_RECORDS_PER_PRD, DEFAULT_QUEUE_ENABLED, DEFAULT_QUEUE_MODE, DEFAULT_QUEUE_MAX_CONCURRENCY, DEFAULT_QUEUE_MAX_WAIT_TIME, DEFAULT_QUEUE_PRIORITY, DEFAULT_QUEUE, DEFAULT_SCHEDULING_PRIORITY;
+var DEFAULT_DEFAULT_BRANCH, DEFAULT_PRD_DIR, DEFAULT_SUMMARY_WINDOW_HOURS, DEFAULT_MAX_RUNTIME, DEFAULT_REVIEWER_MAX_RUNTIME, DEFAULT_CRON_SCHEDULE, DEFAULT_REVIEWER_SCHEDULE, DEFAULT_CRON_SCHEDULE_OFFSET, DEFAULT_MAX_RETRIES, DEFAULT_REVIEWER_MAX_RETRIES, DEFAULT_REVIEWER_RETRY_DELAY, DEFAULT_REVIEWER_MAX_PRS_PER_RUN, DEFAULT_BRANCH_PREFIX, DEFAULT_BRANCH_PATTERNS, DEFAULT_MIN_REVIEW_SCORE, DEFAULT_MAX_LOG_SIZE, DEFAULT_PROVIDER, DEFAULT_EXECUTOR_ENABLED, DEFAULT_REVIEWER_ENABLED, DEFAULT_PROVIDER_ENV, DEFAULT_FALLBACK_ON_RATE_LIMIT, DEFAULT_CLAUDE_MODEL, DEFAULT_PRIMARY_FALLBACK_MODEL, DEFAULT_SECONDARY_FALLBACK_MODEL, VALID_CLAUDE_MODELS, CLAUDE_MODEL_IDS, DEFAULT_NOTIFICATIONS, DEFAULT_PRD_PRIORITY, DEFAULT_SLICER_SCHEDULE, DEFAULT_SLICER_MAX_RUNTIME, DEFAULT_ROADMAP_SCANNER, DEFAULT_TEMPLATES_DIR, DEFAULT_BOARD_PROVIDER, DEFAULT_LOCAL_BOARD_INFO, DEFAULT_AUTO_MERGE, DEFAULT_AUTO_MERGE_METHOD, VALID_MERGE_METHODS, DEFAULT_QA_ENABLED, DEFAULT_QA_SCHEDULE, DEFAULT_QA_MAX_RUNTIME, DEFAULT_QA_ARTIFACTS, DEFAULT_QA_SKIP_LABEL, DEFAULT_QA_AUTO_INSTALL_PLAYWRIGHT, DEFAULT_QA_VALIDATED_LABEL, DEFAULT_QA, QA_LOG_NAME, DEFAULT_AUDIT_ENABLED, DEFAULT_AUDIT_SCHEDULE, DEFAULT_AUDIT_MAX_RUNTIME, DEFAULT_AUDIT, DEFAULT_ANALYTICS_ENABLED, DEFAULT_ANALYTICS_SCHEDULE, DEFAULT_ANALYTICS_MAX_RUNTIME, DEFAULT_ANALYTICS_LOOKBACK_DAYS, DEFAULT_ANALYTICS_TARGET_COLUMN, DEFAULT_ANALYTICS_PROMPT, DEFAULT_ANALYTICS, DEFAULT_PR_RESOLVER_ENABLED, DEFAULT_PR_RESOLVER_SCHEDULE, DEFAULT_PR_RESOLVER_MAX_RUNTIME, DEFAULT_PR_RESOLVER_MAX_PRS_PER_RUN, DEFAULT_PR_RESOLVER_PER_PR_TIMEOUT, DEFAULT_PR_RESOLVER_AI_CONFLICT_RESOLUTION, DEFAULT_PR_RESOLVER_AI_REVIEW_RESOLUTION, DEFAULT_PR_RESOLVER_READY_LABEL, DEFAULT_PR_RESOLVER, DEFAULT_MERGER_ENABLED, DEFAULT_MERGER_SCHEDULE, DEFAULT_MERGER_MAX_RUNTIME, DEFAULT_MERGER_MERGE_METHOD, DEFAULT_MERGER_MIN_REVIEW_SCORE, DEFAULT_MERGER_REBASE_BEFORE_MERGE, DEFAULT_MERGER_MAX_PRS_PER_RUN, DEFAULT_MERGER, MERGER_LOG_NAME, AUDIT_LOG_NAME, PLANNER_LOG_NAME, ANALYTICS_LOG_NAME, PR_RESOLVER_LOG_NAME, VALID_PROVIDERS, VALID_JOB_TYPES, DEFAULT_JOB_PROVIDERS, DEFAULT_PROVIDER_SCHEDULE_OVERRIDES, BUILT_IN_PRESETS, BUILT_IN_PRESET_IDS, PROVIDER_COMMANDS, CONFIG_FILE_NAME, LOCK_FILE_PREFIX, LOG_DIR, CLAIM_FILE_EXTENSION, EXECUTOR_LOG_NAME, REVIEWER_LOG_NAME, EXECUTOR_LOG_FILE, REVIEWER_LOG_FILE, LOG_FILE_NAMES, GLOBAL_CONFIG_DIR, REGISTRY_FILE_NAME, HISTORY_FILE_NAME, PRD_STATES_FILE_NAME, STATE_DB_FILE_NAME, GLOBAL_NOTIFICATIONS_FILE_NAME, MAX_HISTORY_RECORDS_PER_PRD, DEFAULT_QUEUE_ENABLED, DEFAULT_QUEUE_MODE, DEFAULT_QUEUE_MAX_CONCURRENCY, DEFAULT_QUEUE_MAX_WAIT_TIME, DEFAULT_QUEUE_PRIORITY, DEFAULT_QUEUE, DEFAULT_SCHEDULING_PRIORITY;
 var init_constants = __esm({
   "../core/dist/constants.js"() {
     "use strict";
@@ -384,7 +416,7 @@ var init_constants = __esm({
       slicerSchedule: DEFAULT_SLICER_SCHEDULE,
       slicerMaxRuntime: DEFAULT_SLICER_MAX_RUNTIME,
       priorityMode: "roadmap-first",
-      issueColumn: "Draft"
+      issueColumn: "Ready"
     };
     DEFAULT_TEMPLATES_DIR = ".night-watch/templates";
     DEFAULT_BOARD_PROVIDER = {
@@ -458,6 +490,24 @@ If no issues are warranted, output an empty array: []`;
       aiReviewResolution: DEFAULT_PR_RESOLVER_AI_REVIEW_RESOLUTION,
       readyLabel: DEFAULT_PR_RESOLVER_READY_LABEL
     };
+    DEFAULT_MERGER_ENABLED = false;
+    DEFAULT_MERGER_SCHEDULE = "55 */4 * * *";
+    DEFAULT_MERGER_MAX_RUNTIME = 1800;
+    DEFAULT_MERGER_MERGE_METHOD = "squash";
+    DEFAULT_MERGER_MIN_REVIEW_SCORE = 80;
+    DEFAULT_MERGER_REBASE_BEFORE_MERGE = true;
+    DEFAULT_MERGER_MAX_PRS_PER_RUN = 0;
+    DEFAULT_MERGER = {
+      enabled: DEFAULT_MERGER_ENABLED,
+      schedule: DEFAULT_MERGER_SCHEDULE,
+      maxRuntime: DEFAULT_MERGER_MAX_RUNTIME,
+      mergeMethod: DEFAULT_MERGER_MERGE_METHOD,
+      minReviewScore: DEFAULT_MERGER_MIN_REVIEW_SCORE,
+      branchPatterns: [],
+      rebaseBeforeMerge: DEFAULT_MERGER_REBASE_BEFORE_MERGE,
+      maxPrsPerRun: DEFAULT_MERGER_MAX_PRS_PER_RUN
+    };
+    MERGER_LOG_NAME = "merger";
     AUDIT_LOG_NAME = "audit";
     PLANNER_LOG_NAME = "slicer";
     ANALYTICS_LOG_NAME = "analytics";
@@ -734,7 +784,7 @@ function normalizeConfig(rawConfig) {
   if (mergeMethod && VALID_MERGE_METHODS.includes(mergeMethod)) {
     normalized.autoMergeMethod = mergeMethod;
   }
-  for (const jobId of ["qa", "audit", "analytics"]) {
+  for (const jobId of ["qa", "audit", "analytics", "merger"]) {
     const jobDef = getJobDef(jobId);
     if (!jobDef)
       continue;
@@ -1068,6 +1118,17 @@ function buildEnvOverrideConfig(fileConfig) {
       env.prResolver = overrides;
     }
   }
+  const mergerDef = getJobDef("merger");
+  if (mergerDef) {
+    const currentBase = (
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      env.merger ?? fileConfig?.merger ?? mergerDef.defaultConfig
+    );
+    const overrides = buildJobEnvOverrides(mergerDef.envPrefix, currentBase, mergerDef.extraFields);
+    if (overrides) {
+      env.merger = overrides;
+    }
+  }
   const jobProvidersEnv = {};
   for (const jobType of VALID_JOB_TYPES) {
     const val = process.env[`NW_JOB_PROVIDER_${jobType.toUpperCase()}`];
@@ -1163,6 +1224,7 @@ function getDefaultConfig() {
     audit: { ...DEFAULT_AUDIT },
     analytics: { ...DEFAULT_ANALYTICS },
     prResolver: { ...DEFAULT_PR_RESOLVER },
+    merger: { ...DEFAULT_MERGER },
     jobProviders: { ...DEFAULT_JOB_PROVIDERS },
     providerScheduleOverrides: [...DEFAULT_PROVIDER_SCHEDULE_OVERRIDES],
     queue: { ...DEFAULT_QUEUE }
@@ -1230,7 +1292,7 @@ function mergeConfigLayer(base, layer) {
         ...layerQueue,
         providerBuckets: { ...baseQueue.providerBuckets, ...layerQueue.providerBuckets }
       };
-    } else if (_key === "providerEnv" || _key === "boardProvider" || _key === "qa" || _key === "audit" || _key === "analytics" || _key === "prResolver") {
+    } else if (_key === "providerEnv" || _key === "boardProvider" || _key === "qa" || _key === "audit" || _key === "analytics" || _key === "prResolver" || _key === "merger") {
       base[_key] = {
         ...base[_key],
         ...value
@@ -1253,6 +1315,13 @@ function mergeConfigs(base, fileConfig, envConfig) {
   if (fileConfig)
     mergeConfigLayer(merged, fileConfig);
   mergeConfigLayer(merged, envConfig);
+  if (merged.autoMerge === true && !fileConfig?.merger) {
+    merged.merger = {
+      ...merged.merger,
+      enabled: true,
+      mergeMethod: merged.autoMergeMethod ?? "squash"
+    };
+  }
   merged.maxRetries = sanitizeMaxRetries(merged.maxRetries, DEFAULT_MAX_RETRIES);
   merged.reviewerMaxRetries = sanitizeReviewerMaxRetries(merged.reviewerMaxRetries, DEFAULT_REVIEWER_MAX_RETRIES);
   merged.reviewerRetryDelay = sanitizeReviewerRetryDelay(merged.reviewerRetryDelay, DEFAULT_REVIEWER_RETRY_DELAY);
@@ -3590,6 +3659,9 @@ function analyticsLockPath(projectDir) {
 function prResolverLockPath(projectDir) {
   return `${LOCK_FILE_PREFIX}pr-resolver-${projectRuntimeKey(projectDir)}.lock`;
 }
+function mergerLockPath(projectDir) {
+  return `${LOCK_FILE_PREFIX}merger-${projectRuntimeKey(projectDir)}.lock`;
+}
 function isProcessRunning(pid) {
   try {
     process.kill(pid, 0);
@@ -4900,6 +4972,10 @@ function getEventEmoji(event) {
       return "\u2705";
     case "pr_resolver_failed":
       return "\u274C";
+    case "merge_completed":
+      return "\u{1F500}";
+    case "merge_failed":
+      return "\u274C";
   }
 }
 function getEventTitle(event) {
@@ -4930,6 +5006,10 @@ function getEventTitle(event) {
       return "PR Conflict Resolved";
     case "pr_resolver_failed":
       return "PR Resolver Failed";
+    case "merge_completed":
+      return "PR Merged";
+    case "merge_failed":
+      return "Merge Failed";
   }
 }
 function getEventColor(event) {
@@ -4960,6 +5040,10 @@ function getEventColor(event) {
       return 65280;
     case "pr_resolver_failed":
       return 16711680;
+    case "merge_completed":
+      return 10181046;
+    case "merge_failed":
+      return 16711680;
   }
 }
 function buildDescription(ctx) {
@@ -5700,9 +5784,9 @@ var init_slicer_prompt = __esm({
     "use strict";
     __filename = fileURLToPath2(import.meta.url);
     __dirname = path14.dirname(__filename);
-    DEFAULT_SLICER_TEMPLATE = `You are a **PRD Creator Agent**. Your job: analyze the codebase and write a complete Product Requirements Document (PRD) for a feature.
+    DEFAULT_SLICER_TEMPLATE = `You are a **Principal Software Architect**. Your job: analyze the codebase and write a complete Product Requirements Document (PRD) for a feature. The PRD will be used directly as a GitHub issue body, so it must be self-contained and immediately actionable by an engineer.
 
-When this activates: \`PRD Creator: Initializing\`
+When this activates: \`Planning Mode: Principal Architect\`
 
 ---
 
@@ -5723,22 +5807,16 @@ The PRD directory is: \`{{PRD_DIR}}\`
 
 ## Your Task
 
-0. **Load Planner Skill** - Read and apply \`.claude/skills/prd-creator/SKILL.md\` before writing the PRD. If unavailable, continue with this template.
-
-1. **Explore the Codebase** - Read relevant existing files to understand the project structure, patterns, and conventions.
-
-2. **Assess Complexity** - Score the complexity using the rubric and determine whether this is LOW, MEDIUM, or HIGH complexity.
-
-3. **Write a Complete PRD** - Create a full PRD following the prd-creator template structure with Context, Solution, Phases, Tests, and Acceptance Criteria.
-
-4. **Write the PRD File** - Use the Write tool to create the PRD file at the exact path specified in \`{{OUTPUT_FILE_PATH}}\`.
+1. **Explore the Codebase** \u2014 Read relevant existing files to understand structure, patterns, and conventions.
+2. **Assess Complexity** \u2014 Score using the rubric below and determine LOW / MEDIUM / HIGH.
+3. **Write a Complete PRD** \u2014 Follow the exact template structure below. Every section must be filled with concrete information.
+4. **Write the PRD File** \u2014 Use the Write tool to create the PRD file at \`{{OUTPUT_FILE_PATH}}\`.
 
 ---
 
 ## Complexity Scoring
 
 \`\`\`
-COMPLEXITY SCORE (sum all that apply):
 +1  Touches 1-5 files
 +2  Touches 6-10 files
 +3  Touches 10+ files
@@ -5750,7 +5828,7 @@ COMPLEXITY SCORE (sum all that apply):
 
 | Score | Level  | Template Mode                                   |
 | ----- | ------ | ----------------------------------------------- |
-| 1-3   | LOW    | Minimal (skip sections marked with MEDIUM/HIGH) |
+| 1-3   | LOW    | Minimal (skip sections marked MEDIUM/HIGH)      |
 | 4-6   | MEDIUM | Standard (all sections)                         |
 | 7+    | HIGH   | Full + mandatory checkpoints every phase        |
 \`\`\`
@@ -5759,25 +5837,77 @@ COMPLEXITY SCORE (sum all that apply):
 
 ## PRD Template Structure
 
-Your PRD MUST follow this exact structure with these sections:
-1. **Context** - Problem, files analyzed, current behavior, integration points
-2. **Solution** - Approach, architecture diagram, key decisions, data changes
-3. **Sequence Flow** (MEDIUM/HIGH) - Mermaid sequence diagram
-4. **Execution Phases** - Concrete phases with files, implementation steps, and tests
-5. **Acceptance Criteria** - Checklist of completion requirements
+Your PRD MUST use this structure. Replace every [bracketed placeholder] with real content.
+
+# PRD: [Title]
+
+**Complexity: [SCORE] \u2192 [LEVEL] mode**
+
+## 1. Context
+
+**Problem:** [1-2 sentences]
+
+**Files Analyzed:**
+- \`path/to/file.ts\` \u2014 [what you found]
+
+**Current Behavior:**
+- [3-5 bullets]
+
+### Integration Points
+- Entry point: [cron / CLI / event / route]
+- Caller file: [file invoking new code]
+- User flow: User does X \u2192 triggers Y \u2192 result Z
+
+## 2. Solution
+
+**Approach:**
+- [3-5 bullets]
+
+**Key Decisions:** [library choices, error handling, reused utilities]
+
+**Data Changes:** [schema changes, or "None"]
+
+## 3. Sequence Flow (MEDIUM/HIGH only)
+
+[mermaid sequenceDiagram]
+
+## 4. Execution Phases
+
+### Phase N: [Name] \u2014 [User-visible outcome]
+
+**Files (max 5):**
+- \`src/path/file.ts\` \u2014 [what changes]
+
+**Implementation:**
+- [ ] Step 1
+
+**Tests Required:**
+| Test File | Test Name | Assertion |
+|-----------|-----------|-----------|
+| \`src/__tests__/feature.test.ts\` | \`should X when Y\` | \`expect(r).toBe(Z)\` |
+
+**Checkpoint:** Run \`yarn verify\` and related tests after this phase.
+
+## 5. Acceptance Criteria
+
+- [ ] All phases complete
+- [ ] All tests pass
+- [ ] \`yarn verify\` passes
+- [ ] Feature is reachable (not orphaned code)
 
 ---
 
 ## Critical Instructions
 
-1. **Read all relevant existing files BEFORE writing any code**
-2. **Follow existing patterns in the codebase**
-3. **Write the PRD with concrete file paths and implementation details**
-4. **Include specific test names and assertions**
-5. **Use the Write tool to create the PRD file at \`{{OUTPUT_FILE_PATH}}\`**
-6. **The PRD must be complete and actionable - no TODO placeholders**
+1. Read all relevant files BEFORE writing the PRD
+2. Follow existing patterns \u2014 use \`@/*\` path aliases, match naming conventions
+3. Include concrete file paths and implementation steps
+4. Include specific test names and assertions
+5. Use the Write tool to create the file at \`{{OUTPUT_FILE_PATH}}\`
+6. No placeholder text in the final PRD
+7. The PRD is the GitHub issue body \u2014 make it self-contained
 
-DO NOT leave placeholder text like "[Name]" or "[description]" in the final PRD.
+DO NOT leave [bracketed placeholder] text in the output.
 DO NOT skip any sections.
 DO NOT forget to write the file.
 `;
@@ -6647,6 +6777,8 @@ function getLockPathForJob(projectPath, jobType) {
       return analyticsLockPath(projectPath);
     case "pr-resolver":
       return prResolverLockPath(projectPath);
+    case "merger":
+      return mergerLockPath(projectPath);
   }
 }
 function reconcileStaleRunningJobs(db) {
@@ -7714,6 +7846,14 @@ __export(dist_exports, {
   DEFAULT_MAX_LOG_SIZE: () => DEFAULT_MAX_LOG_SIZE,
   DEFAULT_MAX_RETRIES: () => DEFAULT_MAX_RETRIES,
   DEFAULT_MAX_RUNTIME: () => DEFAULT_MAX_RUNTIME,
+  DEFAULT_MERGER: () => DEFAULT_MERGER,
+  DEFAULT_MERGER_ENABLED: () => DEFAULT_MERGER_ENABLED,
+  DEFAULT_MERGER_MAX_PRS_PER_RUN: () => DEFAULT_MERGER_MAX_PRS_PER_RUN,
+  DEFAULT_MERGER_MAX_RUNTIME: () => DEFAULT_MERGER_MAX_RUNTIME,
+  DEFAULT_MERGER_MERGE_METHOD: () => DEFAULT_MERGER_MERGE_METHOD,
+  DEFAULT_MERGER_MIN_REVIEW_SCORE: () => DEFAULT_MERGER_MIN_REVIEW_SCORE,
+  DEFAULT_MERGER_REBASE_BEFORE_MERGE: () => DEFAULT_MERGER_REBASE_BEFORE_MERGE,
+  DEFAULT_MERGER_SCHEDULE: () => DEFAULT_MERGER_SCHEDULE,
   DEFAULT_MIN_REVIEW_SCORE: () => DEFAULT_MIN_REVIEW_SCORE,
   DEFAULT_NOTIFICATIONS: () => DEFAULT_NOTIFICATIONS,
   DEFAULT_PRD_DIR: () => DEFAULT_PRD_DIR,
@@ -7772,6 +7912,7 @@ __export(dist_exports, {
   LocalKanbanProvider: () => LocalKanbanProvider,
   Logger: () => Logger,
   MAX_HISTORY_RECORDS_PER_PRD: () => MAX_HISTORY_RECORDS_PER_PRD,
+  MERGER_LOG_NAME: () => MERGER_LOG_NAME,
   NIGHT_WATCH_LABELS: () => NIGHT_WATCH_LABELS,
   PLANNER_LOG_NAME: () => PLANNER_LOG_NAME,
   PRD_STATES_FILE_NAME: () => PRD_STATES_FILE_NAME,
@@ -7936,6 +8077,7 @@ __export(dist_exports, {
   markItemProcessed: () => markItemProcessed,
   markJobRunning: () => markJobRunning,
   markPrdDone: () => markPrdDone,
+  mergerLockPath: () => mergerLockPath,
   migrateJsonToSqlite: () => migrateJsonToSqlite,
   normalizeJobConfig: () => normalizeJobConfig,
   normalizeSchedulingPriority: () => normalizeSchedulingPriority,
@@ -8319,6 +8461,7 @@ function buildInitConfig(params) {
     },
     audit: { ...defaults.audit },
     analytics: { ...defaults.analytics },
+    merger: { ...defaults.merger },
     prResolver: { ...defaults.prResolver },
     jobProviders: { ...defaults.jobProviders },
     queue: {
@@ -9399,10 +9542,6 @@ function buildEnvVars2(config, options) {
   env.NW_BRANCH_PATTERNS = config.branchPatterns.join(",");
   env.NW_PRD_DIR = config.prdDir;
   env.NW_CLAUDE_MODEL_ID = CLAUDE_MODEL_IDS[config.primaryFallbackModel ?? config.claudeModel ?? "sonnet"];
-  if (config.autoMerge) {
-    env.NW_AUTO_MERGE = "1";
-  }
-  env.NW_AUTO_MERGE_METHOD = config.autoMergeMethod;
   return env;
 }
 function applyCliOverrides2(config, options) {
@@ -9416,9 +9555,6 @@ function applyCliOverrides2(config, options) {
   if (options.provider) {
     overridden._cliProviderOverride = options.provider;
   }
-  if (options.autoMerge !== void 0) {
-    overridden.autoMerge = options.autoMerge;
-  }
   return overridden;
 }
 function isFailingCheck(check) {
@@ -9479,7 +9615,7 @@ function getOpenPrsNeedingWork(branchPatterns) {
   }
 }
 function reviewCommand(program2) {
-  program2.command("review").description("Run PR reviewer now").option("--dry-run", "Show what would be executed without running").option("--timeout <seconds>", "Override max runtime in seconds for reviewer").option("--provider <string>", "AI provider to use (claude or codex)").option("--auto-merge", "Enable auto-merge for this run").action(async (options) => {
+  program2.command("review").description("Run PR reviewer now").option("--dry-run", "Show what would be executed without running").option("--timeout <seconds>", "Override max runtime in seconds for reviewer").option("--provider <string>", "AI provider to use (claude or codex)").action(async (options) => {
     const projectDir = process.cwd();
     let config = loadConfig(projectDir);
     config = applyCliOverrides2(config, options);
@@ -9502,10 +9638,6 @@ function reviewCommand(program2) {
       ]);
       configTable.push(["Min Review Score", `${config.minReviewScore}/100`]);
       configTable.push(["Branch Patterns", config.branchPatterns.join(", ")]);
-      configTable.push([
-        "Auto-merge",
-        config.autoMerge ? `Enabled (${config.autoMergeMethod})` : "Disabled"
-      ]);
       configTable.push(["Max Retry Attempts", String(config.reviewerMaxRetries)]);
       configTable.push(["Retry Delay", `${config.reviewerRetryDelay}s`]);
       configTable.push([
@@ -10139,6 +10271,14 @@ function performInstall(projectDir, config, options) {
       const prResolverEntry = `${prResolverSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} resolve >> ${shellQuote(prResolverLog)} 2>&1  ${marker}`;
       entries.push(prResolverEntry);
     }
+    const disableMerger = options?.noMerger === true || options?.merger === false;
+    const installMerger = disableMerger ? false : config.merger?.enabled ?? false;
+    if (installMerger) {
+      const mergerSchedule = config.merger.schedule;
+      const mergerLog = path25.join(logDir, "merger.log");
+      const mergerEntry = `${mergerSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} merge >> ${shellQuote(mergerLog)} 2>&1  ${marker}`;
+      entries.push(mergerEntry);
+    }
     const existingEntries = new Set(
       Array.from(/* @__PURE__ */ new Set([...getEntries(marker), ...getProjectEntries(projectDir)]))
     );
@@ -10157,7 +10297,7 @@ function performInstall(projectDir, config, options) {
   }
 }
 function installCommand(program2) {
-  program2.command("install").description("Add crontab entries for automated execution").option("-s, --schedule <cron>", "Cron schedule for PRD executor").option("--reviewer-schedule <cron>", "Cron schedule for reviewer").option("--no-reviewer", "Skip installing reviewer cron").option("--no-slicer", "Skip installing slicer cron").option("--no-qa", "Skip installing QA cron").option("--no-audit", "Skip installing audit cron").option("--no-analytics", "Skip installing analytics cron").option("--no-pr-resolver", "Skip installing PR resolver cron").option("-f, --force", "Replace existing cron entries for this project").action(async (options) => {
+  program2.command("install").description("Add crontab entries for automated execution").option("-s, --schedule <cron>", "Cron schedule for PRD executor").option("--reviewer-schedule <cron>", "Cron schedule for reviewer").option("--no-reviewer", "Skip installing reviewer cron").option("--no-slicer", "Skip installing slicer cron").option("--no-qa", "Skip installing QA cron").option("--no-audit", "Skip installing audit cron").option("--no-analytics", "Skip installing analytics cron").option("--no-pr-resolver", "Skip installing PR resolver cron").option("--no-merger", "Skip installing merger cron").option("-f, --force", "Replace existing cron entries for this project").action(async (options) => {
     try {
       const projectDir = process.cwd();
       const config = loadConfig(projectDir);
@@ -10248,6 +10388,15 @@ function installCommand(program2) {
         const prResolverEntry = `${prResolverSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} resolve >> ${shellQuote(prResolverLog)} 2>&1  ${marker}`;
         entries.push(prResolverEntry);
       }
+      const disableMerger = options.noMerger === true || options.merger === false;
+      const installMerger = disableMerger ? false : config.merger?.enabled ?? false;
+      let mergerLog;
+      if (installMerger) {
+        mergerLog = path25.join(logDir, "merger.log");
+        const mergerSchedule = config.merger.schedule;
+        const mergerEntry = `${mergerSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} merge >> ${shellQuote(mergerLog)} 2>&1  ${marker}`;
+        entries.push(mergerEntry);
+      }
       const existingEntrySet = new Set(existingEntries);
       const currentCrontab = readCrontab();
       const baseCrontab = options.force ? currentCrontab.filter((line) => !existingEntrySet.has(line) && !line.includes(marker)) : currentCrontab;
@@ -10280,6 +10429,9 @@ function installCommand(program2) {
       if (installPrResolver && prResolverLog) {
         dim(`  PR Resolver: ${prResolverLog}`);
       }
+      if (installMerger && mergerLog) {
+        dim(`  Merger: ${mergerLog}`);
+      }
       console.log();
       dim("To uninstall, run: night-watch uninstall");
       dim("To check status, run: night-watch status");
@@ -14843,12 +14995,14 @@ function buildScheduleInfoResponse(projectDir, config, entries, installed) {
   const auditPlan = getSchedulingPlan(projectDir, config, "audit");
   const plannerPlan = getSchedulingPlan(projectDir, config, "slicer");
   const analyticsPlan = getSchedulingPlan(projectDir, config, "analytics");
+  const mergerPlan = getSchedulingPlan(projectDir, config, "merger");
   const executorInstalled = installed && config.executorEnabled !== false && hasScheduledCommand(entries, "run");
   const reviewerInstalled = installed && config.reviewerEnabled && hasScheduledCommand(entries, "review");
   const qaInstalled = installed && config.qa.enabled && hasScheduledCommand(entries, "qa");
   const auditInstalled = installed && config.audit.enabled && hasScheduledCommand(entries, "audit");
   const plannerInstalled = installed && config.roadmapScanner.enabled && (hasScheduledCommand(entries, "planner") || hasScheduledCommand(entries, "slice"));
   const analyticsInstalled = installed && config.analytics.enabled && hasScheduledCommand(entries, "analytics");
+  const mergerInstalled = installed && (config.merger?.enabled ?? false) && hasScheduledCommand(entries, "merge");
   return {
     executor: {
       schedule: config.cronSchedule,
@@ -14898,6 +15052,14 @@ function buildScheduleInfoResponse(projectDir, config, entries, installed) {
       manualDelayMinutes: analyticsPlan.manualDelayMinutes,
       balancedDelayMinutes: analyticsPlan.balancedDelayMinutes
     },
+    merger: {
+      schedule: config.merger?.schedule ?? "55 */4 * * *",
+      installed: mergerInstalled,
+      nextRun: mergerInstalled ? addDelayToIsoString(computeNextRun(config.merger?.schedule ?? "55 */4 * * *"), mergerPlan.totalDelayMinutes) : null,
+      delayMinutes: mergerPlan.totalDelayMinutes,
+      manualDelayMinutes: mergerPlan.manualDelayMinutes,
+      balancedDelayMinutes: mergerPlan.balancedDelayMinutes
+    },
     paused: !installed,
     schedulingPriority: config.schedulingPriority,
     entries
@@ -16007,7 +16169,7 @@ function releasePlannerLock(lockFile) {
   }
 }
 function resolvePlannerIssueColumn(config) {
-  return config.roadmapScanner.issueColumn === "Ready" ? "Ready" : "Draft";
+  return config.roadmapScanner.issueColumn === "Draft" ? "Draft" : "Ready";
 }
 function buildPlannerIssueBody(projectDir, config, result) {
   const relativePrdPath = path38.join(config.prdDir, result.file ?? "").replace(/\\/g, "/");
@@ -16021,23 +16183,25 @@ function buildPlannerIssueBody(projectDir, config, result) {
   }
   const maxBodyChars = 6e4;
   const truncated = prdContent.length > maxBodyChars;
-  const prdPreview = truncated ? `${prdContent.slice(0, maxBodyChars)}
+  const prdBody = truncated ? `${prdContent.slice(0, maxBodyChars)}
 
 ...[truncated]` : prdContent;
-  const sourceLines = sourceItem ? [
-    `- Source section: ${sourceItem.section}`,
-    `- Source item: ${sourceItem.title}`,
-    sourceItem.description ? `- Source summary: ${sourceItem.description}` : ""
-  ].filter((line) => line.length > 0) : [];
+  const metaLines = [`- PRD file: \`${relativePrdPath}\``];
+  if (sourceItem) {
+    metaLines.push(`- Source section: ${sourceItem.section}`);
+    if (sourceItem.description) {
+      metaLines.push(`- Source summary: ${sourceItem.description}`);
+    }
+  }
   return [
-    "## Planner Generated PRD",
+    prdBody,
     "",
-    `- PRD file: \`${relativePrdPath}\``,
-    ...sourceLines,
+    "<details>",
+    "<summary>Source metadata</summary>",
     "",
-    "---",
+    ...metaLines,
     "",
-    prdPreview
+    "</details>"
   ].join("\n");
 }
 async function createPlannerIssue(projectDir, config, result) {
@@ -16052,9 +16216,11 @@ async function createPlannerIssue(projectDir, config, result) {
   if (!board) {
     return { created: false, skippedReason: "board-not-configured" };
   }
+  const issueTitle = `PRD: ${result.item.title}`;
+  const normalizeTitle = (t) => t.replace(/^PRD:\s*/i, "").trim().toLowerCase();
   const existingIssues = await provider.getAllIssues();
   const existing = existingIssues.find(
-    (issue2) => issue2.title.trim().toLowerCase() === result.item.title.trim().toLowerCase()
+    (issue2) => normalizeTitle(issue2.title) === normalizeTitle(result.item.title)
   );
   if (existing) {
     return {
@@ -16065,7 +16231,7 @@ async function createPlannerIssue(projectDir, config, result) {
     };
   }
   const issue = await provider.createIssue({
-    title: result.item.title,
+    title: issueTitle,
     body: buildPlannerIssueBody(projectDir, config, result),
     column: resolvePlannerIssueColumn(config)
   });
@@ -17525,6 +17691,128 @@ ${stderr}`);
   });
 }
 
+// src/commands/merge.ts
+init_dist();
+import * as path44 from "path";
+function buildEnvVars7(config, options) {
+  const env = buildBaseEnvVars(config, "merger", options.dryRun);
+  env.NW_MERGER_MAX_RUNTIME = String(config.merger.maxRuntime);
+  env.NW_MERGER_MERGE_METHOD = config.merger.mergeMethod;
+  env.NW_MERGER_MIN_REVIEW_SCORE = String(config.merger.minReviewScore);
+  env.NW_MERGER_BRANCH_PATTERNS = (config.merger.branchPatterns.length > 0 ? config.merger.branchPatterns : config.branchPatterns).join(",");
+  env.NW_MERGER_REBASE_BEFORE_MERGE = config.merger.rebaseBeforeMerge ? "1" : "0";
+  env.NW_MERGER_MAX_PRS_PER_RUN = String(config.merger.maxPrsPerRun);
+  return env;
+}
+function applyCliOverrides6(config, options) {
+  const overridden = { ...config, merger: { ...config.merger } };
+  if (options.timeout) {
+    const timeout = parseInt(options.timeout, 10);
+    if (!isNaN(timeout)) {
+      overridden.merger.maxRuntime = timeout;
+    }
+  }
+  if (options.provider) {
+    overridden._cliProviderOverride = options.provider;
+  }
+  return overridden;
+}
+function resolveMergeNotificationEvent(exitCode, mergedCount, failedCount) {
+  if (exitCode === 0 && mergedCount > 0) {
+    return "merge_completed";
+  }
+  if (exitCode !== 0 || failedCount > 0) {
+    return "merge_failed";
+  }
+  return null;
+}
+function printDryRun(config, envVars, scriptPath, projectDir) {
+  header("Dry Run: Merge Orchestrator");
+  const mergerProvider = resolveJobProvider(config, "merger");
+  header("Configuration");
+  const configTable = createTable({ head: ["Setting", "Value"] });
+  configTable.push(["Provider", mergerProvider]);
+  configTable.push([
+    "Max Runtime",
+    `${config.merger.maxRuntime}s (${Math.floor(config.merger.maxRuntime / 60)}min)`
+  ]);
+  configTable.push(["Merge Method", config.merger.mergeMethod]);
+  configTable.push(["Min Review Score", `${config.merger.minReviewScore}/100`]);
+  configTable.push([
+    "Branch Patterns",
+    config.merger.branchPatterns.length > 0 ? config.merger.branchPatterns.join(", ") : "(top-level)"
+  ]);
+  configTable.push(["Rebase Before Merge", config.merger.rebaseBeforeMerge ? "Yes" : "No"]);
+  configTable.push([
+    "Max PRs Per Run",
+    config.merger.maxPrsPerRun === 0 ? "Unlimited" : String(config.merger.maxPrsPerRun)
+  ]);
+  console.log(configTable.toString());
+  header("Environment Variables");
+  for (const [key, value] of Object.entries(envVars)) {
+    dim(`  ${key}=${value}`);
+  }
+  header("Command");
+  dim(`  bash ${scriptPath} ${projectDir}`);
+  console.log();
+}
+function mergeCommand(program2) {
+  program2.command("merge").description("Merge eligible PRs in FIFO order").option("--dry-run", "Show what would be executed without running").option("--timeout <seconds>", "Override max runtime").option("--provider <string>", "AI provider to use").action(async (options) => {
+    const projectDir = process.cwd();
+    let config = loadConfig(projectDir);
+    config = applyCliOverrides6(config, options);
+    if (!config.merger.enabled && !options.dryRun) {
+      info("Merge orchestrator is disabled in config; skipping.");
+      process.exit(0);
+    }
+    const envVars = buildEnvVars7(config, options);
+    const scriptPath = getScriptPath("night-watch-merger-cron.sh");
+    if (options.dryRun) {
+      printDryRun(config, envVars, scriptPath, projectDir);
+      process.exit(0);
+    }
+    const spinner = createSpinner("Running merge orchestrator...");
+    spinner.start();
+    try {
+      await maybeApplyCronSchedulingDelay(config, "merger", projectDir);
+      const { exitCode, stdout, stderr } = await executeScriptWithOutput(
+        scriptPath,
+        [projectDir],
+        envVars
+      );
+      const scriptResult = parseScriptResult(`${stdout}
+${stderr}`);
+      if (exitCode === 0) {
+        if (scriptResult?.status === "queued") {
+          spinner.succeed("Merge orchestrator queued \u2014 another job is currently running");
+        } else if (scriptResult?.status?.startsWith("skip_")) {
+          spinner.succeed("Merge orchestrator completed (no eligible PRs)");
+        } else {
+          spinner.succeed("Merge orchestrator completed successfully");
+        }
+      } else {
+        spinner.fail(`Merge orchestrator exited with code ${exitCode}`);
+      }
+      const mergedCount = parseInt(scriptResult?.data?.merged ?? "0", 10);
+      const failedCount = parseInt(scriptResult?.data?.failed ?? "0", 10);
+      const notificationEvent = resolveMergeNotificationEvent(exitCode, mergedCount, failedCount);
+      if (notificationEvent) {
+        await sendNotifications(config, {
+          event: notificationEvent,
+          projectName: path44.basename(projectDir),
+          exitCode,
+          provider: formatProviderDisplay(envVars.NW_PROVIDER_CMD, envVars.NW_PROVIDER_LABEL)
+        });
+      }
+      process.exit(exitCode);
+    } catch (err) {
+      spinner.fail("Failed to execute merge command");
+      error(`${err instanceof Error ? err.message : String(err)}`);
+      process.exit(1);
+    }
+  });
+}
+
 // src/cli.ts
 var __filename5 = fileURLToPath6(import.meta.url);
 var __dirname5 = dirname12(__filename5);
@@ -17568,4 +17856,5 @@ queueCommand(program);
 notifyCommand(program);
 summaryCommand(program);
 resolveCommand(program);
+mergeCommand(program);
 program.parse();