@threadbase-sh/streamer 1.41.0 → 1.41.2

package/dist/index.cjs

@@ -1955,8 +1955,8 @@ var PTY_COLS2 = 120;
 var PTY_ROWS2 = 40;
 var SCREEN_SCROLLBACK2 = 1e3;
 var CLAUDE_PROMPT_MARKERS = ["\u256D", "\u276F"];
-var PROMPT_MARKER_FALLBACK_MS = 1e4;
 var QUIET_DETECT_MS2 = 500;
+var CLAUDE_READY_FALLBACK_MS = 8e3;
 function buildPasteBytes(input) {
   return `\x1B[200~${input}\x1B[201~`;
 }
@@ -2032,8 +2032,8 @@ var PTYManager = class {
   // silently lost — the "dot bug".
   queuedInputs = /* @__PURE__ */ new Map();
   log;
-  // Timestamp of first PTY chunk per session; drives the prompt-marker fallback
-  // when neither ╭ nor ❯ shows up within PROMPT_MARKER_FALLBACK_MS.
+  // Timestamp of first PTY chunk per session; used for the [pty.ready] elapsed
+  // measurement so a slow boot is visible in the logs.
   firstChunkAt = /* @__PURE__ */ new Map();
   // Per-session chunk counter and last-chunk timestamp. Diagnostic-only,
   // feeds the [pty.chunk] log lines so we can trace whether Claude responded
@@ -2044,6 +2044,8 @@ var PTYManager = class {
   // QUIET_DETECT_MS after the last chunk so ready/prompt detection doesn't
   // wait for another chunk that may never arrive (Claude blocked on input).
   quietCheckers = /* @__PURE__ */ new Map();
+  // Per-session flat backstop from the first chunk (CLAUDE_READY_FALLBACK_MS).
+  readyFallbackTimers = /* @__PURE__ */ new Map();
   // In-flight start()/startFresh() calls keyed by sessionId. A second
   // concurrent resume for the same session (double-tap, client retry) awaits
   // the first call's promise instead of spawning a duplicate PTY (CRITICAL #3).
@@ -2129,6 +2131,7 @@ var PTYManager = class {
     };
     this.sessions.set(sessionId, session);
     this.pendingReady.add(sessionId);
+    this.armReadyFallback(sessionId);
     proc.onData((data) => {
       this.handleOutput(sessionId, data);
     });
@@ -2189,6 +2192,7 @@ var PTYManager = class {
     };
     this.sessions.set(sessionId, session);
     this.pendingReady.add(sessionId);
+    this.armReadyFallback(sessionId);
     proc.onData((data) => {
       this.handleOutput(sessionId, data);
     });
@@ -2363,6 +2367,7 @@ var PTYManager = class {
     this.shellPromptOpen.delete(sessionId);
     this.quietCheckers.get(sessionId)?.cancel();
     this.quietCheckers.delete(sessionId);
+    this.clearReadyFallback(sessionId);
     try {
       session.process.kill("SIGINT");
     } catch {
@@ -2451,6 +2456,8 @@ var PTYManager = class {
     this.lastChunkAt.clear();
     for (const quiet of this.quietCheckers.values()) quiet.cancel();
     this.quietCheckers.clear();
+    for (const timer of this.readyFallbackTimers.values()) clearTimeout(timer);
+    this.readyFallbackTimers.clear();
     this.permissionOpen.clear();
     this.lastScreenQuestionKey.clear();
     this.shellPromptOpen.clear();
@@ -2493,8 +2500,6 @@ var PTYManager = class {
     const matchedMarker = CLAUDE_PROMPT_MARKERS.find((m) => stripped.includes(m));
     if (session.status === "running" && matchedMarker) {
       this.markReady(sessionId, session, "prompt-marker", `marker:${matchedMarker}`);
-    } else if (session.status === "running" && this.pendingReady.has(sessionId) && now - (this.firstChunkAt.get(sessionId) ?? now) >= PROMPT_MARKER_FALLBACK_MS) {
-      this.markReady(sessionId, session, "timeout-fallback", "fallback:timeout");
     }
     this.onOutput?.(sessionId, data);
     this.detectLivePrompts(sessionId, data, stripped).catch((err) => {
@@ -2594,7 +2599,13 @@ var PTYManager = class {
     const session = this.sessions.get(sessionId);
     if (session?.status !== "running") return;
     if (this.pendingReady.has(sessionId)) {
-      this.markReady(sessionId, session, "quiet-fallback", "quiet:timeout");
+      this.recheckReadyFromScreen(sessionId).catch((err) => {
+        this.log.warn("[pty.ready] boot screen recheck failed", {
+          event: "pty.ready_recheck_failed",
+          sessionId,
+          err
+        });
+      });
     } else {
       this.recheckReadyFromScreen(sessionId).catch((err) => {
         this.log.warn("[pty.ready] screen recheck failed", {
@@ -2626,9 +2637,32 @@ var PTYManager = class {
       this.markReady(sessionId, session, "screen-marker", `quiet:screen-marker:${matchedMarker}`);
     }
   }
+  // Flat backstop from the first chunk: if neither a prompt marker nor the
+  // screen recheck settles the session within CLAUDE_READY_FALLBACK_MS, mark it
+  // ready anyway so start requests resolve and queued input is not held
+  // forever. This is what makes the quiet-checker safe to be strict — a boot
+  // variant whose marker we cannot see still recovers, just 8s later instead of
+  // 500ms sooner and wrong. unref() so it never holds the process open.
+  armReadyFallback(sessionId) {
+    const timer = setTimeout(() => {
+      this.readyFallbackTimers.delete(sessionId);
+      const session = this.sessions.get(sessionId);
+      if (session?.status === "running" && this.pendingReady.has(sessionId)) {
+        this.markReady(sessionId, session, "timeout-fallback", "fallback:timeout");
+      }
+    }, CLAUDE_READY_FALLBACK_MS);
+    timer.unref?.();
+    this.readyFallbackTimers.set(sessionId, timer);
+  }
+  clearReadyFallback(sessionId) {
+    const timer = this.readyFallbackTimers.get(sessionId);
+    if (timer) clearTimeout(timer);
+    this.readyFallbackTimers.delete(sessionId);
+  }
   // Transition a session from "running" to "waiting_input", clear pendingReady,
   // and flush any queued input. Idempotent: callers can invoke at any chunk.
   markReady(sessionId, session, source, reason) {
+    this.clearReadyFallback(sessionId);
     session.lastActivityAt = /* @__PURE__ */ new Date();
     session.status = "waiting_input";
     session.statusSource = source;
@@ -2672,6 +2706,7 @@ var PTYManager = class {
     this.shellPromptOpen.delete(sessionId);
     this.quietCheckers.get(sessionId)?.cancel();
     this.quietCheckers.delete(sessionId);
+    this.clearReadyFallback(sessionId);
   }
 };
 function toPublicSession2(s) {
@@ -6662,7 +6697,8 @@ var ManagedSessionsRepository = class {
              completed_at = @completed_at,
              last_activity_at = @last_activity_at,
              prompt_count = @prompt_count,
-             failure_reason = COALESCE(@failure_reason, failure_reason)
+             failure_reason = COALESCE(@failure_reason, failure_reason),
+             session_name = COALESCE(@session_name, session_name)
        WHERE session_id = @session_id
     `);
     this.getStmt = db.prepare("SELECT * FROM managed_sessions WHERE session_id = ?");
@@ -6719,7 +6755,8 @@ var ManagedSessionsRepository = class {
       completed_at: fields.completedAt?.getTime() ?? null,
       last_activity_at: fields.lastActivityAt?.getTime() ?? null,
       prompt_count: fields.promptCount ?? 0,
-      failure_reason: fields.failureReason ?? null
+      failure_reason: fields.failureReason ?? null,
+      session_name: fields.sessionName ?? null
     });
   }
   get(sessionId) {
@@ -9776,7 +9813,14 @@ var StreamerServer = class {
         this.sessionStore.updateManaged(session.id, {
           status: session.status,
           completedAt: session.completedAt,
-          ...session.lastActivityAt != null && { lastActivityAt: session.lastActivityAt }
+          ...session.lastActivityAt != null && { lastActivityAt: session.lastActivityAt },
+          // The runner derives this from the first user message, on its own
+          // copy of the session. Without mirroring it here SessionStore never
+          // learns it, so a fresh live session is served with no sessionName
+          // 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 }
         });
         this.managedSessionsRepo?.recordStatus(
           session.id,
@@ -9786,7 +9830,11 @@ var StreamerServer = class {
             completedAt: session.completedAt,
             lastActivityAt: session.lastActivityAt ?? null,
             promptCount: session.promptCount,
-            failureReason: session.failureReason ?? null
+            failureReason: session.failureReason ?? null,
+            // Derived from the first user message, so it does not exist yet at
+            // recordSpawn. The input that produces it also flips
+            // waiting_input→running, which lands here.
+            sessionName: session.sessionName ?? null
           }
         );
         if (session.status === "waiting_input" || session.status === "idle") {