@haystackeditor/cli 0.11.0 → 0.12.0

package/dist/commands/install-session-hooks.js

@@ -1,8 +1,9 @@
 /**
  * install-session-hooks — Wire up session-start hooks for coding CLIs.
  *
- * When a CLI session starts, `haystack check-pending --hook` runs automatically
- * and shows the user whether their pending PRs are "Good to merge" or "Need input".
+ * When a CLI session starts, `haystack triage --hook` runs automatically
+ * and shows the user whether their last submitted PR is "Good to merge" or
+ * "Needs input", with the Haystack rating and auto-fixer status.
  *
  * Supported CLIs:
  *   - Claude Code: Native SessionStart hook in .claude/settings.json
@@ -41,7 +42,7 @@ function detectInstalledCLIs() {
 // ============================================================================
 // Claude Code: Native SessionStart hook
 // ============================================================================
-const HAYSTACK_HOOK_COMMAND = 'haystack check-pending --hook';
+const HAYSTACK_HOOK_COMMAND = 'haystack triage --hook';
 function installClaudeHook(gitRoot) {
     const settingsDir = join(gitRoot, '.claude');
     const settingsPath = join(settingsDir, 'settings.json');
@@ -61,13 +62,28 @@ function installClaudeHook(gitRoot) {
         // Ensure SessionStart array exists
         const sessionStart = (hooks.SessionStart || []);
         hooks.SessionStart = sessionStart;
-        // Check if haystack hook already installed
-        const alreadyInstalled = sessionStart.some(entry => entry.hooks?.some(h => h.command?.includes('haystack check-pending')));
-        if (alreadyInstalled) {
-            console.log(chalk.dim('  Claude Code hook already installed.'));
+        // Check if haystack hook already installed (current or legacy)
+        const isHaystackHook = (h) => h.command?.includes('haystack triage') || h.command?.includes('haystack check-pending');
+        const existingIndex = sessionStart.findIndex(entry => entry.hooks?.some(h => isHaystackHook(h)));
+        if (existingIndex !== -1) {
+            const entry = sessionStart[existingIndex];
+            const isLegacy = entry.hooks?.some(h => h.command?.includes('haystack check-pending'));
+            if (isLegacy) {
+                // Migrate legacy hook in-place
+                for (const h of entry.hooks || []) {
+                    if (h.command?.includes('haystack check-pending')) {
+                        h.command = HAYSTACK_HOOK_COMMAND;
+                    }
+                }
+                writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
+                console.log(chalk.green('  Claude Code hook migrated from check-pending to triage.'));
+            }
+            else {
+                console.log(chalk.dim('  Claude Code hook already installed.'));
+            }
             return true;
         }
-        // Add the hook
+        // Add the hook (fresh install)
         sessionStart.push({
             matcher: '',
             hooks: [
@@ -92,7 +108,7 @@ function checkClaudeHook(gitRoot) {
     try {
         const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
         const sessionStart = settings?.hooks?.SessionStart || [];
-        return sessionStart.some((entry) => entry.hooks?.some((h) => h.command?.includes('haystack check-pending')));
+        return sessionStart.some((entry) => entry.hooks?.some((h) => h.command?.includes('haystack triage') || h.command?.includes('haystack check-pending')));
     }
     catch {
         return false;
@@ -109,7 +125,7 @@ ${CODEX_HOOK_MARKER}
 When starting a new session, run this command first to check for pending PR analysis results:
 
 \`\`\`bash
-haystack check-pending --hook
+haystack triage --hook
 \`\`\`
 
 This shows whether your submitted PRs are "Good to merge" or "Need your input".
@@ -157,7 +173,7 @@ ${GEMINI_HOOK_MARKER}
 When starting a new session, run this command first to check for pending PR analysis results:
 
 \`\`\`bash
-haystack check-pending --hook
+haystack triage --hook
 \`\`\`
 
 This shows whether your submitted PRs are "Good to merge" or "Need your input".

package/dist/commands/pr-status.d.ts

@@ -13,4 +13,9 @@
 export interface PRStatusOptions {
     json?: boolean;
 }
+export declare const BUCKET_DISPLAY: Record<string, {
+    label: string;
+    color: (s: string) => string;
+    icon: string;
+}>;
 export declare function prStatusCommand(identifier: string, options: PRStatusOptions): Promise<void>;

package/dist/commands/pr-status.js

@@ -46,9 +46,9 @@ function parsePRIdentifier(identifier) {
 // ============================================================================
 // Display helpers
 // ============================================================================
-const BUCKET_DISPLAY = {
+export const BUCKET_DISPLAY = {
     'analyzing': { label: 'Analyzing', color: chalk.blue, icon: '...' },
-    'auto-fixing': { label: 'Auto-fixing', color: chalk.blue, icon: '>>>' },
+    'auto-fixing': { label: 'Auto-fixing (alpha)', color: chalk.blue, icon: '>>>' },
     'good-to-merge': { label: 'Good to Merge', color: chalk.green, icon: '[+]' },
     'failed-when-merging': { label: 'Failed When Merging', color: chalk.red, icon: '[!]' },
     'issues': { label: 'Issues Found', color: chalk.yellow, icon: '[?]' },

package/dist/commands/setup.js

@@ -509,7 +509,7 @@ export async function setupCommand() {
 // =============================================================================
 // Step 7: Install Entire CLI for session tracking
 // =============================================================================
-const ENTIRE_VERSION = 'v0.5.3-haystack.1';
+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'
@@ -591,7 +591,7 @@ async function installEntireBinary() {
     }
 }
 /**
- * Write .entire/settings.json with skip_raw_transcript via the GitHub API.
+ * Write .entire/settings.json via the GitHub API.
  * selectedRepos are GitHub full names (owner/repo), not local paths.
  */
 async function configureEntireSettingsViaAPI(repoFullName, token) {
@@ -606,12 +606,14 @@ async function configureEntireSettingsViaAPI(repoFullName, token) {
     // 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(Buffer.from(data.content, 'base64').toString('utf-8'));
+            settings = JSON.parse(originalContent);
         }
         catch {
             // Malformed JSON — keep sha for update but use fresh defaults
@@ -630,13 +632,22 @@ async function configureEntireSettingsViaAPI(repoFullName, token) {
         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');
+    // 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: enable skip_raw_transcript for Entire CLI\n\nPrevents committing raw 50MB session transcripts to git.',
+        message: 'chore: configure Entire CLI settings',
         content,
     };
     if (existingSha)
@@ -720,7 +731,7 @@ async function stepInstallEntire(selectedRepos, token) {
             }
         }
         if (configured > 0) {
-            console.log(chalk.green(`\n  ✓ Session tracking configured on ${configured} repo(s) (raw transcripts excluded)\n`));
+            console.log(chalk.green(`\n  ✓ Session tracking configured on ${configured} repo(s) (transcripts auto-compacted)\n`));
             trackSetupEvent('entire_configured', { configured, total: selectedRepos.length });
         }
         else {

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