@threadbase-sh/streamer 1.69.4 → 1.69.6

package/dist/index.cjs

@@ -9623,19 +9623,39 @@ var UnknownOptionError = class extends Error {
   question;
   value;
 };
+var UnsupportedPromptShapeError = class extends Error {
+  constructor(detail) {
+    super(`Unsupported prompt shape: ${detail}`);
+    this.detail = detail;
+    this.name = "UnsupportedPromptShapeError";
+  }
+  detail;
+};
+var IncompleteAnswerError = class extends Error {
+  constructor(question) {
+    super(`Missing answer for question "${question}"`);
+    this.question = question;
+    this.name = "IncompleteAnswerError";
+  }
+  question;
+};
 function answersToKeystrokes(questions, answers) {
-  let out = "";
-  for (const q of questions) {
-    const raw = answers[q.question];
-    if (raw === void 0) {
-      throw new Error(`Missing answer for question "${q.question}"`);
-    }
-    const label = Array.isArray(raw) ? raw[0] : raw;
-    const target = q.options.findIndex((o) => o.label === label);
-    if (target < 0) throw new UnknownOptionError(q.question, label);
-    out += DOWN.repeat(target) + ENTER3;
+  if (questions.length !== 1) {
+    throw new UnsupportedPromptShapeError(`${questions.length} questions`);
   }
-  return out;
+  const q = questions[0];
+  if (q.multiSelect) throw new UnsupportedPromptShapeError("multiSelect");
+  const raw = answers[q.question];
+  if (raw === void 0 || Array.isArray(raw) && raw.length === 0) {
+    throw new IncompleteAnswerError(q.question);
+  }
+  if (Array.isArray(raw) && raw.length > 1) {
+    throw new UnsupportedPromptShapeError(`${raw.length} labels for a single-select question`);
+  }
+  const label = Array.isArray(raw) ? raw[0] : raw;
+  const target = q.options.findIndex((o) => o.label === label);
+  if (target < 0) throw new UnknownOptionError(q.question, label);
+  return DOWN.repeat(target) + ENTER3;
 }
 
 // src/services/questions/resolveAnswer.ts
@@ -9649,6 +9669,10 @@ function resolveAnswer(pending, body) {
     return { ok: true, keys: answersToKeystrokes(pending.questions, answers) };
   } catch (e) {
     if (e instanceof UnknownOptionError) return { ok: false, reason: "unknown_option" };
+    if (e instanceof UnsupportedPromptShapeError) {
+      return { ok: false, reason: "unsupported_prompt_shape" };
+    }
+    if (e instanceof IncompleteAnswerError) return { ok: false, reason: "incomplete_answer" };
     throw e;
   }
 }
