@haystackeditor/cli 0.10.3 → 0.12.0

package/dist/types.js

@@ -94,8 +94,31 @@ export const AI_REVIEWER_DISPLAY_NAMES = {
     codereviewer: 'CodeReviewBot',
     codium: 'Codium',
 };
+/** Maps friendly source names to exact GitHub bot login usernames. */
+export const AI_REVIEWER_BOT_USERNAMES = {
+    cursor: 'cursor-bugbot[bot]',
+    coderabbit: 'coderabbitai[bot]',
+    copilot: 'copilot[bot]',
+    greptile: 'greptile[bot]',
+    sourcery: 'sourcery-ai[bot]',
+    qodo: 'qodo-merge-pro[bot]',
+    codeant: 'codeant-ai[bot]',
+    ellipsis: 'ellipsis-dev[bot]',
+    korbit: 'korbit-ai[bot]',
+    panto: 'pantoaibot[bot]',
+    bito: 'bito[bot]',
+    graphite: 'graphite-app[bot]',
+    deepsource: 'deepsource-io[bot]',
+    snyk: 'snyk[bot]',
+    codacy: 'codacy-production[bot]',
+    sonarcloud: 'sonarcloud[bot]',
+    sweep: 'sweep-ai[bot]',
+    codeguru: 'aws-codeguru-reviewer[bot]',
+    codereviewer: 'codereviewbot[bot]',
+    codium: 'codiumai[bot]',
+};
 const AIReviewerSourceSchema = z.enum(AI_REVIEWER_SOURCES);
