@haystackeditor/cli 0.11.0 → 0.12.1

package/dist/commands/triage.js

@@ -1,18 +1,29 @@
 /**
- * triage command — View Haystack analysis results for any PR.
+ * triage command — Show Haystack analysis results for a PR.
  *
- * Fetches the full rating synthesis (same data shown on the Haystack feed)
- * and displays verdict, findings, verified bugs, and agent fix prompts.
+ * Designed for coding agents to consume. Shows two things:
+ *   1. What the auto-fixer is already handling (so the agent doesn't duplicate work)
+ *   2. Findings with attribution and fix prompts (so the agent knows what to fix)
+ *
+ * When called without a PR identifier, reads the last submitted PR from
+ * `.haystack/pending-submit.json` (written by `haystack submit`).
  *
  * Accepts a PR identifier in several formats:
+ *   haystack triage                      # Last submitted PR
  *   haystack triage 123                  # Uses current repo's owner/repo
  *   haystack triage owner/repo#123       # Fully qualified
  *   haystack triage https://github.com/owner/repo/pull/123
+ *
+ * Output modes:
+ *   --hook    Minimal single-line for session-start hooks
+ *   --json    Machine-readable JSON
+ *   (default) Rich terminal output
  */
 import chalk from 'chalk';
 import { checkAnalysisReady, fetchRatingSynthesis, fetchAutoFixManifest } from '../utils/analysis-api.js';
 import { parseRemoteUrl } from '../utils/git.js';
 import { loadToken } from './login.js';
+import { loadPendingSubmit, updatePendingSubmit, clearPendingSubmit } from '../utils/pending-state.js';
 // ============================================================================
 // PR identifier parsing
 // ============================================================================