@@ -9978,6 +10002,13 @@ var SessionHandlers = class {
   get sessionSubscribers() {
     return this.deps.sessionSubscribers;
   }
+  // Prompt lifecycle events (question / permission and their cancellations)
+  // carry prompt content and go ONLY to the session's subscribers — never to
+  // every connected socket. A client that subscribes after a prompt opened
+  // gets it from the subscribe replay (server-wiring), not from a broadcast.
+  broadcastToSession(sessionId, message) {
+    this.wsHub.broadcastToClients(this.sessionSubscribers.get(sessionId) ?? [], message);
+  }
   get agentConfig() {
     return this.deps.agentConfig;
   }
@@ -10532,7 +10563,7 @@ var SessionHandlers = class {
     const toolUseId = `screen:${sessionId}:${key.length}`;
     this.pendingQuestions.set(sessionId, { toolUseId, questions, origin: "pty" });
     this.pendingQuestionKey.set(sessionId, key);
-    this.wsHub.broadcast({ type: "question", sessionId, toolUseId, questions });
+    this.broadcastToSession(sessionId, { type: "question", sessionId, toolUseId, questions });
   }
   // Permission gate opened/closed (OSC 777 + scraped options). Broadcasts the
   // additive `permission` / `permission_cancelled` events. Mobile answers by
@@ -10542,7 +10573,7 @@ var SessionHandlers = class {
       if (!this.pendingPermission.has(sessionId)) return;
       this.pendingPermission.delete(sessionId);
       this.pendingPermissionKey.delete(sessionId);
-      this.wsHub.broadcast({ type: "permission_cancelled", sessionId });
+      this.broadcastToSession(sessionId, { type: "permission_cancelled", sessionId });
       return;
     }
     const key = permissionContentKey(gate);
@@ -10556,7 +10587,7 @@ var SessionHandlers = class {
       `[ws.broadcast_permission] ${sessionId.slice(0, 8)} subscribers=${subscriberCount}`,
       { event: "ws.broadcast_permission", sessionId, subscriberCount }
     );
-    this.wsHub.broadcast({
+    this.broadcastToSession(sessionId, {
       type: "permission",
       sessionId,
       ...gate.prompt ? { prompt: gate.prompt } : {},
@@ -10604,7 +10635,7 @@ var SessionHandlers = class {
     const gateClosed = () => {
       this.pendingPermission.delete(sessionId);
       this.pendingPermissionKey.delete(sessionId);
-      this.wsHub.broadcast({ type: "permission_cancelled", sessionId });
+      this.broadcastToSession(sessionId, { type: "permission_cancelled", sessionId });
       json(res, 409, { ok: false, reason: "gate_closed" });
     };
     const gate = this.pendingPermission.get(sessionId);
@@ -10676,14 +10707,21 @@ var SessionHandlers = class {
     const pending = this.pendingQuestions.get(sessionId);
     const resolution = resolveAnswer(pending, body);
     if (!resolution.ok) {
-      json(res, 400, { ok: false, reason: resolution.reason });
+      const unanswerable = resolution.reason === "unsupported_prompt_shape" || resolution.reason === "incomplete_answer";
+      json(res, 400, {
+        ok: false,
+        reason: resolution.reason,
+        ...unanswerable ? {
+          error: "This prompt needs an answer the app cannot give yet; answer it in the terminal"
+        } : {}
+      });
       return;
     }
     const toolUseId = pending?.toolUseId ?? "";
     if (!await this.questionMenuStillOpen(sessionId)) {
       this.pendingQuestions.delete(sessionId);
       this.pendingQuestionKey.delete(sessionId);
-      this.wsHub.broadcast({ type: "question_cancelled", sessionId, toolUseId });
+      this.broadcastToSession(sessionId, { type: "question_cancelled", sessionId, toolUseId });
       json(res, 409, { ok: false, reason: "question_gone" });
       return;
     }
@@ -10695,7 +10733,7 @@ var SessionHandlers = class {
       return;
     }
     this.pendingQuestions.delete(sessionId);
-    this.wsHub.broadcast({ type: "question_cancelled", sessionId, toolUseId });
+    this.broadcastToSession(sessionId, { type: "question_cancelled", sessionId, toolUseId });
     json(res, 200, { ok: true });
   }
   // Best-effort: a session we don't own a PTY for, or one that raced away
@@ -17805,7 +17843,7 @@ var StreamerServer = class {
         priorToolUseId
       });
       this.pendingQuestionKey.set(sessionId, key);
-      if (broadcast) this.wsHub.broadcast(m);
+      if (broadcast) this.wsHub.broadcastToClients(this.sessionSubscribers.get(sessionId) ?? [], m);
     }
   }
   cancelPendingQuestion(sessionId) {
@@ -17813,7 +17851,11 @@ var StreamerServer = class {
     if (!pq) return;
     this.pendingQuestions.delete(sessionId);
     this.pendingQuestionKey.delete(sessionId);
-    this.wsHub.broadcast({ type: "question_cancelled", sessionId, toolUseId: pq.toolUseId });
+    this.wsHub.broadcastToClients(this.sessionSubscribers.get(sessionId) ?? [], {
+      type: "question_cancelled",
+      sessionId,
+      toolUseId: pq.toolUseId
+    });
   }
   async handleBrowse(url, res) {
     if (!this.browseRoot) {