@threadbase-sh/streamer 1.44.3 → 1.45.0

package/dist/index.cjs

@@ -2173,14 +2173,19 @@ function scrapePermissionGate(lines) {
   const options = [];
   let cursor;
   let firstOptionLine = -1;
-  for (let i = 0; i < lines.length; i++) {
-    const m = OPTION_RE.exec(stripGutter(lines[i]));
-    if (!m) continue;
-    const index = Number.parseInt(m[2], 10);
-    if (!Number.isFinite(index)) continue;
-    if (firstOptionLine === -1) firstOptionLine = i;
-    if (m[1]) cursor = index;
-    options.push({ index, label: m[3] });
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const stripped = stripGutter(lines[i]);
+    const m = OPTION_RE.exec(stripped);
+    if (m) {
+      const index = Number.parseInt(m[2], 10);
+      if (!Number.isFinite(index)) continue;
+      firstOptionLine = i;
+      if (m[1]) cursor = index;
+      options.unshift({ index, label: m[3] });
+      continue;
+    }
+    if (options.length === 0) continue;
+    if (stripped.trim().length === 0 || BOX_ONLY_RE.test(lines[i].trim())) break;
   }
   if (options.length === 0) return null;
   let prompt;
@@ -2220,6 +2225,17 @@ function scrapeDetail(lines, promptLine) {
   }
   return collected.length > 0 ? collected.reverse().join("\n") : void 0;
 }
+var GATE_FOOTER_RE = /esc to cancel/i;
+var ASK_MENU_FOOTER_RE = /Enter to select/i;
+var YES_NO_LABEL_RE = /^(yes|no)\b/i;
+function detectGateScreen(lines) {
+  if (lines.some((l) => ASK_MENU_FOOTER_RE.test(l))) return null;
+  if (!lines.some((l) => GATE_FOOTER_RE.test(l))) return null;
+  const gate = scrapePermissionGate(lines);
+  if (!gate || gate.options.length < 2) return null;
+  if (!gate.options.some((o) => YES_NO_LABEL_RE.test(o.label))) return null;
+  return gate;
+}
 
 // src/services/questions/detectQuestionFromScreen.ts
 var ASK_FOOTER_RE = /Enter to select/i;
@@ -2367,6 +2383,8 @@ var PTY_ROWS2 = 40;
 var SCREEN_SCROLLBACK2 = 1e3;
 var CLAUDE_PROMPT_MARKERS = ["\u256D", "\u276F"];
 var QUIET_DETECT_MS2 = 500;
