@haystackeditor/cli 0.10.2 → 0.11.0

package/dist/commands/setup.js

@@ -9,10 +9,17 @@
  * 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)
  */
 import chalk from 'chalk';
 import inquirer from 'inquirer';
+import { execFileSync, execSync } from 'child_process';
+import { mkdirSync } from 'fs';
+import { basename, join } from 'path';
 import { loadToken } from './login.js';
+import { hooksInstall } from './hooks.js';
+import { findGitRoot } from '../utils/hooks.js';
+import { trackError, trackSetupEvent } from '../utils/telemetry.js';
 // =============================================================================
 // Constants
 // =============================================================================
@@ -433,7 +440,7 @@ async function stepConfirm(selectedRepos, rules, signals, policies, token) {
     ]);
     if (!confirmed) {
         console.log(chalk.yellow('\n  Setup cancelled.\n'));
-        return;
+        return false;
     }
     // Write to each repo
     const failedRepos = [];
@@ -458,6 +465,7 @@ async function stepConfirm(selectedRepos, rules, signals, policies, token) {
         process.exit(1);
     }
     console.log(chalk.green('\n  Setup complete!\n'));
+    return true;
 }
 // =============================================================================
 // Main command
@@ -492,5 +500,269 @@ export async function setupCommand() {
     // Step 5: Review
     const reviewed = await stepReview(rules, signals, policies);
     // Step 6: Confirm & write
-    await stepConfirm(selectedRepos, reviewed.rules, reviewed.signals, reviewed.policies, token);
+    const confirmed = await stepConfirm(selectedRepos, reviewed.rules, reviewed.signals, reviewed.policies, token);
+    if (!confirmed)
+        return;
+    // Step 7: Install Entire CLI (session tracking)
+    await stepInstallEntire(selectedRepos, token);
+}
+// =============================================================================
+// Step 7: Install Entire CLI for session tracking
+// =============================================================================
+const ENTIRE_VERSION = 'v0.5.3-haystack.1';
+const ENTIRE_RELEASE_BASE = `https://github.com/haystackeditor/cli/releases/download/${ENTIRE_VERSION}`;
+function getEntireBinaryName() {
+    const platform = process.platform === 'darwin' ? 'darwin'
+        : process.platform === 'linux' ? 'linux'
+            : null;
+    if (!platform)
+        return null; // unsupported (Windows, FreeBSD, etc.)
+    const arch = process.arch === 'arm64' ? 'arm64'
+        : process.arch === 'x64' ? 'amd64'
+            : null;
+    if (!arch)
+        return null; // unsupported (s390x, ppc64, etc.)
+    return `entire_${platform}_${arch}`;
+}
+function isEntireInstalled() {
+    // Check the canonical install location first, then fall back to PATH
+    const haystackBin = process.env.HOME
+        ? join(process.env.HOME, '.haystack', 'bin', 'entire')
+        : null;
+    const candidates = haystackBin ? [haystackBin, 'entire'] : ['entire'];
+    for (const bin of candidates) {
+        try {
+            const version = execSync(`"${bin}" --version 2>&1`, { encoding: 'utf-8' }).trim();
+            return {
+                installed: true,
+                isHaystackFork: version.includes('haystack'),
+                version,
+            };
+        }
+        catch {
+            // Try next candidate
+        }
+    }
+    return { installed: false, isHaystackFork: false, version: '' };
+}
+async function installEntireBinary() {
+    const binaryName = getEntireBinaryName();
+    if (!binaryName) {
+        console.log(chalk.yellow(`  Entire CLI is not available for ${process.platform}/${process.arch}.`));
+        console.log(chalk.dim('  Supported: macOS (Intel/Apple Silicon), Linux (x86_64/ARM64)'));
+        return false;
+    }
+    const url = `${ENTIRE_RELEASE_BASE}/${binaryName}`;
+    const installDir = process.env.HOME
+        ? join(process.env.HOME, '.haystack', 'bin')
+        : '/usr/local/bin';
+    try {
+        mkdirSync(installDir, { recursive: true });
+        const targetPath = join(installDir, 'entire');
+        console.log(chalk.dim(`  Downloading ${ENTIRE_VERSION}...`));
+        execFileSync('curl', ['-fsSL', url, '-o', targetPath], { stdio: 'pipe' });
+        execFileSync('chmod', ['+x', targetPath], { stdio: 'pipe' });
+        // Verify using absolute path (don't rely on PATH)
+        const version = execFileSync(targetPath, ['--version'], { encoding: 'utf-8' }).trim();
+        if (!version.includes('haystack')) {
+            console.log(chalk.red(`  Unexpected version: ${version}`));
+            return false;
+        }
+        console.log(chalk.green(`  ✓ Installed: ${version.split('\n')[0]}`));
+        // Check if install dir is on PATH
+        const pathDirs = (process.env.PATH || '').split(':');
+        if (!pathDirs.includes(installDir)) {
+            console.log(chalk.yellow(`\n  Note: ${installDir} is not on your PATH.`));
+            console.log(chalk.dim(`  Add to your shell profile: export PATH="${installDir}:$PATH"\n`));
+        }
+        return true;
+    }
+    catch (err) {
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        console.log(chalk.red(`  Failed to install Entire CLI: ${errorMsg}`));
+        console.log(chalk.dim(`  Manual install: curl -fsSL ${url} -o ~/.haystack/bin/entire && chmod +x ~/.haystack/bin/entire`));
+        trackError('entire_install_failed', {
+            error_message: errorMsg,
+            error_stack: err instanceof Error ? err.stack : undefined,
+            entire_version: ENTIRE_VERSION,
+            install_dir: installDir,
+        });
+        return false;
+    }
+}
+/**
+ * Write .entire/settings.json with skip_raw_transcript via the GitHub API.
+ * selectedRepos are GitHub full names (owner/repo), not local paths.
+ */
+async function configureEntireSettingsViaAPI(repoFullName, token) {
+    const [owner, repo] = repoFullName.split('/');
+    const filePath = '.entire/settings.json';
+    const headers = {
+        Authorization: `Bearer ${token}`,
+        Accept: 'application/vnd.github.v3+json',
+        'User-Agent': 'Haystack-CLI',
+        'Content-Type': 'application/json',
+    };
+    // Fetch existing .entire/settings.json (if any)
+    let existingSha = null;
+    let settings = { enabled: true };
+    const getResp = await fetch(`${GITHUB_API}/repos/${owner}/${repo}/contents/${filePath}`, { headers });
+    if (getResp.ok) {
+        const data = (await getResp.json());
+        existingSha = data.sha;
+        try {
+            settings = JSON.parse(Buffer.from(data.content, 'base64').toString('utf-8'));
+        }
+        catch {
+            // Malformed JSON — keep sha for update but use fresh defaults
+            console.log(chalk.dim(`  Existing .entire/settings.json in ${repoFullName} is malformed — will repair`));
+        }
+    }
+    else if (getResp.status !== 404) {
+        // Non-404 failure (auth, network, rate limit) — don't guess, surface it
+        const errText = await getResp.text().catch(() => '');
+        const error = new Error(`Failed to read .entire/settings.json: ${getResp.status} ${errText}`);
+        trackError('entire_settings_read_failed', {
+            error_message: error.message,
+            repo: repoFullName,
+            status: getResp.status,
+        });
+        throw error;
+    }
+    // 404 → file doesn't exist, existingSha stays null → PUT will create
+    // Add skip_raw_transcript
+    const strategyOptions = (settings.strategy_options || {});
+    strategyOptions.skip_raw_transcript = true;
+    settings.strategy_options = strategyOptions;
+    const content = Buffer.from(JSON.stringify(settings, null, 2) + '\n').toString('base64');
+    const body = {
+        message: 'chore: enable skip_raw_transcript for Entire CLI\n\nPrevents committing raw 50MB session transcripts to git.',
+        content,
+    };
+    if (existingSha)
+        body.sha = existingSha;
+    const putResp = await fetch(`${GITHUB_API}/repos/${owner}/${repo}/contents/${filePath}`, {
+        method: 'PUT',
+        headers,
+        body: JSON.stringify(body),
+    });
+    if (!putResp.ok) {
+        const errText = await putResp.text().catch(() => '');
+        const error = new Error(`GitHub API ${putResp.status}: ${errText}`);
+        trackError('entire_settings_write_failed', {
+            error_message: error.message,
+            repo: repoFullName,
+            status: putResp.status,
+            had_existing: !!existingSha,
+        });
+        throw error;
+    }
+}
+async function stepInstallEntire(selectedRepos, token) {
+    console.log(chalk.bold('\n  Step 7: Session tracking (Entire CLI)\n'));
+    const status = isEntireInstalled();
+    let binaryReady = status.installed && status.isHaystackFork;
+    let userConsented = true; // true if user said yes or was already installed
+    if (binaryReady) {
+        console.log(chalk.dim(`  Entire CLI already installed (${status.version.split('\n')[0]})`));
+    }
+    else if (status.installed) {
+        console.log(chalk.dim(`  Stock Entire CLI detected: ${status.version.split('\n')[0]}`));
+        const { upgrade } = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'upgrade',
+                message: 'Upgrade to Haystack fork? (adds transcript optimization — saves GB of git storage)',
+                default: true,
+            },
+        ]);
+        if (upgrade) {
+            binaryReady = await installEntireBinary();
+        }
+        else {
+            userConsented = false;
+        }
+    }
+    else {
+        const { install } = await inquirer.prompt([
+            {
+                type: 'confirm',
+                name: 'install',
+                message: 'Install Entire CLI? (tracks AI coding sessions for analysis)',
+                default: true,
+            },
+        ]);
+        if (install) {
+            binaryReady = await installEntireBinary();
+        }
+        else {
+            userConsented = false;
+        }
+    }
+    if (!userConsented) {
+        console.log(chalk.dim('  Skipping session tracking.\n'));
+    }
+    // Configure .entire/settings.json on each repo via GitHub API
+    // (works even if binary install failed — settings are remote; skip if user declined)
+    if (userConsented) {
+        let configured = 0;
+        for (const repoFullName of selectedRepos) {
+            try {
+                process.stdout.write(chalk.dim(`  Configuring ${repoFullName}...`));
+                await configureEntireSettingsViaAPI(repoFullName, token);
+                process.stdout.write('\r\x1b[K');
+                console.log(chalk.green(`  ✓ ${repoFullName}`));
+                configured++;
+            }
+            catch (err) {
+                process.stdout.write('\r\x1b[K');
+                console.log(chalk.yellow(`  ⚠ ${repoFullName}: ${err instanceof Error ? err.message : err}`));
+            }
+        }
+        if (configured > 0) {
+            console.log(chalk.green(`\n  ✓ Session tracking configured on ${configured} repo(s) (raw transcripts excluded)\n`));
+            trackSetupEvent('entire_configured', { configured, total: selectedRepos.length });
+        }
+        else {
+            console.log(chalk.yellow('\n  ⚠ Could not configure session tracking on any repos.\n'));
+            trackError('entire_config_all_failed', { total: selectedRepos.length });
+        }
+    }
+    // Offer to install local git hooks if cwd is inside one of the selected repos
+    const gitRoot = findGitRoot();
+    if (gitRoot) {
+        const gitDirName = basename(gitRoot).toLowerCase();
+        const repoName = selectedRepos.find((r) => {
+            const name = r.split('/')[1]?.replace(/\.git$/, '');
+            return name && gitDirName === name.toLowerCase();
+        });
+        if (repoName) {
+            try {
+                const { installHooks } = await inquirer.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'installHooks',
+                        message: `Install git hooks locally for ${repoName}? (agent detection, truncation checking, LLM rules)`,
+                        default: true,
+                    },
+                ]);
+                if (installHooks) {
+                    console.log('');
+                    await hooksInstall({ skipEntire: true, force: true });
+                }
+            }
+            catch (err) {
+                console.log(chalk.yellow(`  ⚠ Hook installation failed: ${err instanceof Error ? err.message : err}`));
+                console.log(chalk.dim('  You can install hooks later with: haystack hooks install'));
+            }
+        }
+        else {
+            console.log(chalk.dim('  To install git hooks in a repo, cd into it and run:'));
+            console.log(chalk.dim('    haystack hooks install\n'));
+        }
+    }
+    else {
+        console.log(chalk.dim('  To install git hooks in a repo, cd into it and run:'));
+        console.log(chalk.dim('    haystack hooks install\n'));
+    }
 }

