@haystackeditor/cli 0.10.3 → 0.12.0

package/dist/index.js

@@ -11,10 +11,11 @@
  *   npx @haystackeditor/cli status         # Check configuration
  *   npx @haystackeditor/cli login          # Authenticate with GitHub
  *   npx @haystackeditor/cli submit         # Create a PR (auto-merge or review)
- *   npx @haystackeditor/cli check-pending  # Check analysis status
+ *   npx @haystackeditor/cli triage          # Check last submitted PR
  *   npx @haystackeditor/cli triage 123     # View analysis results for a PR
  *   npx @haystackeditor/cli dismiss 123    # Dismiss findings for a PR
  *   npx @haystackeditor/cli mark-reviewed 123 # Mark review as not needed
+ *   npx @haystackeditor/cli request-review 123 # Tag a PR as needing human review
  *   npx @haystackeditor/cli pr-status 123  # Show PR status in Haystack pipeline
  *   npx @haystackeditor/cli config         # Manage preferences
  */
@@ -22,22 +23,22 @@ import { Command } from 'commander';
 import { statusCommand } from './commands/status.js';
 import { initCommand } from './commands/init.js';
 import { loginCommand, logoutCommand } from './commands/login.js';
-import { handleAgenticTool, handleAutoMerge, handleWaitForReviewers } from './commands/config.js';
+import { handleAgenticTool, handleAutoMerge, handleWaitForReviewers, isAutoMergeEnabled } from './commands/config.js';
 import { installSkills, listSkills } from './commands/skills.js';
 import { hooksInstall, hooksStatus, hooksUpdate } from './commands/hooks.js';
 import { submitCommand } from './commands/submit.js';
-import { checkPendingCommand } from './commands/check-pending.js';
 import { installSessionHooks, sessionHooksStatus } from './commands/install-session-hooks.js';
 import { listPolicies, addPolicy, removePolicy, initPolicies, addInstruction } from './commands/policy.js';
 import { triageCommand } from './commands/triage.js';
 import { dismissCommand, markReviewedCommand, undismissCommand } from './commands/dismiss.js';
+import { requestReviewCommand } from './commands/request-review.js';
 import { prStatusCommand } from './commands/pr-status.js';
 import { setupCommand } from './commands/setup.js';
 const program = new Command();
 program
     .name('haystack')
     .description('Haystack CLI — automated PR review, triage, and merge queue')
-    .version('0.10.3');
+    .version('0.11.0');
 program
     .command('init')
     .description('Create .haystack.json configuration')
@@ -93,12 +94,13 @@ program
     .option('--draft', 'Create as draft PR')
     .option('--review [reviewer]', 'Request human review (BLOCKS auto-merge — only use when explicitly asked)')
     .option('--force', 'Skip pre-PR triage checks')
-    .option('--auto-fix', 'Auto-fix analysis issues before surfacing to Feed')
+    .option('--auto-fix', 'Alpha auto-fix for straightforward mechanical issues (discouraged)')
+    .option('--auto-merge', 'Apply auto-merge label (default: from .haystack.json, --no-auto-merge to disable)')
     .option('--no-wait', 'Skip waiting for analysis results')
     .addHelpText('after', `
 This command is designed for AI coding agents to submit PRs.
 
-  1. Runs pre-PR triage (code review, rules, intent drift) via sub-agents
+  1. Runs pre-PR triage (code review, rules, instruction drift) via sub-agents
   2. Pushes the current branch to origin
   3. Creates a pull request on GitHub
   4. Waits for Haystack analysis results (triggered via GitHub App webhook)
@@ -107,16 +109,21 @@ Pre-PR Triage:
   Before creating the PR, haystack spawns parallel sub-agents to check for:
   • Code review bugs (logic errors, null crashes, security issues)
   • Rule violations (from .haystack/pr-rules.yml)
-  • Intent drift (AI agent deviations from user instructions)
+  • Instruction drift (AI agent deviations from user instructions)
 
   Use --force to skip triage entirely.
   Use --no-wait to skip waiting for analysis results.
-  Use --auto-fix to auto-fix analysis issues before surfacing to Feed.
+  Use --auto-fix only when explicitly opting into the alpha fixer for
+  straightforward mechanical issues.
 
 Review Routing:
   By default, PRs enter the auto-merge queue and merge automatically once
   Haystack analysis passes. This is the correct default for most PRs.
 
+  ⚠ --auto-fix is currently alpha and discouraged by default. Prefer plain
+  haystack submit unless you explicitly want the sandbox fixer to attempt
+  straightforward mechanical fixes before issues hit the Feed.
+
   ⚠ Only use --review when the user EXPLICITLY asks for human review.
   --review BLOCKS auto-merge — the PR will NOT merge until a human approves,
   which delays merging. Do not add --review "just to be safe".
@@ -126,8 +133,8 @@ Review Routing:
   • --review <username>  Same label, plus requests review from that GitHub user
 
 Examples:
-  haystack submit --auto-fix           # Recommended: triage, create PR, auto-fix issues
-  haystack submit                      # Triage, create PR, auto-merge queue (no auto-fix)
+  haystack submit                      # Recommended: triage, create PR, auto-merge queue
+  haystack submit --auto-fix           # Discouraged alpha: auto-fix straightforward mechanical issues
   haystack submit --force              # Skip triage
   haystack submit --no-wait            # Don't wait for analysis
   haystack submit --title "Fix auth"   # Custom PR title
@@ -139,38 +146,28 @@ Examples:
   haystack submit --review             # ⚠ Blocks auto-merge, needs human approval
   haystack submit --review octocat     # ⚠ Blocks auto-merge, requests review from octocat
 `)
