@haystackeditor/cli 0.15.0 → 0.15.2

package/dist/commands/setup.js

@@ -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,26 @@ 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;
+        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 +820,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;

package/dist/utils/prompter.js

@@ -50,7 +50,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 +77,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) {
@@ -131,22 +138,32 @@ class JsonPrompter {
             try {
                 obj = JSON.parse(trimmed);
             }
-            catch {
-                return; // ignore non-JSON noise on stdin
+            catch (err) {
+                // Surface malformed input on stderr (PR001: no silent swallow) so an
+                // agent can tell its line was rejected and resend, instead of the
+                // prompt hanging on input that never parsed. stderr keeps stdout NDJSON.
+                process.stderr.write(`haystack setup: ignoring unparseable stdin line: ${err instanceof Error ? err.message : String(err)}\n`);
+                return;
             }
-            if (!obj || typeof obj.id !== 'string')
+            if (!obj || typeof obj !== 'object')
+                return;
+            // Mirror OpenCode: question replies are keyed by `requestID`, permission
+            // replies by `permissionID`. Legacy `id` accepted too.
+            const key = (obj.requestID ?? obj.permissionID ?? obj.id);
+            if (typeof key !== 'string')
                 return;
-            const resolve = this.pending.get(obj.id);
+            const resolve = this.pending.get(key);
             if (resolve) {
-                this.pending.delete(obj.id);
-                resolve(obj.value);
+                this.pending.delete(key);
+                resolve(obj);
             }
             else {
-                this.buffered.set(obj.id, obj.value);
+                this.buffered.set(key, obj);
             }
         });
     }
-    awaitAnswer(id) {
+    /** Wait for the agent's reply object, keyed by the request/permission id. */
+    awaitReply(id) {
         if (this.buffered.has(id)) {
             const v = this.buffered.get(id);
             this.buffered.delete(id);
@@ -158,42 +175,60 @@ class JsonPrompter {
     async confirm(q) {
         if (q.id in this.answers)
             return Boolean(this.answers[q.id]);
-        this.emit({ type: 'question', id: q.id, kind: 'confirm', prompt: q.message, default: q.default ?? true });
-        return Boolean(await this.awaitAnswer(q.id));
+        // A confirm is a single-choice question; emit OpenCode's `question` envelope.
+        // Reply: {requestID, answers: <bool>}; reject: {requestID, reject: true}.
+        this.emit({ type: 'question', requestID: q.id, kind: 'confirm', prompt: q.message, default: q.default ?? true });
+        const reply = await this.awaitReply(q.id);
+        if (reply.reject)
+            return false;
+        const a = reply.answers ?? reply.value; // `answers` is canonical; `value` accepted
+        return typeof a === 'boolean' ? a : Boolean(a);
     }
     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 }));
-        this.emit({ type: 'question', id: q.id, kind: 'multiselect', prompt: q.message, options });
-        return (await this.awaitAnswer(q.id));
+        // 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);
+        if (reply.reject)
+            return [];
+        const a = reply.answers ?? reply.value;
+        return Array.isArray(a) ? a : [];
     }
     async action(q) {
         if (this.answers[q.id] === 'skip')
             return false;
         if (await q.check())
             return true;
-        // Tell the agent an out-of-band action is needed; then poll until satisfied.
-        // An agent may also push {"id","value":"skip"|"done"} on stdin to override.
-        this.emit({ type: 'action', id: q.id, prompt: q.message, url: q.url, poll: true });
+        // An out-of-band action maps to OpenCode's `permission` request. Reply:
+        // {permissionID, response: "once"|"always"|"reject"}. We also keep polling
+        // check() so it resolves on its own once the action completes.
+        this.emit({ type: 'permission', permissionID: q.id, prompt: q.message, url: q.url, poll: true });
         const started = Date.now();
         const timeout = q.timeoutMs ?? 10 * 60 * 1000;
         const interval = q.pollIntervalMs ?? 3000;
         let override = null;
-        // Resolve the moment the agent answers, OR when polling detects completion.
         this.ensureStdin();
-        const answerPromise = this.awaitAnswer(q.id).then((v) => {
-            override = v === 'skip' ? 'skip' : 'done';
+        const answerPromise = this.awaitReply(q.id).then((reply) => {
+            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;
-            if (override === 'done')
-                return (await q.check()); // agent says installed; trust but verify
+            // '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]);
         }
         return false;
@@ -221,6 +256,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.0",
+  "version": "0.15.2",
   "description": "Set up Haystack for your project — automated PR review, triage, and merge queue",
   "type": "module",
   "bin": {