package/dist/commands/submit.js

@@ -51,7 +51,7 @@ function checkerDisplayName(checker) {
     switch (checker) {
         case 'code-review': return 'Code Review';
         case 'rules-validator': return 'Rules Validator';
-        case 'intent-drift': return 'Intent Drift';
+        case 'intent-drift': return 'Instruction Drift';
         default: return checker;
     }
 }

package/dist/commands/triage.js

@@ -10,7 +10,7 @@
  *   haystack triage https://github.com/owner/repo/pull/123
  */
 import chalk from 'chalk';
-import { checkAnalysisReady, fetchRatingSynthesis } from '../utils/analysis-api.js';
+import { checkAnalysisReady, fetchRatingSynthesis, fetchAutoFixManifest } from '../utils/analysis-api.js';
 import { parseRemoteUrl } from '../utils/git.js';
 import { loadToken } from './login.js';
 // ============================================================================
@@ -83,7 +83,7 @@ function severityIcon(severity) {
         default: return chalk.dim('-');
     }
 }
-function printRichOutput(pr, synthesis) {
+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}`));
@@ -117,22 +117,56 @@ function printRichOutput(pr, synthesis) {
             console.log(`  ${chalk.dim('Checks:')}   ${parts.join('  ')}`);
         }
     }
-    // Findings (synthesisDisplay) — the main actionable content
+    // Auto-fix manifest — show what the fixer did vs left for human review
+    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})`)}`);
+            for (const item of manifest.fixedItems) {
+                console.log(`  ${chalk.green('  ✓')} ${chalk.dim(`[${item.category}]`)} ${item.summary}`);
+            }
+            console.log('');
+        }
+        if (manifest.leftForReview.length > 0) {
+            console.log(`  ${chalk.yellow.bold(`Left for you (${manifest.leftForReview.length})`)}`);
+            for (const item of manifest.leftForReview) {
+                console.log(`  ${chalk.yellow('  →')} ${chalk.dim(`[${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) {
-        console.log(chalk.bold('\n  Findings\n'));
-        for (let i = 0; i < synthesis.synthesisDisplay.length; i++) {
-            const finding = synthesis.synthesisDisplay[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) {
-                // Indent multi-line detail
-                const detailLines = finding.detail.split('\n');
-                for (const line of detailLines) {
-                    console.log(`     ${chalk.dim(line)}`);
+        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)}`);
+                    }
                 }