-    .action(submitCommand);
-program
-    .command('check-pending')
-    .description('Check status of pending Haystack analysis')
-    .option('--json', 'Output as JSON')
-    .option('--hook', 'Minimal output for session-start hooks')
-    .option('--clear', 'Clear pending submit state')
-    .addHelpText('after', `
-After \`haystack submit\`, this checks whether the analysis finished
-and shows a two-state verdict:
-
-  Good to merge     — No issues found, safe to merge
-  Needs your input  — Bugs or rule violations found
-
-This runs automatically on CLI session start if session hooks are installed.
-
-Examples:
-  haystack check-pending              # Rich terminal output
-  haystack check-pending --hook       # Minimal output (for hooks)
-  haystack check-pending --json       # Machine-readable JSON
-  haystack check-pending --clear      # Clear pending state
-`)
-    .action(checkPendingCommand);
+    .action(async (options) => {
+    // Resolve --auto-merge default from .haystack.json when not explicitly set
+    if (options.autoMerge === undefined) {
+        options.autoMerge = await isAutoMergeEnabled();
+    }
+    return submitCommand(options);
+});
 program
-    .command('triage <pr>')
+    .command('triage [pr]')
     .description('View Haystack analysis results for a PR')
     .option('--json', 'Output as JSON')
+    .option('--hook', 'Minimal single-line output for session-start hooks')
+    .option('--clear', 'Clear pending submit state')
     .option('--no-wait', 'Exit immediately if analysis is still pending')
     .addHelpText('after', `
 Look up triage results (bugs, rule violations, verdict) for any PR.
+When called without a PR identifier, checks the last submitted PR.
+
+Runs automatically on CLI session start if session hooks are installed.
 
 PR identifier formats:
+  (none)                                  Last submitted PR
   123                                     PR number (uses current repo)
   #123                                    PR number with hash
   owner/repo#123                          Fully qualified
@@ -180,11 +177,14 @@ By default, if analysis is still in progress, the command will poll
 for up to 5 minutes. Use --no-wait to exit immediately instead.
 
 Examples:
+  haystack triage                             # Last submitted PR
   haystack triage 42                          # Current repo, PR #42
   haystack triage acme/widgets#99             # Specific repo
   haystack triage https://github.com/o/r/pull/1  # From URL
   haystack triage 42 --json                   # Machine-readable output
   haystack triage 42 --no-wait                # Don't wait if pending
+  haystack triage --hook                      # Session-start hook output
+  haystack triage --clear                     # Clear pending state
 `)
     .action(triageCommand);
 program
