@threadbase-sh/streamer 1.67.3 → 1.67.4

package/dist/index.js

@@ -2787,6 +2787,18 @@ function detectShellPrompt(lines) {
   return null;
 }
 
+// src/services/questions/permissionAnswerKeys.ts
+var ENTER2 = "\r";
+function permissionAnswerKeys(index) {
+  if (!Number.isInteger(index) || index < 0) {
+    throw new Error(`Invalid permission option index: ${index}`);
+  }
+  return `${index}${ENTER2}`;
+}
+function isPermissionAnswer(gate, keys) {
+  return gate.options.some((o) => keys === (o.answerKeys ?? permissionAnswerKeys(o.index)));
+}
+
 // src/utils/deriveSessionName.ts
 function deriveSessionName(firstMessageText) {
   const firstLine = firstMessageText.split("\n", 1)[0]?.trim() ?? "";
@@ -2829,10 +2841,12 @@ var PTYManager = class {
   onLiveQuestion;
   onLiveQuestionGone;
   onUserMessage;
-  // Per-session permission-gate state. True between an OSC 777 (gate open) and
-  // the next prompt-ready without a fresh 777 (gate closed). Prevents
-  // re-broadcasting open/close on every chunk.
-  permissionOpen = /* @__PURE__ */ new Set();
+  // Per-session permission-gate state: the gate currently open on a session's
+  // screen. Set between an OSC 777 / paint-time claim (gate open) and the next
+  // prompt-ready without a fresh 777 (gate closed). Prevents re-broadcasting
+  // open/close on every chunk. Holds the gate itself rather than just the id so
+  // sendKeys can tell whether the bytes it is writing are that gate's answer.
+  permissionOpen = /* @__PURE__ */ new Map();
   // Last chunk's raw tail per session — prepended to the next chunk before
   // the OSC regex test so a split escape still matches. Consumed on match.
   oscTail = /* @__PURE__ */ new Map();
@@ -3067,6 +3081,11 @@ var PTYManager = class {
     );
     session.process.write(keys);
     session.lastActivityAt = /* @__PURE__ */ new Date();
+    const openGate = this.permissionOpen.get(sessionId);
+    if (openGate && isPermissionAnswer(openGate, keys)) {
+      this.permissionOpen.delete(sessionId);
+      this.onPermissionChange?.(sessionId, null);
+    }
   }
   sendInput(sessionId, input) {
     const session = this.sessions.get(sessionId);
@@ -3413,7 +3432,7 @@ var PTYManager = class {
     }
     if (oscPermission && !askFooterOnScreen) {
       const gate = scrapePermissionGate(lines);
-      this.permissionOpen.add(sessionId);
+      this.permissionOpen.set(sessionId, gate ?? { options: [] });
       this.onPermissionChange?.(sessionId, gate ?? { options: [] });
     } else if (this.permissionOpen.has(sessionId) && !askFooterOnScreen) {
       const gate = detectGateScreen(lines);
@@ -3427,6 +3446,7 @@ var PTYManager = class {
           this.closedGateKey.delete(sessionId);
         }
       } else if (gate) {
+        this.permissionOpen.set(sessionId, gate);
         this.onPermissionChange?.(sessionId, gate);
       }
     } else if (!askFooterOnScreen && !oscWaitingForInput) {
@@ -3434,7 +3454,7 @@ var PTYManager = class {
       if (gate) {
         const key = permissionContentKey({ ...gate, cursor: void 0 });
         if (this.closedGateKey.get(sessionId) !== key) {
-          this.permissionOpen.add(sessionId);
+          this.permissionOpen.set(sessionId, gate);
           this.onPermissionChange?.(sessionId, gate);
         }
       } else {
@@ -9553,7 +9573,7 @@ function parseStatusLine(lines) {
 
 // src/services/questions/answersToKeystrokes.ts
 var DOWN = "\x1B[B";
-var ENTER2 = "\r";
+var ENTER3 = "\r";
 var UnknownOptionError = class extends Error {
   constructor(question, value) {
     super(`No option labelled "${value}" for question "${question}"`);
@@ -9574,7 +9594,7 @@ function answersToKeystrokes(questions, answers) {
     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) + ENTER2;
+    out += DOWN.repeat(target) + ENTER3;
   }
   return out;
 }