@haystackeditor/cli 0.15.1 → 0.15.3

package/dist/commands/setup.js

@@ -19,7 +19,7 @@ import { resolveAuthContext } from '../utils/auth.js';
 import { hooksInstall } from './hooks.js';
 import { findGitRoot } from '../utils/hooks.js';
 import { trackError, trackSetupEvent } from '../utils/telemetry.js';
-import { createPrompter, loadAnswersFile } from '../utils/prompter.js';
+import { createPrompter, loadAnswersFile, PromptCancelledError } from '../utils/prompter.js';
 /** The active prompter for this `setup` invocation (TTY or JSON). */
 let ui;
 /**
@@ -39,8 +39,11 @@ function buildAnswerMap(options) {
         answers.install_hooks = false;
     }
     if (options.yes) {
-        // Accept defaults non-interactively: don't open the toggle UI (keep every
-        // discovered item) and confirm the write. Only fill ids not already set.
+        // Accept the interactive wizard's defaults non-interactively: keep every
+        // discovered item (skip the toggle UI), confirm the write, and say yes to
+        // the same things the prompts default to (auto-merge, session tracking,
+        // hooks). Use --skip-entire / --no-auto-merge to opt out. Only fill ids not
+        // already set by an explicit flag or --answers.
         if (!('want_to_toggle' in answers))
             answers.want_to_toggle = false;
         if (!('confirm_write' in answers))
@@ -48,9 +51,11 @@ function buildAnswerMap(options) {
         if (!('auto_merge' in answers))
             answers.auto_merge = true;
         if (!('install_entire' in answers))
-            answers.install_entire = false;
+            answers.install_entire = true;
+        if (!('upgrade_entire' in answers))
+            answers.upgrade_entire = true;
         if (!('install_hooks' in answers))
-            answers.install_hooks = false;
+            answers.install_hooks = true;
     }
     return answers;
 }
@@ -730,14 +735,33 @@ function tryOpenBrowser(url) {
  *  the poll keeps waiting) but rethrows a genuine auth failure so the caller can
  *  bail and prompt re-auth. */
 async function isAppInstalled(token) {
-    return (await fetchHaystackInstallations(token)).length > 0;
+    try {
+        return (await fetchHaystackInstallations(token)).length > 0;
+    }
+    catch (err) {
+        // Auth failures are permanent — surface them. Anything else (5xx, network
+        // blip) is transient during the install poll: return false so the poll
+        // keeps waiting instead of crashing the wizard.
+        if (err instanceof InstallationsAuthError)
+            throw err;
+        // Transient (5xx / network / rate limit): log so it isn't a silent fallback
+        // (PR001), then return false so the install poll keeps waiting. Re-throwing
+        // here — a literal reading of "no silent fallback" — would reintroduce the
+        // poll-crash this function exists to prevent, so we log instead.
+        trackError('haystack_setup_app_check_transient_error', {
+            error_message: err instanceof Error ? err.message : String(err),
+        });
+        return false;
+    }
 }
 async function stepEnsureAppInstalled(token) {
     console.log(chalk.bold('  Step 0: Verify GitHub App'));
-    // Initial check — distinguish a genuine auth failure (bail, prompt re-auth)
-    // from a transient probe error (refuse-to-fail and proceed).
+    // Initial check — use the raw fetch (not isAppInstalled, which swallows
+    // transient errors) so we can distinguish three outcomes: installed (done),
+    // genuine auth failure (bail + prompt re-auth), or a transient probe error
+    // (refuse-to-fail and proceed rather than brick setup over a blip).
     try {
-        if (await isAppInstalled(token)) {
+        if ((await fetchHaystackInstallations(token)).length > 0) {
             console.log(chalk.green('  ✓ Haystack App installed\n'));
             return;
         }
@@ -803,14 +827,24 @@ async function stepSelectRepos(token) {
         console.log(chalk.yellow('\n  No repositories found.\n'));
         process.exit(1);
     }
-    const selectedRepos = await ui.multiselect({
-        id: 'select_repos',
-        message: 'Select repositories to configure:',
-        choices: repos.map((r) => ({ name: r, value: r })),
-    });
-    if (selectedRepos.length === 0) {
-        console.log(chalk.yellow('\n  No repositories selected.\n'));
-        process.exit(1);
+    let selectedRepos = [];
+    for (;;) {
+        selectedRepos = await ui.multiselect({
+            id: 'select_repos',
+            message: 'Select repositories to configure:',
+            choices: repos.map((r) => ({ name: r, value: r })),
+        });
+        if (selectedRepos.length > 0)
+            break;
+        // Interactive: keep the picker open so the user can correct an empty pick
+        // (restores the old inquirer `validate` behavior). Non-interactive: a
+        // pre-supplied / agent-sent empty selection can't be fixed by re-prompting,
+        // so fail clearly instead of looping forever.
+        if (!ui.interactive) {
+            console.log(chalk.yellow('\n  No repositories selected. Pass --repo <owner/name>.\n'));
+            process.exit(1);
+        }
+        console.log(chalk.yellow('  Select at least one repository.'));
     }
     console.log(chalk.green(`  ${selectedRepos.length} repo(s) selected\n`));
     return selectedRepos;
@@ -1145,6 +1179,15 @@ export async function setupCommand(options = {}) {
     try {
         await runSetupFlow(options);
     }
+    catch (err) {
+        // An agent cancelling a prompt is a clean exit, not a crash.
+        if (err instanceof PromptCancelledError) {
+            console.log(chalk.yellow('\n  Setup cancelled.\n'));
+            ui.result({ status: 'cancelled' });
+            return;
+        }
+        throw err;
+    }
     finally {
         ui.close();
     }

package/dist/utils/prompter.d.ts

@@ -25,6 +25,12 @@ export type Choice<T> = {
 } | {
     separator: string;
 };
+/** Thrown when an agent explicitly rejects/cancels a prompt (vs. answering it),
+ *  so callers can distinguish a cancellation from a valid empty answer. */
+export declare class PromptCancelledError extends Error {
+    readonly requestID: string;
+    constructor(requestID: string);
+}
 export interface Prompter {
     /** True for the human TTY prompter — gates side effects like opening a browser
      *  that only make sense for a local interactive user. */

package/dist/utils/prompter.js

@@ -23,6 +23,16 @@ import { readFileSync } from 'node:fs';
 function isSeparator(c) {
     return c.separator !== undefined;
 }
+/** Thrown when an agent explicitly rejects/cancels a prompt (vs. answering it),
+ *  so callers can distinguish a cancellation from a valid empty answer. */
+export class PromptCancelledError extends Error {
+    requestID;
+    constructor(requestID) {
+        super(`Prompt "${requestID}" was cancelled.`);
+        this.requestID = requestID;
+        this.name = 'PromptCancelledError';
+    }
+}
 export function loadAnswersFile(path) {
     const raw = readFileSync(path, 'utf8');
     const parsed = JSON.parse(raw);
@@ -50,7 +60,7 @@ class TtyPrompter {
     }
     async multiselect(q) {
         if (q.id in this.answers)
-            return this.answers[q.id];
+            return asArray(this.answers[q.id], q.id);
         const choices = q.choices.map((c) => isSeparator(c) ? new inquirer.Separator(c.separator) : { name: c.name, value: c.value, checked: c.checked });
         const { value } = await inquirer.prompt([
             { type: 'checkbox', name: 'value', message: q.message, choices: choices, pageSize: 20 },
@@ -77,9 +87,16 @@ class TtyPrompter {
         return false;
     }
     progress(message, detail) {
+        // Only emit carriage-return / clear-line ANSI to a real TTY; piped to a file
+        // or CI log (non-interactive, no --json) those sequences corrupt the output,
+        // so stay silent there.
+        if (!process.stdout.isTTY)
+            return;
         process.stdout.write(`\r${chalk.dim('  ' + message)}${detail ? chalk.dim(' — ' + detail) : ''}\x1b[K`);
     }
     clearProgress() {
+        if (!process.stdout.isTTY)
+            return;
         process.stdout.write('\r\x1b[K');
     }
     result(_data) {
@@ -179,17 +196,19 @@ class JsonPrompter {
     }
     async multiselect(q) {
         if (q.id in this.answers)
-            return this.answers[q.id];
+            return asArray(this.answers[q.id], q.id);
         const options = q.choices
             .filter((c) => !isSeparator(c))
             .map((c) => ({ value: c.value, label: c.name, default: c.checked ?? false }));
         // Reply: {requestID, answers: <value[]>}; reject: {requestID, reject: true}.
         this.emit({ type: 'question', requestID: q.id, kind: 'multiselect', prompt: q.message, options });
         const reply = await this.awaitReply(q.id);
+        // Surface a rejection as a distinct cancellation rather than masking it as an
+        // empty selection, and surface a non-array reply as a protocol error rather
+        // than silently coercing to [] (PR001: no silent fallback).
         if (reply.reject)
-            return [];
-        const a = reply.answers ?? reply.value;
-        return Array.isArray(a) ? a : [];
+            throw new PromptCancelledError(q.id);
+        return asArray(reply.answers ?? reply.value, q.id);
     }
     async action(q) {
         if (this.answers[q.id] === 'skip')
@@ -209,22 +228,29 @@ class JsonPrompter {
             const r = (reply.response ?? reply.value);
             override = r === 'reject' || r === 'skip' ? 'skip' : 'done';
         });
-        while (Date.now() - started < timeout) {
-            if (await q.check())
-                return true;
-            if (override === 'skip')
-                return false;
-            // 'done' means the agent reports the action complete — but completion may
-            // be eventually-consistent, so keep polling check() at the interval until
-            // it confirms or we time out (matching TTY behavior), rather than failing
-            // on a single immediate check.
-            if (override === 'done') {
-                await sleep(interval);
-                continue;
+        try {
+            while (Date.now() - started < timeout) {
+                if (await q.check())
+                    return true;
+                if (override === 'skip')
+                    return false;
+                // 'done' means the agent reports the action complete — but completion may
+                // be eventually-consistent, so keep polling check() at the interval until
+                // it confirms or we time out (matching TTY behavior), rather than failing
+                // on a single immediate check.
+                if (override === 'done') {
+                    await sleep(interval);
+                    continue;
+                }
+                await Promise.race([sleep(interval), answerPromise]);
             }
-            await Promise.race([sleep(interval), answerPromise]);
+            return false;
+        }
+        finally {
+            // If polling or the timeout won before any stdin reply arrived, drop the
+            // dangling resolver so it doesn't accumulate across action() calls.
+            this.pending.delete(q.id);
         }
-        return false;
     }
     progress(message, detail) {
         this.emit({ type: 'progress', message, ...(detail ? { detail } : {}) });
@@ -249,6 +275,15 @@ export function createPrompter(options = {}) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+/** Validate a pre-supplied multiselect answer is actually an array before use,
+ *  so a bad --answers value (e.g. a string) fails fast with a clear message
+ *  instead of crashing downstream array operations. */
+function asArray(value, id) {
+    if (!Array.isArray(value)) {
+        throw new Error(`Answer for "${id}" must be a JSON array, got ${typeof value}.`);
+    }
+    return value;
+}
 function stringifyArg(a) {
     return typeof a === 'string' ? a : String(a);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haystackeditor/cli",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Set up Haystack for your project — automated PR review, triage, and merge queue",
   "type": "module",
   "bin": {