@haystackeditor/cli 0.11.0 → 0.12.0

package/dist/index.js

@@ -11,7 +11,7 @@
  *   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
@@ -23,11 +23,10 @@ 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';
@@ -95,7 +94,8 @@ 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.
@@ -113,12 +113,17 @@ Pre-PR Triage:
 
   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".
@@ -128,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
@@ -141,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
@@ -182,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
@@ -429,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/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/types.d.ts

@@ -84,14 +84,18 @@ declare const MergeQueueConfigSchema: z.ZodObject<{
         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<{
@@ -117,6 +121,7 @@ declare const MergeQueueConfigSchema: z.ZodObject<{
         enabled?: boolean | undefined;
         min_batch_size?: number | undefined;
         max_batch_size?: number | undefined;
+        batch_window_seconds?: number | undefined;
     } | undefined;
     wait_for_reviewer?: {
         bots: string[];
@@ -133,6 +138,7 @@ declare const MergeQueueConfigSchema: z.ZodObject<{
         enabled?: boolean | undefined;
         min_batch_size?: number | undefined;
         max_batch_size?: number | undefined;
+        batch_window_seconds?: number | undefined;
     } | undefined;
     wait_for_reviewer?: {
         bots: string[];
@@ -1182,14 +1188,18 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             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<{
@@ -1215,6 +1225,7 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             enabled?: boolean | undefined;
             min_batch_size?: number | undefined;
             max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
         } | undefined;
         wait_for_reviewer?: {
             bots: string[];
@@ -1231,6 +1242,7 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             enabled?: boolean | undefined;
             min_batch_size?: number | undefined;
             max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
         } | undefined;
         wait_for_reviewer?: {
             bots: string[];
@@ -1251,6 +1263,7 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             enabled?: boolean | undefined;
             min_batch_size?: number | undefined;
             max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
         } | undefined;
         wait_for_reviewer?: {
             bots: string[];
@@ -1372,6 +1385,7 @@ export declare const HaystackConfigSchema: z.ZodObject<{
             enabled?: boolean | undefined;
             min_batch_size?: number | undefined;
             max_batch_size?: number | undefined;
+            batch_window_seconds?: number | undefined;
         } | undefined;
         wait_for_reviewer?: {
             bots: string[];

package/dist/types.js

@@ -138,6 +138,8 @@ const MergeQueueConfigSchema = z.object({
         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({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haystackeditor/cli",
-  "version": "0.11.0",
+  "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);
-    }
-}