@haystackeditor/cli 0.15.2 → 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;
 /**
@@ -744,6 +744,13 @@ async function isAppInstalled(token) {
         // 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;
     }
 }
@@ -1172,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);
@@ -193,10 +203,12 @@ class JsonPrompter {
         // 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')
@@ -216,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 } : {}) });

package/package.json

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