+                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('');
             }
-            console.log('');
         }
     }
     // Verified bugs
@@ -161,8 +195,8 @@ function printRichOutput(pr, synthesis) {
         }
         console.log('');
     }
-    // Agent fix prompts — the key actionable output for coding agents
-    const fixableFindings = (synthesis.synthesisDisplay || []).filter(f => f.agentFixPrompt);
+    // 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'));
@@ -181,7 +215,7 @@ function printRichOutput(pr, synthesis) {
     console.log(`  ${chalk.dim('Full review:')} ${chalk.cyan(reviewUrl)}`);
     console.log('');
 }
-function printJsonOutput(pr, synthesis) {
+function printJsonOutput(pr, synthesis, manifest) {
     const reviewUrl = `https://haystackeditor.com/review/${pr.owner}/${pr.repo}/${pr.prNumber}`;
     const output = {
         owner: pr.owner,
@@ -192,12 +226,13 @@ function printJsonOutput(pr, synthesis) {
         phase: synthesis.phase,
         canAutoMerge: synthesis.reviewRecommendation?.canAutoMerge ?? false,
         needsHumanReview: synthesis.needsHumanReview,
-        findings: (synthesis.synthesisDisplay || []).map(f => ({
+        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,
@@ -209,6 +244,11 @@ function printJsonOutput(pr, synthesis) {
         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));
@@ -328,8 +368,11 @@ export async function triageCommand(identifier, options) {
     }
     if (!analysisReady)
         return;
-    // Fetch the full rating synthesis
-    const synthesis = await fetchRatingSynthesis(pr.owner, pr.repo, pr.prNumber, token);
+    // Fetch the full rating synthesis and auto-fix manifest in parallel
+    const [synthesis, autoFixManifest] = await Promise.all([
+        fetchRatingSynthesis(pr.owner, pr.repo, pr.prNumber, token),
+        fetchAutoFixManifest(pr.owner, pr.repo, pr.prNumber, token),
+    ]);
     if (!synthesis) {
         if (options.json) {
             console.log(JSON.stringify({
@@ -346,9 +389,58 @@ export async function triageCommand(identifier, options) {
     }
     // Output
     if (options.json) {
-        printJsonOutput(pr, synthesis);
+        printJsonOutput(pr, synthesis, autoFixManifest);
     }
     else {
-        printRichOutput(pr, synthesis);
+        printRichOutput(pr, synthesis, autoFixManifest);
+    }
+    // Record findings-seen marker (fire-and-forget — failure is non-fatal)
+    if (synthesis.synthesisDisplay && synthesis.synthesisDisplay.length > 0 && token) {
+        const findingKeys = synthesis.synthesisDisplay.map((f) => `${f.category}|${f.summary}`);
+        recordFindingsSeen(pr, token, findingKeys).catch((err) => {
+            // Non-blocking but logged — don't swallow silently
+            if (process.env.DEBUG) {
+                console.error(chalk.dim(`  [debug] findings-seen write failed: ${err}`));
+            }
+        });
+    }
+}
+/**
+ * Record that the user has seen analysis findings for this PR.
+ * Fire-and-forget: failure is silently ignored.
+ */
+async function recordFindingsSeen(pr, token, findingKeys) {
+    // Get PR head SHA
+    const ghResp = await fetch(`https://api.github.com/repos/${pr.owner}/${pr.repo}/pulls/${pr.prNumber}`, {
+        headers: {
+            Authorization: `Bearer ${token}`,
+            Accept: 'application/vnd.github.v3+json',
+            'User-Agent': 'Haystack-CLI',
+        },
+    });
+    if (!ghResp.ok) {
+        throw new Error(`GitHub API returned ${ghResp.status}`);
+    }
+    const ghData = await ghResp.json();
+    const sha = ghData?.head?.sha;
+    if (typeof sha !== 'string' || !sha) {
+        throw new Error('Unexpected GitHub response: missing head.sha');
+    }
+    const resp = await fetch('https://haystackeditor.com/api/findings-seen', {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+            'User-Agent': 'Haystack-CLI',
+        },
+        body: JSON.stringify({
+            repoFullName: `${pr.owner}/${pr.repo}`,
+            prNumber: pr.prNumber,
+            commitSha: sha,
+            findingKeys,
+        }),
+    });
+    if (!resp.ok) {
+        throw new Error(`findings-seen API returned ${resp.status}`);
     }
 }

package/dist/index.d.ts

@@ -15,6 +15,7 @@
  *   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
+ *   npx @haystackeditor/cli request-review 123 # Tag a PR as needing human review
  *   npx @haystackeditor/cli pr-status 123  # Show PR status in Haystack pipeline
  *   npx @haystackeditor/cli config         # Manage preferences
  */

package/dist/index.js

@@ -15,6 +15,7 @@
  *   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
+ *   npx @haystackeditor/cli request-review 123 # Tag a PR as needing human review
  *   npx @haystackeditor/cli pr-status 123  # Show PR status in Haystack pipeline
  *   npx @haystackeditor/cli config         # Manage preferences
  */
@@ -31,13 +32,14 @@ import { installSessionHooks, sessionHooksStatus } from './commands/install-sess
 import { listPolicies, addPolicy, removePolicy, initPolicies, addInstruction } from './commands/policy.js';
 import { triageCommand } from './commands/triage.js';
 import { dismissCommand, markReviewedCommand, undismissCommand } from './commands/dismiss.js';
+import { requestReviewCommand } from './commands/request-review.js';
 import { prStatusCommand } from './commands/pr-status.js';
 import { setupCommand } from './commands/setup.js';
 const program = new Command();
 program
     .name('haystack')
     .description('Haystack CLI — automated PR review, triage, and merge queue')
-    .version('0.10.2');
+    .version('0.11.0');
 program
     .command('init')
     .description('Create .haystack.json configuration')
@@ -98,7 +100,7 @@ program
     .addHelpText('after', `
 This command is designed for AI coding agents to submit PRs.
 
-  1. Runs pre-PR triage (code review, rules, intent drift) via sub-agents
+  1. Runs pre-PR triage (code review, rules, instruction drift) via sub-agents
   2. Pushes the current branch to origin
   3. Creates a pull request on GitHub
   4. Waits for Haystack analysis results (triggered via GitHub App webhook)
@@ -107,7 +109,7 @@ Pre-PR Triage:
   Before creating the PR, haystack spawns parallel sub-agents to check for:
   • Code review bugs (logic errors, null crashes, security issues)
   • Rule violations (from .haystack/pr-rules.yml)
-  • Intent drift (AI agent deviations from user instructions)
+  • Instruction drift (AI agent deviations from user instructions)
 
   Use --force to skip triage entirely.
   Use --no-wait to skip waiting for analysis results.
@@ -247,6 +249,29 @@ Examples:
   haystack undismiss acme/widgets#99     # Undo for specific repo
 `)
     .action(undismissCommand);
+program
+    .command('request-review <pr> [reviewer]')
+    .description('Tag a PR as needing human review')
+    .addHelpText('after', `
+Tag any PR with "needs human review", even after it was created.
+Adds the haystack:needs-review label to the PR, moving it from
+"Good to Merge" to the "Needs Assignment" queue in the feed.
+
+Optionally specify a reviewer to request review from a specific
+GitHub user.
+
+PR identifier formats:
+  123                                     PR number (uses current repo)
+  #123                                    PR number with hash
+  owner/repo#123                          Fully qualified
+  https://github.com/owner/repo/pull/123  GitHub URL
+
+Examples:
+  haystack request-review 42                  # Tag PR #42 for human review
+  haystack request-review 42 octocat          # Tag and request review from octocat
+  haystack request-review acme/widgets#99     # Specific repo
+`)
+    .action(requestReviewCommand);
 program
     .command('pr-status <pr>')
     .description('Show the current Haystack status of a PR')
@@ -317,25 +342,25 @@ config
     .description('Configure which AI reviewers the merge queue waits for')
     .addHelpText('after', `
 Actions:
-  list          Show current expected reviewers (default)
-  add <names>   Add one or more AI reviewer sources
-  remove <names> Remove one or more AI reviewer sources
-  clear         Remove all expected reviewers
+  list          Show configured reviewer bots (default)
+  add <names>   Add one or more reviewer bots
+  remove <names> Remove one or more reviewer bots
+  clear         Remove all reviewer bots
 
-AI reviewer sources are stored in .haystack.json under
-babysitter.expected_ai_reviewers. The merge queue will
-wait for these reviewers to post before starting the
-grace period.
+Accepts friendly names (cursor, coderabbit) or exact
+GitHub bot usernames (cursor-bugbot[bot]).
 
-Run \`haystack config wait-for-reviewers list\` to see
-all available reviewer sources and which are enabled.
+Stored in .haystack.json under merge_queue.wait_for_reviewer.bots.
+The merge queue will block merging until ALL configured
+bots have posted a review or comment on the PR.
 
 Examples:
-  haystack config wait-for-reviewers                    # Show status
-  haystack config wait-for-reviewers add cursor         # Wait for Cursor BugBot
-  haystack config wait-for-reviewers add cursor coderabbit  # Add multiple
-  haystack config wait-for-reviewers remove cursor      # Stop waiting for Cursor
-  haystack config wait-for-reviewers clear              # Wait for none
+  haystack config wait-for-reviewers                          # Show status
+  haystack config wait-for-reviewers add cursor               # Wait for Cursor BugBot
+  haystack config wait-for-reviewers add cursor coderabbit    # Add multiple
+  haystack config wait-for-reviewers add cursor-bugbot[bot]   # Raw bot username
+  haystack config wait-for-reviewers remove cursor            # Stop waiting
+  haystack config wait-for-reviewers clear                    # Wait for none
 `)
     .action(handleWaitForReviewers);
 // Skills subcommands