@threadbase-sh/streamer 1.53.1 → 1.54.0

package/dist/index.cjs

@@ -1114,6 +1114,7 @@ function rememberedGateDigit(gate) {
 // src/services/questions/codexScreen.ts
 var CODEX_PROMPT_READY_TEXT = "Ready";
 var CODEX_BUSY_STATUS_RE = /\b(?:Starting|Working)\b/;
+var CODEX_WORKING_STATUS_RE = /\bWorking\b/;
 var CODEX_MCP_BOOT_RE = /Booting MCP|Starting MCP servers/i;
 var CODEX_TRUST_GATE_REGEX = /trust the contents/i;
 var CODEX_HOOKS_GATE_REGEX = /hooks need review/i;
@@ -1150,12 +1151,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) {
@@ -1202,6 +1206,20 @@ function gateCard(gate, lines) {
   };
 }
 
+// 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;
+}
+
 // src/utils/debounce.ts
 function debounce(fn, waitMs) {
   let timer = null;
@@ -1246,6 +1264,7 @@ var CodexPtyRunner = class {
   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.
@@ -1294,6 +1313,7 @@ var CodexPtyRunner = class {
   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;
@@ -1861,6 +1881,9 @@ var CodexPtyRunner = class {
       );
       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);
@@ -1975,11 +1998,25 @@ var CodexPtyRunner = class {
     });
     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,
@@ -2071,12 +2108,16 @@ function toPublicSession(s) {
     ...s.lastActivityAt != null && { lastActivityAt: s.lastActivityAt },
     ...s.statusSource != null && { statusSource: s.statusSource },
     ...s.statusUpdatedAt != null && { statusUpdatedAt: s.statusUpdatedAt },
-    ...s.filePath != null && { filePath: s.filePath }
+    ...s.filePath != null && { filePath: s.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: s.subStatus ?? null
   };
 }
 
 // src/pty-host/protocol.ts
-var PTY_HOST_PROTOCOL_VERSION = 2;
+var PTY_HOST_PROTOCOL_VERSION = 3;
 function isHostEvent(message) {
   return "type" in message && message.type === "event";
 }
@@ -2314,6 +2355,9 @@ var RemoteSessionRunner = class _RemoteSessionRunner {
       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;
@@ -2712,6 +2756,7 @@ var PTYManager = class {
   onStatusChange;
   onReady;
   onPermissionChange;
+  onPhaseChange;
   onLiveQuestion;
   onLiveQuestionGone;
   onUserMessage;
@@ -2773,6 +2818,7 @@ var PTYManager = class {
     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;
@@ -3279,6 +3325,10 @@ var PTYManager = class {
     }
     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`, {
@@ -3422,12 +3472,27 @@ var PTYManager = class {
   }
   // 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",
@@ -3491,7 +3556,12 @@ function toPublicSession2(s) {
     ...s.statusUpdatedAt != null && { statusUpdatedAt: s.statusUpdatedAt },
     ...s.filePath != null && { filePath: s.filePath },
     ...s.sessionName != null && { sessionName: s.sessionName },
-    ...s.firstMessageText != null && { firstMessageText: s.firstMessageText }
+    ...s.firstMessageText != null && { firstMessageText: s.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: s.subStatus ?? null
   };
 }
 
@@ -7955,6 +8025,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,
@@ -11911,6 +11987,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, ts) => {
       deps.wsHub.broadcastToClients(deps.sessionSubscribers.get(sessionId) ?? [], {
         type: "user_message",
@@ -13940,6 +14025,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) {
@@ -14120,6 +14206,13 @@ function managedToResponse(s, ptyAttached) {
     promptCount: s.promptCount,
     startedAt: s.startedAt.toISOString(),
     completedAt: s.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: s.subStatus ?? null,
     ptyAttached,
     ...s.projectId != null && { projectId: s.projectId },
     ...s.sessionName != null && { sessionName: s.sessionName },
@@ -14170,6 +14263,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,