@threadbase-sh/streamer 1.70.2 → 1.70.4

package/dist/index.js

@@ -2665,6 +2665,15 @@ var OPTION_RE2 = /^\s*(?:❯)?\s*(\d+)\.\s+(.+?)\s*$/;
 var QUESTION_RE = /\?\s*$/;
 var BOX_ONLY_RE2 = /^[\s│─┌┐└┘├┤┬┴┼╭╮╰╯╱╲=_-]+$/;
 var PERMISSION_LABEL_RE = /^(Yes|No)\b/i;
+var KNOWN_STATE_MARKER_RE = /^(?:\[(?:[ xX*]|✓|✔)\]|[☐☑☒])\s*/;
+var UNKNOWN_STATE_MARKER_RE = /^(?:\[[^\]]{0,3}\]|\([^)]{0,3}\))\s*/;
+function stripStateMarker(label) {
+  if (KNOWN_STATE_MARKER_RE.test(label)) {
+    return { label: label.replace(KNOWN_STATE_MARKER_RE, ""), marked: true };
+  }
+  if (UNKNOWN_STATE_MARKER_RE.test(label)) return { label, marked: true };
+  return { label, marked: false };
+}
 function stripBoxGutter(line) {
   return line.replace(/^\s*[│|]\s?/, "").replace(/\s*[│|]\s*$/, "");
 }
@@ -2679,6 +2688,7 @@ function detectQuestionFromScreen(lines) {
   if (footerIdx === -1) return null;
   const options = [];
   let firstOptionIdx = -1;
+  let sawStateMarker = false;
   for (let i = footerIdx - 1; i >= 0; i--) {
     const line = lines[i];
     const inner = stripBoxGutter(line);
@@ -2692,8 +2702,10 @@ function detectQuestionFromScreen(lines) {
     if (options.length > 0 && QUESTION_RE.test(trimmed) && !OPTION_RE2.test(inner)) break;
     const m = OPTION_RE2.exec(inner);
     if (m) {
-      const label = m[2].trim();
-      if (PERMISSION_LABEL_RE.test(label)) return null;
+      const rendered = m[2].trim();
+      if (PERMISSION_LABEL_RE.test(rendered)) return null;
+      const { label, marked } = stripStateMarker(rendered);
+      if (marked) sawStateMarker = true;
       options.unshift({ label, description: "" });
       firstOptionIdx = i;
     }
@@ -2712,7 +2724,7 @@ function detectQuestionFromScreen(lines) {
   }
   if (!question) return null;
   return {
-    questions: [{ question, header: "", multiSelect: false, options }]
+    questions: [{ question, header: "", multiSelect: sawStateMarker, options }]
   };
 }
 function isQuestionMenuOnScreen(lines) {
@@ -18515,23 +18527,16 @@ var StreamerServer = class {
    * it.
    */
   async resolveConversationTarget(sessionId) {
-    let jsonlPath = this.conversationHandlers.findJsonlPath(sessionId);
-    let conv = await this.conversationHandlers.findConversationByUuid(sessionId);
-    let historyId = sessionId;
-    let registryProvider;
-    if (!jsonlPath && !conv) {
-      const row = this.managedSessionsRepo?.get(sessionId) ?? null;
-      const boundId = row ? resumeIdForRow(row) : null;
-      if (boundId != null && boundId !== sessionId) {
-        historyId = boundId;
-        registryProvider = row?.provider;
-        jsonlPath = this.conversationHandlers.findJsonlPath(boundId);
-        conv = await this.conversationHandlers.findConversationByUuid(boundId);
-      }
-    }
+    const row = this.managedSessionsRepo?.get(sessionId) ?? null;
+    const liveSession = this.sessionStore.getManaged(sessionId);
+    const resumeId = (row ? resumeIdForRow(row) : null) ?? (liveSession?.provider === CODEX_CLI_PROVIDER ? liveSession.boundConversationId ?? null : null);
+    const historyId = resumeId ?? sessionId;
+    const managedProvider = row?.provider ?? liveSession?.provider;
+    const jsonlPath = this.conversationHandlers.findJsonlPath(historyId);
+    const conv = await this.conversationHandlers.findConversationByUuid(historyId);
     const cachedConvMeta = this.cache?.getMetaById(historyId);
     const cachedPath = cachedConvMeta?.filePath ? toNativeFilePath(cachedConvMeta.filePath) : null;
-    const cachedCodexPath = (registryProvider === CODEX_CLI_PROVIDER || cachedConvMeta?.provider === CODEX_CLI_PROVIDER) && cachedPath != null && existsSync16(cachedPath) ? cachedPath : null;
+    const cachedCodexPath = (managedProvider === CODEX_CLI_PROVIDER || cachedConvMeta?.provider === CODEX_CLI_PROVIDER) && cachedPath != null && existsSync16(cachedPath) ? cachedPath : null;
     const jsonlCwd = jsonlPath ? await this.conversationHandlers.readCwdFromJsonl(jsonlPath) : null;
     const projectPath = jsonlCwd ?? conv?.projectPath ?? (cachedCodexPath ? cachedConvMeta?.projectPath : null);
     if (!projectPath) {
@@ -18541,7 +18546,7 @@ var StreamerServer = class {
       return { ok: false, reason: "no_project_path" };
     }
     const provider = coerceProviderForRunner(
-      conv?.provider ?? cachedConvMeta?.provider ?? registryProvider
+      conv?.provider ?? cachedConvMeta?.provider ?? managedProvider
     );
     return {
       ok: true,