@@ -247,6 +247,29 @@ Examples:
   haystack undismiss acme/widgets#99     # Undo for specific repo
 `)
     .action(undismissCommand);
+program
+    .command('request-review <pr> [reviewer]')
+    .description('Tag a PR as needing human review')
+    .addHelpText('after', `
+Tag any PR with "needs human review", even after it was created.
+Adds the haystack:needs-review label to the PR, moving it from
+"Good to Merge" to the "Needs Assignment" queue in the feed.
+
+Optionally specify a reviewer to request review from a specific
+GitHub user.
+
+PR identifier formats:
+  123                                     PR number (uses current repo)
+  #123                                    PR number with hash
+  owner/repo#123                          Fully qualified
+  https://github.com/owner/repo/pull/123  GitHub URL
+
+Examples:
+  haystack request-review 42                  # Tag PR #42 for human review
+  haystack request-review 42 octocat          # Tag and request review from octocat
+  haystack request-review acme/widgets#99     # Specific repo
+`)
+    .action(requestReviewCommand);
 program
     .command('pr-status <pr>')
     .description('Show the current Haystack status of a PR')
@@ -317,25 +340,25 @@ config
     .description('Configure which AI reviewers the merge queue waits for')
     .addHelpText('after', `
 Actions:
-  list          Show current expected reviewers (default)
-  add <names>   Add one or more AI reviewer sources
-  remove <names> Remove one or more AI reviewer sources
-  clear         Remove all expected reviewers
+  list          Show configured reviewer bots (default)
+  add <names>   Add one or more reviewer bots
+  remove <names> Remove one or more reviewer bots
+  clear         Remove all reviewer bots
 
-AI reviewer sources are stored in .haystack.json under
-babysitter.expected_ai_reviewers. The merge queue will
-wait for these reviewers to post before starting the
-grace period.
+Accepts friendly names (cursor, coderabbit) or exact
+GitHub bot usernames (cursor-bugbot[bot]).
 
-Run \`haystack config wait-for-reviewers list\` to see
-all available reviewer sources and which are enabled.
+Stored in .haystack.json under merge_queue.wait_for_reviewer.bots.
+The merge queue will block merging until ALL configured
+bots have posted a review or comment on the PR.
 
 Examples:
-  haystack config wait-for-reviewers                    # Show status
-  haystack config wait-for-reviewers add cursor         # Wait for Cursor BugBot
-  haystack config wait-for-reviewers add cursor coderabbit  # Add multiple
-  haystack config wait-for-reviewers remove cursor      # Stop waiting for Cursor
-  haystack config wait-for-reviewers clear              # Wait for none
+  haystack config wait-for-reviewers                          # Show status
+  haystack config wait-for-reviewers add cursor               # Wait for Cursor BugBot
+  haystack config wait-for-reviewers add cursor coderabbit    # Add multiple
+  haystack config wait-for-reviewers add cursor-bugbot[bot]   # Raw bot username
+  haystack config wait-for-reviewers remove cursor            # Stop waiting
+  haystack config wait-for-reviewers clear                    # Wait for none
 `)
     .action(handleWaitForReviewers);
 // Skills subcommands
@@ -404,7 +427,7 @@ hooks
     .description('Install session-start hooks for coding CLIs')
     .option('--cli <name>', 'Target CLI: claude, codex, gemini, or all')
     .addHelpText('after', `
-Configures your coding CLI to run \`haystack check-pending\` on session start.
+Configures your coding CLI to run \`haystack triage --hook\` on session start.
 This shows pending PR analysis results when you open a new terminal session.
 
   Claude Code:  Native SessionStart hook (.claude/settings.json)

package/dist/triage/prompts.js

@@ -45,7 +45,7 @@ const INTENT_DRIFT_SCHEMA = `{
       "line": 42,
       "severity": "error | warning | info",
       "message": "Description of the drift or incomplete fulfillment",
-      "pattern": "intent_drift | incomplete_fulfillment"
+      "pattern": "intent_drift | incomplete_fulfillment | scope_creep"
     }
   ],
   "summary": "Brief 1-sentence summary",
@@ -261,12 +261,20 @@ The agent didn't finish everything that was asked:
 - Agent said "I'll skip X for now" for something the user explicitly requested
 - Tests not written when user asked for tests
 
+### Scope Creep
+The agent added functionality the user never asked for:
+- User asks to fix a bug → agent also adds a cooldown, retry logic, or caching layer
+- User asks to investigate → agent proactively "fixes" things beyond what was discussed
+- User asks for one feature → agent bundles in extra features "while we're at it"
+- Any new mechanism not traceable to a user instruction
+
 ## Red flags to search for in the diff
 
 - Fixed/hardcoded values where dynamic behavior was requested
 - TODO, FIXME, placeholder, stub comments in new code
 - Empty function bodies or early returns
 - Interface fields that are declared but never assigned anywhere
