@threadbase-sh/streamer 1.53.1 → 1.54.0

package/dist/cli.cjs

@@ -103179,12 +103179,15 @@ function detectCodexBlockingPrompt(lines) {
 function codexStatusBarLine(lines) {
   return [...lines].reverse().find((l) => l.trim() !== "") ?? "";
 }
-function codexScreenBlocksComposer(lines) {
+function codexScreenPreTurn(lines) {
   const screenText = lines.join("\n");
   if (CODEX_HOOKS_GATE_REGEX.test(screenText) || CODEX_TRUST_GATE_REGEX.test(screenText)) {
     return true;
   }
-  if (CODEX_MCP_BOOT_RE.test(screenText)) return true;
+  return CODEX_MCP_BOOT_RE.test(screenText);
+}
+function codexScreenBlocksComposer(lines) {
+  if (codexScreenPreTurn(lines)) return true;
   return CODEX_BUSY_STATUS_RE.test(codexStatusBarLine(lines));
 }
 function codexScreenShowsReady(lines) {
@@ -103230,12 +103233,13 @@ function gateCard(gate, lines) {
     ]
   };
 }
-var CODEX_PROMPT_READY_TEXT, CODEX_BUSY_STATUS_RE, CODEX_MCP_BOOT_RE, CODEX_TRUST_GATE_REGEX, CODEX_HOOKS_GATE_REGEX, CODEX_ACTIVE_WRITER_RE, CODEX_ACTIVE_WRITER_CODE, CODEX_USAGE_LIMIT_RE, CODEX_USAGE_RESET_TIP_RE, CODEX_RATE_LIMIT_MENU_RE;
+var CODEX_PROMPT_READY_TEXT, CODEX_BUSY_STATUS_RE, CODEX_WORKING_STATUS_RE, CODEX_MCP_BOOT_RE, CODEX_TRUST_GATE_REGEX, CODEX_HOOKS_GATE_REGEX, CODEX_ACTIVE_WRITER_RE, CODEX_ACTIVE_WRITER_CODE, CODEX_USAGE_LIMIT_RE, CODEX_USAGE_RESET_TIP_RE, CODEX_RATE_LIMIT_MENU_RE;
 var init_codexScreen = __esm({
   "src/services/questions/codexScreen.ts"() {
     "use strict";
     CODEX_PROMPT_READY_TEXT = "Ready";
     CODEX_BUSY_STATUS_RE = /\b(?:Starting|Working)\b/;
+    CODEX_WORKING_STATUS_RE = /\bWorking\b/;
     CODEX_MCP_BOOT_RE = /Booting MCP|Starting MCP servers/i;
     CODEX_TRUST_GATE_REGEX = /trust the contents/i;
     CODEX_HOOKS_GATE_REGEX = /hooks need review/i;
@@ -120480,6 +120484,27 @@ var init_codexGateAnswers = __esm({
   }
 });
 
+// src/services/questions/parseAgentPhase.ts
+function codexPhase(lines) {
+  if (codexScreenPreTurn(lines)) return null;
+  return CODEX_WORKING_STATUS_RE.test(codexStatusBarLine(lines)) ? "working" : null;
+}
+function claudePhase(_lines) {
+  return null;
+}
+function parseAgentPhase(lines, provider) {
+  if (provider === CODEX_CLI_PROVIDER) return codexPhase(lines);
+  if (provider === CLAUDE_CODE_PROVIDER) return claudePhase(lines);
+  return null;
+}
+var init_parseAgentPhase = __esm({
+  "src/services/questions/parseAgentPhase.ts"() {
+    "use strict";
+    init_providers();
+    init_codexScreen();
+  }
+});
+
 // src/utils/debounce.ts
 function debounce(fn, waitMs) {
   let timer = null;
@@ -120534,7 +120559,11 @@ function toPublicSession(s3) {
     ...s3.lastActivityAt != null && { lastActivityAt: s3.lastActivityAt },
     ...s3.statusSource != null && { statusSource: s3.statusSource },
     ...s3.statusUpdatedAt != null && { statusUpdatedAt: s3.statusUpdatedAt },
-    ...s3.filePath != null && { filePath: s3.filePath }
+    ...s3.filePath != null && { filePath: s3.filePath },
+    // Unconditional — see PTYManager's toPublicSession: a streamer re-adopting
+    // a surviving pty-host's sessions mid-turn has no other source for the
+    // phase, and the host's change guard will not re-emit it.
+    subStatus: s3.subStatus ?? null
   };
 }
 var import_crypto9, import_fs25, import_path25, OUTPUT_BUFFER_MAX, INPUT_HISTORY_MAX, QUIET_DETECT_MS, CODEX_READY_FALLBACK_MS, SUBMIT_BYTES, CODEX_SUBMIT_DELAY_MS, CODEX_SUBMIT_MAX_WAIT_MS, CODEX_SUBMIT_STALE_MS, CodexPtyRunner;
@@ -120550,6 +120579,7 @@ var init_codex_pty_runner = __esm({
     init_pty_shared();
     init_codexGateAnswers();
     init_codexScreen();
+    init_parseAgentPhase();
     init_debounce();
     OUTPUT_BUFFER_MAX = 65536;
     INPUT_HISTORY_MAX = 50;
@@ -120563,6 +120593,7 @@ var init_codex_pty_runner = __esm({
       sessions = /* @__PURE__ */ new Map();
       onOutput;
       onStatusChange;
+      onPhaseChange;
       onReady;
       // Broadcasts Codex's blocking startup gates (directory trust, hooks review)
       // as question cards; null dismisses the card once the gate leaves the screen.
@@ -120611,6 +120642,7 @@ var init_codex_pty_runner = __esm({
       constructor(options = {}) {
         this.onOutput = options.onOutput;
         this.onStatusChange = options.onStatusChange;
+        this.onPhaseChange = options.onPhaseChange;
         this.onReady = options.onReady;
         this.onPermissionChange = options.onPermissionChange;
         this.onLiveQuestion = options.onLiveQuestion;
@@ -121178,6 +121210,9 @@ var init_codex_pty_runner = __esm({
           );
           return;
         }
+        if (session.status === "running") {
+          this.setPhase(sessionId, session, parseAgentPhase(lines, CODEX_CLI_PROVIDER));
+        }
         const gate = CODEX_HOOKS_GATE_REGEX.test(screenText) ? "hooks" : CODEX_TRUST_GATE_REGEX.test(screenText) ? "trust" : null;
         if (gate) {
           this.handleGate(sessionId, session, gate, lines);
@@ -121292,11 +121327,25 @@ var init_codex_pty_runner = __esm({
         });
         this.onPermissionChange?.(sessionId, card);
       }
+      /**
+       * Record the agent's phase and notify only on a real change. The guard is
+       * load-bearing, not an optimisation: detectScreenState runs on every chunk,
+       * so an unguarded setter would fire the WS frame behind this several times a
+       * second for a whole turn while reporting the same value. Same contract as
+       * PTYManager.setPhase — the two runners deliberately stay separate classes.
+       */
+      setPhase(sessionId, session, phase) {
+        const next = phase ?? null;
+        if ((session.subStatus ?? null) === next) return;
+        session.subStatus = next;
+        this.onPhaseChange?.(sessionId, next);
+      }
       markReady(sessionId, session, source, reason) {
         session.lastActivityAt = /* @__PURE__ */ new Date();
         session.status = "waiting_input";
         session.statusSource = source;
         session.statusUpdatedAt = /* @__PURE__ */ new Date();
+        this.setPhase(sessionId, session, null);
         this.log.info(`[codex.ready] ${sessionId.slice(0, 8)} ${reason}`, {
           event: "codex.ready",
           sessionId,
@@ -121394,7 +121443,7 @@ var PTY_HOST_PROTOCOL_VERSION, SESSION_DATE_FIELDS, LineDecoder;
 var init_protocol = __esm({
   "src/pty-host/protocol.ts"() {
     "use strict";
-    PTY_HOST_PROTOCOL_VERSION = 2;
+    PTY_HOST_PROTOCOL_VERSION = 3;
     SESSION_DATE_FIELDS = [
       "startedAt",
       "completedAt",
@@ -121624,6 +121673,9 @@ var init_remote_session_runner = __esm({
           case "permission-change":
             this.options.onPermissionChange?.(event.sessionId, event.gate);
             break;
+          case "phase-change":
+            this.options.onPhaseChange?.(event.sessionId, event.phase);
+            break;
           case "live-question":
             this.options.onLiveQuestion?.(event.sessionId, event.questions);
             break;
@@ -121884,7 +121936,12 @@ function toPublicSession2(s3) {
     ...s3.statusUpdatedAt != null && { statusUpdatedAt: s3.statusUpdatedAt },
     ...s3.filePath != null && { filePath: s3.filePath },
     ...s3.sessionName != null && { sessionName: s3.sessionName },
-    ...s3.firstMessageText != null && { firstMessageText: s3.firstMessageText }
+    ...s3.firstMessageText != null && { firstMessageText: s3.firstMessageText },
+    // Unconditional: this shape crosses the pty-host boundary, and a streamer
+    // re-adopting a surviving host's sessions mid-turn has no other source for
+    // the phase — no snapshot or replay event carries it, and setPhase's change
+    // guard means the host will never re-emit it for the rest of that turn.
+    subStatus: s3.subStatus ?? null
   };
 }
 var import_crypto10, import_fs26, import_path26, OUTPUT_BUFFER_MAX2, INPUT_HISTORY_MAX2, CLAUDE_PROMPT_MARKERS, QUIET_DETECT_MS2, OSC_TAIL_CHARS, SCRAPE_THROTTLE_MS, CLAUDE_READY_FALLBACK_MS, SUBMIT_BYTES2, SUBMIT_DELAY_MS, SUBMIT_MAX_WAIT_MS, PTYManager;
@@ -121902,6 +121959,7 @@ var init_pty_manager = __esm({
     init_detectPermissionGate();
     init_detectQuestionFromScreen();
     init_detectShellPrompt();
+    init_parseAgentPhase();
     init_debounce();
     init_deriveSessionName();
     OUTPUT_BUFFER_MAX2 = 65536;
@@ -121920,6 +121978,7 @@ var init_pty_manager = __esm({
       onStatusChange;
       onReady;
       onPermissionChange;
+      onPhaseChange;
       onLiveQuestion;
       onLiveQuestionGone;
       onUserMessage;
@@ -121981,6 +122040,7 @@ var init_pty_manager = __esm({
         this.onStatusChange = options.onStatusChange;
         this.onReady = options.onReady;
         this.onPermissionChange = options.onPermissionChange;
+        this.onPhaseChange = options.onPhaseChange;
         this.onLiveQuestion = options.onLiveQuestion;
         this.onLiveQuestionGone = options.onLiveQuestionGone;
         this.onUserMessage = options.onUserMessage;
@@ -122487,6 +122547,10 @@ var init_pty_manager = __esm({
         }
         this.lastDetectAt.set(sessionId, nowMs);
         const lines = await this.getOutputLines(sessionId, 60);
+        const phaseSession = this.sessions.get(sessionId);
+        if (phaseSession?.status === "running") {
+          this.setPhase(sessionId, phaseSession, parseAgentPhase(lines, CLAUDE_CODE_PROVIDER));
+        }
         const askFooterOnScreen = lines.some((l) => /Enter to select/i.test(l));
         if (oscPermission || hasAskFooter || askFooterOnScreen) {
           this.log.debug?.(`[pty.prompt_detect] ${sessionId.slice(0, 8)} trigger`, {
@@ -122630,12 +122694,27 @@ var init_pty_manager = __esm({
       }
       // Transition a session from "running" to "waiting_input", clear pendingReady,
       // and flush any queued input. Idempotent: callers can invoke at any chunk.
+      /**
+       * Record the agent's phase and notify only on a real change.
+       *
+       * The change guard is load-bearing, not an optimisation: the scrape pass runs
+       * on every chunk, so an unguarded setter would fire the callback — and the
+       * WS frame behind it — several times a second for the entire duration of a
+       * turn while reporting the same value.
+       */
+      setPhase(sessionId, session, phase) {
+        const next = phase ?? null;
+        if ((session.subStatus ?? null) === next) return;
+        session.subStatus = next;
+        this.onPhaseChange?.(sessionId, next);
+      }
       markReady(sessionId, session, source, reason) {
         this.clearReadyFallback(sessionId);
         session.lastActivityAt = /* @__PURE__ */ new Date();
         session.status = "waiting_input";
         session.statusSource = source;
         session.statusUpdatedAt = /* @__PURE__ */ new Date();
+        this.setPhase(sessionId, session, null);
         const elapsedMs = Date.now() - (this.firstChunkAt.get(sessionId) ?? Date.now());
         this.log.info(`[pty.ready] ${sessionId.slice(0, 8)} ${reason} (elapsed=${elapsedMs}ms)`, {
           event: "pty.ready",
@@ -128105,6 +128184,7 @@ var init_host = __esm({
           onStatusChange: (session) => this.emit({ type: "event", event: "status-change", session }),
           onReady: (session) => this.emit({ type: "event", event: "ready", session }),
           onPermissionChange: (sessionId, gate) => this.emit({ type: "event", event: "permission-change", sessionId, gate }),
+          onPhaseChange: (sessionId, phase) => this.emit({ type: "event", event: "phase-change", sessionId, phase }),
           onLiveQuestion: (sessionId, questions) => this.emit({ type: "event", event: "live-question", sessionId, questions }),
           onLiveQuestionGone: (sessionId) => this.emit({ type: "event", event: "live-question-gone", sessionId }),
           onUserMessage: (sessionId, text, ts2) => this.emit({ type: "event", event: "user-message", sessionId, text, ts: ts2 })
@@ -145287,6 +145367,12 @@ function conversationToResumableSession(c) {
     branch: c.branch ?? void 0,
     lastOutput: "",
     elapsedMs: 0,
+    // No PTY behind a cached conversation, so there is no phase — emitted
+    // explicitly for the same reason as in managedToResponse/discoveredToResponse:
+    // the client merges session frames, so an absent key keeps the previous
+    // value and the indicator latches. `GET /api/sessions/:id` serves this
+    // shape whenever the id is a conversation rather than a live session.
+    subStatus: null,
     promptCount: c.messageCount,
     startedAt: c.lastActivity,
     completedAt: null,
@@ -149714,6 +149800,15 @@ function createLiveSessionOptions(deps) {
         seq
       });
     },
+    onPhaseChange: (sessionId, phase) => {
+      deps.sessionStore.updateManaged(sessionId, { subStatus: phase });
+      deps.wsHub.broadcastToClients(deps.sessionSubscribers.get(sessionId) ?? [], {
+        type: "session_phase",
+        sessionId,
+        phase,
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    },
     onUserMessage: (sessionId, text, ts2) => {
       deps.wsHub.broadcastToClients(deps.sessionSubscribers.get(sessionId) ?? [], {
         type: "user_message",
@@ -151786,6 +151881,7 @@ var SessionStore = class {
     const session = this.managed.get(sessionId);
     if (!session) return null;
     Object.assign(session, updates);
+    if (updates.status != null && updates.status !== "running") session.subStatus = null;
     return session;
   }
   removeManaged(sessionId) {
@@ -151966,6 +152062,13 @@ function managedToResponse(s3, ptyAttached) {
     promptCount: s3.promptCount,
     startedAt: s3.startedAt.toISOString(),
     completedAt: s3.completedAt?.toISOString() ?? null,
+    // Unconditional, like completedAt above — do NOT move this into the
+    // `...(x != null && { x })` block below. That guard uses loose `!=`, which
+    // catches null as well as undefined, and would turn an explicit "no phase"
+    // back into an absent key. The client merges session frames, so an absent
+    // key keeps the previous value and the indicator latches on a finished
+    // turn — the tb-mobile PR #647 bug, arriving through the serialiser.
+    subStatus: s3.subStatus ?? null,
     ptyAttached,
     ...s3.projectId != null && { projectId: s3.projectId },
     ...s3.sessionName != null && { sessionName: s3.sessionName },
@@ -152016,6 +152119,10 @@ function discoveredToResponse(d, conversationId) {
     // cannot see the process's prompt state.
     lifecycle: "detached",
     lifecycleSource: "probe",
+    // No PTY here, so nothing to scrape and no phase to report. Emitted
+    // explicitly rather than omitted, for the same reason as in
+    // managedToResponse: absence must never be a third state on the wire.
+    subStatus: null,
     projectPath: d.projectPath,
     projectName: d.projectName,
     branch: d.branch,