@haystackeditor/cli 0.10.3 → 0.12.0

package/dist/commands/config.js

@@ -9,7 +9,7 @@ import { readFileSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 import { execSync } from 'child_process';
 import { loadToken } from './login.js';
-import { AI_REVIEWER_SOURCES, AI_REVIEWER_DISPLAY_NAMES } from '../types.js';
+import { AI_REVIEWER_SOURCES, AI_REVIEWER_DISPLAY_NAMES, AI_REVIEWER_BOT_USERNAMES } from '../types.js';
 const API_BASE = 'https://haystackeditor.com/api/preferences';
 const AGENTIC_TOOL_LABELS = {
     'opencode': 'OpenCode (Haystack billing)',
@@ -166,10 +166,17 @@ export async function handleAgenticTool(tool) {
 /**
  * Check if auto-merge is enabled for the current repo.
  * Returns false if .haystack.json is missing or on error.
+ *
+ * NOTE: This does NOT go through loadHaystackConfig() because that function
+ * calls process.exit(1) when .haystack.json is missing — which is uncatchable
+ * by try/catch. We read the file directly so missing config safely returns false.
  */
 export async function isAutoMergeEnabled() {
     try {
-        return getPreference('auto_merge');
+        const root = execSync('git rev-parse --show-toplevel', { encoding: 'utf-8' }).trim();
+        const raw = readFileSync(resolve(root, '.haystack.json'), 'utf-8');
+        const config = JSON.parse(raw);
+        return config.preferences?.auto_merge ?? false;
     }
     catch {
         return false;
@@ -228,77 +235,103 @@ export async function handleAutoMerge(action) {
 // ============================================================================
 // Wait-for-reviewers (repo-level via .haystack.json)
 // ============================================================================
-function getBabysitterConfig() {
+/** Reverse map: bot username → friendly source name */
+const BOT_USERNAME_TO_SOURCE = {};
+for (const source of AI_REVIEWER_SOURCES) {
+    BOT_USERNAME_TO_SOURCE[AI_REVIEWER_BOT_USERNAMES[source]] = source;
+}
+function getMergeQueueConfig() {
     const { config, path } = loadHaystackConfig();
-    const babysitter = config.babysitter ?? {};
-    const reviewers = babysitter.expected_ai_reviewers ?? [];
-    return { config, path, reviewers };
+    const mergeConfig = config.merge_queue ?? {};
+    const bots = mergeConfig.wait_for_reviewer?.bots ?? [];
+    return { config, path, bots };
 }
-function saveBabysitterReviewers(config, configPath, reviewers) {
-    const babysitter = config.babysitter ?? {};
-    babysitter.expected_ai_reviewers = reviewers.length > 0 ? reviewers : undefined;
-    config.babysitter = babysitter;
+function saveMergeQueueBots(config, configPath, bots, timeoutMinutes) {
+    const mergeConfig = config.merge_queue ?? {};
+    if (bots.length > 0) {
+        mergeConfig.wait_for_reviewer = {
+            bots,
+            ...(timeoutMinutes != null ? { timeout_minutes: timeoutMinutes } : mergeConfig.wait_for_reviewer?.timeout_minutes != null ? { timeout_minutes: mergeConfig.wait_for_reviewer.timeout_minutes } : {}),
+        };
+    }
+    else {
+        delete mergeConfig.wait_for_reviewer;
+    }
+    // Always write to merge_queue (new key)
+    config.merge_queue = mergeConfig;
     saveHaystackConfig(config, configPath);
 }
-function printAvailableReviewers(currentReviewers) {
-    const currentSet = new Set(currentReviewers);
+function printAvailableReviewers(currentBots) {
+    const currentSet = new Set(currentBots);
     console.log(chalk.dim('Available AI reviewer sources:'));
     for (const source of AI_REVIEWER_SOURCES) {
         const name = AI_REVIEWER_DISPLAY_NAMES[source];
-        const active = currentSet.has(source);
+        const botUsername = AI_REVIEWER_BOT_USERNAMES[source];
+        const active = currentSet.has(botUsername);
         const marker = active ? chalk.green('  ✓ ') : '    ';
-        console.log(`${marker}${chalk.cyan(source)} — ${name}`);
+        console.log(`${marker}${chalk.cyan(source)} — ${name} ${chalk.dim(`(${botUsername})`)}`);
     }
     console.log();
 }
-function validateReviewerSources(sources) {
-    const validSet = new Set(AI_REVIEWER_SOURCES);
-    const invalid = sources.filter(s => !validSet.has(s));
-    if (invalid.length > 0) {
-        console.error(chalk.red(`\nUnknown reviewer source(s): ${invalid.join(', ')}`));
-        console.log(chalk.dim(`\nValid sources: ${AI_REVIEWER_SOURCES.join(', ')}`));
-        process.exit(1);
+/** Resolve a source name (e.g. "cursor") to its GitHub bot username. Also accepts raw bot usernames. */
+function resolveToBot(input) {
+    const lower = input.toLowerCase();
+    // Check if it's a known friendly source name
+    if (AI_REVIEWER_SOURCES.includes(lower)) {
+        return AI_REVIEWER_BOT_USERNAMES[lower];
     }
-    return sources;
+    // Already a bot username (e.g. "cursor-bugbot[bot]")
+    return input;
+}
+function displayName(botUsername) {
+    const source = BOT_USERNAME_TO_SOURCE[botUsername];
+    if (source) {
+        return `${AI_REVIEWER_DISPLAY_NAMES[source]} (${botUsername})`;
+    }
+    return botUsername;
 }
 export async function handleWaitForReviewers(action, reviewers) {
     const normalizedAction = action?.toLowerCase();
     // Default: show status
     if (!normalizedAction || normalizedAction === 'list' || normalizedAction === 'status') {
-        const { reviewers: current } = getBabysitterConfig();
-        console.log(chalk.bold('\nMerge queue — expected AI reviewers\n'));
-        if (current.length > 0) {
-            console.log('The merge queue will wait for these external reviewers before merging:');
-            for (const source of current) {
-                const name = AI_REVIEWER_DISPLAY_NAMES[source] ?? source;
-                console.log(`  ${chalk.green(name)} ${chalk.dim(`(${source})`)}`);
+        const { bots } = getMergeQueueConfig();
+        console.log(chalk.bold('\nWait for AI reviewers\n'));
+        if (bots.length > 0) {
+            console.log('Haystack will wait for ALL of these bots to post before showing PRs in the inbox:');
+            for (const bot of bots) {
+                console.log(`  ${chalk.green(displayName(bot))}`);
             }
+            console.log();
+            console.log(chalk.dim('Note: AI reviewers with check runs (CodeRabbit, Greptile, Cursor BugBot, etc.)'));
+            console.log(chalk.dim('are detected automatically. Only configure review-only bots here (e.g. Copilot).'));
         }
         else {
-            console.log('No external AI reviewers configured.');
-            console.log(chalk.dim('The merge queue will not wait for any external reviewers.'));
+            console.log('No review-only AI reviewers configured.');
+            console.log(chalk.dim('AI reviewers with check runs are still detected automatically.'));
         }
         console.log();
-        printAvailableReviewers(current);
-        console.log(chalk.dim('Add with: haystack config wait-for-reviewers add <source>'));
+        printAvailableReviewers(bots);
+        console.log(chalk.dim('Add with:    haystack config wait-for-reviewers add cursor coderabbit'));
+        console.log(chalk.dim('Or raw bot:  haystack config wait-for-reviewers add cursor-bugbot[bot]'));
         console.log();
         return;
     }
     if (normalizedAction === 'add') {
         if (!reviewers || reviewers.length === 0) {
-            console.error(chalk.red('\nSpecify at least one reviewer source to add.'));
-            const { reviewers: current } = getBabysitterConfig();
+            console.error(chalk.red('\nSpecify at least one reviewer to add.'));
+            const { bots } = getMergeQueueConfig();
             console.log();
-            printAvailableReviewers(current);
+            printAvailableReviewers(bots);
             process.exit(1);
+            return; // unreachable — satisfies TS narrowing
         }
-        const validated = validateReviewerSources(reviewers);
-        const { config, path, reviewers: current } = getBabysitterConfig();
-        const merged = Array.from(new Set([...current, ...validated]));
-        saveBabysitterReviewers(config, path, merged);
-        const added = validated.filter(s => !current.includes(s));
+        const resolved = reviewers.map(resolveToBot);
+        const { config, path, bots: current } = getMergeQueueConfig();
+        const merged = Array.from(new Set([...current, ...resolved]));
+        saveMergeQueueBots(config, path, merged);
+        const added = resolved.filter(b => !current.includes(b));
         if (added.length > 0) {
-            console.log(chalk.green(`\nAdded: ${added.map(s => AI_REVIEWER_DISPLAY_NAMES[s] ?? s).join(', ')}`));
+            console.log(chalk.green(`\nAdded: ${added.map(displayName).join(', ')}`));
         }
         else {
             console.log(chalk.dim('\nAll specified reviewers were already configured.'));
@@ -308,17 +341,18 @@ export async function handleWaitForReviewers(action, reviewers) {
     }
     if (normalizedAction === 'remove') {
         if (!reviewers || reviewers.length === 0) {
-            console.error(chalk.red('\nSpecify at least one reviewer source to remove.'));
+            console.error(chalk.red('\nSpecify at least one reviewer to remove.'));
             process.exit(1);
+            return; // unreachable — satisfies TS narrowing
         }
-        const validated = validateReviewerSources(reviewers);
-        const { config, path, reviewers: current } = getBabysitterConfig();
-        const removeSet = new Set(validated);
-        const remaining = current.filter(s => !removeSet.has(s));
-        saveBabysitterReviewers(config, path, remaining);
-        const removed = validated.filter(s => current.includes(s));
+        const resolved = reviewers.map(resolveToBot);
+        const { config, path, bots: current } = getMergeQueueConfig();
+        const removeSet = new Set(resolved);
+        const remaining = current.filter(b => !removeSet.has(b));
+        saveMergeQueueBots(config, path, remaining);
+        const removed = resolved.filter(b => current.includes(b));
         if (removed.length > 0) {
-            console.log(chalk.yellow(`\nRemoved: ${removed.map(s => AI_REVIEWER_DISPLAY_NAMES[s] ?? s).join(', ')}`));
+            console.log(chalk.yellow(`\nRemoved: ${removed.map(displayName).join(', ')}`));
         }
         else {
             console.log(chalk.dim('\nNone of the specified reviewers were configured.'));
@@ -327,28 +361,19 @@ export async function handleWaitForReviewers(action, reviewers) {
         return;
     }
     if (normalizedAction === 'clear') {
-        const { config, path } = getBabysitterConfig();
-        saveBabysitterReviewers(config, path, []);
+        const { config, path } = getMergeQueueConfig();
+        saveMergeQueueBots(config, path, []);
         console.log(chalk.yellow('\nCleared all expected AI reviewers.'));
         console.log(chalk.dim('The merge queue will not wait for any external reviewers.'));
         console.log(chalk.dim('Commit .haystack.json to share with your team.\n'));
         return;
     }
-    // Unknown action — maybe the user passed a reviewer name directly
-    // Try treating action + reviewers as all reviewer names for 'add'
-    const allNames = [action, ...(reviewers ?? [])];
-    const validSet = new Set(AI_REVIEWER_SOURCES);
-    if (allNames.every(n => validSet.has(n))) {
-        // Treat as implicit 'add'
-        const validated = validateReviewerSources(allNames);
-        const { config, path, reviewers: current } = getBabysitterConfig();
-        const merged = Array.from(new Set([...current, ...validated]));
-        saveBabysitterReviewers(config, path, merged);
-        console.log(chalk.green(`\nAdded: ${validated.map(s => AI_REVIEWER_DISPLAY_NAMES[s] ?? s).join(', ')}`));
-        console.log(chalk.dim('Commit .haystack.json to share with your team.\n'));
-        return;
-    }
-    console.error(chalk.red(`\nUnknown action: ${action}`));
-    console.log('\nUsage: haystack config wait-for-reviewers [list|add|remove|clear] [sources...]\n');
-    process.exit(1);
+    // Unknown action — maybe the user passed reviewer names directly (implicit 'add')
+    const allNames = [action, ...(reviewers ?? [])].filter(Boolean);
+    const resolved = allNames.map(resolveToBot);
+    const { config, path, bots: current } = getMergeQueueConfig();
+    const merged = Array.from(new Set([...current, ...resolved]));
+    saveMergeQueueBots(config, path, merged);
+    console.log(chalk.green(`\nAdded: ${resolved.map(displayName).join(', ')}`));
+    console.log(chalk.dim('Commit .haystack.json to share with your team.\n'));
 }

package/dist/commands/dismiss.js

@@ -161,7 +161,8 @@ async function runOverride(identifier, type, commandName) {
         console.log(chalk.green(`\n  Review marked as not needed for ${prLabel}`));
     }
     console.log(chalk.dim(`  Commit: ${headSha.slice(0, 7)}`));
-    console.log(chalk.dim('  The PR will move to "Good to Merge" in the feed.\n'));
+    console.log(chalk.dim('  The PR will move to "Good to Merge" in the feed.'));
+    console.log(chalk.dim('  If a new commit introduces net-new issues, the PR will resurface.\n'));
 }
 // ============================================================================
 // Exported commands

package/dist/commands/install-session-hooks.d.ts

@@ -1,8 +1,9 @@
 /**
  * install-session-hooks — Wire up session-start hooks for coding CLIs.
  *
- * When a CLI session starts, `haystack check-pending --hook` runs automatically
- * and shows the user whether their pending PRs are "Good to merge" or "Need input".
+ * When a CLI session starts, `haystack triage --hook` runs automatically
+ * and shows the user whether their last submitted PR is "Good to merge" or
+ * "Needs input", with the Haystack rating and auto-fixer status.
  *
  * Supported CLIs:
  *   - Claude Code: Native SessionStart hook in .claude/settings.json

package/dist/commands/install-session-hooks.js

@@ -1,8 +1,9 @@
 /**
  * install-session-hooks — Wire up session-start hooks for coding CLIs.
  *
- * When a CLI session starts, `haystack check-pending --hook` runs automatically
- * and shows the user whether their pending PRs are "Good to merge" or "Need input".
+ * When a CLI session starts, `haystack triage --hook` runs automatically
+ * and shows the user whether their last submitted PR is "Good to merge" or
+ * "Needs input", with the Haystack rating and auto-fixer status.
  *
  * Supported CLIs:
  *   - Claude Code: Native SessionStart hook in .claude/settings.json
@@ -41,7 +42,7 @@ function detectInstalledCLIs() {
 // ============================================================================
 // Claude Code: Native SessionStart hook
 // ============================================================================
-const HAYSTACK_HOOK_COMMAND = 'haystack check-pending --hook';
+const HAYSTACK_HOOK_COMMAND = 'haystack triage --hook';
 function installClaudeHook(gitRoot) {
     const settingsDir = join(gitRoot, '.claude');
     const settingsPath = join(settingsDir, 'settings.json');
@@ -61,13 +62,28 @@ function installClaudeHook(gitRoot) {
         // Ensure SessionStart array exists
         const sessionStart = (hooks.SessionStart || []);
         hooks.SessionStart = sessionStart;
-        // Check if haystack hook already installed
-        const alreadyInstalled = sessionStart.some(entry => entry.hooks?.some(h => h.command?.includes('haystack check-pending')));
-        if (alreadyInstalled) {
-            console.log(chalk.dim('  Claude Code hook already installed.'));
+        // Check if haystack hook already installed (current or legacy)
+        const isHaystackHook = (h) => h.command?.includes('haystack triage') || h.command?.includes('haystack check-pending');
+        const existingIndex = sessionStart.findIndex(entry => entry.hooks?.some(h => isHaystackHook(h)));
+        if (existingIndex !== -1) {
+            const entry = sessionStart[existingIndex];
+            const isLegacy = entry.hooks?.some(h => h.command?.includes('haystack check-pending'));
+            if (isLegacy) {
+                // Migrate legacy hook in-place
+                for (const h of entry.hooks || []) {
+                    if (h.command?.includes('haystack check-pending')) {
+                        h.command = HAYSTACK_HOOK_COMMAND;
+                    }
+                }
+                writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+                console.log(chalk.green('  Claude Code hook migrated from check-pending to triage.'));
+            }
+            else {
+                console.log(chalk.dim('  Claude Code hook already installed.'));
+            }
             return true;
         }
-        // Add the hook
+        // Add the hook (fresh install)
         sessionStart.push({
             matcher: '',
             hooks: [
@@ -92,7 +108,7 @@ function checkClaudeHook(gitRoot) {
     try {
         const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
         const sessionStart = settings?.hooks?.SessionStart || [];
-        return sessionStart.some((entry) => entry.hooks?.some((h) => h.command?.includes('haystack check-pending')));
+        return sessionStart.some((entry) => entry.hooks?.some((h) => h.command?.includes('haystack triage') || h.command?.includes('haystack check-pending')));
     }
     catch {
         return false;
@@ -109,7 +125,7 @@ ${CODEX_HOOK_MARKER}
 When starting a new session, run this command first to check for pending PR analysis results:
 
 \`\`\`bash
-haystack check-pending --hook
+haystack triage --hook
 \`\`\`
 
 This shows whether your submitted PRs are "Good to merge" or "Need your input".
@@ -157,7 +173,7 @@ ${GEMINI_HOOK_MARKER}
 When starting a new session, run this command first to check for pending PR analysis results:
 
 \`\`\`bash
-haystack check-pending --hook
+haystack triage --hook
 \`\`\`
 
 This shows whether your submitted PRs are "Good to merge" or "Need your input".

package/dist/commands/pr-status.d.ts

@@ -13,4 +13,9 @@
 export interface PRStatusOptions {
     json?: boolean;
 }
+export declare const BUCKET_DISPLAY: Record<string, {
+    label: string;
+    color: (s: string) => string;
+    icon: string;
+}>;
 export declare function prStatusCommand(identifier: string, options: PRStatusOptions): Promise<void>;

package/dist/commands/pr-status.js

@@ -46,9 +46,9 @@ function parsePRIdentifier(identifier) {
 // ============================================================================
 // Display helpers
 // ============================================================================
-const BUCKET_DISPLAY = {
+export const BUCKET_DISPLAY = {
     'analyzing': { label: 'Analyzing', color: chalk.blue, icon: '...' },
-    'auto-fixing': { label: 'Auto-fixing', color: chalk.blue, icon: '>>>' },
+    'auto-fixing': { label: 'Auto-fixing (alpha)', color: chalk.blue, icon: '>>>' },
     'good-to-merge': { label: 'Good to Merge', color: chalk.green, icon: '[+]' },
     'failed-when-merging': { label: 'Failed When Merging', color: chalk.red, icon: '[!]' },
     'issues': { label: 'Issues Found', color: chalk.yellow, icon: '[?]' },

package/dist/commands/request-review.d.ts

@@ -0,0 +1,15 @@
+/**
+ * request-review command — Tag a PR as needing human review after creation.
+ *
+ * haystack request-review <pr> [reviewer]
+ *
+ * Adds the `haystack:needs-review` label to the PR. Optionally requests
+ * review from a specific GitHub user. The PR will move to the
+ * "Needs Assignment" or "Awaiting Review" bucket in the Haystack feed.
+ *
+ * Accepts a PR identifier in several formats:
+ *   123                                    # Uses current repo's owner/repo
+ *   owner/repo#123                         # Fully qualified
+ *   https://github.com/owner/repo/pull/123 # GitHub URL
+ */
+export declare function requestReviewCommand(identifier: string, reviewer?: string): Promise<void>;

package/dist/commands/request-review.js

@@ -0,0 +1,95 @@
+/**
+ * request-review command — Tag a PR as needing human review after creation.
+ *
+ * haystack request-review <pr> [reviewer]
+ *
+ * Adds the `haystack:needs-review` label to the PR. Optionally requests
+ * review from a specific GitHub user. The PR will move to the
+ * "Needs Assignment" or "Awaiting Review" bucket in the Haystack feed.
+ *
+ * Accepts a PR identifier in several formats:
+ *   123                                    # Uses current repo's owner/repo
+ *   owner/repo#123                         # Fully qualified
+ *   https://github.com/owner/repo/pull/123 # GitHub URL
+ */
+import chalk from 'chalk';
+import { loadToken } from './login.js';
+import { parseRemoteUrl } from '../utils/git.js';
+import { ensureHaystackLabels, addLabelsToIssue, requestReviewers, } from '../utils/github-api.js';
+// ============================================================================
+// PR identifier parsing (shared pattern with dismiss.ts)
+// ============================================================================
+function parsePRIdentifier(identifier) {
+    const urlMatch = identifier.match(/^https?:\/\/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)\/?$/);
+    if (urlMatch) {
+        return { owner: urlMatch[1], repo: urlMatch[2], prNumber: parseInt(urlMatch[3], 10) };
+    }
+    const qualifiedMatch = identifier.match(/^([^/]+)\/([^#]+)#(\d+)$/);
+    if (qualifiedMatch) {
+        return { owner: qualifiedMatch[1], repo: qualifiedMatch[2], prNumber: parseInt(qualifiedMatch[3], 10) };
+    }
+    const numberMatch = identifier.match(/^#?(\d+)$/);
+    if (numberMatch) {
+        const prNumber = parseInt(numberMatch[1], 10);
+        try {
+            const remote = parseRemoteUrl('origin');
+            return { owner: remote.owner, repo: remote.repo, prNumber };
+        }
+        catch {
+            throw new Error(`Cannot determine repository for PR #${prNumber}.\n` +
+                `Use the full format: haystack request-review owner/repo#${prNumber}`);
+        }
+    }
+    throw new Error(`Invalid PR identifier: "${identifier}"\n\n` +
+        `Accepted formats:\n` +
+        `  haystack request-review 123\n` +
+        `  haystack request-review owner/repo#123\n` +
+        `  haystack request-review https://github.com/owner/repo/pull/123`);
+}
+// ============================================================================
+// Main command
+// ============================================================================
+export async function requestReviewCommand(identifier, reviewer) {
+    // Parse PR identifier
+    let pr;
+    try {
+        pr = parsePRIdentifier(identifier);
+    }
+    catch (err) {
+        console.error(chalk.red(`\n${err.message}\n`));
+        process.exit(1);
+    }
+    // Require auth
+    const token = await loadToken();
+    if (!token) {
+        console.error(chalk.red('\nNot logged in. Run `haystack login` first.\n'));
+        process.exit(1);
+    }
+    const prLabel = `${pr.owner}/${pr.repo}#${pr.prNumber}`;
+    console.log(chalk.dim(`\nRequesting review for ${prLabel}...`));
+    // Ensure the label exists in the repo, then add it to the PR
+    try {
+        await ensureHaystackLabels(pr.owner, pr.repo, ['haystack:needs-review']);
+        await addLabelsToIssue(pr.owner, pr.repo, pr.prNumber, ['haystack:needs-review']);
+    }
+    catch (err) {
+        console.error(chalk.red(`\nFailed to add label: ${err.message}\n`));
+        process.exit(1);
+    }
+    // Request specific reviewer if provided
+    if (reviewer) {
+        try {
+            await requestReviewers(pr.owner, pr.repo, pr.prNumber, [reviewer]);
+            console.log(chalk.green(`\n  Review requested from ${reviewer} on ${prLabel}`));
+        }
+        catch (err) {
+            // Label was added successfully, just the reviewer request failed
+            console.log(chalk.green(`\n  Marked ${prLabel} for review`));
+            console.log(chalk.yellow(`  Could not request reviewer "${reviewer}": ${err.message}`));
+        }
+    }
+    else {
+        console.log(chalk.green(`\n  Marked ${prLabel} for human review`));
+    }
+    console.log(chalk.dim('  The PR will appear in the "Needs Assignment" queue in the feed.\n'));
+}

package/dist/commands/setup.d.ts

@@ -9,5 +9,6 @@
  * 5. Scan for review policies
  * 6. Review discovered items (toggle on/off)
  * 7. Confirm & write .haystack.json to selected repos
+ * 8. Install session tracking (Entire CLI + .entire/settings.json + local hooks)
  */
 export declare function setupCommand(): Promise<void>;