-const BabysitterConfigSchema = z.object({
+const MergeQueueConfigSchema = z.object({
     /** Enable the Haystack auto-merge queue */
     merge_queue: z.boolean().optional(),
     /** Automatically rebase PRs that develop merge conflicts after pushes to the base branch */
@@ -107,8 +130,24 @@ const BabysitterConfigSchema = z.object({
         /** Per-author wait time overrides (author login → minutes) */
         authors: z.record(z.string(), z.number()).optional(),
     }).optional(),
-    /** AI reviewer sources to wait for before starting the merge grace period */
-    expected_ai_reviewers: z.array(AIReviewerSourceSchema).optional(),
+    /** Batch multiple PRs into one CI run */
+    batch_merge: z.object({
+        /** Enable batch merging */
+        enabled: z.boolean().optional(),
+        /** Minimum PRs to form a batch */
+        min_batch_size: z.number().optional(),
+        /** Maximum PRs per batch (cap: 20) */
+        max_batch_size: z.number().optional(),
+        /** Seconds to wait after grace period for more PRs to accumulate (default: 30, 0 to disable) */
+        batch_window_seconds: z.number().optional(),
+    }).optional(),
+    /** Wait for external AI code reviewers before merging — all bots must post */
+    wait_for_reviewer: z.object({
+        /** GitHub bot usernames to wait for (e.g. "cursor-bugbot[bot]") */
+        bots: z.array(z.string()),
+        /** Give up waiting after this many minutes (default: 30) */
+        timeout_minutes: z.number().optional(),
+    }).optional(),
 });
 // =============================================================================
 // SERVICE (for monorepos)
@@ -253,6 +292,6 @@ export const HaystackConfigSchema = z.object({
     network: NetworkConfigSchema.optional(),
     /** Secrets required by this project */
     secrets: z.record(z.string(), SecretDeclarationSchema).optional(),
-    /** Babysitter configuration for autonomous PR maintenance */
-    babysitter: BabysitterConfigSchema.optional(),
+    /** Merge queue configuration for autonomous PR maintenance */
+    merge_queue: MergeQueueConfigSchema.optional(),
 });

package/dist/utils/analysis-api.d.ts

@@ -105,4 +105,20 @@ export declare function fetchAnalysisResults(owner: string, repo: string, prNumb
  * This is the rich analysis data shown on the Haystack feed — includes
  * verdict, rating, structured findings, verified bugs, and agent fix prompts.
  */
+export interface AutoFixManifest {
+    jobId: string;
+    repo: string;
+    prNumber: number;
+    fixedItems: Array<{
+        category: string;
+        summary: string;
+    }>;
+    leftForReview: Array<{
+        category: string;
+        summary: string;
+        reason: string;
+    }>;
+    timestamp: string;
+}
+export declare function fetchAutoFixManifest(owner: string, repo: string, prNumber: number, token?: string): Promise<AutoFixManifest | null>;
 export declare function fetchRatingSynthesis(owner: string, repo: string, prNumber: number, token?: string): Promise<RatingSynthesis | null>;

package/dist/utils/analysis-api.js

@@ -160,11 +160,29 @@ export async function fetchAnalysisResults(owner, repo, prNumber, token) {
         autoMerged,
     };
 }
-/**
- * Fetch the full rating synthesis for a PR.
- * This is the rich analysis data shown on the Haystack feed — includes
- * verdict, rating, structured findings, verified bugs, and agent fix prompts.
- */
+export async function fetchAutoFixManifest(owner, repo, prNumber, token) {
+    const url = `${PROD_API_BASE}/v3/result/${owner}/${repo}/${prNumber}/auto-fix-manifest.json`;
+    try {
+        const response = await fetch(url, {
+            headers: apiHeaders(token),
+        });
+        if (!response.ok)
+            return null;
+        const data = await response.json();
+        if (data.download_url) {
+            const s3Resp = await fetch(data.download_url, {
+                headers: { 'User-Agent': 'Haystack-CLI' },
+            });
+            if (!s3Resp.ok)
+                return null;
+            return await s3Resp.json();
+        }
+        return data;
+    }
+    catch {
+        return null;
+    }
+}
 export async function fetchRatingSynthesis(owner, repo, prNumber, token) {
     // Use v3/result endpoint (same as the Lambda serves generic files)
     const url = `${PROD_API_BASE}/v3/result/${owner}/${repo}/${prNumber}/rating_synthesis.json`;

package/dist/utils/telemetry.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Lightweight CLI telemetry — fire-and-forget error tracking via PostHog HTTP API.
+ *
+ * Events go to the same PostHog project as the web app, enabling unified
+ * alerting across frontend, CLI, and backend.
+ *
+ * All calls are non-blocking and never throw — telemetry failures must not
+ * break CLI commands.
+ */
+/**
+ * Track an error event. Fire-and-forget — never throws.
+ */
+export declare function trackError(errorType: string, metadata?: Record<string, unknown>): void;
+/**
+ * Track a setup event (non-error). Fire-and-forget.
+ */
+export declare function trackSetupEvent(step: string, metadata?: Record<string, unknown>): void;

package/dist/utils/telemetry.js

@@ -0,0 +1,109 @@
+/**
+ * Lightweight CLI telemetry — fire-and-forget error tracking via PostHog HTTP API.
+ *
+ * Events go to the same PostHog project as the web app, enabling unified
+ * alerting across frontend, CLI, and backend.
+ *
+ * All calls are non-blocking and never throw — telemetry failures must not
+ * break CLI commands.
+ */
+import { readFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import * as os from 'os';
+const POSTHOG_HOST = 'https://us.i.posthog.com';
+const POSTHOG_API_KEY = process.env.HAYSTACK_POSTHOG_KEY || 'phc_7wHrCoMlcwuftLe6N38hPb9wKHb4OK0wNw9ayeRySad';
+const CURRENT_FILE_DIR = dirname(fileURLToPath(import.meta.url));
+const PACKAGE_JSON_PATH = resolve(CURRENT_FILE_DIR, '../../package.json');
+/**
+ * Stable machine identifier for PostHog distinct_id.
+ * Uses hostname + username so events are attributable per-machine.
+ * Never throws — falls back to hostname-only or 'anonymous'.
+ */
+function getDistinctId() {
+    try {
+        const hostname = os.hostname();
+        try {
+            return `cli:${os.userInfo().username}@${hostname}`;
+        }
+        catch {
+            return `cli:${hostname}`;
+        }
+    }
+    catch {
+        return 'cli:anonymous';
+    }
+}
+/**
+ * Track an error event. Fire-and-forget — never throws.
+ */
+export function trackError(errorType, metadata) {
+    try {
+        if (typeof globalThis.fetch !== 'function')
+            return;
+        const event = {
+            api_key: POSTHOG_API_KEY,
+            distinct_id: getDistinctId(),
+            event: 'cli_error',
+            properties: {
+                error_type: errorType,
+                cli_version: getCLIVersion(),
+                os: process.platform,
+                arch: process.arch,
+                node_version: process.version,
+                timestamp: new Date().toISOString(),
+                ...metadata,
+            },
+            timestamp: new Date().toISOString(),
+        };
+        // Fire-and-forget — never block the CLI
+        globalThis.fetch(`${POSTHOG_HOST}/capture/`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(event),
+        }).catch(() => { });
+    }
+    catch {
+        // Telemetry must never crash the CLI
+    }
+}
+/**
+ * Track a setup event (non-error). Fire-and-forget.
+ */
+export function trackSetupEvent(step, metadata) {
+    try {
+        if (typeof globalThis.fetch !== 'function')
+            return;
+        const event = {
+            api_key: POSTHOG_API_KEY,
+            distinct_id: getDistinctId(),
+            event: 'cli_setup',
+            properties: {
+                step,
+                cli_version: getCLIVersion(),
+                os: process.platform,
+                arch: process.arch,
+                timestamp: new Date().toISOString(),
+                ...metadata,
+            },
+            timestamp: new Date().toISOString(),
+        };
+        globalThis.fetch(`${POSTHOG_HOST}/capture/`, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(event),
+        }).catch(() => { });
+    }
+    catch {
+        // Telemetry must never crash the CLI
+    }
+}
+function getCLIVersion() {
+    try {
+        const packageJson = JSON.parse(readFileSync(PACKAGE_JSON_PATH, 'utf8'));
+        return typeof packageJson.version === 'string' ? packageJson.version : 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haystackeditor/cli",
-  "version": "0.10.3",
+  "version": "0.12.0",
   "description": "Set up Haystack for your project — automated PR review, triage, and merge queue",
   "type": "module",
   "bin": {

package/dist/commands/check-pending.d.ts

@@ -1,19 +0,0 @@
-/**
- * check-pending command — Check status of pending Haystack analysis.
- *
- * Reads `.haystack/pending-submit.json`, polls the analysis API if needed,
- * and outputs a two-state verdict:
- *   - "Good to merge" (no issues)
- *   - "Needs your input" (issues found)
- *
- * Output modes:
- *   --hook    Minimal single-line for session-start hooks
- *   --json    Machine-readable JSON
- *   (default) Rich terminal output
- */
-export interface CheckPendingOptions {
-    json?: boolean;
-    hook?: boolean;
-    clear?: boolean;
-}
-export declare function checkPendingCommand(options: CheckPendingOptions): Promise<void>;

package/dist/commands/check-pending.js

@@ -1,217 +0,0 @@
-/**
- * check-pending command — Check status of pending Haystack analysis.
- *
- * Reads `.haystack/pending-submit.json`, polls the analysis API if needed,
- * and outputs a two-state verdict:
- *   - "Good to merge" (no issues)
- *   - "Needs your input" (issues found)
- *
- * Output modes:
- *   --hook    Minimal single-line for session-start hooks
- *   --json    Machine-readable JSON
- *   (default) Rich terminal output
- */
-import chalk from 'chalk';
-import { loadPendingSubmit, updatePendingSubmit, clearPendingSubmit } from '../utils/pending-state.js';
-import { checkAnalysisReady, fetchAnalysisResults } from '../utils/analysis-api.js';
-import { findExistingPR } from '../utils/github-api.js';
-import { loadToken } from './login.js';
-// ============================================================================
-// Polling
-// ============================================================================
-const POLL_INTERVAL_MS = 3_000;
-const POLL_TIMEOUT_MS = 30_000;
-/**
- * Poll the result endpoint until analysis is ready or timeout.
- */
-async function waitForAnalysis(owner, repo, prNumber, timeoutMs, token) {
-    const deadline = Date.now() + timeoutMs;
-    let consecutiveErrors = 0;
-    while (Date.now() < deadline) {
-        const result = await checkAnalysisReady(owner, repo, prNumber, token);
-        if (result.status === 'ready')
-            return 'completed';
-        if (result.status === 'error') {
-            consecutiveErrors++;
-            if (consecutiveErrors >= 5)
-                return 'failed';
-        }
-        else {
-            consecutiveErrors = 0;
-        }
-        await new Promise(r => setTimeout(r, POLL_INTERVAL_MS));
-    }
-    return 'pending';
-}
-// ============================================================================
-// Output formatting
-// ============================================================================
-function printHookOutput(pending) {
-    if (!pending.analysisResult) {
-        console.log(`[Haystack] PR #${pending.prNumber}: Analysis in progress...`);
-        return;
-    }
-    const result = pending.analysisResult;
-    if (result.state === 'good-to-merge') {
-        if (result.autoMerged) {
-            console.log(`[Haystack] \u2705 PR #${pending.prNumber} "${getBranchLabel(pending)}": Auto-merged`);
-        }
-        else {
-            console.log(`[Haystack] \u2705 PR #${pending.prNumber} "${getBranchLabel(pending)}": Good to merge`);
-        }
-    }
-    else {
-        const parts = [];
-        if (result.bugCount > 0)
-            parts.push(`${result.bugCount} bug(s)`);
-        if (result.ruleViolationCount > 0)
-            parts.push(`${result.ruleViolationCount} rule violation(s)`);
-        if (parts.length === 0)
-            parts.push(`${result.warningCount} warning(s)`);
-        console.log(`[Haystack] \u26A0\uFE0F  PR #${pending.prNumber} "${getBranchLabel(pending)}": Needs your input (${parts.join(', ')})`);
-        console.log(`  Review: ${result.reviewUrl}`);
-    }
-}
-function printRichOutput(pending) {
-    console.log(chalk.bold('\n' + '\u2501'.repeat(50)));
-    console.log(chalk.bold(`  Haystack Analysis: PR #${pending.prNumber}`));
-    console.log(chalk.bold('\u2501'.repeat(50) + '\n'));
-    console.log(`  ${chalk.dim('Branch:')}  ${pending.branch} \u2192 ${pending.baseBranch}`);
-    console.log(`  ${chalk.dim('URL:')}     ${chalk.cyan(pending.prUrl)}`);
-    if (!pending.analysisResult) {
-        if (pending.status === 'polling') {
-            console.log(`  ${chalk.dim('Status:')}  ${chalk.yellow('Analysis in progress...')}`);
-        }
-        else if (pending.status === 'failed') {
-            console.log(`  ${chalk.dim('Status:')}  ${chalk.red('Analysis failed')}`);
-        }
-        else if (pending.status === 'stale') {
-            console.log(`  ${chalk.dim('Status:')}  ${chalk.dim('Stale (submitted > 2h ago)')}`);
-        }
-        console.log('');
-        return;
-    }
-    const result = pending.analysisResult;
-    if (result.state === 'good-to-merge') {
-        if (result.autoMerged) {
-            console.log(`  ${chalk.dim('Verdict:')} ${chalk.green.bold('Auto-merged')}`);
-            console.log(`  ${chalk.dim('Issues:')}  ${chalk.green('None — PR was automatically merged')}`);
-        }
-        else {
-            console.log(`  ${chalk.dim('Verdict:')} ${chalk.green.bold('Good to merge')}`);
-            console.log(`  ${chalk.dim('Issues:')}  ${chalk.green('None')}`);
-        }
-    }
-    else {
-        console.log(`  ${chalk.dim('Verdict:')} ${chalk.yellow.bold('Needs your input')}`);
-        console.log(`  ${chalk.dim('Issues:')}  ${result.summary}`);
-        console.log('');
-        for (const issue of result.issues) {
-            const icon = issue.severity === 'error' ? chalk.red('\u2717') : chalk.yellow('!');
-            const loc = issue.line ? `${issue.file}:${issue.line}` : issue.file;
-            console.log(`  ${icon} ${chalk.dim(loc)} ${issue.message}`);
-        }
-    }
-    console.log(`\n  ${chalk.dim('Review:')} ${chalk.cyan(result.reviewUrl)}`);
-    console.log('');
-}
-function printJsonOutput(pending) {
-    const output = {
-        prNumber: pending.prNumber,
-        prUrl: pending.prUrl,
-        branch: pending.branch,
-        baseBranch: pending.baseBranch,
-        status: pending.status,
-        submittedAt: pending.submittedAt,
-        verdict: pending.analysisResult?.state || null,
-        bugCount: pending.analysisResult?.bugCount || 0,
-        warningCount: pending.analysisResult?.warningCount || 0,
-        ruleViolationCount: pending.analysisResult?.ruleViolationCount || 0,
-        summary: pending.analysisResult?.summary || null,
-        issues: pending.analysisResult?.issues || [],
-        reviewUrl: pending.analysisResult?.reviewUrl || null,
-        autoMerged: pending.analysisResult?.autoMerged || false,
-    };
-    console.log(JSON.stringify(output, null, 2));
-}
-function getBranchLabel(pending) {
-    return pending.branch.replace(/^refs\/heads\//, '');
-}
-// ============================================================================
-// Main command
-// ============================================================================
-export async function checkPendingCommand(options) {
-    // Handle --clear
-    if (options.clear) {
-        clearPendingSubmit();
-        if (!options.hook) {
-            console.log(chalk.dim('Pending submit state cleared.'));
-        }
-        return;
-    }
-    // Load pending state
-    const pending = loadPendingSubmit();
-    if (!pending) {
-        if (options.json) {
-            console.log(JSON.stringify({ status: 'none' }));
-        }
-        else if (!options.hook) {
-            // Silent for hook mode — no pending submits is fine
-            console.log(chalk.dim('No pending submits.\n'));
-        }
-        return;
-    }
-    // Load token for private repo auth (best-effort, don't block if unavailable)
-    const token = await loadToken() || undefined;
-    // If still polling, try to resolve it
-    if (pending.status === 'polling') {
-        // Quick check: is the PR still open?
-        try {
-            const pr = await findExistingPR(pending.owner, pending.repo, pending.branch);
-            if (!pr) {
-                // PR was closed or merged
-                updatePendingSubmit({ status: 'stale', resolvedAt: new Date().toISOString() });
-                pending.status = 'stale';
-            }
-        }
-        catch {
-            // Auth not available or API error — continue with polling
-        }
-        if (pending.status === 'polling') {
-            // For hook mode, do a single quick poll (no waiting)
-            const timeout = options.hook ? 5_000 : POLL_TIMEOUT_MS;
-            const result = await waitForAnalysis(pending.owner, pending.repo, pending.prNumber, timeout, token);
-            if (result === 'completed') {
-                // Fetch the actual analysis results
-                try {
-                    const verdict = await fetchAnalysisResults(pending.owner, pending.repo, pending.prNumber, token);
-                    updatePendingSubmit({
-                        status: 'completed',
-                        analysisResult: verdict,
-                        resolvedAt: new Date().toISOString(),
-                    });
-                    pending.status = 'completed';
-                    pending.analysisResult = verdict;
-                }
-                catch {
-                    // Could not fetch results — leave as polling
-                }
-            }
-            else if (result === 'failed') {
-                updatePendingSubmit({ status: 'failed', resolvedAt: new Date().toISOString() });
-                pending.status = 'failed';
-            }
-            // 'pending' — leave as-is for next check
-        }
-    }
-    // Output based on mode
-    if (options.json) {
-        printJsonOutput(pending);
-    }
-    else if (options.hook) {
-        printHookOutput(pending);
-    }
-    else {
-        printRichOutput(pending);
-    }
-}