@threadbase-sh/streamer 1.36.0 → 1.36.2

package/dist/index.cjs

@@ -1449,9 +1449,13 @@ var import_fs6 = require("fs");
 var import_path6 = require("path");
 
 // src/services/questions/detectPermissionGate.ts
-var OSC_777_RE = /\x1b\]777;notify;Claude Code;[^\x07\x1b]*/;
+var OSC_777_PERMISSION_RE = /\x1b\]777;notify;Claude Code;[^\x07\x1b]*needs your permission/;
+var OSC_777_WAITING_RE = /\x1b\]777;notify;Claude Code;[^\x07\x1b]*waiting for your input/;
 function hasPermissionOsc(rawData) {
-  return OSC_777_RE.test(rawData);
+  return OSC_777_PERMISSION_RE.test(rawData);
+}
+function hasWaitingForInputOsc(rawData) {
+  return OSC_777_WAITING_RE.test(rawData);
 }
 var OPTION_RE = /^\s*(❯)?\s*(\d+)\.\s+(.+?)\s*$/;
 var FOOTER_RE = /Enter to select|Esc to cancel|↑|↓|to navigate|to cancel/i;
@@ -1602,22 +1606,29 @@ function detectShellPrompt(lines) {
     };
   }
   const lastNumberedIdx = (() => {
-    for (let i = last.idx; i >= 0; i--) {
-      if (NUMBERED_RE.test(lines[i])) return i;
+    let i = last.idx;
+    if (!NUMBERED_RE.test(lines[i])) {
+      if (i > 0 && (PRESS_ENTER_RE.test(lines[i].trim()) || CONTINUE_RE.test(lines[i].trim()))) {
+        i--;
+      } else {
+        return -1;
+      }
     }
-    return -1;
+    while (i >= 0 && !NUMBERED_RE.test(lines[i]) && lines[i].trim().length === 0) i--;
+    return i >= 0 && NUMBERED_RE.test(lines[i]) ? i : -1;
   })();
   if (lastNumberedIdx >= 0) {
     const options = [];
-    for (let i = 0; i <= lastNumberedIdx; i++) {
+    let firstRow = lastNumberedIdx;
+    for (let i = lastNumberedIdx; i >= 0; i--) {
       const m = NUMBERED_RE.exec(lines[i]);
-      if (!m) continue;
+      if (!m) break;
       const num = Number.parseInt(m[1], 10);
-      if (!Number.isFinite(num)) continue;
-      options.push({ index: num, label: m[2].trim(), answerKeys: `${num}${ENTER}` });
+      if (!Number.isFinite(num)) break;
+      options.unshift({ index: num, label: m[2].trim(), answerKeys: `${num}${ENTER}` });
+      firstRow = i;
     }
     if (options.length >= 2) {
-      const firstRow = lines.findIndex((l) => NUMBERED_RE.test(l));
       let prompt = "";
       for (let i = firstRow - 1; i >= 0; i--) {
         const t = lines[i].trim();
@@ -2186,12 +2197,13 @@ var PTYManager = class {
     const session = this.sessions.get(sessionId);
     if (!session) return;
     const oscPermission = hasPermissionOsc(rawData);
+    const oscWaitingForInput = hasWaitingForInputOsc(rawData);
     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 && !hasAskFooter && !hasShellPromptHint && !this.permissionOpen.has(sessionId) && !this.shellPromptOpen.has(sessionId) && !this.lastScreenQuestionKey.has(sessionId)) {
+    if (!oscPermission && !oscWaitingForInput && !hasAskFooter && !hasShellPromptHint && !this.permissionOpen.has(sessionId) && !this.shellPromptOpen.has(sessionId) && !this.lastScreenQuestionKey.has(sessionId)) {
       return;
     }
     const lines = await this.getOutputLines(sessionId, 60);
@@ -2214,11 +2226,11 @@ var PTYManager = class {
       this.onPermissionChange?.(sessionId, gate ?? { options: [] });
     } else if (this.permissionOpen.has(sessionId) && !askFooterOnScreen) {
       const gate = scrapePermissionGate(lines);
-      if (gate) {
-        this.onPermissionChange?.(sessionId, gate);
-      } else if (hasPromptMarker) {
+      if (oscWaitingForInput || !gate && hasPromptMarker) {
         this.permissionOpen.delete(sessionId);
         this.onPermissionChange?.(sessionId, null);
+      } else if (gate) {
+        this.onPermissionChange?.(sessionId, gate);
       }
     }
     if (askFooterOnScreen) {
@@ -2713,11 +2725,11 @@ var import_node_ws = require("@hono/node-ws");
 var import_client = require("@temporalio/client");
 var import_scanner3 = require("@threadbase-sh/scanner");
 var import_events = require("events");
-var import_fs17 = require("fs");
+var import_fs18 = require("fs");
 var import_promises7 = require("fs/promises");
 var import_http = require("http");
-var import_os8 = require("os");
-var import_path17 = require("path");
+var import_os9 = require("os");
+var import_path18 = require("path");
 var import_readline = require("readline");
 
 // node_modules/nanoid/index.js
@@ -3630,8 +3642,8 @@ var createSessionRoutes = (deps) => {
     await deps.handleStopSession(c.req.param("id"), c.env.outgoing);
     return alreadyHandled6();
   });
-  app.get("/:id", (c) => {
-    deps.handleGetSession(c.req.param("id"), c.env.outgoing);
+  app.get("/:id", async (c) => {
+    await deps.handleGetSession(c.req.param("id"), c.env.outgoing);
     return alreadyHandled6();
   });
   return app;
@@ -5444,6 +5456,14 @@ function seal(plaintext, recipientPublicKeyBase64) {
   };
 }
 
+// src/services/cache/cacheMetadata.ts
+function getCacheMetadata(repo, key) {
+  return repo.getCacheMetadata(key);
+}
+function setCacheMetadata(repo, key, value) {
+  repo.setCacheMetadata(key, value);
+}
+
 // src/services/cache-integrity/cacheIntegrityMonitor.ts
 var import_crypto8 = require("crypto");
 var import_fs13 = require("fs");
@@ -5984,6 +6004,140 @@ function pruneAgentConversations(cache) {
   return { scanned: rows.length, pruned, missing };
 }
 
+// src/utils/dates.ts
+var import_date_fns = require("date-fns");
+function parseIsoDateOrNull(value) {
+  if (!value) return null;
+  const parsed = (0, import_date_fns.parseISO)(value);
+  return (0, import_date_fns.isValid)(parsed) ? parsed : null;
+}
+function compareIsoDesc(a, b) {
+  const dateA = parseIsoDateOrNull(a);
+  const dateB = parseIsoDateOrNull(b);
+  if (!dateA && !dateB) return 0;
+  if (!dateA) return 1;
+  if (!dateB) return -1;
+  return (0, import_date_fns.compareDesc)(dateA, dateB);
+}
+
+// src/services/projects/ensureProjectsForConversations.ts
+function ensureProjectsForConversations(repo, conversations) {
+  const conversationsByPath = /* @__PURE__ */ new Map();
+  for (const conversation of conversations) {
+    if (!conversation.projectPath) continue;
+    const canonical = canonicalizeProjectPath(conversation.projectPath);
+    if (!canonical) continue;
+    const existing = conversationsByPath.get(canonical) ?? [];
+    existing.push(conversation);
+    conversationsByPath.set(canonical, existing);
+  }
+  const pathToProjectId = /* @__PURE__ */ new Map();
+  for (const [path, projectConversations] of conversationsByPath) {
+    const latest = pickLatestConversation(projectConversations);
+    const project = repo.upsertProjectByPath(path, {
+      lastConversationId: latest?.id ?? null,
+      lastConversationCreatedAt: latest?.createdAt ?? null,
+      latestMessageAt: latest?.latestMessageAt ?? null
+    });
+    pathToProjectId.set(path, project.id);
+  }
+  return pathToProjectId;
+}
+function pickLatestConversation(conversations) {
+  if (conversations.length === 0) return void 0;
+  return [...conversations].sort((a, b) => {
+    const cmp = compareIsoDesc(a.latestMessageAt ?? null, b.latestMessageAt ?? null);
+    if (cmp !== 0) return cmp;
+    return compareIsoDesc(a.createdAt ?? null, b.createdAt ?? null);
+  })[0];
+}
+
+// src/services/conversations/refreshConversationCache.ts
+function refreshConversationCache(deps) {
+  const { projectsRepo, conversationsRepo, cacheMetadataRepo } = deps;
+  const conversations = conversationsRepo.listConversationsForProjectBackfill();
+  const pathToProjectId = ensureProjectsForConversations(
+    projectsRepo,
+    conversations.map((c) => ({
+      id: c.id,
+      projectPath: c.projectPath,
+      latestMessageAt: c.lastActivity ?? null,
+      createdAt: c.lastActivity ?? null
+    }))
+  );
+  let conversationsBackfilled = 0;
+  for (const conversation of conversations) {
+    if (!conversation.projectPath) continue;
+    if (conversation.projectId) continue;
+    const projectId = pathToProjectId.get(canonicalizeProjectPath(conversation.projectPath));
+    if (!projectId) continue;
+    conversationsRepo.updateConversationProjectId({
+      conversationId: conversation.id,
+      projectId
+    });
+    conversationsBackfilled += 1;
+  }
+  const latest = conversationsRepo.getLatestConversation();
+  if (latest) {
+    setCacheMetadata(cacheMetadataRepo, "last_conversation_id", latest.id);
+    if (latest.lastActivity) {
+      setCacheMetadata(cacheMetadataRepo, "last_conversation_created_at", latest.lastActivity);
+    }
+  }
+  setCacheMetadata(cacheMetadataRepo, "conversations_last_indexed_at", (/* @__PURE__ */ new Date()).toISOString());
+  return {
+    projectsTouched: pathToProjectId.size,
+    conversationsBackfilled,
+    latestConversationId: latest?.id ?? null
+  };
+}
+
+// src/services/conversations/shouldRefreshProjectsFromHdd.ts
+var import_fs16 = require("fs");
+var import_os8 = require("os");
+var import_path16 = require("path");
+var DEFAULT_PROJECTS_DIR = (0, import_path16.join)((0, import_os8.homedir)(), ".claude", "projects");
+function maxProjectsTreeMtimeMs(projectsDir) {
+  let maxMs;
+  try {
+    maxMs = (0, import_fs16.statSync)(projectsDir).mtimeMs;
+  } catch {
+    return null;
+  }
+  try {
+    for (const ent of (0, import_fs16.readdirSync)(projectsDir, { withFileTypes: true })) {
+      if (!ent.isDirectory()) continue;
+      try {
+        const childMs = (0, import_fs16.statSync)((0, import_path16.join)(projectsDir, ent.name)).mtimeMs;
+        if (childMs > maxMs) maxMs = childMs;
+      } catch {
+      }
+    }
+  } catch {
+  }
+  return maxMs;
+}
+function shouldRefreshProjectsFromHdd(conversationsRepo, cacheMetadataRepo, opts = {}) {
+  if (conversationsRepo.hasOrphanRows()) return true;
+  const dirs = /* @__PURE__ */ new Set();
+  if (opts.projectsDirs) {
+    for (const d of opts.projectsDirs) dirs.add(d);
+  }
+  dirs.add(opts.projectsDir ?? DEFAULT_PROJECTS_DIR);
+  let newestMs = null;
+  for (const dir of dirs) {
+    const ms = maxProjectsTreeMtimeMs(dir);
+    if (ms === null) continue;
+    if (newestMs === null || ms > newestMs) newestMs = ms;
+  }
+  if (newestMs === null) return false;
+  const lastIndexedIso = getCacheMetadata(cacheMetadataRepo, "conversations_last_indexed_at");
+  if (!lastIndexedIso) return true;
+  const lastIndexedMs = Date.parse(lastIndexedIso);
+  if (Number.isNaN(lastIndexedMs)) return true;
+  return newestMs > lastIndexedMs;
+}
+
 // src/services/projectChats/deriveProjectChatTitle.ts
 function deriveProjectChatTitle(input) {
   const trimmed = input.title?.trim();
@@ -5995,6 +6149,32 @@ function deriveProjectChatTitle(input) {
   return `Untitled \xB7 ${input.id.slice(0, 8)}`;
 }
 
+// src/services/questions/parseStatusLine.ts
+var MODEL_RE = /(Opus|Sonnet|Haiku|Fable)\s+[\d.]+(?:\s*\([^)]*\))?/;
+var EFFORT_RE = /●\s*([A-Za-z]+)\s*·\s*\/effort/;
+var PERMISSION_MODE_RE = /⏵⏵\s*([^(·\n]+?)\s*(?:\(|·|$)/;
+function parseStatusLine(lines) {
+  const info = {};
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const line = lines[i];
+    if (!line) continue;
+    if (info.effort === void 0) {
+      const m = EFFORT_RE.exec(line);
+      if (m) info.effort = m[1];
+    }
+    if (info.permissionMode === void 0) {
+      const m = PERMISSION_MODE_RE.exec(line);
+      if (m) info.permissionMode = m[1].trim();
+    }
+    if (info.model === void 0) {
+      const m = MODEL_RE.exec(line);
+      if (m) info.model = m[0].replace(/\s+/g, " ").trim();
+    }
+    if (info.model && info.effort && info.permissionMode) break;
+  }
+  return info;
+}
+
 // src/services/questions/detectAskUserQuestion.ts
 function normalizeContent2(raw) {
   if (Array.isArray(raw)) return raw;
@@ -6119,7 +6299,7 @@ function resolveAnswer(pending, body) {
 }
 
 // src/services/sessions/conversationBusy.ts
-var import_fs16 = require("fs");
+var import_fs17 = require("fs");
 var RESUME_BUSY_WINDOW_MS = 12e4;
 function resolveResumeBusyWindowMs(env = process.env) {
   const raw = env.THREADBASE_RESUME_BUSY_WINDOW_MS;
@@ -6136,7 +6316,7 @@ function conversationBusy(input) {
   let lastActivityMs = null;
   if (input.jsonlPath) {
     try {
-      const mtimeMs = (0, import_fs16.statSync)(input.jsonlPath).mtimeMs;
+      const mtimeMs = (0, import_fs17.statSync)(input.jsonlPath).mtimeMs;
       const age = now - mtimeMs;
       lastActivityMs = Math.max(0, age);
       const isSelfEcho = input.selfPtyEndedAt != null && mtimeMs <= input.selfPtyEndedAt + SELF_ACTIVITY_SKEW_MS;
@@ -6364,7 +6544,7 @@ function discoveredToResponse(d, conversationId) {
 var import_crypto9 = require("crypto");
 var import_promises6 = require("fs/promises");
 var import_heic_convert = __toESM(require("heic-convert"), 1);
-var import_path16 = require("path");
+var import_path17 = require("path");
 var UPLOAD_DIR_NAME = ".threadbase-uploads";
 var MAX_BYTES = 25 * 1024 * 1024;
 var HEIC_MIMES = /* @__PURE__ */ new Set(["image/heic", "image/heif"]);
@@ -6397,9 +6577,9 @@ async function saveUploadFile(input) {
   }
   const id = `up_${(0, import_crypto9.randomBytes)(8).toString("hex")}`;
   const safeName = sanitizeFilename(originalName) || `file${MIME_TO_EXT[mimeType] ?? ""}`;
-  const dir = (0, import_path16.join)(input.projectPath, UPLOAD_DIR_NAME, input.sessionId);
+  const dir = (0, import_path17.join)(input.projectPath, UPLOAD_DIR_NAME, input.sessionId);
   await (0, import_promises6.mkdir)(dir, { recursive: true });
-  const filePath = (0, import_path16.join)(dir, `${Date.now()}-${id}-${safeName}`);
+  const filePath = (0, import_path17.join)(dir, `${Date.now()}-${id}-${safeName}`);
   await (0, import_promises6.writeFile)(filePath, buffer);
   return {
     id,
@@ -6509,14 +6689,6 @@ function computeConversationEtag({
   return `"${digest}"`;
 }
 
-// src/utils/dates.ts
-var import_date_fns = require("date-fns");
-function parseIsoDateOrNull(value) {
-  if (!value) return null;
-  const parsed = (0, import_date_fns.parseISO)(value);
-  return (0, import_date_fns.isValid)(parsed) ? parsed : null;
-}
-
 // src/utils/isScannedSnapshotStale.ts
 var STALENESS_TOLERANCE_MS = 1e3;
 function isScannedSnapshotStale(snapshotTimestamp, fileMtimeMs) {
@@ -6817,13 +6989,13 @@ var StreamerServer = class {
     this.disableDb = config.disableDb ?? false;
     this.scannerPersistenceDisabled = config.scannerPersistent === false;
     this.scanProfiles = config.scanProfiles;
-    this.codexRoots = config.codexRoots ?? [(0, import_path17.join)((0, import_os8.homedir)(), ".codex", "sessions")];
+    this.codexRoots = config.codexRoots ?? [(0, import_path18.join)((0, import_os9.homedir)(), ".codex", "sessions")];
     this.ptyGracePeriodMs = config.ptyGracePeriodMs ?? DEFAULT_PTY_GRACE_PERIOD_MS;
     this.defaultSystemPrompt = config.defaultSystemPrompt ?? DEFAULT_SYSTEM_PROMPT;
     this.defaultPermissionMode = config.defaultPermissionMode ?? loadDefaultPermissionMode() ?? "acceptEdits";
     this.defaultModel = config.defaultModel ?? "sonnet";
     this.defaultEffort = config.defaultEffort ?? "low";
-    this.cacheDir = config.cacheDir ?? loadCacheDir() ?? (0, import_path17.join)((0, import_os8.homedir)(), ".threadbase", "cache");
+    this.cacheDir = config.cacheDir ?? loadCacheDir() ?? (0, import_path18.join)((0, import_os9.homedir)(), ".threadbase", "cache");
     this.tailSize = config.tailSize ?? loadTailSize() ?? 10;
     this.directoryDebounceMs = parseDirScanDebounceEnv(process.env.THREADBASE_DIR_SCAN_DEBOUNCE_MS) ?? config.directoryScanDebounceMs ?? 1e3;
     this.markScannerStaleDebounced = debounce(() => {
@@ -6864,7 +7036,7 @@ var StreamerServer = class {
           const seqs = cache.extendMessageIndex(
             filePath,
             spans,
-            (0, import_fs17.statSync)(filePath),
+            (0, import_fs18.statSync)(filePath),
             readFrom,
             endOffset
           );
@@ -7030,7 +7202,7 @@ var StreamerServer = class {
         temporalClient,
         taskQueue: agentConfig.temporal.taskQueue
       });
-      const conversationsBaseDir = agentConfig.conversationsDir || (0, import_path17.join)((0, import_path17.dirname)(this.cacheDir), "conversations");
+      const conversationsBaseDir = agentConfig.conversationsDir || (0, import_path18.join)((0, import_path18.dirname)(this.cacheDir), "conversations");
       conversationWriter = createConversationWriter({
         baseDir: conversationsBaseDir
       });
@@ -7151,7 +7323,7 @@ var StreamerServer = class {
             }
           }
           if (msg.type === "hold_session" && typeof msg.sessionId === "string") {
-            this.startGraceTimer(msg.sessionId, 0);
+            this.startGraceTimer(msg.sessionId, this.ptyGracePeriodMs);
           }
         } catch {
         }
@@ -7353,7 +7525,7 @@ var StreamerServer = class {
         });
         try {
           this.cache = ConversationCache.open(
-            (0, import_path17.join)(this.cacheDir, "cache.db"),
+            (0, import_path18.join)(this.cacheDir, "cache.db"),
             this.tailSize,
             void 0,
             {
@@ -7398,7 +7570,7 @@ var StreamerServer = class {
             this.fileWatcher.watchDirectory(dir);
           }
           for (const dir of this.codexRoots) {
-            if (!(0, import_fs17.existsSync)(dir)) continue;
+            if (!(0, import_fs18.existsSync)(dir)) continue;
             this.fileWatcher.watchDirectory(dir);
           }
         } catch (err) {
@@ -7479,6 +7651,20 @@ var StreamerServer = class {
               count: pruned.length,
               event: "cache.prune_ghosts"
             });
+            if (this.projectsRepo && this.conversationsRepo && this.cacheMetadataRepo) {
+              refreshConversationCache({
+                cache: this.cache,
+                projectsRepo: this.projectsRepo,
+                conversationsRepo: this.conversationsRepo,
+                cacheMetadataRepo: this.cacheMetadataRepo
+              });
+            } else if (this.cacheMetadataRepo) {
+              setCacheMetadata(
+                this.cacheMetadataRepo,
+                "conversations_last_indexed_at",
+                (/* @__PURE__ */ new Date()).toISOString()
+              );
+            }
           }
         }).catch((err) => {
           const message = err instanceof Error ? err.message : String(err);
@@ -7718,6 +7904,56 @@ var StreamerServer = class {
   checkSessionInputRateLimit(sessionId) {
     return this.checkRateLimit(this.sessionInputAttempts, sessionId, 500, 6e4);
   }
+  /** Project roots watched for conversation JSONLs (profiles or ~/.claude/projects). */
+  projectsDirsForFreshnessCheck() {
+    if (this.scanProfiles && this.scanProfiles.length > 0) {
+      return this.scanProfiles.filter((p) => p.enabled).map((p) => (0, import_path18.join)(p.configDir, "projects"));
+    }
+    return [(0, import_path18.join)((0, import_os9.homedir)(), ".claude", "projects")];
+  }
+  /**
+   * Full-glob scan + cache upsert/delete reconcile. Used by ?refresh=1 and by
+   * the automatic freshness path when the directory watcher marked the scanner
+   * stale or shouldRefreshProjectsFromHdd detected disk drift.
+   */
+  async reconcileConversationsCacheFromDisk() {
+    if (!this.cache) return;
+    const scanner = await this.rescanForRefresh();
+    const metas = [...scanner.getMetadataCache().values()];
+    try {
+      this.cache.upsertFromScannerMeta(metas);
+      if (!this.cacheMonitor?.pending) {
+        this.cache.reconcileDeletions(canonicalLivePathSet(metas));
+      }
+      if (this.projectsRepo && this.conversationsRepo && this.cacheMetadataRepo) {
+        refreshConversationCache({
+          cache: this.cache,
+          projectsRepo: this.projectsRepo,
+          conversationsRepo: this.conversationsRepo,
+          cacheMetadataRepo: this.cacheMetadataRepo
+        });
+      } else if (this.cacheMetadataRepo) {
+        setCacheMetadata(
+          this.cacheMetadataRepo,
+          "conversations_last_indexed_at",
+          (/* @__PURE__ */ new Date()).toISOString()
+        );
+      }
+    } catch (err) {
+      this.log.warn(
+        `refresh reconcile failed: ${err instanceof Error ? err.message : String(err)}`,
+        { event: "conversations.reconcile_failed" }
+      );
+    }
+  }
+  shouldAutoReconcileConversationList() {
+    if (!this.cache) return false;
+    if (this.scannerStale) return true;
+    if (!this.conversationsRepo || !this.cacheMetadataRepo) return false;
+    return shouldRefreshProjectsFromHdd(this.conversationsRepo, this.cacheMetadataRepo, {
+      projectsDirs: this.projectsDirsForFreshnessCheck()
+    });
+  }
   async handleListConversations(url, res) {
     if (this.rejectIfWarmingUp(res)) return;
     const limit = intParam(url, "limit", 50);
@@ -7726,19 +7962,14 @@ var StreamerServer = class {
     const project = url.searchParams.get("project") ?? void 0;
     const providerFilter = url.searchParams.get("provider") ?? void 0;
     const bustCache = url.searchParams.get("refresh") === "1";
-    if (bustCache && this.cache) {
-      const scanner2 = await this.withWarmup("conversation_refresh", () => this.rescanForRefresh());
-      const metas2 = [...scanner2.getMetadataCache().values()];
-      try {
-        this.cache.upsertFromScannerMeta(metas2);
-        if (!this.cacheMonitor?.pending) {
-          this.cache.reconcileDeletions(canonicalLivePathSet(metas2));
-        }
-      } catch (err) {
-        this.log.warn(
-          `refresh reconcile failed: ${err instanceof Error ? err.message : String(err)}`,
-          { event: "conversations.reconcile_failed" }
+    if (this.cache && (bustCache || this.shouldAutoReconcileConversationList())) {
+      if (bustCache) {
+        await this.withWarmup(
+          "conversation_refresh",
+          () => this.reconcileConversationsCacheFromDisk()
         );
+      } else {
+        await this.reconcileConversationsCacheFromDisk();
       }
     }
     if (this.cache) {
@@ -8000,22 +8231,22 @@ var StreamerServer = class {
    */
   projectsDirs() {
     if (this.scanProfiles && this.scanProfiles.length > 0) {
-      return this.scanProfiles.filter((p) => p.enabled).map((p) => (0, import_path17.join)(p.configDir, "projects"));
+      return this.scanProfiles.filter((p) => p.enabled).map((p) => (0, import_path18.join)(p.configDir, "projects"));
     }
-    return [(0, import_path17.join)((0, import_os8.homedir)(), ".claude", "projects")];
+    return [(0, import_path18.join)((0, import_os9.homedir)(), ".claude", "projects")];
   }
   findJsonlPath(uuid) {
     const filename = `${uuid}.jsonl`;
     for (const projectsDir of this.projectsDirs()) {
-      if (!(0, import_fs17.existsSync)(projectsDir)) continue;
-      for (const dir of (0, import_fs17.readdirSync)(projectsDir)) {
-        const fp = (0, import_path17.join)(projectsDir, dir, filename);
-        if ((0, import_fs17.existsSync)(fp)) return fp;
-        const projectDir = (0, import_path17.join)(projectsDir, dir);
+      if (!(0, import_fs18.existsSync)(projectsDir)) continue;
+      for (const dir of (0, import_fs18.readdirSync)(projectsDir)) {
+        const fp = (0, import_path18.join)(projectsDir, dir, filename);
+        if ((0, import_fs18.existsSync)(fp)) return fp;
+        const projectDir = (0, import_path18.join)(projectsDir, dir);
         try {
-          for (const sub of (0, import_fs17.readdirSync)(projectDir)) {
-            const subagentPath = (0, import_path17.join)(projectDir, sub, "subagents", filename);
-            if ((0, import_fs17.existsSync)(subagentPath)) return subagentPath;
+          for (const sub of (0, import_fs18.readdirSync)(projectDir)) {
+            const subagentPath = (0, import_path18.join)(projectDir, sub, "subagents", filename);
+            if ((0, import_fs18.existsSync)(subagentPath)) return subagentPath;
           }
         } catch {
         }
@@ -8025,7 +8256,7 @@ var StreamerServer = class {
   }
   async readCwdFromJsonl(filePath) {
     return new Promise((resolve2) => {
-      const rl = (0, import_readline.createInterface)({ input: (0, import_fs17.createReadStream)(filePath), crlfDelay: Infinity });
+      const rl = (0, import_readline.createInterface)({ input: (0, import_fs18.createReadStream)(filePath), crlfDelay: Infinity });
       let found = false;
       rl.on("line", (line) => {
         if (found) return;
@@ -8115,7 +8346,7 @@ var StreamerServer = class {
     if (this.isManagedTailPath(key)) return;
     let mtimeMs;
     try {
-      mtimeMs = (0, import_fs17.statSync)(filePath).mtimeMs;
+      mtimeMs = (0, import_fs18.statSync)(filePath).mtimeMs;
     } catch {
       return;
     }
@@ -8297,7 +8528,7 @@ var StreamerServer = class {
     if (!conv.filePath) return false;
     let mtimeMs = null;
     try {
-      mtimeMs = (0, import_fs17.statSync)(conv.filePath).mtimeMs;
+      mtimeMs = (0, import_fs18.statSync)(conv.filePath).mtimeMs;
     } catch {
       return false;
     }
@@ -8666,13 +8897,23 @@ var StreamerServer = class {
       throw err;
     }
   }
-  handleGetSession(sessionId, res) {
+  async handleGetSession(sessionId, res) {
     if (this.rejectIfWarmingUp(res)) return;
     const session = this.sessionStore.get(sessionId, this.ptyAttachedIds());
     if (session) {
-      if (!(0, import_fs17.existsSync)(session.projectPath)) {
+      if (!(0, import_fs18.existsSync)(session.projectPath)) {
         session.failureReason = `Project directory not found: ${session.projectPath}`;
       }
+      if (this.ptyManager.hasSession(sessionId)) {
+        try {
+          const lines = await this.ptyManager.getOutputLines(sessionId, 10);
+          const status = parseStatusLine(lines);
+          if (session.model == null && status.model) session.model = status.model;
+          if (status.effort) session.effort = status.effort;
+          if (status.permissionMode) session.permissionMode = status.permissionMode;
+        } catch {
+        }
+      }
       json(res, 200, session);
       return;
     }
@@ -9131,7 +9372,7 @@ var StreamerServer = class {
       const jsonlCwd = jsonlPath ? await this.readCwdFromJsonl(jsonlPath) : null;
       if (jsonlCwd) {
         projectPath = jsonlCwd;
-        projectName = projectName || (0, import_path17.basename)(jsonlCwd);
+        projectName = projectName || (0, import_path18.basename)(jsonlCwd);
       }
     }
     if (!projectPath) {
@@ -9207,7 +9448,7 @@ var StreamerServer = class {
         sessionStore: this.sessionStore,
         // biome-ignore lint/style/noNonNullAssertion: agentClient is set when agentConfig.enabled is true
         agentClient: this.agentClient,
-        conversationsDir: this.cacheDir ? (0, import_path17.join)((0, import_path17.dirname)(this.cacheDir), "conversations") : "",
+        conversationsDir: this.cacheDir ? (0, import_path18.join)((0, import_path18.dirname)(this.cacheDir), "conversations") : "",
         agentConfig: this.agentConfig
       });
       json(res, result.status, result.body);
@@ -9351,7 +9592,7 @@ var StreamerServer = class {
   // file isn't slurped in full.
   readFirstLineSessionId(filePath) {
     try {
-      const content = (0, import_fs17.readFileSync)(filePath, "utf8");
+      const content = (0, import_fs18.readFileSync)(filePath, "utf8");
       const nl = content.indexOf("\n");
       const firstLine = nl === -1 ? content : content.slice(0, nl);
       if (!firstLine.trim()) return null;
@@ -9366,9 +9607,9 @@ var StreamerServer = class {
   // was passed to Claude via --session-id so the filename matches from the start.
   watchForJsonl(sessionId, projectPath) {
     const encoded = projectPath.replace(/[/\\:.]/g, "-");
-    const projectsDir = (0, import_path17.join)((0, import_os8.homedir)(), ".claude", "projects", encoded);
+    const projectsDir = (0, import_path18.join)((0, import_os9.homedir)(), ".claude", "projects", encoded);
     const expectedFile = `${sessionId}.jsonl`;
-    const filePath = (0, import_path17.join)(projectsDir, expectedFile);
+    const filePath = (0, import_path18.join)(projectsDir, expectedFile);
     const deadline = Date.now() + 12e4;
     let watcher = null;
     const cleanup = () => {
@@ -9386,14 +9627,14 @@ var StreamerServer = class {
         cleanup();
         return;
       }
-      let resolvedFilePath = (0, import_fs17.existsSync)(filePath) ? filePath : null;
-      if (!resolvedFilePath && (0, import_fs17.existsSync)(projectsDir)) {
+      let resolvedFilePath = (0, import_fs18.existsSync)(filePath) ? filePath : null;
+      if (!resolvedFilePath && (0, import_fs18.existsSync)(projectsDir)) {
         try {
           const now = Date.now();
-          const match = (0, import_fs17.readdirSync)(projectsDir).filter((f) => f.endsWith(".jsonl")).map((f) => ({ f, mtime: (0, import_fs17.statSync)((0, import_path17.join)(projectsDir, f)).mtimeMs })).filter(({ mtime }) => now - mtime < 5e3).filter(
-            ({ f }) => (0, import_path17.basename)(f, ".jsonl") === sessionId || this.readFirstLineSessionId((0, import_path17.join)(projectsDir, f)) === sessionId
+          const match = (0, import_fs18.readdirSync)(projectsDir).filter((f) => f.endsWith(".jsonl")).map((f) => ({ f, mtime: (0, import_fs18.statSync)((0, import_path18.join)(projectsDir, f)).mtimeMs })).filter(({ mtime }) => now - mtime < 5e3).filter(
+            ({ f }) => (0, import_path18.basename)(f, ".jsonl") === sessionId || this.readFirstLineSessionId((0, import_path18.join)(projectsDir, f)) === sessionId
           ).sort((a, b) => b.mtime - a.mtime)[0];
-          if (match) resolvedFilePath = (0, import_path17.join)(projectsDir, match.f);
+          if (match) resolvedFilePath = (0, import_path18.join)(projectsDir, match.f);
         } catch {
         }
       }
@@ -9401,7 +9642,7 @@ var StreamerServer = class {
       cleanup();
       this.sessionFileMap.set(sessionId, resolvedFilePath);
       try {
-        const existing = (0, import_fs17.readFileSync)(resolvedFilePath, "utf8").split("\n").filter(Boolean);
+        const existing = (0, import_fs18.readFileSync)(resolvedFilePath, "utf8").split("\n").filter(Boolean);
         if (existing.length > 0) {
           this.broadcastConversationLines(sessionId, existing);
         }
@@ -9425,7 +9666,7 @@ var StreamerServer = class {
     if (this.sessionFileMap.has(sessionId)) return;
     try {
       require("fs").mkdirSync(projectsDir, { recursive: true });
-      watcher = (0, import_fs17.watch)(projectsDir, tryWire);
+      watcher = (0, import_fs18.watch)(projectsDir, tryWire);
       watcher.on("error", cleanup);
     } catch {
     }
@@ -9441,7 +9682,7 @@ var StreamerServer = class {
   watchForCodexRollout(sessionId, projectPath) {
     const deadline = Date.now() + 12e4;
     const now = /* @__PURE__ */ new Date();
-    const dateDir = (0, import_path17.join)(
+    const dateDir = (0, import_path18.join)(
       String(now.getFullYear()),
       String(now.getMonth() + 1).padStart(2, "0"),
       String(now.getDate()).padStart(2, "0")
@@ -9454,7 +9695,7 @@ var StreamerServer = class {
     };
     const matchesProjectPath = (candidatePath) => {
       try {
-        const firstLine = (0, import_fs17.readFileSync)(candidatePath, "utf8").split("\n", 1)[0];
+        const firstLine = (0, import_fs18.readFileSync)(candidatePath, "utf8").split("\n", 1)[0];
         if (!firstLine) return null;
         const parsed = JSON.parse(firstLine);
         if (parsed?.type !== "session_meta") return null;
@@ -9482,18 +9723,18 @@ var StreamerServer = class {
         this.sessionStore.listManaged().filter((s) => s.id !== sessionId && s.boundConversationId != null).map((s) => s.boundConversationId)
       );
       for (const root of this.codexRoots) {
-        const sessionsDir = (0, import_path17.join)(root, dateDir);
-        if (!(0, import_fs17.existsSync)(sessionsDir)) continue;
+        const sessionsDir = (0, import_path18.join)(root, dateDir);
+        if (!(0, import_fs18.existsSync)(sessionsDir)) continue;
         let candidateFiles;
         try {
-          candidateFiles = (0, import_fs17.readdirSync)(sessionsDir).filter((f) => f.endsWith(".jsonl"));
+          candidateFiles = (0, import_fs18.readdirSync)(sessionsDir).filter((f) => f.endsWith(".jsonl"));
         } catch {
           continue;
         }
         const nowMs = Date.now();
-        const recentCandidates = candidateFiles.map((f) => ({ f, mtime: (0, import_fs17.statSync)((0, import_path17.join)(sessionsDir, f)).mtimeMs })).filter(({ mtime }) => nowMs - mtime < 1e4).sort((a, b) => b.mtime - a.mtime);
+        const recentCandidates = candidateFiles.map((f) => ({ f, mtime: (0, import_fs18.statSync)((0, import_path18.join)(sessionsDir, f)).mtimeMs })).filter(({ mtime }) => nowMs - mtime < 1e4).sort((a, b) => b.mtime - a.mtime);
         for (const { f } of recentCandidates) {
-          const candidatePath = (0, import_path17.join)(sessionsDir, f);
+          const candidatePath = (0, import_path18.join)(sessionsDir, f);
           const match = matchesProjectPath(candidatePath);
           if (!match) continue;
           if (boundElsewhere.has(match.id)) continue;
@@ -9503,7 +9744,7 @@ var StreamerServer = class {
           this.sessionFileMap.set(sessionId, candidatePath);
           this.fileWatcher.watch(candidatePath);
           try {
-            const existing = (0, import_fs17.readFileSync)(candidatePath, "utf8").split("\n").filter(Boolean);
+            const existing = (0, import_fs18.readFileSync)(candidatePath, "utf8").split("\n").filter(Boolean);
             if (existing.length > 0) {
               this.broadcastConversationLines(sessionId, existing);
             }
@@ -9637,7 +9878,7 @@ async function waitForProcessExit(pid, timeoutMs, pollMs = ADOPT_KILL_POLL_MS) {
 }
 function classifyResumability(cwd) {
   if (!cwd) return { resumable: true };
-  if ((0, import_fs17.existsSync)(cwd)) return { resumable: true };
+  if ((0, import_fs18.existsSync)(cwd)) return { resumable: true };
   const ranInWorktree = /\/\.worktrees\//.test(cwd) || /\/\.claude\/worktrees\//.test(cwd);
   return {
     resumable: false,