@@ -57,209 +68,120 @@ function parsePRIdentifier(identifier) {
 // ============================================================================
 // Output formatting
 // ============================================================================
-function ratingLabel(rating) {
-    switch (rating) {
-        case 5: return chalk.green.bold('5/5') + chalk.green(' — Safe to merge');
-        case 4: return chalk.green('4/5') + chalk.dim(' — Low risk');
-        case 3: return chalk.yellow('3/5') + chalk.dim(' — Moderate risk');
-        case 2: return chalk.red('2/5') + chalk.dim(' — High risk');
-        case 1: return chalk.red.bold('1/5') + chalk.red(' — Critical issues');
-        default: return chalk.dim(`${rating}/5`);
-    }
-}
-function verdictLabel(verdict) {
-    switch (verdict) {
-        case 'clean': return chalk.green.bold('Clean');
-        case 'has-issues': return chalk.yellow.bold('Has Issues');
-        default: return chalk.dim('Unknown');
-    }
-}
-function severityIcon(severity) {
-    switch (severity) {
-        case 'critical': return chalk.red.bold('✗✗');
-        case 'high': return chalk.red('✗');
-        case 'medium': return chalk.yellow('!');
-        case 'low': return chalk.blue('·');
-        default: return chalk.dim('-');
-    }
-}
 function printRichOutput(pr, synthesis, manifest) {
     const reviewUrl = `https://haystackeditor.com/review/${pr.owner}/${pr.repo}/${pr.prNumber}`;
-    console.log(chalk.bold('\n' + '━'.repeat(60)));
-    console.log(chalk.bold(`  Haystack Analysis: ${pr.owner}/${pr.repo}#${pr.prNumber}`));
-    console.log(chalk.bold('━'.repeat(60) + '\n'));
-    // Rating & verdict
-    console.log(`  ${chalk.dim('Rating:')}   ${ratingLabel(synthesis.haystackRating)}`);
-    console.log(`  ${chalk.dim('Verdict:')}  ${verdictLabel(synthesis.analysisVerdict)}`);
-    if (synthesis.phase) {
-        const phaseLabel = synthesis.phase === 2 ? 'Final (post-verification)' : 'Preliminary (pre-verification)';
-        console.log(`  ${chalk.dim('Phase:')}    ${chalk.dim(phaseLabel)}`);
-    }
-    if (synthesis.verificationConfidence) {
-        const conf = synthesis.verificationConfidence;
-        const levelColor = conf.level === 'high' ? chalk.green : conf.level === 'medium' ? chalk.yellow : chalk.red;
-        console.log(`  ${chalk.dim('Verified:')} ${levelColor(conf.level)} — ${chalk.dim(conf.summary)}`);
-    }
-    if (synthesis.reviewRecommendation?.canAutoMerge) {
-        console.log(`  ${chalk.dim('Merge:')}    ${chalk.green('Safe to auto-merge')}`);
-    }
-    // Verification results (build/test/lint)
-    if (synthesis.verification) {
-        const v = synthesis.verification;
-        const parts = [];
-        if (v.build)
-            parts.push(v.build.success ? chalk.green('build ✓') : chalk.red('build ✗'));
-        if (v.test)
-            parts.push(v.test.success ? chalk.green('test ✓') : chalk.red('test ✗'));
-        if (v.lint)
-            parts.push(v.lint.success ? chalk.green('lint ✓') : chalk.red('lint ✗'));
-        if (parts.length > 0) {
-            console.log(`  ${chalk.dim('Checks:')}   ${parts.join('  ')}`);
-        }
-    }
-    // Auto-fix manifest — show what the fixer did vs left for human review
+    console.log(`\n  ${chalk.bold(`Haystack Triage: ${pr.owner}/${pr.repo}#${pr.prNumber}`)}\n`);
+    // Auto-fixer status — what's being fixed vs what it skipped
     if (manifest && (manifest.fixedItems.length > 0 || manifest.leftForReview.length > 0)) {
-        console.log(chalk.bold('\n  Auto-Fixer Results\n'));
         if (manifest.fixedItems.length > 0) {
-            console.log(`  ${chalk.green.bold(`Fixed (${manifest.fixedItems.length})`)}`);
+            console.log(chalk.bold('  Auto-fixer is handling:\n'));
             for (const item of manifest.fixedItems) {
-                console.log(`  ${chalk.green('  ✓')} ${chalk.dim(`[${item.category}]`)} ${item.summary}`);
+                console.log(`    - [${item.category}] ${item.summary}`);
             }
             console.log('');
         }
         if (manifest.leftForReview.length > 0) {
-            console.log(`  ${chalk.yellow.bold(`Left for you (${manifest.leftForReview.length})`)}`);
+            console.log(chalk.bold('  Auto-fixer skipped:\n'));
             for (const item of manifest.leftForReview) {
-                console.log(`  ${chalk.yellow('  →')} ${chalk.dim(`[${item.category}]`)} ${item.summary}`);
-                console.log(`     ${chalk.dim(item.reason)}`);
+                console.log(`    - [${item.category}] ${item.summary}`);
+                console.log(`      ${chalk.dim(item.reason)}`);
             }
             console.log('');
         }
     }
-    // Findings (synthesisDisplay) — split into new and previously reported
-    if (synthesis.synthesisDisplay && synthesis.synthesisDisplay.length > 0) {
-        const newFindings = synthesis.synthesisDisplay.filter((f) => f.isNew !== false);
-        const knownFindings = synthesis.synthesisDisplay.filter((f) => f.isNew === false);
-        // New findings — shown prominently
-        if (newFindings.length > 0) {
-            console.log(chalk.bold('\n  Findings\n'));
-            for (let i = 0; i < newFindings.length; i++) {
-                const finding = newFindings[i];
-                const sourceTag = finding.source ? chalk.dim(` (via ${finding.source})`) : '';
-                console.log(`  ${chalk.yellow(`${i + 1}.`)} ${chalk.bold(finding.category)}${sourceTag}`);
-                console.log(`     ${finding.summary}`);
-                if (finding.detail) {
-                    const detailLines = finding.detail.split('\n');
-                    for (const line of detailLines) {
-                        console.log(`     ${chalk.dim(line)}`);
-                    }
+    // Findings — the actionable output for agents
+    const findings = synthesis.synthesisDisplay || [];
+    if (findings.length > 0) {
+        console.log(chalk.bold('  Findings:\n'));
+        for (let i = 0; i < findings.length; i++) {
+            const finding = findings[i];
+            const sourceTag = finding.source ? ` (${finding.source})` : '';
+            console.log(`  ${i + 1}. [${finding.category}]${sourceTag} ${finding.summary}`);
+            if (finding.detail) {
+                for (const line of finding.detail.split('\n')) {
+                    console.log(`     ${line}`);
                 }
-                console.log('');
-            }
-        }
-        // Previously reported findings — dimmed
-        if (knownFindings.length > 0) {
-            console.log(chalk.dim(`  Previously Reported (${knownFindings.length})\n`));
-            for (let i = 0; i < knownFindings.length; i++) {
-                const finding = knownFindings[i];
-                const sourceTag = finding.source ? chalk.dim(` (via ${finding.source})`) : '';
-                console.log(`  ${chalk.dim(`${i + 1}.`)} ${chalk.dim(finding.category)}${sourceTag}`);
-                console.log(`     ${chalk.dim(finding.summary)}`);
-                console.log('');
             }
-        }
-    }
-    // Verified bugs
-    const confirmedBugs = (synthesis.verifiedBugs || []).filter(b => b.verified);
-    if (confirmedBugs.length > 0) {
-        console.log(chalk.bold('  Verified Bugs\n'));
-        for (const bug of confirmedBugs) {
-            const sourceTag = bug.source ? chalk.dim(` (via ${bug.source.type}${bug.source.author ? `: ${bug.source.author}` : ''})`) : '';
-            console.log(`  ${severityIcon(bug.assessedSeverity)} ${chalk.bold(bug.originalTitle)}${sourceTag}`);
-            console.log(`     ${chalk.dim('Severity:')} ${bug.assessedSeverity}${bug.likelihood ? `, ${bug.likelihood} occurrence` : ''}`);
-            console.log(`     ${bug.rationale}`);
-            console.log('');
-        }
-    }
-    // Human review reasons
-    if (synthesis.humanReviewReasons && synthesis.humanReviewReasons.length > 0) {
-        console.log(chalk.bold('  Human Review Required\n'));
-        for (const reason of synthesis.humanReviewReasons) {
-            const icon = reason.severity === 'high' || reason.severity === 'critical'
-                ? chalk.red('!')
-                : chalk.yellow('·');
-            console.log(`  ${icon} ${reason.reason}`);
-            if (reason.source) {
-                console.log(`     ${chalk.dim(`Source: ${reason.source}`)}`);
+            if (finding.agentFixPrompt) {
+                const fixLines = finding.agentFixPrompt.split('\n');
+                console.log(`     ${chalk.dim('Fix:')} ${fixLines[0]}`);
+                for (const line of fixLines.slice(1)) {
+                    console.log(`     ${line}`);
+                }
             }
-        }
-        console.log('');
-    }
-    // Agent fix prompts — only for new findings (known issues were already triaged)
-    const fixableFindings = (synthesis.synthesisDisplay || []).filter((f) => f.agentFixPrompt && f.isNew !== false);
-    if (fixableFindings.length > 0) {
-        console.log(chalk.bold('  Agent Fix Prompts'));
-        console.log(chalk.dim('  (Copy these to your coding agent to fix the issues)\n'));
-        for (let i = 0; i < fixableFindings.length; i++) {
-            const finding = fixableFindings[i];
-            console.log(chalk.cyan(`  --- Fix ${i + 1}: ${finding.category} ---`));
-            console.log(`  ${finding.agentFixPrompt}`);
             console.log('');
         }
     }
-    // Verification impact
-    if (synthesis.verificationImpact) {
-        console.log(`  ${chalk.dim('Verification impact:')} ${synthesis.verificationImpact}`);
-        console.log('');
+    else if (!manifest || manifest.fixedItems.length === 0) {
+        console.log(chalk.dim('  No findings.\n'));
     }
-    console.log(`  ${chalk.dim('Full review:')} ${chalk.cyan(reviewUrl)}`);
-    console.log('');
+    console.log(`  ${chalk.dim(reviewUrl)}\n`);
 }
 function printJsonOutput(pr, synthesis, manifest) {
-    const reviewUrl = `https://haystackeditor.com/review/${pr.owner}/${pr.repo}/${pr.prNumber}`;
     const output = {
         owner: pr.owner,
         repo: pr.repo,
         prNumber: pr.prNumber,
-        haystackRating: synthesis.haystackRating,
-        analysisVerdict: synthesis.analysisVerdict,
-        phase: synthesis.phase,
-        canAutoMerge: synthesis.reviewRecommendation?.canAutoMerge ?? false,
-        needsHumanReview: synthesis.needsHumanReview,
+        rating: synthesis.haystackRating,
+        autoFixerHandling: manifest?.fixedItems ?? [],
+        autoFixerSkipped: manifest?.leftForReview ?? [],
         findings: (synthesis.synthesisDisplay || []).map((f) => ({
             category: f.category,
             summary: f.summary,
             detail: f.detail,
             agentFixPrompt: f.agentFixPrompt || null,
             source: f.source || null,
-            isNew: f.isNew ?? null,
         })),
-        verifiedBugs: (synthesis.verifiedBugs || []).filter(b => b.verified).map(b => ({
-            title: b.originalTitle,
-            severity: b.assessedSeverity,
-            likelihood: b.likelihood,
-            rationale: b.rationale,
-            source: b.source || null,
-        })),
-        humanReviewReasons: synthesis.humanReviewReasons || [],
-        verification: synthesis.verification || null,
-        verificationConfidence: synthesis.verificationConfidence || null,
-        autoFixManifest: manifest ? {
-            fixedItems: manifest.fixedItems,
-            leftForReview: manifest.leftForReview,
-            timestamp: manifest.timestamp,
-        } : null,
-        reviewUrl,
     };
     console.log(JSON.stringify(output, null, 2));
 }
+function ratingStars(rating) {
+    const filled = '\u2605'; // ★
+    const empty = '\u2606'; // ☆
+    return filled.repeat(rating) + empty.repeat(5 - rating);
+}
+function printHookOutput(pr, synthesis, manifest, status) {
+    const label = `${pr.owner}/${pr.repo}#${pr.prNumber}`;
+    const reviewUrl = `https://haystackeditor.com/review/${pr.owner}/${pr.repo}/${pr.prNumber}`;
+    if (status === 'pending') {
+        console.log(`[Haystack] ${label}: Analysis in progress...`);
+        return;
+    }
+    if (status === 'failed') {
+        console.log(`[Haystack] ${label}: Analysis failed`);
+        return;
+    }
+    if (status === 'stale') {
+        console.log(`[Haystack] ${label}: Stale (submitted > 2h ago)`);
+        return;
+    }
+    if (!synthesis) {
+        console.log(`[Haystack] ${label}: Analysis in progress...`);
+        return;
+    }
+    const findings = synthesis.synthesisDisplay || [];
+    const stars = ratingStars(synthesis.haystackRating);
+    const fixingCount = manifest?.fixedItems?.length ?? 0;
+    if (findings.length === 0 && fixingCount === 0) {
+        console.log(`[Haystack] \u2705 ${label} ${stars}: Good to merge`);
+    }
+    else {
+        const parts = [];
+        if (findings.length > 0)
+            parts.push(`${findings.length} finding(s)`);
+        if (fixingCount > 0)
+            parts.push(`${fixingCount} being auto-fixed`);
+        console.log(`[Haystack] \u26A0\uFE0F  ${label} ${stars}: Needs your input (${parts.join(', ')})`);
+        console.log(`  ${reviewUrl}`);
+    }
+}
 // ============================================================================
 // Polling
 // ============================================================================
 const POLL_INTERVAL_MS = 5_000;
 const POLL_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes
-async function waitForAnalysis(owner, repo, prNumber, token, quiet) {
-    const deadline = Date.now() + POLL_TIMEOUT_MS;
+async function waitForAnalysis(owner, repo, prNumber, timeoutMs, token, quiet) {
+    const deadline = Date.now() + timeoutMs;
     let consecutiveErrors = 0;
     while (Date.now() < deadline) {
         const result = await checkAnalysisReady(owner, repo, prNumber, token);
@@ -281,21 +203,55 @@ async function waitForAnalysis(owner, repo, prNumber, token, quiet) {
     return 'pending';
 }
 // ============================================================================
+// PR resolution
+// ============================================================================
+/**
+ * Resolve a PR from an explicit identifier or from pending-submit state.
+ * Returns null (and handles output) if no PR can be resolved.
+ */
+function resolvePR(identifier, options) {
+    if (identifier) {
+        try {
+            return parsePRIdentifier(identifier);
+        }
+        catch (err) {
+            console.error(chalk.red(`\n${err.message}\n`));
+            process.exit(1);
+        }
+    }
+    // No arg — read from pending state
+    const pending = loadPendingSubmit();
+    if (!pending) {
+        if (options.json) {
+            console.log(JSON.stringify({ status: 'none' }));
+        }
+        else if (!options.hook) {
+            console.log(chalk.dim('No pending submits. Pass a PR number to triage a specific PR.\n'));
+        }
+        return null;
+    }
+    return { owner: pending.owner, repo: pending.repo, prNumber: pending.prNumber };
+}
+// ============================================================================
 // Main command
 // ============================================================================
 export async function triageCommand(identifier, options) {
-    // Parse PR identifier
-    let pr;
-    try {
-        pr = parsePRIdentifier(identifier);
-    }
-    catch (err) {
-        console.error(chalk.red(`\n${err.message}\n`));
-        process.exit(1);
+    // Handle --clear
+    if (options.clear) {
+        clearPendingSubmit();
+        if (!options.hook) {
+            console.log(chalk.dim('Pending submit state cleared.'));
+        }
+        return;
     }
+    // Resolve PR identifier — explicit arg or fall back to pending-submit.json
+    const pr = resolvePR(identifier, options);
+    if (!pr)
+        return;
     // Load GitHub token for private repo auth
     const token = await loadToken() || undefined;
-    if (!options.json) {
+    const isQuiet = options.hook || options.json;
+    if (!isQuiet) {
         console.log(chalk.dim(`\nFetching analysis for ${pr.owner}/${pr.repo}#${pr.prNumber}...`));
     }
     // Check if analysis is ready — resolve to a terminal state before fetching
@@ -305,56 +261,74 @@ export async function triageCommand(identifier, options) {
         analysisReady = true;
     }
     else if (readyResult.status === 'pending') {
-        if (options.wait === false) {
-            if (options.json) {
-                console.log(JSON.stringify({
-                    owner: pr.owner, repo: pr.repo, prNumber: pr.prNumber, status: 'pending',
-                }, null, 2));
+        // Hook mode: short 5s poll. --no-wait: skip. Default: full poll.
+        if (options.hook) {
+            const hookResult = await waitForAnalysis(pr.owner, pr.repo, pr.prNumber, 5_000, token, true);
+            if (hookResult === 'ready') {
+                analysisReady = true;
             }
             else {
-                console.log(chalk.yellow('\n  Analysis is still in progress.'));
-                console.log(chalk.dim('  Re-run without --no-wait to poll until complete.\n'));
+                updatePendingSubmitIfExists(pr);
+                printHookOutput(pr, null, null, 'pending');
+                return;
             }
-            return;
         }
-        // Wait for analysis
-        if (!options.json) {
-            console.log(chalk.dim('  Analysis in progress, waiting...'));
-        }
-        const waitResult = await waitForAnalysis(pr.owner, pr.repo, pr.prNumber, token, options.json);
-        if (!options.json) {
-            process.stderr.write('\r' + ' '.repeat(60) + '\r');
-        }
-        if (waitResult === 'ready') {
-            analysisReady = true;
-        }
-        else if (waitResult === 'pending') {
+        else if (options.wait === false) {
             if (options.json) {
                 console.log(JSON.stringify({
                     owner: pr.owner, repo: pr.repo, prNumber: pr.prNumber, status: 'pending',
                 }, null, 2));
             }
             else {
-                console.log(chalk.yellow('\n  Timed out waiting for analysis.'));
-                console.log(chalk.dim('  Try again later: ') + chalk.cyan(`haystack triage ${pr.owner}/${pr.repo}#${pr.prNumber}\n`));
+                console.log(chalk.yellow('\n  Analysis is still in progress.'));
+                console.log(chalk.dim('  Re-run without --no-wait to poll until complete.\n'));
             }
             return;
         }
         else {
-            // waitResult === 'error'
-            if (options.json) {
-                console.log(JSON.stringify({
-                    owner: pr.owner, repo: pr.repo, prNumber: pr.prNumber, status: 'error',
-                }, null, 2));
+            // Full poll
+            if (!options.json) {
+                console.log(chalk.dim('  Analysis in progress, waiting...'));
+            }
+            const waitResult = await waitForAnalysis(pr.owner, pr.repo, pr.prNumber, POLL_TIMEOUT_MS, token, options.json);
+            if (!options.json) {
+                process.stderr.write('\r' + ' '.repeat(60) + '\r');
+            }
+            if (waitResult === 'ready') {
+                analysisReady = true;
+            }
+            else if (waitResult === 'pending') {
+                if (options.json) {
+                    console.log(JSON.stringify({
+                        owner: pr.owner, repo: pr.repo, prNumber: pr.prNumber, status: 'pending',
+                    }, null, 2));
+                }
+                else {
+                    console.log(chalk.yellow('\n  Timed out waiting for analysis.'));
+                    console.log(chalk.dim('  Try again later: ') + chalk.cyan(`haystack triage ${pr.owner}/${pr.repo}#${pr.prNumber}\n`));
+                }
+                return;
             }
             else {
-                console.error(chalk.red('\n  Analysis check failed.\n'));
+                // waitResult === 'error'
+                if (options.json) {
+                    console.log(JSON.stringify({
+                        owner: pr.owner, repo: pr.repo, prNumber: pr.prNumber, status: 'error',
+                    }, null, 2));
+                }
+                else {
+                    console.error(chalk.red('\n  Analysis check failed.\n'));
+                }
+                process.exit(1);
             }
-            process.exit(1);
         }
     }
     else {
         // readyResult.status === 'error'
+        if (options.hook) {
+            printHookOutput(pr, null, null, 'failed');
+            return;
+        }
         if (options.json) {
             console.log(JSON.stringify({
                 owner: pr.owner, repo: pr.repo, prNumber: pr.prNumber,
@@ -373,7 +347,13 @@ export async function triageCommand(identifier, options) {
         fetchRatingSynthesis(pr.owner, pr.repo, pr.prNumber, token),
         fetchAutoFixManifest(pr.owner, pr.repo, pr.prNumber, token),
     ]);
+    // Update pending state if this PR matches the pending submit
+    updatePendingSubmitIfExists(pr, synthesis ? 'completed' : undefined);
     if (!synthesis) {
+        if (options.hook) {
+            printHookOutput(pr, null, null, 'pending');
+            return;
+        }
         if (options.json) {
             console.log(JSON.stringify({
                 owner: pr.owner, repo: pr.repo, prNumber: pr.prNumber,
@@ -388,7 +368,10 @@ export async function triageCommand(identifier, options) {
         process.exit(1);
     }
     // Output
-    if (options.json) {
+    if (options.hook) {
+        printHookOutput(pr, synthesis, autoFixManifest);
+    }
+    else if (options.json) {
         printJsonOutput(pr, synthesis, autoFixManifest);
     }
     else {
@@ -405,6 +388,30 @@ export async function triageCommand(identifier, options) {
         });
     }
 }
+/**
+ * Update the pending-submit state if the given PR matches the pending one.
+ * Best-effort — failure is silently ignored.
+ */
+function updatePendingSubmitIfExists(pr, status) {
+    try {
+        const pending = loadPendingSubmit();
+        if (!pending)
+            return;
+        if (pending.owner !== pr.owner || pending.repo !== pr.repo || pending.prNumber !== pr.prNumber)
+            return;
+        if (pending.status !== 'polling')
+            return;
+        if (status === 'completed') {
+            updatePendingSubmit({
+                status: 'completed',
+                resolvedAt: new Date().toISOString(),
+            });
+        }
+    }
+    catch {
+        // Non-fatal
+    }
+}
 /**
  * Record that the user has seen analysis findings for this PR.
  * Fire-and-forget: failure is silently ignored.

package/dist/index.d.ts

@@ -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