@haystackeditor/cli 0.15.19 → 0.15.21

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

@@ -12,4 +12,15 @@
  *   owner/repo#123                         # Fully qualified
  *   https://github.com/owner/repo/pull/123 # GitHub URL
  */
-export declare function requestReviewCommand(identifier: string, reviewer?: string): Promise<void>;
+import { type ActionPayload } from '../utils/action-output.js';
+export interface RequestReviewPayload extends ActionPayload {
+    reviewer: string | null;
+    /** Set when the label was applied but the specific-reviewer request failed. */
+    reviewer_request_failed: string | null;
+}
+/** Apply the needs-review label (and optional reviewer). Throws on failure. */
+export declare function performRequestReview(identifier: string, reviewer?: string): Promise<RequestReviewPayload>;
+export interface RequestReviewOptions {
+    json?: boolean;
+}
+export declare function requestReviewCommand(identifier: string, reviewer?: string, options?: RequestReviewOptions): Promise<void>;

package/dist/commands/request-review.js

@@ -13,85 +13,62 @@
  *   https://github.com/owner/repo/pull/123 # GitHub URL
  */
 import chalk from 'chalk';
+import { emitActionPayload, failAction } from '../utils/action-output.js';
 import { resolveAuthContext } from '../utils/auth.js';
-import { parseRemoteUrl } from '../utils/git.js';
+import { parsePrRef } from '../utils/pr-ref.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);
+/** Apply the needs-review label (and optional reviewer). Throws on failure. */
+export async function performRequestReview(identifier, reviewer) {
+    const pr = parsePrRef(identifier, 'request-review');
+    const authContext = await resolveAuthContext({ owner: pr.owner, repo: pr.repo });
+    const ref = `${pr.owner}/${pr.repo}#${pr.prNumber}`;
+    await ensureHaystackLabels(pr.owner, pr.repo, ['haystack:needs-review'], authContext.token);
+    await addLabelsToIssue(pr.owner, pr.repo, pr.prNumber, ['haystack:needs-review'], authContext.token);
+    let reviewerRequestFailed = null;
+    if (reviewer) {
         try {
-            const remote = parseRemoteUrl('origin');
-            return { owner: remote.owner, repo: remote.repo, prNumber };
+            await requestReviewers(pr.owner, pr.repo, pr.prNumber, [reviewer], authContext.token);
         }
-        catch {
-            throw new Error(`Cannot determine repository for PR #${prNumber}.\n` +
-                `Use the full format: haystack request-review owner/repo#${prNumber}`);
+        catch (err) {
+            // Label was added successfully, just the reviewer request failed —
+            // report the partial outcome instead of failing the whole action.
+            reviewerRequestFailed = err.message;
         }
     }
-    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`);
+    return {
+        action: 'request_review',
+        status: 'ok',
+        ref,
+        reviewer: reviewer && !reviewerRequestFailed ? reviewer : null,
+        reviewer_request_failed: reviewerRequestFailed,
+        detail: reviewer && !reviewerRequestFailed
+            ? `Review requested from ${reviewer}; the PR moves to the "Needs Assignment" queue.`
+            : 'PR marked for human review; it moves to the "Needs Assignment" queue.',
+    };
 }
-// ============================================================================
-// Main command
-// ============================================================================
-export async function requestReviewCommand(identifier, reviewer) {
-    // Parse PR identifier
-    let pr;
+export async function requestReviewCommand(identifier, reviewer, options = {}) {
+    if (!options.json)
+        console.log(chalk.dim(`\nRequesting review for ${identifier}...`));
+    let payload;
     try {
-        pr = parsePRIdentifier(identifier);
+        payload = await performRequestReview(identifier, reviewer);
     }
     catch (err) {
-        console.error(chalk.red(`\n${err.message}\n`));
-        process.exit(1);
+        failAction(options.json, 'request_review', null, err.message);
+        return; // unreachable — satisfies TS narrowing
     }
-    let authContext;
-    try {
-        authContext = await resolveAuthContext({ owner: pr.owner, repo: pr.repo });
+    if (options.json) {
+        emitActionPayload(payload);
+        return;
     }
-    catch (err) {
-        console.error(chalk.red(`\n${err.message}\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'], authContext.token);
-        await addLabelsToIssue(pr.owner, pr.repo, pr.prNumber, ['haystack:needs-review'], authContext.token);
-    }
-    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], authContext.token);
-            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}`));
-        }
+    if (payload.reviewer) {
+        console.log(chalk.green(`\n  Review requested from ${payload.reviewer} on ${payload.ref}`));
     }
     else {
-        console.log(chalk.green(`\n  Marked ${prLabel} for human review`));
+        console.log(chalk.green(`\n  Marked ${payload.ref} for human review`));
+        if (payload.reviewer_request_failed) {
+            console.log(chalk.yellow(`  Could not request reviewer "${reviewer}": ${payload.reviewer_request_failed}`));
+        }
     }
     console.log(chalk.dim('  The PR will appear in the "Needs Assignment" queue in the feed.\n'));
 }

package/dist/commands/review.d.ts

@@ -20,5 +20,6 @@
  */
 export interface ReviewOptions {
     wait?: boolean;
+    json?: boolean;
 }
 export declare function reviewCommand(identifier: string | undefined, options: ReviewOptions): Promise<void>;

package/dist/commands/review.js

@@ -19,11 +19,12 @@
  *   haystack review https://github.com/owner/repo/pull/123
  */
 import chalk from 'chalk';
+import { emitActionPayload, failAction } from '../utils/action-output.js';
 import { triggerAnalysis, fetchTriggerStatus } from '../utils/analysis-api.js';
 import { fetchTriageHeadSha } from './triage.js';
-import { parseRemoteUrl } from '../utils/git.js';
 import { loadToken } from '../utils/auth.js';
 import { loadPendingSubmit } from '../utils/pending-state.js';
+import { parsePrRef } from '../utils/pr-ref.js';
 import { triageCommand } from './triage.js';
 // ============================================================================
 // Constants
@@ -32,44 +33,13 @@ const STATUS_POLL_INTERVAL_MS = 10_000;
 // Full analyses regularly take 10+ minutes on large PRs; this bounds the
 // CLI's wait, not the analysis itself (results land on the feed regardless).
 const STATUS_POLL_TIMEOUT_MS = 25 * 60 * 1000;
-// ============================================================================
-// PR identifier parsing (shared pattern with request-review.ts / triage.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 review owner/repo#${prNumber}`);
-        }
-    }
-    throw new Error(`Invalid PR identifier: "${identifier}"\n\n` +
-        `Accepted formats:\n` +
-        `  haystack review 123\n` +
-        `  haystack review owner/repo#123\n` +
-        `  haystack review https://github.com/owner/repo/pull/123`);
-}
-function resolvePR(identifier) {
+function resolvePR(identifier, json) {
     if (identifier) {
         try {
-            return parsePRIdentifier(identifier);
+            return parsePrRef(identifier, 'review');
         }
         catch (err) {
-            console.error(chalk.red(`\n${err.message}\n`));
-            process.exit(1);
+            failAction(json, 'trigger_review', null, err.message);
         }
     }
     const pending = loadPendingSubmit();
@@ -114,7 +84,10 @@ async function waitForRun(requestId, token) {
 // Main command
 // ============================================================================
 export async function reviewCommand(identifier, options) {
-    const pr = resolvePR(identifier);
+    if (options.json && identifier === undefined && !loadPendingSubmit()) {
+        failAction(true, 'trigger_review', null, 'No pending submit to review. Pass a PR identifier: haystack review owner/repo#123 --json');
+    }
+    const pr = resolvePR(identifier, options.json);
     if (!pr)
         return;
     const prLabel = `${pr.owner}/${pr.repo}#${pr.prNumber}`;
@@ -123,15 +96,14 @@ export async function reviewCommand(identifier, options) {
         token = await loadToken({ owner: pr.owner, repo: pr.repo });
     }
     catch (err) {
-        console.error(chalk.red(`\nCould not load Haystack credentials: ${err.message}\n`));
-        process.exit(1);
+        failAction(options.json, 'trigger_review', prLabel, `Could not load Haystack credentials: ${err.message}`);
     }
     if (!token) {
-        console.error(chalk.red('\nTriggering an analysis requires authentication.'));
-        console.log(chalk.dim('  Run ') + chalk.cyan('haystack login') + chalk.dim(' first.\n'));
-        process.exit(1);
+        failAction(options.json, 'trigger_review', prLabel, 'Triggering an analysis requires authentication. Run `haystack login` first.');
+        return; // unreachable — satisfies TS narrowing
     }
-    console.log(chalk.dim(`\nRequesting a fresh analysis for ${prLabel}...`));
+    if (!options.json)
+        console.log(chalk.dim(`\nRequesting a fresh analysis for ${prLabel}...`));
     // Resolve the current head so ingestion's dedup compares commits — an
     // in-flight run for an OLDER head must be superseded, not reused. A
     // failed metadata fetch degrades to a head-less trigger (the dedup is a
@@ -141,31 +113,47 @@ export async function reviewCommand(identifier, options) {
         headSha = await fetchTriageHeadSha(pr, token) ?? undefined;
     }
     catch (err) {
-        console.log(chalk.dim(`  Could not resolve the PR head (${err.message}) — continuing without it.`));
+        console.error(chalk.dim(`  Could not resolve the PR head (${err.message}) — continuing without it.`));
     }
     const trigger = await triggerAnalysis(pr.owner, pr.repo, pr.prNumber, token, headSha);
     if (trigger.status === 'rate_limited') {
-        console.error(chalk.red(`\n  ${trigger.message}`));
-        if (trigger.retryAfterSeconds) {
-            console.log(chalk.dim(`  Try again in ~${Math.ceil(trigger.retryAfterSeconds / 60)} minute(s).\n`));
-        }
-        process.exit(1);
+        const retryHint = trigger.retryAfterSeconds
+            ? ` Try again in ~${Math.ceil(trigger.retryAfterSeconds / 60)} minute(s).`
+            : '';
+        failAction(options.json, 'trigger_review', prLabel, `${trigger.message}${retryHint}`);
     }
     if (trigger.status === 'denied') {
-        console.error(chalk.red(`\n  ${trigger.message}\n`));
-        process.exit(1);
+        failAction(options.json, 'trigger_review', prLabel, trigger.message);
     }
     if (trigger.status === 'error') {
-        console.error(chalk.red(`\n  Failed to trigger analysis: ${trigger.message}\n`));
-        process.exit(1);
-    }
-    if (trigger.status === 'already_processing') {
-        console.log(chalk.yellow('  An analysis for this PR is already running — waiting on it instead.'));
+        failAction(options.json, 'trigger_review', prLabel, `Failed to trigger analysis: ${trigger.message}`);
+        return; // unreachable — satisfies TS narrowing
     }
-    else {
-        console.log(chalk.green('  Analysis started.'));
+    if (!options.json) {
+        if (trigger.status === 'already_processing') {
+            console.log(chalk.yellow('  An analysis for this PR is already running — waiting on it instead.'));
+        }
+        else {
+            console.log(chalk.green('  Analysis started.'));
+        }
     }
+    /** One envelope for every terminal state of the trigger. */
+    const emitJson = (runStatus, detail, done) => {
+        emitActionPayload({
+            action: 'trigger_review',
+            status: 'ok',
+            ref: prLabel,
+            detail,
+            request_id: trigger.requestId,
+            run_status: runStatus,
+            next: done ? `haystack triage ${prLabel} --json` : null,
+        });
+    };
     if (options.wait === false) {
+        if (options.json) {
+            emitJson(trigger.status, 'Analysis triggered; not waiting for completion.', true);
+            return;
+        }
         console.log(chalk.dim('  Check results later with: ') + chalk.cyan(`haystack triage ${prLabel}`));
         console.log(chalk.dim('  Or view the review: ') + chalk.cyan(`https://haystackeditor.com/review/${pr.owner}/${pr.repo}/${pr.prNumber}\n`));
         return;
@@ -173,21 +161,31 @@ export async function reviewCommand(identifier, options) {
     const outcome = await waitForRun(trigger.requestId, token);
     process.stderr.write('\r' + ' '.repeat(60) + '\r');
     if (outcome === 'failed') {
-        console.error(chalk.red('\n  Analysis run failed.'));
-        console.log(chalk.dim('  Check the review page: ') + chalk.cyan(`https://haystackeditor.com/review/${pr.owner}/${pr.repo}/${pr.prNumber}\n`));
-        process.exit(1);
+        failAction(options.json, 'trigger_review', prLabel, `Analysis run failed. Check the review page: https://haystackeditor.com/review/${pr.owner}/${pr.repo}/${pr.prNumber}`);
     }
     if (outcome === 'superseded') {
+        if (options.json) {
+            emitJson('superseded', 'This run was superseded by a newer analysis (a push likely landed meanwhile). The latest results stand.', true);
+            return;
+        }
         console.log(chalk.yellow('\n  This run was superseded by a newer analysis (a push likely landed meanwhile).'));
         console.log(chalk.dim('  Showing the latest results instead.'));
         await triageCommand(prLabel, { wait: false });
         return;
     }
     if (outcome === 'timeout') {
+        if (options.json) {
+            emitJson('running', 'Still running after 25 minutes; the analysis continues server-side.', true);
+            return;
+        }
         console.log(chalk.yellow('\n  Still running after 25 minutes — giving up on waiting.'));
         console.log(chalk.dim('  Check results later with: ') + chalk.cyan(`haystack triage ${prLabel}\n`));
         return;
     }
     // Completed — render results through the triage view (no extra wait).
+    if (options.json) {
+        emitJson('completed', 'Analysis completed.', true);
+        return;
+    }
     await triageCommand(prLabel, { wait: false });
 }

package/dist/commands/setup.js

@@ -48,8 +48,11 @@ function buildAnswerMap(options) {
             answers.want_to_toggle = false;
         if (!('confirm_write' in answers))
             answers.confirm_write = true;
-        if (!('auto_merge' in answers))
+        if (!('auto_merge' in answers)) {
             answers.auto_merge = true;
+            // Consequential default applied without an interactive prompt — say so.
+            console.error('--yes: enabling auto-merge (the wizard default). Pass --no-auto-merge to opt out.');
+        }
         if (!('install_entire' in answers))
             answers.install_entire = true;
         if (!('upgrade_entire' in answers))

package/dist/commands/submit.d.ts

@@ -19,8 +19,11 @@ export interface SubmitOptions {
     review?: string | true;
     force?: boolean;
     wait?: boolean;
+    json?: boolean;
     autoFix?: boolean;
     autoMerge?: boolean;
+    autoMergeSource?: 'flag' | 'config';
+    autoFixSource?: 'flag' | 'config';
     maxTurns?: number;
     triageTimeout?: number;
 }