@haystackeditor/cli 0.10.3 → 0.12.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,280 @@ 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.2';
+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 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 };
+    let originalContent = '';
+    const getResp = await fetch(`${GITHUB_API}/repos/${owner}/${repo}/contents/${filePath}`, { headers });
+    if (getResp.ok) {
+        const data = (await getResp.json());
+        existingSha = data.sha;
+        originalContent = Buffer.from(data.content, 'base64').toString('utf-8');
+        try {
+            settings = JSON.parse(originalContent);
+        }
+        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
+    // Remove legacy skip_raw_transcript if present (v0.5.3-haystack.2+ compacts automatically)
+    if (settings.strategy_options && typeof settings.strategy_options === 'object') {
+        const strategyOptions = settings.strategy_options;
+        delete strategyOptions.skip_raw_transcript;
+        if (Object.keys(strategyOptions).length === 0) {
+            delete settings.strategy_options;
+        }
+    }
+    const updatedContent = JSON.stringify(settings, null, 2) + '\n';
+    // Skip write if nothing changed (avoids no-op commits)
+    if (existingSha && updatedContent === originalContent) {
+        return;
+    }
+    const content = Buffer.from(updatedContent).toString('base64');
+    const body = {
+        message: 'chore: configure Entire CLI settings',
+        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) (transcripts auto-compacted)\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.d.ts

@@ -19,5 +19,6 @@ export interface SubmitOptions {
     force?: boolean;
     wait?: boolean;
     autoFix?: boolean;
+    autoMerge?: boolean;
 }
 export declare function submitCommand(options: SubmitOptions): Promise<void>;

package/dist/commands/submit.js

@@ -16,7 +16,6 @@ import { createPullRequest, findExistingPR, requireGitHubAuth, requestReviewers,
 import { runTriage } from '../triage/runner.js';
 import { checkAnalysisReady, fetchAnalysisResults } from '../utils/analysis-api.js';
 import { savePendingSubmit, updatePendingSubmit } from '../utils/pending-state.js';
-import { isAutoMergeEnabled } from './config.js';
 import { ensureHaystackLabels, addLabelsToIssue, } from '../utils/github-api.js';
 // ============================================================================
 // Helpers
@@ -51,7 +50,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;
     }
 }