+var OSC_TAIL_CHARS = 128;
+var SCRAPE_THROTTLE_MS = 300;
 var CLAUDE_READY_FALLBACK_MS = 8e3;
 function buildPasteBytes(input) {
   return `\x1B[200~${input}\x1B[201~`;
@@ -2425,6 +2443,12 @@ var PTYManager = class {
   // the next prompt-ready without a fresh 777 (gate closed). Prevents
   // re-broadcasting open/close on every chunk.
   permissionOpen = /* @__PURE__ */ new Set();
+  // 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();
+  // When the last full detection pass ran per session (any trigger) — the
+  // clock the SCRAPE_THROTTLE_MS ceiling is measured against.
+  lastDetectAt = /* @__PURE__ */ new Map();
   // Content key of the last AskUserQuestion broadcast from the rendered screen,
   // per session — de-dupes the same menu firing on consecutive repaints.
   lastScreenQuestionKey = /* @__PURE__ */ new Map();
@@ -2433,6 +2457,13 @@ var PTYManager = class {
   // on a prompt-ready/marker return and de-dupe consecutive repaints. Modelled
   // on permissionOpen but keyed by content (a shell prompt has no OSC trigger).
   shellPromptOpen = /* @__PURE__ */ new Map();
+  // Content key (permissionContentKey, cursor excluded — see arm 3) of the
+  // gate that was still painted on screen when arm 2 closed it. Suppresses
+  // arm 3 re-claiming that same box from a later trigger-less/throttled pass
+  // before Claude erases it — otherwise the paint-time claim reopens the
+  // card it just closed. Cleared once detectGateScreen sees the box is gone,
+  // so a genuinely new (even content-identical) gate is claimed normally.
+  closedGateKey = /* @__PURE__ */ new Map();
   // Tracks sessions (both fresh and resume) whose PTY has spawned but Claude
   // hasn't yet reached an interactive prompt — i.e. onReady hasn't fired.
   pendingReady = /* @__PURE__ */ new Set();
@@ -2786,8 +2817,11 @@ var PTYManager = class {
     this.queuedInputs.delete(sessionId);
     this.firstChunkAt.delete(sessionId);
     this.permissionOpen.delete(sessionId);
+    this.oscTail.delete(sessionId);
+    this.lastDetectAt.delete(sessionId);
     this.lastScreenQuestionKey.delete(sessionId);
     this.shellPromptOpen.delete(sessionId);
+    this.closedGateKey.delete(sessionId);
     this.quietCheckers.get(sessionId)?.cancel();
     this.quietCheckers.delete(sessionId);
     this.clearReadyFallback(sessionId);
@@ -2882,8 +2916,11 @@ var PTYManager = class {
     for (const timer of this.readyFallbackTimers.values()) clearTimeout(timer);
     this.readyFallbackTimers.clear();
     this.permissionOpen.clear();
+    this.oscTail.clear();
+    this.lastDetectAt.clear();
     this.lastScreenQuestionKey.clear();
     this.shellPromptOpen.clear();
+    this.closedGateKey.clear();
   }
   handleOutput(sessionId, data) {
     const session = this.sessions.get(sessionId);
@@ -2947,16 +2984,24 @@ var PTYManager = class {
   async detectLivePrompts(sessionId, rawData, stripped) {
     const session = this.sessions.get(sessionId);
     if (!session) return;
-    const oscPermission = hasPermissionOsc(rawData);
-    const oscWaitingForInput = hasWaitingForInputOsc(rawData);
+    const oscWindow = (this.oscTail.get(sessionId) ?? "") + rawData;
+    const oscPermission = hasPermissionOsc(oscWindow);
+    const oscWaitingForInput = hasWaitingForInputOsc(oscWindow);
+    if (rawData !== "") {
+      if (oscPermission || oscWaitingForInput) this.oscTail.delete(sessionId);
+      else this.oscTail.set(sessionId, oscWindow.slice(-OSC_TAIL_CHARS));
+    }
     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 && !oscWaitingForInput && !hasAskFooter && !hasShellPromptHint && !this.permissionOpen.has(sessionId) && !this.shellPromptOpen.has(sessionId) && !this.lastScreenQuestionKey.has(sessionId)) {
+    const nowMs = Date.now();
+    const scrapeDue = nowMs - (this.lastDetectAt.get(sessionId) ?? 0) >= SCRAPE_THROTTLE_MS;
+    if (!oscPermission && !oscWaitingForInput && !hasAskFooter && !hasShellPromptHint && !scrapeDue && !this.permissionOpen.has(sessionId) && !this.shellPromptOpen.has(sessionId) && !this.lastScreenQuestionKey.has(sessionId)) {
       return;
     }
+    this.lastDetectAt.set(sessionId, nowMs);
     const lines = await this.getOutputLines(sessionId, 60);
     const askFooterOnScreen = lines.some((l) => /Enter to select/i.test(l));
     if (oscPermission || hasAskFooter || askFooterOnScreen) {
@@ -2976,13 +3021,30 @@ var PTYManager = class {
       this.permissionOpen.add(sessionId);
       this.onPermissionChange?.(sessionId, gate ?? { options: [] });
     } else if (this.permissionOpen.has(sessionId) && !askFooterOnScreen) {
-      const gate = scrapePermissionGate(lines);
-      if (oscWaitingForInput || !gate && hasPromptMarker) {
+      const gate = detectGateScreen(lines);
+      const stillPainted = gate !== null || scrapePermissionGate(lines) !== null;
+      if (oscWaitingForInput || !stillPainted && hasPromptMarker) {
         this.permissionOpen.delete(sessionId);
         this.onPermissionChange?.(sessionId, null);
+        if (gate) {
+          this.closedGateKey.set(sessionId, permissionContentKey({ ...gate, cursor: void 0 }));
+        } else {
+          this.closedGateKey.delete(sessionId);
+        }
       } else if (gate) {
         this.onPermissionChange?.(sessionId, gate);
       }
+    } else if (!askFooterOnScreen && !oscWaitingForInput) {
+      const gate = detectGateScreen(lines);
+      if (gate) {
+        const key = permissionContentKey({ ...gate, cursor: void 0 });
+        if (this.closedGateKey.get(sessionId) !== key) {
+          this.permissionOpen.add(sessionId);
+          this.onPermissionChange?.(sessionId, gate);
+        }
+      } else {
+        this.closedGateKey.delete(sessionId);
+      }
     }
     if (askFooterOnScreen) {
       const detected = detectQuestionFromScreen(lines);
@@ -3125,8 +3187,11 @@ var PTYManager = class {
     this.queuedInputs.delete(sessionId);
     this.firstChunkAt.delete(sessionId);
     this.permissionOpen.delete(sessionId);
+    this.oscTail.delete(sessionId);
+    this.lastDetectAt.delete(sessionId);
     this.lastScreenQuestionKey.delete(sessionId);
     this.shellPromptOpen.delete(sessionId);
+    this.closedGateKey.delete(sessionId);
     this.quietCheckers.get(sessionId)?.cancel();
     this.quietCheckers.delete(sessionId);
     this.clearReadyFallback(sessionId);
@@ -9811,7 +9876,12 @@ function managedToResponse(s, ptyAttached) {
     // the durable registry, so it is a previous run's session with no process
     // behind it — `resumable`, and `historical` rather than `managed`
     // (docs/plans/live-sessions-persistence-plan.md §4, Phase 1).
-    lifecycle: ptyAttached ? "attached" : s.rehydrated ? "resumable" : s.failureReason != null ? "failed" : "completed",
+    // A session this run itself put on hold (grace timer, explicit hold_session,
+    // idle reaper) is the other exception: the PTY is gone the same way an exit
+    // leaves it gone, but the conversation is still resumable, not terminal —
+    // `putOnHold` records that by leaving `statusSource: "shutdown"` (the only
+    // place either runner sets it), so it is checked here alongside `rehydrated`.
+    lifecycle: ptyAttached ? "attached" : s.rehydrated || s.statusSource === "shutdown" ? "resumable" : s.failureReason != null ? "failed" : "completed",
     lifecycleSource: ptyAttached ? s.reconciled ? "reconcile" : "spawn" : s.rehydrated ? "reconcile" : "exit",
     // We own its PTY, so `status` is the authoritative signal — no inferred
     // `activity` is attached for managed sessions.
@@ -10662,7 +10732,14 @@ var StreamerServer = class {
           // even though the registry has one — the name only appeared after a
           // restart rebuilt the row as a stub. Guarded so a runner that has not
           // derived one yet cannot blank a name set by enrichResumedSessionAsync.
-          ...session.sessionName != null && { sessionName: session.sessionName }
+          ...session.sessionName != null && { sessionName: session.sessionName },
+          // Without mirroring this, SessionStore's copy is frozen at whatever
+          // `addManaged` saw at spawn ("spawn") forever, because updateManaged
+          // is a partial merge — so managedToResponse can never tell a
+          // grace-timer/idle-reaper hold (statusSource "shutdown") apart from a
+          // genuine process exit ("process-exit"), and reports both as
+          // `lifecycle: "completed"`. See managedToResponse in session-store.ts.
+          ...session.statusSource != null && { statusSource: session.statusSource }
         });
         this.managedSessionsRepo?.recordStatus(
           session.id,