+- New mechanisms (cooldowns, retries, caches, rate limits) not requested by the user
 
 ## Output
 
@@ -277,15 +285,15 @@ ${INTENT_DRIFT_SCHEMA}
 \`\`\`
 
 - Set \`sessionsChecked\` to the number of trace files you read
-- Set \`passed\` to \`true\` if no drift or incomplete fulfillment found
+- Set \`passed\` to \`true\` if no drift, incomplete fulfillment, or scope creep found
 - Set \`passed\` to \`false\` if any issues with severity "error" were found
-- For each issue, set \`pattern\` to either "intent_drift" or "incomplete_fulfillment"
+- For each issue, set \`pattern\` to "intent_drift", "incomplete_fulfillment", or "scope_creep"
 - You MUST write the result file even if no issues are found
 
 ## Severity guidelines
 
-- **error**: Core user intent violated — the main thing they asked for is wrong or missing
-- **warning**: Secondary requirement missed or approximated
+- **error**: Core user intent violated — the main thing they asked for is wrong or missing, or large unrequested feature added
+- **warning**: Secondary requirement missed or approximated, or small unrequested mechanism added
 - **info**: Minor simplification that mostly still works as intended${precomputedDiff ? `
 
 ## Diff (precomputed)

package/dist/triage/runner.js

@@ -17,7 +17,7 @@ const TRIAGE_DIR = '.haystack/triage';
 const TIMEOUT_MS = 300_000; // 5 minutes per checker
 /** Max agentic turns per checker — kept tight since these are read-only tasks */
 const MAX_TURNS = {
-    'code-review': 10,
+    'code-review': 5,
     'rules-validator': 10,
     'intent-drift': 10,
 };

package/dist/triage/traces.js