@@ -269,14 +268,7 @@ export async function submitCommand(options) {
     // -------------------------------------------------------------------------
     // Step 6: Apply auto-merge label if enabled
     // -------------------------------------------------------------------------
-    let autoMergeEnabled = false;
-    try {
-        autoMergeEnabled = await isAutoMergeEnabled();
-    }
-    catch {
-        // Preference check failure should not block submission
-    }
-    if (autoMergeEnabled) {
+    if (options.autoMerge) {
         try {
             await ensureHaystackLabels(remoteInfo.owner, remoteInfo.repo, ['haystack:auto-merge']);
             await addLabelsToIssue(remoteInfo.owner, remoteInfo.repo, prNumber, ['haystack:auto-merge']);
@@ -293,7 +285,7 @@ export async function submitCommand(options) {
         try {
             await ensureHaystackLabels(remoteInfo.owner, remoteInfo.repo, ['haystack:auto-fix']);
             await addLabelsToIssue(remoteInfo.owner, remoteInfo.repo, prNumber, ['haystack:auto-fix']);
-            console.log(chalk.green('✓ Auto-fix enabled for this PR'));
+            console.log(chalk.green('✓ Auto-fix (alpha) enabled for this PR'));
         }
         catch (err) {
             console.log(chalk.yellow(`⚠ Could not set auto-fix label: ${err.message}`));
@@ -328,11 +320,11 @@ export async function submitCommand(options) {
     console.log(`  ${chalk.dim('URL:')}    ${chalk.cyan(prUrl)}`);
     console.log(`  ${chalk.dim('Title:')}  ${options.title || getLastCommitMessage()}`);
     console.log(`  ${chalk.dim('Branch:')} ${currentBranch} → ${baseBranch}`);
-    if (autoMergeEnabled) {
+    if (options.autoMerge) {
         console.log(`  ${chalk.dim('Merge:')}  ${chalk.green('Auto-merge if safe')}`);
     }
     if (options.autoFix) {
-        console.log(`  ${chalk.dim('Fix:')}    ${chalk.cyan('Auto-fix issues before Feed')}`);
+        console.log(`  ${chalk.dim('Fix:')}    ${chalk.cyan('Auto-fix alpha enabled')}`);
     }
     if (options.review) {
         const reviewer = typeof options.review === 'string' ? options.review : 'needs assignment';
@@ -343,7 +335,7 @@ export async function submitCommand(options) {
     // Step 9: Wait for Haystack analysis (triggered via GitHub App webhook)
     // -------------------------------------------------------------------------
     console.log(chalk.dim('Haystack analysis triggered via GitHub App webhook.'));
-    // Save pending state (so check-pending works even if we disconnect)
+    // Save pending state (so `haystack triage` works even if we disconnect)
     const pendingState = {
         version: 1,
         prNumber,
@@ -359,7 +351,7 @@ export async function submitCommand(options) {
     // If --no-wait or non-interactive, exit here
     if (options.wait === false || !process.stdin.isTTY) {
         console.log(chalk.dim('\nAnalysis running in background.'));
-        console.log(chalk.dim('Check results later with: ') + chalk.cyan('haystack check-pending\n'));
+        console.log(chalk.dim('Check results later with: ') + chalk.cyan('haystack triage\n'));
         return;
     }
     // Wait for analysis inline by polling the result endpoint
@@ -369,7 +361,7 @@ export async function submitCommand(options) {
     const sigintHandler = () => {
         interrupted = true;
         console.log(chalk.dim('\n\nAnalysis still running. Check later with:'));
-        console.log(chalk.cyan('  haystack check-pending\n'));
+        console.log(chalk.cyan('  haystack triage\n'));
         process.exit(0);
     };
     process.on('SIGINT', sigintHandler);
@@ -407,9 +399,10 @@ export async function submitCommand(options) {
                 else if (options.autoFix) {
                     // Auto-fix flow: agent fixes straightforward issues in the background.
                     // Issues appear in Feed immediately — user can review while agent works.
-                    console.log(chalk.cyan.bold('  ⚙ Auto-fix triggered\n'));
+                    console.log(chalk.cyan.bold('  ⚙ Auto-fix triggered (alpha)\n'));
                     console.log(chalk.dim(`  ${verdict.summary}\n`));
-                    console.log(chalk.dim('  Coding agent is fixing straightforward issues in the background.'));
+                    console.log(chalk.dim('  Coding agent is fixing straightforward mechanical issues in the background.'));
+                    console.log(chalk.dim('  Auto-fix is currently alpha.'));
                     console.log(chalk.dim('  Issues that need your judgment are in the Feed now.\n'));
                     const reviewUrl = `https://haystackeditor.com/review/${remoteInfo.owner}/${remoteInfo.repo}/${prNumber}`;
                     console.log(`  ${chalk.dim('Feed:')} ${chalk.cyan(reviewUrl)}\n`);
@@ -451,6 +444,6 @@ export async function submitCommand(options) {
     process.removeListener('SIGINT', sigintHandler);
     if (Date.now() >= deadline && !interrupted) {
         console.log(chalk.yellow('\n\n  Timed out waiting for analysis.'));
-        console.log(chalk.dim('  Check results later with: ') + chalk.cyan('haystack check-pending\n'));
+        console.log(chalk.dim('  Check results later with: ') + chalk.cyan('haystack triage\n'));
     }
 }

package/dist/commands/triage.d.ts

@@ -1,16 +1,28 @@
 /**
- * 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
  */
 export interface TriageOptions {
     json?: boolean;
     wait?: boolean;
+    hook?: boolean;
+    clear?: boolean;
 }
-export declare function triageCommand(identifier: string, options: TriageOptions): Promise<void>;
+export declare function triageCommand(identifier: string | undefined, options: TriageOptions): Promise<void>;