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

package/dist/cli.js

@@ -201,6 +201,35 @@ var init_job_registry = __esm({
           maxRuntime: 3600
         }
       },
+      {
+        id: "pr-resolver",
+        name: "PR Conflict Solver",
+        description: "Resolves merge conflicts via AI rebase; optionally addresses review comments and labels PRs ready-to-merge",
+        cliCommand: "resolve",
+        logName: "pr-resolver",
+        lockSuffix: "-pr-resolver.lock",
+        queuePriority: 35,
+        envPrefix: "NW_PR_RESOLVER",
+        extraFields: [
+          { name: "branchPatterns", type: "string[]", defaultValue: [] },
+          { name: "maxPrsPerRun", type: "number", defaultValue: 0 },
+          { name: "perPrTimeout", type: "number", defaultValue: 600 },
+          { name: "aiConflictResolution", type: "boolean", defaultValue: true },
+          { name: "aiReviewResolution", type: "boolean", defaultValue: false },
+          { name: "readyLabel", type: "string", defaultValue: "ready-to-merge" }
+        ],
+        defaultConfig: {
+          enabled: true,
+          schedule: "15 6,14,22 * * *",
+          maxRuntime: 3600,
+          branchPatterns: [],
+          maxPrsPerRun: 0,
+          perPrTimeout: 600,
+          aiConflictResolution: true,
+          aiReviewResolution: false,
+          readyLabel: "ready-to-merge"
+        }
+      },
       {
         id: "slicer",
         name: "Slicer",
@@ -234,7 +263,8 @@ var init_job_registry = __esm({
             defaultValue: "both"
           },
           { name: "skipLabel", type: "string", defaultValue: "skip-qa" },
-          { name: "autoInstallPlaywright", type: "boolean", defaultValue: true }
+          { name: "autoInstallPlaywright", type: "boolean", defaultValue: true },
+          { name: "validatedLabel", type: "string", defaultValue: "e2e-validated" }
         ],
         defaultConfig: {
           enabled: true,
@@ -243,7 +273,8 @@ var init_job_registry = __esm({
           branchPatterns: [],
           artifacts: "both",
           skipLabel: "skip-qa",
-          autoInstallPlaywright: true
+          autoInstallPlaywright: true,
+          validatedLabel: "e2e-validated"
         }
       },
       {
@@ -308,13 +339,14 @@ function resolveProviderBucketKey(provider, providerEnv) {
     return `claude-proxy:${baseUrl}`;
   }
 }
-var DEFAULT_DEFAULT_BRANCH, DEFAULT_PRD_DIR, 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, 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, AUDIT_LOG_NAME, PLANNER_LOG_NAME, ANALYTICS_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, 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";
     init_job_registry();
     DEFAULT_DEFAULT_BRANCH = "";
     DEFAULT_PRD_DIR = "docs/prds";
+    DEFAULT_SUMMARY_WINDOW_HOURS = 12;
     DEFAULT_MAX_RUNTIME = 7200;
     DEFAULT_REVIEWER_MAX_RUNTIME = 3600;
     DEFAULT_CRON_SCHEDULE = "5 * * * *";
@@ -369,6 +401,7 @@ var init_constants = __esm({
     DEFAULT_QA_ARTIFACTS = "both";
     DEFAULT_QA_SKIP_LABEL = "skip-qa";
     DEFAULT_QA_AUTO_INSTALL_PLAYWRIGHT = true;
+    DEFAULT_QA_VALIDATED_LABEL = "e2e-validated";
     DEFAULT_QA = {
       enabled: DEFAULT_QA_ENABLED,
       schedule: DEFAULT_QA_SCHEDULE,
@@ -376,7 +409,8 @@ var init_constants = __esm({
       branchPatterns: [],
       artifacts: DEFAULT_QA_ARTIFACTS,
       skipLabel: DEFAULT_QA_SKIP_LABEL,
-      autoInstallPlaywright: DEFAULT_QA_AUTO_INSTALL_PLAYWRIGHT
+      autoInstallPlaywright: DEFAULT_QA_AUTO_INSTALL_PLAYWRIGHT,
+      validatedLabel: DEFAULT_QA_VALIDATED_LABEL
     };
     QA_LOG_NAME = "night-watch-qa";
     DEFAULT_AUDIT_ENABLED = true;
@@ -405,9 +439,29 @@ If no issues are warranted, output an empty array: []`;
       targetColumn: DEFAULT_ANALYTICS_TARGET_COLUMN,
       analysisPrompt: DEFAULT_ANALYTICS_PROMPT
     };
+    DEFAULT_PR_RESOLVER_ENABLED = true;
+    DEFAULT_PR_RESOLVER_SCHEDULE = "15 6,14,22 * * *";
+    DEFAULT_PR_RESOLVER_MAX_RUNTIME = 3600;
+    DEFAULT_PR_RESOLVER_MAX_PRS_PER_RUN = 0;
+    DEFAULT_PR_RESOLVER_PER_PR_TIMEOUT = 600;
+    DEFAULT_PR_RESOLVER_AI_CONFLICT_RESOLUTION = true;
+    DEFAULT_PR_RESOLVER_AI_REVIEW_RESOLUTION = false;
+    DEFAULT_PR_RESOLVER_READY_LABEL = "ready-to-merge";
+    DEFAULT_PR_RESOLVER = {
+      enabled: DEFAULT_PR_RESOLVER_ENABLED,
+      schedule: DEFAULT_PR_RESOLVER_SCHEDULE,
+      maxRuntime: DEFAULT_PR_RESOLVER_MAX_RUNTIME,
+      branchPatterns: [],
+      maxPrsPerRun: DEFAULT_PR_RESOLVER_MAX_PRS_PER_RUN,
+      perPrTimeout: DEFAULT_PR_RESOLVER_PER_PR_TIMEOUT,
+      aiConflictResolution: DEFAULT_PR_RESOLVER_AI_CONFLICT_RESOLUTION,
+      aiReviewResolution: DEFAULT_PR_RESOLVER_AI_REVIEW_RESOLUTION,
+      readyLabel: DEFAULT_PR_RESOLVER_READY_LABEL
+    };
     AUDIT_LOG_NAME = "audit";
     PLANNER_LOG_NAME = "slicer";
     ANALYTICS_LOG_NAME = "analytics";
+    PR_RESOLVER_LOG_NAME = "pr-resolver";
     VALID_PROVIDERS = ["claude", "codex"];
     VALID_JOB_TYPES = getValidJobTypes();
     DEFAULT_JOB_PROVIDERS = {};
@@ -689,6 +743,13 @@ function normalizeConfig(rawConfig) {
       normalized[jobId] = normalizeJobConfig(rawJob, jobDef);
     }
   }
+  const prResolverDef = getJobDef("pr-resolver");
+  if (prResolverDef) {
+    const rawJob = readObject(rawConfig.prResolver);
+    if (rawJob) {
+      normalized.prResolver = normalizeJobConfig(rawJob, prResolverDef);
+    }
+  }
   const rawJobProviders = readObject(rawConfig.jobProviders);
   if (rawJobProviders) {
     const jobProviders = {};
@@ -996,6 +1057,17 @@ function buildEnvOverrideConfig(fileConfig) {
       env[jobId] = overrides;
     }
   }
+  const prResolverDef = getJobDef("pr-resolver");
+  if (prResolverDef) {
+    const currentBase = (
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      env.prResolver ?? fileConfig?.prResolver ?? prResolverDef.defaultConfig
+    );
+    const overrides = buildJobEnvOverrides(prResolverDef.envPrefix, currentBase, prResolverDef.extraFields);
+    if (overrides) {
+      env.prResolver = overrides;
+    }
+  }
   const jobProvidersEnv = {};
   for (const jobType of VALID_JOB_TYPES) {
     const val = process.env[`NW_JOB_PROVIDER_${jobType.toUpperCase()}`];
@@ -1090,6 +1162,7 @@ function getDefaultConfig() {
     qa: { ...DEFAULT_QA },
     audit: { ...DEFAULT_AUDIT },
     analytics: { ...DEFAULT_ANALYTICS },
+    prResolver: { ...DEFAULT_PR_RESOLVER },
     jobProviders: { ...DEFAULT_JOB_PROVIDERS },
     providerScheduleOverrides: [...DEFAULT_PROVIDER_SCHEDULE_OVERRIDES],
     queue: { ...DEFAULT_QUEUE }
@@ -1157,7 +1230,7 @@ function mergeConfigLayer(base, layer) {
         ...layerQueue,
         providerBuckets: { ...baseQueue.providerBuckets, ...layerQueue.providerBuckets }
       };
-    } else if (_key === "providerEnv" || _key === "boardProvider" || _key === "qa" || _key === "audit" || _key === "analytics") {
+    } else if (_key === "providerEnv" || _key === "boardProvider" || _key === "qa" || _key === "audit" || _key === "analytics" || _key === "prResolver") {
       base[_key] = {
         ...base[_key],
         ...value
@@ -2936,6 +3009,11 @@ var init_labels = __esm({
         name: "analytics",
         description: "Created by the analytics job for Amplitude findings",
         color: "1d76db"
+      },
+      {
+        name: "e2e-validated",
+        description: "PR acceptance requirements validated by e2e/integration tests",
+        color: "0e8a16"
       }
     ];
   }
@@ -3509,6 +3587,9 @@ function plannerLockPath(projectDir) {
 function analyticsLockPath(projectDir) {
   return `${LOCK_FILE_PREFIX}analytics-${projectRuntimeKey(projectDir)}.lock`;
 }
+function prResolverLockPath(projectDir) {
+  return `${LOCK_FILE_PREFIX}pr-resolver-${projectRuntimeKey(projectDir)}.lock`;
+}
 function isProcessRunning(pid) {
   try {
     process.kill(pid, 0);
@@ -3809,7 +3890,7 @@ async function collectPrInfo(projectDir, branchPatterns) {
     } catch {
       return [];
     }
-    const { stdout: output } = await execAsync("gh pr list --state open --json headRefName,number,title,url,statusCheckRollup,reviewDecision", {
+    const { stdout: output } = await execAsync("gh pr list --state open --json headRefName,number,title,url,statusCheckRollup,reviewDecision,labels", {
       cwd: projectDir,
       encoding: "utf-8"
     });
@@ -3833,7 +3914,8 @@ async function collectPrInfo(projectDir, branchPatterns) {
         branch: pr.headRefName,
         url: pr.url,
         ciStatus: deriveCiStatus(pr.statusCheckRollup),
-        reviewScore: deriveReviewScore(pr.reviewDecision)
+        reviewScore: deriveReviewScore(pr.reviewDecision),
+        labels: (pr.labels ?? []).map((l) => l.name)
       };
     });
   } catch {
@@ -4812,6 +4894,12 @@ function getEventEmoji(event) {
       return "\u{1F500}";
     case "qa_completed":
       return "\u{1F9EA}";
+    case "pr_resolver_completed":
+      return "\u{1F527}";
+    case "pr_resolver_conflict_resolved":
+      return "\u2705";
+    case "pr_resolver_failed":
+      return "\u274C";
   }
 }
 function getEventTitle(event) {
@@ -4836,6 +4924,12 @@ function getEventTitle(event) {
       return "PR Auto-Merged";
     case "qa_completed":
       return "QA Completed";
+    case "pr_resolver_completed":
+      return "PR Resolver Completed";
+    case "pr_resolver_conflict_resolved":
+      return "PR Conflict Resolved";
+    case "pr_resolver_failed":
+      return "PR Resolver Failed";
   }
 }
 function getEventColor(event) {
@@ -4860,6 +4954,12 @@ function getEventColor(event) {
       return 10181046;
     case "qa_completed":
       return 3066993;
+    case "pr_resolver_completed":
+      return 51283;
+    case "pr_resolver_conflict_resolved":
+      return 65280;
+    case "pr_resolver_failed":
+      return 16711680;
   }
 }
 function buildDescription(ctx) {
@@ -6178,6 +6278,15 @@ function isJobTypeEnabled(config, jobType) {
       return true;
   }
 }
+function getJobSchedule(config, jobType) {
+  switch (jobType) {
+    case "reviewer":
+      return config.reviewerSchedule ?? "";
+    case "executor":
+    default:
+      return config.cronSchedule ?? "";
+  }
+}
 function loadPeerConfig(projectPath) {
   if (!fs17.existsSync(projectPath) || !fs17.existsSync(path16.join(projectPath, CONFIG_FILE_NAME))) {
     return null;
@@ -6191,11 +6300,15 @@ function loadPeerConfig(projectPath) {
 function collectSchedulingPeers(currentProjectDir, currentConfig, jobType) {
   const peers = /* @__PURE__ */ new Map();
   const currentPath = path16.resolve(currentProjectDir);
+  const currentSchedule = getJobSchedule(currentConfig, jobType);
   const addPeer = (projectPath, config) => {
     const resolvedPath = path16.resolve(projectPath);
     if (!isJobTypeEnabled(config, jobType)) {
       return;
     }
+    if (getJobSchedule(config, jobType) !== currentSchedule) {
+      return;
+    }
     peers.set(resolvedPath, {
       path: resolvedPath,
       config,
@@ -6532,6 +6645,8 @@ function getLockPathForJob(projectPath, jobType) {
       return plannerLockPath(projectPath);
     case "analytics":
       return analyticsLockPath(projectPath);
+    case "pr-resolver":
+      return prResolverLockPath(projectPath);
   }
 }
 function reconcileStaleRunningJobs(db) {
@@ -6621,6 +6736,15 @@ function getJobPriority(jobType, config) {
 function enqueueJob(projectPath, projectName, jobType, envVars, config, providerKey) {
   const db = openDb();
   try {
+    const existing = db.prepare(`SELECT id FROM job_queue WHERE project_path = ? AND job_type = ? AND status IN ('pending', 'dispatched', 'running')`).get(projectPath, jobType);
+    if (existing) {
+      logger2.info("Skipping duplicate enqueue \u2014 active entry already exists", {
+        id: existing.id,
+        jobType,
+        project: projectName
+      });
+      return existing.id;
+    }
     const priority = getJobPriority(jobType, config);
     const now = Math.floor(Date.now() / 1e3);
     const envJson = JSON.stringify(envVars);
@@ -7086,6 +7210,88 @@ var init_job_queue = __esm({
   }
 });
 
+// ../core/dist/utils/summary.js
+function computeCounts(runs) {
+  const counts = {
+    total: runs.length,
+    succeeded: 0,
+    failed: 0,
+    timedOut: 0,
+    rateLimited: 0,
+    skipped: 0
+  };
+  for (const run2 of runs) {
+    switch (run2.status) {
+      case "success":
+        counts.succeeded++;
+        break;
+      case "failure":
+        counts.failed++;
+        break;
+      case "timeout":
+        counts.timedOut++;
+        break;
+      case "rate_limited":
+        counts.rateLimited++;
+        break;
+      case "skipped":
+        counts.skipped++;
+        break;
+    }
+  }
+  return counts;
+}
+function buildActionItems(counts, prs, pendingItems) {
+  const items = [];
+  if (counts.failed > 0) {
+    items.push(`${counts.failed} failed job${counts.failed > 1 ? "s" : ""} \u2014 run \`night-watch logs\` to investigate`);
+  }
+  if (counts.timedOut > 0) {
+    items.push(`${counts.timedOut} timed out job${counts.timedOut > 1 ? "s" : ""} \u2014 check logs for details`);
+  }
+  if (counts.rateLimited > 0) {
+    items.push(`${counts.rateLimited} rate-limited job${counts.rateLimited > 1 ? "s" : ""} \u2014 consider adjusting schedule`);
+  }
+  const failingCiPrs = prs.filter((pr) => pr.ciStatus === "fail");
+  for (const pr of failingCiPrs) {
+    items.push(`PR #${pr.number} has failing CI \u2014 check ${pr.url}`);
+  }
+  const readyToMergePrs = prs.filter((pr) => pr.labels.includes("ready-to-merge"));
+  if (readyToMergePrs.length > 0) {
+    items.push(`${readyToMergePrs.length} PR${readyToMergePrs.length > 1 ? "s" : ""} marked ready-to-merge \u2014 review and merge`);
+  }
+  if (pendingItems.length > 0) {
+    const jobTypes = [...new Set(pendingItems.map((item) => item.jobType))];
+    items.push(`${pendingItems.length} job${pendingItems.length > 1 ? "s" : ""} pending in queue (${jobTypes.join(", ")})`);
+  }
+  return items;
+}
+async function getSummaryData(projectDir, windowHours = DEFAULT_SUMMARY_WINDOW_HOURS, branchPatterns = []) {
+  const analytics = getJobRunsAnalytics(windowHours);
+  const jobRuns = analytics.recentRuns;
+  const counts = computeCounts(jobRuns);
+  const openPrs = await collectPrInfo(projectDir, branchPatterns);
+  const queueStatus = getQueueStatus();
+  const pendingQueueItems = queueStatus.items.filter((item) => item.status === "pending");
+  const actionItems = buildActionItems(counts, openPrs, pendingQueueItems);
+  return {
+    windowHours,
+    jobRuns,
+    counts,
+    openPrs,
+    pendingQueueItems,
+    actionItems
+  };
+}
+var init_summary = __esm({
+  "../core/dist/utils/summary.js"() {
+    "use strict";
+    init_constants();
+    init_status_data();
+    init_job_queue();
+  }
+});
+
 // ../core/dist/analytics/amplitude-client.js
 function buildAuthHeader(apiKey, secretKey) {
   return `Basic ${Buffer.from(`${apiKey}:${secretKey}`).toString("base64")}`;
@@ -7516,6 +7722,15 @@ __export(dist_exports, {
   DEFAULT_PROVIDER: () => DEFAULT_PROVIDER,
   DEFAULT_PROVIDER_ENV: () => DEFAULT_PROVIDER_ENV,
   DEFAULT_PROVIDER_SCHEDULE_OVERRIDES: () => DEFAULT_PROVIDER_SCHEDULE_OVERRIDES,
+  DEFAULT_PR_RESOLVER: () => DEFAULT_PR_RESOLVER,
+  DEFAULT_PR_RESOLVER_AI_CONFLICT_RESOLUTION: () => DEFAULT_PR_RESOLVER_AI_CONFLICT_RESOLUTION,
+  DEFAULT_PR_RESOLVER_AI_REVIEW_RESOLUTION: () => DEFAULT_PR_RESOLVER_AI_REVIEW_RESOLUTION,
+  DEFAULT_PR_RESOLVER_ENABLED: () => DEFAULT_PR_RESOLVER_ENABLED,
+  DEFAULT_PR_RESOLVER_MAX_PRS_PER_RUN: () => DEFAULT_PR_RESOLVER_MAX_PRS_PER_RUN,
+  DEFAULT_PR_RESOLVER_MAX_RUNTIME: () => DEFAULT_PR_RESOLVER_MAX_RUNTIME,
+  DEFAULT_PR_RESOLVER_PER_PR_TIMEOUT: () => DEFAULT_PR_RESOLVER_PER_PR_TIMEOUT,
+  DEFAULT_PR_RESOLVER_READY_LABEL: () => DEFAULT_PR_RESOLVER_READY_LABEL,
+  DEFAULT_PR_RESOLVER_SCHEDULE: () => DEFAULT_PR_RESOLVER_SCHEDULE,
   DEFAULT_QA: () => DEFAULT_QA,
   DEFAULT_QA_ARTIFACTS: () => DEFAULT_QA_ARTIFACTS,
   DEFAULT_QA_AUTO_INSTALL_PLAYWRIGHT: () => DEFAULT_QA_AUTO_INSTALL_PLAYWRIGHT,
@@ -7523,6 +7738,7 @@ __export(dist_exports, {
   DEFAULT_QA_MAX_RUNTIME: () => DEFAULT_QA_MAX_RUNTIME,
   DEFAULT_QA_SCHEDULE: () => DEFAULT_QA_SCHEDULE,
   DEFAULT_QA_SKIP_LABEL: () => DEFAULT_QA_SKIP_LABEL,
+  DEFAULT_QA_VALIDATED_LABEL: () => DEFAULT_QA_VALIDATED_LABEL,
   DEFAULT_QUEUE: () => DEFAULT_QUEUE,
   DEFAULT_QUEUE_ENABLED: () => DEFAULT_QUEUE_ENABLED,
   DEFAULT_QUEUE_MAX_CONCURRENCY: () => DEFAULT_QUEUE_MAX_CONCURRENCY,
@@ -7540,6 +7756,7 @@ __export(dist_exports, {
   DEFAULT_SECONDARY_FALLBACK_MODEL: () => DEFAULT_SECONDARY_FALLBACK_MODEL,
   DEFAULT_SLICER_MAX_RUNTIME: () => DEFAULT_SLICER_MAX_RUNTIME,
   DEFAULT_SLICER_SCHEDULE: () => DEFAULT_SLICER_SCHEDULE,
+  DEFAULT_SUMMARY_WINDOW_HOURS: () => DEFAULT_SUMMARY_WINDOW_HOURS,
   DEFAULT_TEMPLATES_DIR: () => DEFAULT_TEMPLATES_DIR,
   EXECUTOR_LOG_FILE: () => EXECUTOR_LOG_FILE,
   EXECUTOR_LOG_NAME: () => EXECUTOR_LOG_NAME,
@@ -7562,6 +7779,7 @@ __export(dist_exports, {
   PRIORITY_LABELS: () => PRIORITY_LABELS,
   PRIORITY_LABEL_INFO: () => PRIORITY_LABEL_INFO,
   PROVIDER_COMMANDS: () => PROVIDER_COMMANDS,
+  PR_RESOLVER_LOG_NAME: () => PR_RESOLVER_LOG_NAME,
   QA_LOG_NAME: () => QA_LOG_NAME,
   REGISTRY_FILE_NAME: () => REGISTRY_FILE_NAME,
   REVIEWER_LOG_FILE: () => REVIEWER_LOG_FILE,
@@ -7690,6 +7908,7 @@ __export(dist_exports, {
   getScriptPath: () => getScriptPath,
   getStateFilePath: () => getStateFilePath,
   getStateItem: () => getStateItem,
+  getSummaryData: () => getSummaryData,
   getUncheckedItems: () => getUncheckedItems,
   getValidJobTypes: () => getValidJobTypes,
   groupBySection: () => groupBySection2,
@@ -7726,6 +7945,7 @@ __export(dist_exports, {
   parseTimeToMinutes: () => parseTimeToMinutes,
   performCancel: () => performCancel,
   plannerLockPath: () => plannerLockPath,
+  prResolverLockPath: () => prResolverLockPath,
   prepareBranchWorktree: () => prepareBranchWorktree,
   prepareDetachedWorktree: () => prepareDetachedWorktree,
   projectRuntimeKey: () => projectRuntimeKey,
@@ -7822,6 +8042,7 @@ var init_dist = __esm({
     init_webhook_validator();
     init_worktree_manager();
     init_job_queue();
+    init_summary();
     init_analytics();
     init_prd_template();
     init_slicer_prompt();
@@ -8098,6 +8319,7 @@ function buildInitConfig(params) {
     },
     audit: { ...defaults.audit },
     analytics: { ...defaults.analytics },
+    prResolver: { ...defaults.prResolver },
     jobProviders: { ...defaults.jobProviders },
     queue: {
       ...defaults.queue,
@@ -8221,7 +8443,7 @@ function initCommand(program2) {
     const cwd = process.cwd();
     const force = options.force || false;
     const prdDir = options.prdDir || DEFAULT_PRD_DIR;
-    const totalSteps = 13;
+    const totalSteps = 14;
     const interactive = isInteractiveInitSession();
     console.log();
     header("Night Watch CLI - Initializing");
@@ -8476,7 +8698,35 @@ function initCommand(program2) {
         }
       }
     }
-    step(11, totalSteps, "Registering project in global registry...");
+    step(11, totalSteps, "Syncing Night Watch labels to GitHub...");
+    let labelSyncStatus = "Skipped";
+    if (!remoteStatus.hasGitHubRemote || !ghAuthenticated) {
+      labelSyncStatus = !remoteStatus.hasGitHubRemote ? "Skipped (no GitHub remote)" : "Skipped (gh auth required)";
+      info("Skipping label sync (no GitHub remote or gh not authenticated).");
+    } else {
+      try {
+        const { NIGHT_WATCH_LABELS: NIGHT_WATCH_LABELS2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+        let created = 0;
+        for (const label2 of NIGHT_WATCH_LABELS2) {
+          try {
+            execSync3(
+              `gh label create "${label2.name}" --description "${label2.description}" --color "${label2.color}" --force`,
+              { cwd, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
+            );
+            created++;
+          } catch {
+          }
+        }
+        labelSyncStatus = `Synced ${created}/${NIGHT_WATCH_LABELS2.length} labels`;
+        success(`Synced ${created}/${NIGHT_WATCH_LABELS2.length} labels to GitHub`);
+      } catch (labelErr) {
+        labelSyncStatus = "Failed";
+        warn(
+          `Could not sync labels: ${labelErr instanceof Error ? labelErr.message : String(labelErr)}`
+        );
+      }
+    }
+    step(12, totalSteps, "Registering project in global registry...");
     try {
       const { registerProject: registerProject2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
       const entry = registerProject2(cwd);
@@ -8486,7 +8736,7 @@ function initCommand(program2) {
         `  Warning: Could not register in global registry: ${regErr instanceof Error ? regErr.message : String(regErr)}`
       );
     }
-    step(12, totalSteps, "Installing Night Watch skills...");
+    step(13, totalSteps, "Installing Night Watch skills...");
     const skillsResult = installSkills(cwd, selectedProvider, force, TEMPLATES_DIR);
     if (skillsResult.installed > 0) {
       success(`Installed ${skillsResult.installed} skills to ${skillsResult.location}`);
@@ -8498,7 +8748,7 @@ function initCommand(program2) {
     } else if (skillsResult.type === "none") {
       info("No compatible AI skills directory detected \u2014 skipping.");
     }
-    step(13, totalSteps, "Initialization complete!");
+    step(14, totalSteps, "Initialization complete!");
     header("Initialization Complete");
     const filesTable = createTable({ head: ["Created Files", ""] });
     filesTable.push(["PRD Directory", `${prdDir}/done/`]);
@@ -8511,6 +8761,7 @@ function initCommand(program2) {
     filesTable.push(["", `instructions/prd-creator.md (${templateSources[5].source})`]);
     filesTable.push(["Config File", CONFIG_FILE_NAME]);
     filesTable.push(["Board Setup", boardSetupStatus]);
+    filesTable.push(["Label Sync", labelSyncStatus]);
     filesTable.push(["Global Registry", "~/.night-watch/projects.json"]);
     let skillsSummary;
     if (skillsResult.installed > 0) {
@@ -9058,6 +9309,15 @@ function shouldSendReviewNotification(scriptStatus) {
   }
   return !scriptStatus.startsWith("skip_");
 }
+function shouldSendReviewCompletionNotification(exitCode, scriptStatus) {
+  if (exitCode !== 0) {
+    return false;
+  }
+  if (scriptStatus === "failure" || scriptStatus === "timeout") {
+    return false;
+  }
+  return shouldSendReviewNotification(scriptStatus);
+}
 function parseAutoMergedPrNumbers(raw) {
   if (!raw || raw.trim().length === 0) {
     return [];
@@ -9316,12 +9576,15 @@ ${stderr}`);
         spinner.fail(`PR reviewer exited with code ${exitCode}`);
       }
       if (!options.dryRun) {
-        const skipNotification = !shouldSendReviewNotification(scriptResult?.status);
-        if (skipNotification) {
-          info("Skipping review notification (no actionable review result)");
+        const shouldNotifyCompletion = shouldSendReviewCompletionNotification(
+          exitCode,
+          scriptResult?.status
+        );
+        if (!shouldNotifyCompletion) {
+          info("Skipping review completion notification (review did not complete successfully)");
         }
         let fallbackPrDetails = null;
-        if (!skipNotification && exitCode === 0) {
+        if (shouldNotifyCompletion) {
           const reviewedPrNumbers = parseReviewedPrNumbers(scriptResult?.data.prs);
           const firstReviewedPrNumber = reviewedPrNumbers[0];
           if (firstReviewedPrNumber !== void 0) {
@@ -9331,7 +9594,7 @@ ${stderr}`);
             fallbackPrDetails = fetchReviewedPrDetails(config.branchPatterns, projectDir);
           }
         }
-        if (!skipNotification) {
+        if (shouldNotifyCompletion) {
           const attempts = parseRetryAttempts(scriptResult?.data.attempts);
           const finalScore = parseFinalReviewScore(scriptResult?.data.final_score);
           const legacyNoChangesNeeded = scriptResult?.data.no_changes_needed === "1";
@@ -9453,6 +9716,7 @@ function buildEnvVars3(config, options) {
   const branchPatterns = config.qa.branchPatterns.length > 0 ? config.qa.branchPatterns : config.branchPatterns;
   env.NW_BRANCH_PATTERNS = branchPatterns.join(",");
   env.NW_QA_SKIP_LABEL = config.qa.skipLabel;
+  env.NW_QA_VALIDATED_LABEL = config.qa.validatedLabel;
   env.NW_QA_ARTIFACTS = config.qa.artifacts;
   env.NW_QA_AUTO_INSTALL_PLAYWRIGHT = config.qa.autoInstallPlaywright ? "1" : "0";
   env.NW_CLAUDE_MODEL_ID = CLAUDE_MODEL_IDS[config.primaryFallbackModel ?? config.claudeModel ?? "sonnet"];
@@ -9502,6 +9766,7 @@ function qaCommand(program2) {
       const branchPatterns = config.qa.branchPatterns.length > 0 ? config.qa.branchPatterns : config.branchPatterns;
       configTable.push(["Branch Patterns", branchPatterns.join(", ")]);
       configTable.push(["Skip Label", config.qa.skipLabel]);
+      configTable.push(["Validated Label", config.qa.validatedLabel]);
       configTable.push(["Artifacts", config.qa.artifacts]);
       configTable.push([
         "Auto-install Playwright",
@@ -9533,6 +9798,8 @@ ${stderr}`);
           spinner.succeed("QA process queued \u2014 another job is currently running");
         } else if (scriptResult?.status?.startsWith("skip_")) {
           spinner.succeed("QA process completed (no PRs needed QA)");
+        } else if (scriptResult?.status === "warning_qa") {
+          spinner.succeed("QA process completed with warnings");
         } else {
           spinner.succeed("QA process completed successfully");
         }
@@ -9864,6 +10131,14 @@ function performInstall(projectDir, config, options) {
       const analyticsEntry = `${analyticsSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} analytics >> ${shellQuote(analyticsLog)} 2>&1  ${marker}`;
       entries.push(analyticsEntry);
     }
+    const disablePrResolver = options?.noPrResolver === true || options?.prResolver === false;
+    const installPrResolver = disablePrResolver ? false : config.prResolver.enabled;
+    if (installPrResolver) {
+      const prResolverSchedule = config.prResolver.schedule;
+      const prResolverLog = path25.join(logDir, "pr-resolver.log");
+      const prResolverEntry = `${prResolverSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} resolve >> ${shellQuote(prResolverLog)} 2>&1  ${marker}`;
+      entries.push(prResolverEntry);
+    }
     const existingEntries = new Set(
       Array.from(/* @__PURE__ */ new Set([...getEntries(marker), ...getProjectEntries(projectDir)]))
     );
@@ -9882,7 +10157,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("-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("-f, --force", "Replace existing cron entries for this project").action(async (options) => {
     try {
       const projectDir = process.cwd();
       const config = loadConfig(projectDir);
@@ -9964,6 +10239,15 @@ function installCommand(program2) {
         const analyticsEntry = `${analyticsSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} analytics >> ${shellQuote(analyticsLog)} 2>&1  ${marker}`;
         entries.push(analyticsEntry);
       }
+      const disablePrResolver = options.noPrResolver === true || options.prResolver === false;
+      const installPrResolver = disablePrResolver ? false : config.prResolver.enabled;
+      let prResolverLog;
+      if (installPrResolver) {
+        prResolverLog = path25.join(logDir, "pr-resolver.log");
+        const prResolverSchedule = config.prResolver.schedule;
+        const prResolverEntry = `${prResolverSchedule} ${pathPrefix}${providerEnvPrefix}${cliBinPrefix}${cronTriggerPrefix}cd ${shellQuote(projectDir)} && ${shellQuote(nightWatchBin)} resolve >> ${shellQuote(prResolverLog)} 2>&1  ${marker}`;
+        entries.push(prResolverEntry);
+      }
       const existingEntrySet = new Set(existingEntries);
       const currentCrontab = readCrontab();
       const baseCrontab = options.force ? currentCrontab.filter((line) => !existingEntrySet.has(line) && !line.includes(marker)) : currentCrontab;
@@ -9993,6 +10277,9 @@ function installCommand(program2) {
       if (installAnalytics && analyticsLog) {
         dim(`  Analytics: ${analyticsLog}`);
       }
+      if (installPrResolver && prResolverLog) {
+        dim(`  PR Resolver: ${prResolverLog}`);
+      }
       console.log();
       dim("To uninstall, run: night-watch uninstall");
       dim("To check status, run: night-watch status");
@@ -10025,7 +10312,13 @@ function performUninstall(projectDir, options) {
     if (!options?.keepLogs) {
       const logDir = path26.join(projectDir, "logs");
       if (fs24.existsSync(logDir)) {
-        const logFiles = ["executor.log", "reviewer.log", "slicer.log", "audit.log"];
+        const logFiles = [
+          "executor.log",
+          "reviewer.log",
+          "slicer.log",
+          "audit.log",
+          "pr-resolver.log"
+        ];
         logFiles.forEach((logFile) => {
           const logPath = path26.join(logDir, logFile);
           if (fs24.existsSync(logPath)) {
@@ -10070,7 +10363,13 @@ function uninstallCommand(program2) {
       if (!options.keepLogs) {
         const logDir = path26.join(projectDir, "logs");
         if (fs24.existsSync(logDir)) {
-          const logFiles = ["executor.log", "reviewer.log", "slicer.log", "audit.log"];
+          const logFiles = [
+            "executor.log",
+            "reviewer.log",
+            "slicer.log",
+            "audit.log",
+            "pr-resolver.log"
+          ];
           let logsRemoved = 0;
           logFiles.forEach((logFile) => {
             const logPath = path26.join(logDir, logFile);
@@ -16740,8 +17039,9 @@ function createQueueCommand() {
     }
     process.exit(0);
   });
-  queue.command("dispatch").description("Dispatch the next pending job (used by cron scripts)").option("--log <file>", "Log file to write dispatch output").action((_opts) => {
-    const entry = dispatchNextJob(loadConfig(process.cwd()).queue);
+  queue.command("dispatch").description("Dispatch the next pending job (used by cron scripts)").option("--log <file>", "Log file to write dispatch output").option("--project-dir <dir>", "Project directory to load queue config from (defaults to cwd)").action((_opts) => {
+    const configDir = _opts.projectDir ?? process.cwd();
+    const entry = dispatchNextJob(loadConfig(configDir).queue);
     if (!entry) {
       logger5.info("No pending jobs to dispatch");
       return;
@@ -16819,8 +17119,9 @@ function createQueueCommand() {
     }
     removeJob(queueId);
   });
-  queue.command("can-start").description("Return a zero exit status when the global queue has an available slot").action(() => {
-    const queueConfig = loadConfig(process.cwd()).queue;
+  queue.command("can-start").description("Return a zero exit status when the global queue has an available slot").option("--project-dir <dir>", "Project directory to load queue config from (defaults to cwd)").action((opts) => {
+    const configDir = opts.projectDir ?? process.cwd();
+    const queueConfig = loadConfig(configDir).queue;
     process.exit(canStartJob(queueConfig) ? 0 : 1);
   });
   queue.command("expire").description("Expire stale queued jobs").option(
@@ -16842,7 +17143,26 @@ function createQueueCommand() {
   });
   return queue;
 }
-var QUEUE_MARKER_KEYS = /* @__PURE__ */ new Set(["NW_DRY_RUN", "NW_CRON_TRIGGER", "NW_DEFAULT_BRANCH"]);
+var QUEUE_MARKER_KEYS = /* @__PURE__ */ new Set([
+  "NW_DRY_RUN",
+  "NW_CRON_TRIGGER",
+  "NW_DEFAULT_BRANCH",
+  "NW_TARGET_PR",
+  "NW_REVIEWER_WORKER_MODE",
+  "NW_REVIEWER_PARALLEL",
+  "NW_REVIEWER_WORKER_STAGGER",
+  "NW_REVIEWER_MAX_RUNTIME",
+  "NW_REVIEWER_MAX_RETRIES",
+  "NW_REVIEWER_RETRY_DELAY",
+  "NW_REVIEWER_MAX_PRS_PER_RUN",
+  "NW_MIN_REVIEW_SCORE",
+  "NW_BRANCH_PATTERNS",
+  "NW_PRD_DIR",
+  "NW_AUTO_MERGE",
+  "NW_AUTO_MERGE_METHOD",
+  "NW_MAX_RUNTIME",
+  "NW_QA_MAX_RUNTIME"
+]);
 function filterQueueMarkers(envJson) {
   const result = {};
   for (const [key, value] of Object.entries(envJson)) {
@@ -16911,6 +17231,300 @@ function notifyCommand(program2) {
   );
 }
 
+// src/commands/summary.ts
+init_dist();
+import path42 from "path";
+import chalk8 from "chalk";
+function formatDuration2(seconds) {
+  if (seconds === null) return "-";
+  const mins = Math.floor(seconds / 60);
+  const secs = seconds % 60;
+  if (mins === 0) return `${secs}s`;
+  return `${mins}m ${secs}s`;
+}
+function formatCiStatus2(status) {
+  if (status === "pass") return chalk8.green("pass");
+  if (status === "fail") return chalk8.red("fail");
+  if (status === "pending") return chalk8.yellow("pending");
+  return chalk8.dim("unknown");
+}
+function formatReviewScore2(score) {
+  if (score === null) return chalk8.dim("-");
+  if (score >= 80) return chalk8.green(String(score));
+  if (score >= 60) return chalk8.yellow(String(score));
+  return chalk8.red(String(score));
+}
+function formatJobStatus(status) {
+  if (status === "success") return chalk8.green("success");
+  if (status === "failure") return chalk8.red("failure");
+  if (status === "timeout") return chalk8.yellow("timeout");
+  if (status === "rate_limited") return chalk8.magenta("rate_limited");
+  if (status === "skipped") return chalk8.dim("skipped");
+  return chalk8.dim(status);
+}
+function getProjectName2(projectPath) {
+  return path42.basename(projectPath) || projectPath;
+}
+function formatProvider(providerKey) {
+  return providerKey.split(":")[0] || providerKey;
+}
+function summaryCommand(program2) {
+  program2.command("summary").description("Show a summary of recent Night Watch activity").option(
+    "--hours <n>",
+    "Time window in hours (default: 12)",
+    String(DEFAULT_SUMMARY_WINDOW_HOURS)
+  ).option("--json", "Output summary as JSON").action(async (options) => {
+    try {
+      const projectDir = process.cwd();
+      const config = loadConfig(projectDir);
+      const hours = parseInt(options.hours || String(DEFAULT_SUMMARY_WINDOW_HOURS), 10);
+      if (isNaN(hours) || hours <= 0) {
+        console.error("Error: --hours must be a positive integer");
+        process.exit(1);
+      }
+      const data = await getSummaryData(projectDir, hours, config.branchPatterns);
+      if (options.json) {
+        console.log(JSON.stringify(data, null, 2));
+        return;
+      }
+      console.log();
+      console.log(chalk8.bold.cyan(`Night Watch Summary (last ${data.windowHours}h)`));
+      console.log(chalk8.dim("\u2500".repeat(40)));
+      console.log();
+      if (data.jobRuns.length === 0) {
+        info("No recent activity in this time window.");
+        console.log();
+      } else {
+        const countParts = [];
+        if (data.counts.succeeded > 0) {
+          countParts.push(chalk8.green(`\u2713 ${data.counts.succeeded} succeeded`));
+        }
+        if (data.counts.failed > 0) {
+          countParts.push(chalk8.red(`\u2717 ${data.counts.failed} failed`));
+        }
+        if (data.counts.timedOut > 0) {
+          countParts.push(chalk8.yellow(`\u23F1 ${data.counts.timedOut} timed out`));
+        }
+        if (data.counts.rateLimited > 0) {
+          countParts.push(chalk8.magenta(`\u23F3 ${data.counts.rateLimited} rate limited`));
+        }
+        if (data.counts.skipped > 0) {
+          countParts.push(chalk8.dim(`${data.counts.skipped} skipped`));
+        }
+        console.log(`Jobs Executed: ${data.counts.total}`);
+        if (countParts.length > 0) {
+          console.log(`  ${countParts.join("   ")}`);
+        }
+        console.log();
+        const table = createTable({
+          head: ["Job", "Status", "Project", "Provider", "Duration"],
+          colWidths: [12, 12, 20, 12, 12]
+        });
+        for (const run2 of data.jobRuns.slice(0, 10)) {
+          table.push([
+            run2.jobType,
+            formatJobStatus(run2.status),
+            getProjectName2(run2.projectPath),
+            formatProvider(run2.providerKey),
+            formatDuration2(run2.durationSeconds)
+          ]);
+        }
+        console.log(table.toString());
+        if (data.jobRuns.length > 10) {
+          dim(`  ... and ${data.jobRuns.length - 10} more`);
+        }
+        console.log();
+      }
+      if (data.openPrs.length > 0) {
+        header(`Open PRs (${data.openPrs.length})`);
+        const prTable = createTable({
+          head: ["#", "Title", "CI", "Score"],
+          colWidths: [6, 40, 10, 8]
+        });
+        for (const pr of data.openPrs) {
+          const title = pr.title.length > 37 ? pr.title.substring(0, 34) + "..." : pr.title;
+          prTable.push([
+            String(pr.number),
+            title,
+            formatCiStatus2(pr.ciStatus),
+            formatReviewScore2(pr.reviewScore)
+          ]);
+        }
+        console.log(prTable.toString());
+        console.log();
+      }
+      if (data.pendingQueueItems.length > 0) {
+        const jobTypes = [...new Set(data.pendingQueueItems.map((item) => item.jobType))];
+        const projectNames = [...new Set(data.pendingQueueItems.map((item) => item.projectName))];
+        dim(
+          `Queue: ${data.pendingQueueItems.length} pending (${jobTypes.join(", ")}) for ${projectNames.join(", ")}`
+        );
+        console.log();
+      }
+      if (data.actionItems.length > 0) {
+        console.log(chalk8.yellow("\u26A0 Action needed:"));
+        for (const item of data.actionItems) {
+          console.log(`  \u2022 ${item}`);
+        }
+      } else {
+        console.log(chalk8.green("\u2713 No action needed \u2014 all jobs healthy."));
+      }
+      console.log();
+    } catch (error2) {
+      console.error(
+        `Error getting summary: ${error2 instanceof Error ? error2.message : String(error2)}`
+      );
+      process.exit(1);
+    }
+  });
+}
+
+// src/commands/resolve.ts
+init_dist();
+import { execFileSync as execFileSync7 } from "child_process";
+import * as path43 from "path";
+function buildEnvVars6(config, options) {
+  const env = buildBaseEnvVars(config, "pr-resolver", options.dryRun);
+  env.NW_PR_RESOLVER_MAX_RUNTIME = String(config.prResolver.maxRuntime);
+  env.NW_PR_RESOLVER_MAX_PRS_PER_RUN = String(config.prResolver.maxPrsPerRun);
+  env.NW_PR_RESOLVER_PER_PR_TIMEOUT = String(config.prResolver.perPrTimeout);
+  env.NW_PR_RESOLVER_AI_CONFLICT_RESOLUTION = config.prResolver.aiConflictResolution ? "1" : "0";
+  env.NW_PR_RESOLVER_AI_REVIEW_RESOLUTION = config.prResolver.aiReviewResolution ? "1" : "0";
+  env.NW_PR_RESOLVER_READY_LABEL = config.prResolver.readyLabel;
+  env.NW_PR_RESOLVER_BRANCH_PATTERNS = config.prResolver.branchPatterns.join(",");
+  return env;
+}
+function applyCliOverrides5(config, options) {
+  const overridden = { ...config, prResolver: { ...config.prResolver } };
+  if (options.timeout) {
+    const timeout = parseInt(options.timeout, 10);
+    if (!isNaN(timeout)) {
+      overridden.prResolver.maxRuntime = timeout;
+    }
+  }
+  if (options.provider) {
+    overridden._cliProviderOverride = options.provider;
+  }
+  return overridden;
+}
+function getOpenPrs() {
+  try {
+    const args = ["pr", "list", "--state", "open", "--json", "number,title,headRefName,mergeable"];
+    const result = execFileSync7("gh", args, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const prs = JSON.parse(result.trim() || "[]");
+    return prs.map(
+      (pr) => ({
+        number: pr.number,
+        title: pr.title,
+        branch: pr.headRefName,
+        mergeable: pr.mergeable
+      })
+    );
+  } catch {
+    return [];
+  }
+}
+function resolveCommand(program2) {
+  program2.command("resolve").description("Run PR conflict resolver now").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 = applyCliOverrides5(config, options);
+    if (!config.prResolver.enabled && !options.dryRun) {
+      info("PR resolver is disabled in config; skipping.");
+      process.exit(0);
+    }
+    const envVars = buildEnvVars6(config, options);
+    const scriptPath = getScriptPath("night-watch-pr-resolver-cron.sh");
+    if (options.dryRun) {
+      header("Dry Run: PR Resolver");
+      const resolverProvider = resolveJobProvider(config, "pr-resolver");
+      header("Configuration");
+      const configTable = createTable({ head: ["Setting", "Value"] });
+      configTable.push(["Provider", resolverProvider]);
+      configTable.push([
+        "Max Runtime",
+        `${config.prResolver.maxRuntime}s (${Math.floor(config.prResolver.maxRuntime / 60)}min)`
+      ]);
+      configTable.push([
+        "Max PRs Per Run",
+        config.prResolver.maxPrsPerRun === 0 ? "Unlimited" : String(config.prResolver.maxPrsPerRun)
+      ]);
+      configTable.push(["Per-PR Timeout", `${config.prResolver.perPrTimeout}s`]);
+      configTable.push([
+        "AI Conflict Resolution",
+        config.prResolver.aiConflictResolution ? "Enabled" : "Disabled"
+      ]);
+      configTable.push([
+        "AI Review Resolution",
+        config.prResolver.aiReviewResolution ? "Enabled" : "Disabled"
+      ]);
+      configTable.push(["Ready Label", config.prResolver.readyLabel]);
+      configTable.push([
+        "Branch Patterns",
+        config.prResolver.branchPatterns.length > 0 ? config.prResolver.branchPatterns.join(", ") : "(all)"
+      ]);
+      console.log(configTable.toString());
+      header("Open PRs");
+      const openPrs = getOpenPrs();
+      if (openPrs.length === 0) {
+        dim("  (no open PRs found)");
+      } else {
+        for (const pr of openPrs) {
+          const conflictStatus = pr.mergeable === "CONFLICTING" ? " [CONFLICT]" : "";
+          info(`#${pr.number}: ${pr.title}${conflictStatus}`);
+          dim(`         Branch: ${pr.branch}`);
+        }
+      }
+      header("Environment Variables");
+      for (const [key, value] of Object.entries(envVars)) {
+        dim(`  ${key}=${value}`);
+      }
+      header("Command");
+      dim(`  bash ${scriptPath} ${projectDir}`);
+      console.log();
+      process.exit(0);
+    }
+    const spinner = createSpinner("Running PR resolver...");
+    spinner.start();
+    try {
+      await maybeApplyCronSchedulingDelay(config, "pr-resolver", projectDir);
+      const { exitCode, stdout, stderr } = await executeScriptWithOutput(
+        scriptPath,
+        [projectDir],
+        envVars
+      );
+      const scriptResult = parseScriptResult(`${stdout}
+${stderr}`);
+      if (exitCode === 0) {
+        if (scriptResult?.status === "queued") {
+          spinner.succeed("PR resolver queued \u2014 another job is currently running");
+        } else if (scriptResult?.status?.startsWith("skip_")) {
+          spinner.succeed("PR resolver completed (no PRs needed resolution)");
+        } else {
+          spinner.succeed("PR resolver completed successfully");
+        }
+      } else {
+        spinner.fail(`PR resolver exited with code ${exitCode}`);
+      }
+      const notificationEvent = exitCode === 0 ? "pr_resolver_completed" : "pr_resolver_failed";
+      await sendNotifications(config, {
+        event: notificationEvent,
+        projectName: path43.basename(projectDir),
+        exitCode,
+        provider: formatProviderDisplay(envVars.NW_PROVIDER_CMD, envVars.NW_PROVIDER_LABEL)
+      });
+      process.exit(exitCode);
+    } catch (err) {
+      spinner.fail("Failed to execute resolve 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);
@@ -16952,4 +17566,6 @@ program.addCommand(createStateCommand());
 boardCommand(program);
 queueCommand(program);
 notifyCommand(program);
+summaryCommand(program);
+resolveCommand(program);
 program.parse();