@haystackeditor/cli 0.15.0 → 0.15.1

package/dist/utils/prompter.js

@@ -131,22 +131,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,8 +168,14 @@ 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)
@@ -167,33 +183,45 @@ class JsonPrompter {
         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;

package/package.json

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