@threadbase-sh/streamer 1.36.0 → 1.36.1

package/dist/index.cjs

@@ -1449,9 +1449,13 @@ var import_fs6 = require("fs");
 var import_path6 = require("path");
 
 // src/services/questions/detectPermissionGate.ts
-var OSC_777_RE = /\x1b\]777;notify;Claude Code;[^\x07\x1b]*/;
+var OSC_777_PERMISSION_RE = /\x1b\]777;notify;Claude Code;[^\x07\x1b]*needs your permission/;
+var OSC_777_WAITING_RE = /\x1b\]777;notify;Claude Code;[^\x07\x1b]*waiting for your input/;
 function hasPermissionOsc(rawData) {
-  return OSC_777_RE.test(rawData);
+  return OSC_777_PERMISSION_RE.test(rawData);
+}
+function hasWaitingForInputOsc(rawData) {
+  return OSC_777_WAITING_RE.test(rawData);
 }
 var OPTION_RE = /^\s*(❯)?\s*(\d+)\.\s+(.+?)\s*$/;
 var FOOTER_RE = /Enter to select|Esc to cancel|↑|↓|to navigate|to cancel/i;
@@ -1602,22 +1606,29 @@ function detectShellPrompt(lines) {
     };
   }
   const lastNumberedIdx = (() => {
-    for (let i = last.idx; i >= 0; i--) {
-      if (NUMBERED_RE.test(lines[i])) return i;
+    let i = last.idx;
+    if (!NUMBERED_RE.test(lines[i])) {
+      if (i > 0 && (PRESS_ENTER_RE.test(lines[i].trim()) || CONTINUE_RE.test(lines[i].trim()))) {
+        i--;
+      } else {
+        return -1;
+      }
     }
-    return -1;
+    while (i >= 0 && !NUMBERED_RE.test(lines[i]) && lines[i].trim().length === 0) i--;
+    return i >= 0 && NUMBERED_RE.test(lines[i]) ? i : -1;
   })();
   if (lastNumberedIdx >= 0) {
     const options = [];
-    for (let i = 0; i <= lastNumberedIdx; i++) {
+    let firstRow = lastNumberedIdx;
+    for (let i = lastNumberedIdx; i >= 0; i--) {
       const m = NUMBERED_RE.exec(lines[i]);
-      if (!m) continue;
+      if (!m) break;
       const num = Number.parseInt(m[1], 10);
-      if (!Number.isFinite(num)) continue;
-      options.push({ index: num, label: m[2].trim(), answerKeys: `${num}${ENTER}` });
+      if (!Number.isFinite(num)) break;
+      options.unshift({ index: num, label: m[2].trim(), answerKeys: `${num}${ENTER}` });
+      firstRow = i;
     }
     if (options.length >= 2) {
-      const firstRow = lines.findIndex((l) => NUMBERED_RE.test(l));
       let prompt = "";
       for (let i = firstRow - 1; i >= 0; i--) {
         const t = lines[i].trim();
@@ -2186,12 +2197,13 @@ var PTYManager = class {
     const session = this.sessions.get(sessionId);
     if (!session) return;
     const oscPermission = hasPermissionOsc(rawData);
+    const oscWaitingForInput = hasWaitingForInputOsc(rawData);
     const hasAskFooter = /Enter to select/i.test(stripped);
     const hasPromptMarker = CLAUDE_PROMPT_MARKERS.some((m) => stripped.includes(m));
     const hasShellPromptHint = /[[(]\s*y\s*\/\s*n\s*[\])]|press\s+(enter|return|any key)|\bcontinue\b\s*\?|^\s*(?:❯|>)?\s*\d+[.)]\s+\S/im.test(
       stripped
     );
-    if (!oscPermission && !hasAskFooter && !hasShellPromptHint && !this.permissionOpen.has(sessionId) && !this.shellPromptOpen.has(sessionId) && !this.lastScreenQuestionKey.has(sessionId)) {
+    if (!oscPermission && !oscWaitingForInput && !hasAskFooter && !hasShellPromptHint && !this.permissionOpen.has(sessionId) && !this.shellPromptOpen.has(sessionId) && !this.lastScreenQuestionKey.has(sessionId)) {
       return;
     }
     const lines = await this.getOutputLines(sessionId, 60);
@@ -2214,11 +2226,11 @@ var PTYManager = class {
       this.onPermissionChange?.(sessionId, gate ?? { options: [] });
     } else if (this.permissionOpen.has(sessionId) && !askFooterOnScreen) {
       const gate = scrapePermissionGate(lines);
-      if (gate) {
-        this.onPermissionChange?.(sessionId, gate);
-      } else if (hasPromptMarker) {
+      if (oscWaitingForInput || !gate && hasPromptMarker) {
         this.permissionOpen.delete(sessionId);
         this.onPermissionChange?.(sessionId, null);
+      } else if (gate) {
+        this.onPermissionChange?.(sessionId, gate);
       }
     }
     if (askFooterOnScreen) {
@@ -3630,8 +3642,8 @@ var createSessionRoutes = (deps) => {
     await deps.handleStopSession(c.req.param("id"), c.env.outgoing);
     return alreadyHandled6();
   });
-  app.get("/:id", (c) => {
-    deps.handleGetSession(c.req.param("id"), c.env.outgoing);
+  app.get("/:id", async (c) => {
+    await deps.handleGetSession(c.req.param("id"), c.env.outgoing);
     return alreadyHandled6();
   });
   return app;
@@ -5995,6 +6007,32 @@ function deriveProjectChatTitle(input) {
   return `Untitled \xB7 ${input.id.slice(0, 8)}`;
 }
 
+// src/services/questions/parseStatusLine.ts
+var MODEL_RE = /(Opus|Sonnet|Haiku|Fable)\s+[\d.]+(?:\s*\([^)]*\))?/;
+var EFFORT_RE = /●\s*([A-Za-z]+)\s*·\s*\/effort/;
+var PERMISSION_MODE_RE = /⏵⏵\s*([^(·\n]+?)\s*(?:\(|·|$)/;
+function parseStatusLine(lines) {
+  const info = {};
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const line = lines[i];
+    if (!line) continue;
+    if (info.effort === void 0) {
+      const m = EFFORT_RE.exec(line);
+      if (m) info.effort = m[1];
+    }
+    if (info.permissionMode === void 0) {
+      const m = PERMISSION_MODE_RE.exec(line);
+      if (m) info.permissionMode = m[1].trim();
+    }
+    if (info.model === void 0) {
+      const m = MODEL_RE.exec(line);
+      if (m) info.model = m[0].replace(/\s+/g, " ").trim();
+    }
+    if (info.model && info.effort && info.permissionMode) break;
+  }
+  return info;
+}
+
 // src/services/questions/detectAskUserQuestion.ts
 function normalizeContent2(raw) {
   if (Array.isArray(raw)) return raw;
@@ -7151,7 +7189,7 @@ var StreamerServer = class {
             }
           }
           if (msg.type === "hold_session" && typeof msg.sessionId === "string") {
-            this.startGraceTimer(msg.sessionId, 0);
+            this.startGraceTimer(msg.sessionId, this.ptyGracePeriodMs);
           }
         } catch {
         }
@@ -8666,13 +8704,23 @@ var StreamerServer = class {
       throw err;
     }
   }
-  handleGetSession(sessionId, res) {
+  async handleGetSession(sessionId, res) {
     if (this.rejectIfWarmingUp(res)) return;
     const session = this.sessionStore.get(sessionId, this.ptyAttachedIds());
     if (session) {
       if (!(0, import_fs17.existsSync)(session.projectPath)) {
         session.failureReason = `Project directory not found: ${session.projectPath}`;
       }
+      if (this.ptyManager.hasSession(sessionId)) {
+        try {
+          const lines = await this.ptyManager.getOutputLines(sessionId, 10);
+          const status = parseStatusLine(lines);
+          if (session.model == null && status.model) session.model = status.model;
+          if (status.effort) session.effort = status.effort;
+          if (status.permissionMode) session.permissionMode = status.permissionMode;
+        } catch {
+        }
+      }
       json(res, 200, session);
       return;
     }