@@ -146,7 +146,10 @@ function extractHumanText(content) {
         return null;
     const textParts = [];
     for (const block of content) {
-        if (block?.type !== 'text' || typeof block.text !== 'string')
+        // Support both old ({type: "text", text}) and new ({id, text}) content blocks
+        if (typeof block?.text !== 'string')
+            continue;
+        if (block.type && block.type !== 'text')
             continue;
         const stripped = stripWrappers(block.text);
         if (stripped && !isSlashCommand(stripped)) {
@@ -231,9 +234,12 @@ function extractUserMessages(tracePath) {
     }
     const entries = parseJsonl(content, tracePath);
     for (const entry of entries) {
-        if (entry?.type !== 'user')
+        // Support both old format (entry.message.role === 'user') and new (entry.type === 'user')
+        const role = entry.message?.role ?? entry?.type;
+        if (role !== 'user')
             continue;
-        const msg = entry.message?.content;
+        // Support both old format ({message: {content}}) and new ({content} at top level)
+        const msg = entry.message?.content ?? entry.content;
         if (!msg)
             continue;
         const text = extractHumanText(msg);

package/dist/triage/types.d.ts

@@ -13,7 +13,7 @@ export interface TriageIssue {
     /** For rules validator: rule ID (e.g., PR001) */
     rule?: string;
     /** For intent drift: drift pattern */
-    pattern?: 'intent_drift' | 'incomplete_fulfillment';
+    pattern?: 'intent_drift' | 'incomplete_fulfillment' | 'scope_creep';
 }
 export interface CodeReviewResult {
     checker: 'code-review';

package/dist/types.d.ts

@@ -56,7 +56,9 @@ declare const DevServerSchema: z.ZodObject<{
 /** Valid AI reviewer source identifiers that the merge queue can wait for */
 export declare const AI_REVIEWER_SOURCES: readonly ["cursor", "coderabbit", "copilot", "greptile", "sourcery", "qodo", "codeant", "ellipsis", "korbit", "panto", "bito", "graphite", "deepsource", "snyk", "codacy", "sonarcloud", "sweep", "codeguru", "codereviewer", "codium"];
 export declare const AI_REVIEWER_DISPLAY_NAMES: Record<typeof AI_REVIEWER_SOURCES[number], string>;
-declare const BabysitterConfigSchema: z.ZodObject<{
+/** Maps friendly source names to exact GitHub bot login usernames. */
+export declare const AI_REVIEWER_BOT_USERNAMES: Record<typeof AI_REVIEWER_SOURCES[number], string>;
+declare const MergeQueueConfigSchema: z.ZodObject<{
     /** Enable the Haystack auto-merge queue */
     merge_queue: z.ZodOptional<z.ZodBoolean>;
     /** Automatically rebase PRs that develop merge conflicts after pushes to the base branch */
@@ -74,8 +76,40 @@ declare const BabysitterConfigSchema: z.ZodObject<{
         default_minutes?: number | undefined;
         authors?: Record<string, number> | undefined;
     }>>;
-    /** AI reviewer sources to wait for before starting the merge grace period */
-    expected_ai_reviewers: z.ZodOptional<z.ZodArray<z.ZodEnum<["cursor", "coderabbit", "copilot", "greptile", "sourcery", "qodo", "codeant", "ellipsis", "korbit", "panto", "bito", "graphite", "deepsource", "snyk", "codacy", "sonarcloud", "sweep", "codeguru", "codereviewer", "codium"]>, "many">>;
+    /** Batch multiple PRs into one CI run */
+    batch_merge: z.ZodOptional<z.ZodObject<{
+        /** Enable batch merging */
+        enabled: z.ZodOptional<z.ZodBoolean>;
+        /** Minimum PRs to form a batch */
+        min_batch_size: z.ZodOptional<z.ZodNumber>;
+        /** Maximum PRs per batch (cap: 20) */
+        max_batch_size: z.ZodOptional<z.ZodNumber>;
+        /** Seconds to wait after grace period for more PRs to accumulate (default: 30, 0 to disable) */
+        batch_window_seconds: z.ZodOptional<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        enabled?: boolean | undefined;
+        min_batch_size?: number | undefined;
+        max_batch_size?: number | undefined;
+        batch_window_seconds?: number | undefined;
+    }, {
+        enabled?: boolean | undefined;
+        min_batch_size?: number | undefined;
+        max_batch_size?: number | undefined;
+        batch_window_seconds?: number | undefined;
+    }>>;
+    /** Wait for external AI code reviewers before merging — all bots must post */
+    wait_for_reviewer: z.ZodOptional<z.ZodObject<{
+        /** GitHub bot usernames to wait for (e.g. "cursor-bugbot[bot]") */
+        bots: z.ZodArray<z.ZodString, "many">;
+        /** Give up waiting after this many minutes (default: 30) */
+        timeout_minutes: z.ZodOptional<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        bots: string[];
+        timeout_minutes?: number | undefined;
+    }, {
+        bots: string[];
+        timeout_minutes?: number | undefined;
+    }>>;
 }, "strip", z.ZodTypeAny, {
     merge_queue?: boolean | undefined;
     auto_resolve_conflicts?: boolean | undefined;
@@ -83,7 +117,16 @@ declare const BabysitterConfigSchema: z.ZodObject<{
         default_minutes?: number | undefined;
         authors?: Record<string, number> | undefined;
     } | undefined;
-    expected_ai_reviewers?: ("cursor" | "coderabbit" | "copilot" | "greptile" | "sourcery" | "qodo" | "codeant" | "ellipsis" | "korbit" | "panto" | "bito" | "graphite" | "deepsource" | "snyk" | "codacy" | "sonarcloud" | "sweep" | "codeguru" | "codereviewer" | "codium")[] | undefined;
+    batch_merge?: {
+        enabled?: boolean | undefined;
+        min_batch_size?: number | undefined;
+        max_batch_size?: number | undefined;
+        batch_window_seconds?: number | undefined;
+    } | undefined;
+    wait_for_reviewer?: {
+        bots: string[];
+        timeout_minutes?: number | undefined;
+    } | undefined;
 }, {
     merge_queue?: boolean | undefined;
     auto_resolve_conflicts?: boolean | undefined;
@@ -91,7 +134,16 @@ declare const BabysitterConfigSchema: z.ZodObject<{
         default_minutes?: number | undefined;
         authors?: Record<string, number> | undefined;
     } | undefined;
-    expected_ai_reviewers?: ("cursor" | "coderabbit" | "copilot" | "greptile" | "sourcery" | "qodo" | "codeant" | "ellipsis" | "korbit" | "panto" | "bito" | "graphite" | "deepsource" | "snyk" | "codacy" | "sonarcloud" | "sweep" | "codeguru" | "codereviewer" | "codium")[] | undefined;
+    batch_merge?: {
+        enabled?: boolean | undefined;
+        min_batch_size?: number | undefined;
+        max_batch_size?: number | undefined;
+        batch_window_seconds?: number | undefined;
+    } | undefined;
+    wait_for_reviewer?: {
+        bots: string[];
+        timeout_minutes?: number | undefined;
+    } | undefined;
 }>;
 declare const ServiceSchema: z.ZodObject<{
     /** Root directory relative to repo root */
@@ -1109,8 +1161,8 @@ export declare const HaystackConfigSchema: z.ZodObject<{
         services?: string[] | undefined;
         description?: string | undefined;
     }>>>;
-    /** Babysitter configuration for autonomous PR maintenance */
-    babysitter: z.ZodOptional<z.ZodObject<{
+    /** Merge queue configuration for autonomous PR maintenance */
+    merge_queue: z.ZodOptional<z.ZodObject<{
         /** Enable the Haystack auto-merge queue */
         merge_queue: z.ZodOptional<z.ZodBoolean>;
         /** Automatically rebase PRs that develop merge conflicts after pushes to the base branch */
@@ -1128,8 +1180,40 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             default_minutes?: number | undefined;
             authors?: Record<string, number> | undefined;
         }>>;
-        /** AI reviewer sources to wait for before starting the merge grace period */
-        expected_ai_reviewers: z.ZodOptional<z.ZodArray<z.ZodEnum<["cursor", "coderabbit", "copilot", "greptile", "sourcery", "qodo", "codeant", "ellipsis", "korbit", "panto", "bito", "graphite", "deepsource", "snyk", "codacy", "sonarcloud", "sweep", "codeguru", "codereviewer", "codium"]>, "many">>;
+        /** Batch multiple PRs into one CI run */
+        batch_merge: z.ZodOptional<z.ZodObject<{
+            /** Enable batch merging */
+            enabled: z.ZodOptional<z.ZodBoolean>;
+            /** Minimum PRs to form a batch */
+            min_batch_size: z.ZodOptional<z.ZodNumber>;
+            /** Maximum PRs per batch (cap: 20) */
+            max_batch_size: z.ZodOptional<z.ZodNumber>;
+            /** Seconds to wait after grace period for more PRs to accumulate (default: 30, 0 to disable) */
+            batch_window_seconds: z.ZodOptional<z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            enabled?: boolean | undefined;
+            min_batch_size?: number | undefined;
+            max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
+        }, {
+            enabled?: boolean | undefined;
+            min_batch_size?: number | undefined;
+            max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
+        }>>;
+        /** Wait for external AI code reviewers before merging — all bots must post */
+        wait_for_reviewer: z.ZodOptional<z.ZodObject<{
+            /** GitHub bot usernames to wait for (e.g. "cursor-bugbot[bot]") */
+            bots: z.ZodArray<z.ZodString, "many">;
+            /** Give up waiting after this many minutes (default: 30) */
+            timeout_minutes: z.ZodOptional<z.ZodNumber>;
+        }, "strip", z.ZodTypeAny, {
+            bots: string[];
+            timeout_minutes?: number | undefined;
+        }, {
+            bots: string[];
+            timeout_minutes?: number | undefined;
+        }>>;
     }, "strip", z.ZodTypeAny, {
         merge_queue?: boolean | undefined;
         auto_resolve_conflicts?: boolean | undefined;
@@ -1137,7 +1221,16 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             default_minutes?: number | undefined;
             authors?: Record<string, number> | undefined;
         } | undefined;
-        expected_ai_reviewers?: ("cursor" | "coderabbit" | "copilot" | "greptile" | "sourcery" | "qodo" | "codeant" | "ellipsis" | "korbit" | "panto" | "bito" | "graphite" | "deepsource" | "snyk" | "codacy" | "sonarcloud" | "sweep" | "codeguru" | "codereviewer" | "codium")[] | undefined;
+        batch_merge?: {
+            enabled?: boolean | undefined;
+            min_batch_size?: number | undefined;
+            max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
+        } | undefined;
+        wait_for_reviewer?: {
+            bots: string[];
+            timeout_minutes?: number | undefined;
+        } | undefined;
     }, {
         merge_queue?: boolean | undefined;
         auto_resolve_conflicts?: boolean | undefined;
@@ -1145,11 +1238,38 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             default_minutes?: number | undefined;
             authors?: Record<string, number> | undefined;
         } | undefined;
-        expected_ai_reviewers?: ("cursor" | "coderabbit" | "copilot" | "greptile" | "sourcery" | "qodo" | "codeant" | "ellipsis" | "korbit" | "panto" | "bito" | "graphite" | "deepsource" | "snyk" | "codacy" | "sonarcloud" | "sweep" | "codeguru" | "codereviewer" | "codium")[] | undefined;
+        batch_merge?: {
+            enabled?: boolean | undefined;
+            min_batch_size?: number | undefined;
+            max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
+        } | undefined;
+        wait_for_reviewer?: {
+            bots: string[];
+            timeout_minutes?: number | undefined;
+        } | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     version: "1";
     name?: string | undefined;
+    merge_queue?: {
+        merge_queue?: boolean | undefined;
+        auto_resolve_conflicts?: boolean | undefined;
+        merge_debounce?: {
+            default_minutes?: number | undefined;
+            authors?: Record<string, number> | undefined;
+        } | undefined;
+        batch_merge?: {
+            enabled?: boolean | undefined;
+            min_batch_size?: number | undefined;
+            max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
+        } | undefined;
+        wait_for_reviewer?: {
+            bots: string[];
+            timeout_minutes?: number | undefined;
+        } | undefined;
+    } | undefined;
     services?: Record<string, {
         command: string;
         type?: "server" | "batch" | undefined;
@@ -1251,18 +1371,27 @@ export declare const HaystackConfigSchema: z.ZodObject<{
         services?: string[] | undefined;
         description?: string | undefined;
     }> | undefined;
-    babysitter?: {
+}, {
+    version: "1";
+    name?: string | undefined;
+    merge_queue?: {
         merge_queue?: boolean | undefined;
         auto_resolve_conflicts?: boolean | undefined;
         merge_debounce?: {
             default_minutes?: number | undefined;
             authors?: Record<string, number> | undefined;
         } | undefined;
-        expected_ai_reviewers?: ("cursor" | "coderabbit" | "copilot" | "greptile" | "sourcery" | "qodo" | "codeant" | "ellipsis" | "korbit" | "panto" | "bito" | "graphite" | "deepsource" | "snyk" | "codacy" | "sonarcloud" | "sweep" | "codeguru" | "codereviewer" | "codium")[] | undefined;
+        batch_merge?: {
+            enabled?: boolean | undefined;
+            min_batch_size?: number | undefined;
+            max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
+        } | undefined;
+        wait_for_reviewer?: {
+            bots: string[];
+            timeout_minutes?: number | undefined;
+        } | undefined;
     } | undefined;
-}, {
-    version: "1";
-    name?: string | undefined;
     services?: Record<string, {
         command: string;
         type?: "server" | "batch" | undefined;
@@ -1364,15 +1493,6 @@ export declare const HaystackConfigSchema: z.ZodObject<{
         services?: string[] | undefined;
         description?: string | undefined;
     }> | undefined;
-    babysitter?: {
-        merge_queue?: boolean | undefined;
-        auto_resolve_conflicts?: boolean | undefined;
-        merge_debounce?: {
-            default_minutes?: number | undefined;
-            authors?: Record<string, number> | undefined;
-        } | undefined;
-        expected_ai_reviewers?: ("cursor" | "coderabbit" | "copilot" | "greptile" | "sourcery" | "qodo" | "codeant" | "ellipsis" | "korbit" | "panto" | "bito" | "graphite" | "deepsource" | "snyk" | "codacy" | "sonarcloud" | "sweep" | "codeguru" | "codereviewer" | "codium")[] | undefined;
-    } | undefined;
 }>;
 export type HaystackConfig = z.infer<typeof HaystackConfigSchema>;
 export type VerificationCommand = z.infer<typeof VerificationCommandSchema>;
@@ -1392,7 +1512,7 @@ export type DockerService = z.infer<typeof DockerServiceSchema>;
 export type DatabaseConfig = z.infer<typeof DatabaseConfigSchema>;
 export type NetworkConfig = z.infer<typeof NetworkConfigSchema>;
 export type SecretDeclaration = z.infer<typeof SecretDeclarationSchema>;
-export type BabysitterConfig = z.infer<typeof BabysitterConfigSchema>;
+export type MergeQueueConfig = z.infer<typeof MergeQueueConfigSchema>;
 /**
  * Project detection results
  */