@threadbase-sh/streamer 1.52.3 → 1.52.5

package/dist/index.cjs

@@ -537,11 +537,12 @@ function validateFeatureFlagValues(raw) {
   const out = {};
   const dropped = [];
   for (const [id, value] of Object.entries(raw)) {
-    if (!findFeatureFlag(id) || typeof value !== "boolean") {
+    const def = findFeatureFlag(id);
+    if (!def || typeof value !== "boolean") {
       dropped.push(id);
       continue;
     }
-    out[id] = value;
+    out[def.id] = value;
   }
   if (dropped.length > 0) {
     getLogger("feature-flags").warn(
@@ -556,15 +557,29 @@ function validateFeatureFlagValues(raw) {
 }
 function resolveFeatureFlags(opts) {
   const env = opts?.env ?? process.env;
-  const out = {};
+  const values = {};
+  const sources = {};
   for (const def of FEATURE_FLAGS) {
-    out[def.id] = parseBooleanEnv(env[def.env]) ?? opts?.cli?.[def.id] ?? opts?.yaml?.[def.id] ?? def.default;
+    const rungs = [
+      ["override", opts?.override?.[def.id]],
+      ["env", parseBooleanEnv(env[def.env])],
+      ["cli", opts?.cli?.[def.id]],
+      ["yaml", opts?.yaml?.[def.id]]
+    ];
+    const won = rungs.find(([, v]) => v !== void 0);
+    values[def.id] = won ? won[1] : def.default;
+    sources[def.id] = won ? won[0] : "default";
   }
-  return out;
+  return { values, sources };
 }
 function nonDefaultFeatureFlags(values) {
   return FEATURE_FLAGS.filter((f) => values[f.id] !== f.default).map((f) => f.id);
 }
+function describeFeatureFlags(resolution) {
+  return FEATURE_FLAGS.map(
+    (f) => `${f.id}=${resolution.values[f.id]}(${resolution.sources[f.id]})`
+  ).join(" ");
+}
 
 // src/auth.ts
 function configDir() {
@@ -13267,6 +13282,7 @@ function autoResumeSkipReason(row, opts) {
   if (opts.now - row.status_updated_at > AUTO_RESUME_WINDOW_MS) return "too_old";
   if (!opts.projectExists(row.project_path)) return "project_missing";
   if (resumeIdForRow(row) == null) return "resume_identity_missing";
+  if (!opts.historyExists(row)) return "history_missing";
   return null;
 }
 function planAutoResume(rows, opts) {
@@ -13528,7 +13544,34 @@ var SessionRegistryBoot = class {
   /** Resume only the recent sessions the user explicitly allowed us to start at boot. */
   async autoResumePreviousSessions(rows) {
     if (!this.autoResumeOnBoot) return;
-    const plan = planAutoResume(rows, { now: Date.now(), projectExists: import_fs25.existsSync });
+    const now = Date.now();
+    const baseOptions = { now, projectExists: import_fs25.existsSync, historyExists: () => true };
+    const historyExists = /* @__PURE__ */ new Map();
+    const preflights = /* @__PURE__ */ new Set();
+    for (const row of rows) {
+      if (autoResumeSkipReason(row, baseOptions) != null) {
+        historyExists.set(row.session_id, false);
+        continue;
+      }
+      while (preflights.size >= AUTO_RESUME_CONCURRENCY) {
+        await Promise.race(preflights);
+      }
+      const preflight = (async () => {
+        try {
+          const target = await this.deps.resolveConversationTarget(row.session_id);
+          historyExists.set(row.session_id, target.ok || target.reason !== "history_file_missing");
+        } catch {
+          historyExists.set(row.session_id, true);
+        }
+      })();
+      preflights.add(preflight);
+      void preflight.then(() => preflights.delete(preflight));
+    }
+    await Promise.all(preflights);
+    const plan = planAutoResume(rows, {
+      ...baseOptions,
+      historyExists: (row) => historyExists.get(row.session_id) ?? false
+    });
     const skippedBy = {};
     for (const { row, reason } of plan.skipped) {
       skippedBy[reason] = (skippedBy[reason] ?? 0) + 1;
@@ -14496,6 +14539,10 @@ var StreamerServer = class {
   // Resolved once at boot; see src/feature-flags.ts. Total map — every registry
   // id is present, so indexing it never yields undefined.
   featureFlags;
+  // Which rung of the precedence chain decided each flag. Reported at boot and
+  // over GET /api/config/feature-flags — the resolved boolean alone cannot say
+  // whether a value came from the environment, the CLI, server.yaml or nowhere.
+  featureFlagSources;
   // Derived from featureFlags.codexSystemPrompt. Kept as its own field so the
   // read site in startFresh() is unchanged.
   codexSystemPromptEnabled;
@@ -14609,10 +14656,13 @@ var StreamerServer = class {
     this.codexRoots = config.codexRoots ?? [(0, import_path22.join)((0, import_os12.homedir)(), ".codex", "sessions")];
     this.ptyGracePeriodMs = config.ptyGracePeriodMs ?? DEFAULT_PTY_GRACE_PERIOD_MS;
     this.defaultSystemPrompt = config.defaultSystemPrompt ?? DEFAULT_SYSTEM_PROMPT;
-    this.featureFlags = resolveFeatureFlags({ cli: config.featureFlags, yaml: loadFeatureFlags() });
-    if (config.codexSystemPromptEnabled !== void 0) {
-      this.featureFlags.codexSystemPrompt = config.codexSystemPromptEnabled;
-    }
+    const flagResolution = resolveFeatureFlags({
+      override: config.codexSystemPromptEnabled === void 0 ? void 0 : { codexSystemPrompt: config.codexSystemPromptEnabled },
+      cli: config.featureFlags,
+      yaml: loadFeatureFlags()
+    });
+    this.featureFlags = flagResolution.values;
+    this.featureFlagSources = flagResolution.sources;
     this.codexSystemPromptEnabled = this.featureFlags.codexSystemPrompt;
     this.defaultPermissionMode = config.defaultPermissionMode ?? loadDefaultPermissionMode() ?? "acceptEdits";
     this.defaultModel = config.defaultModel ?? "sonnet";
@@ -14653,17 +14703,17 @@ var StreamerServer = class {
       selfPtyEndedAt: this.selfPtyEndedAt,
       resumeSession: (opts) => this.sessionHandlers.resumeSession(opts),
       watchConversationFile: (sessionId, historyId) => this.sessionWatchers.watchConversationFile(sessionId, historyId),
-      broadcastSessionList: () => this.wsHub.broadcast(this.sessionListPayload())
+      broadcastSessionList: () => this.wsHub.broadcast(this.sessionListPayload()),
+      resolveConversationTarget: (sessionId) => this.resolveConversationTarget(sessionId)
     });
     this.includeAgents = parseIncludeAgentsEnv(process.env.THREADBASE_INCLUDE_AGENTS);
     this.agentEntrypoints = parseAgentEntrypointsEnv(process.env.THREADBASE_AGENT_ENTRYPOINTS);
-    const enabledFlags = nonDefaultFeatureFlags(this.featureFlags);
-    if (enabledFlags.length > 0) {
-      this.log.info(`Feature flags active: ${enabledFlags.join(", ")}`, {
-        event: "config.feature_flags_active",
-        flags: enabledFlags
-      });
-    }
+    this.log.info(`Feature flags: ${describeFeatureFlags(flagResolution)}`, {
+      event: "config.feature_flags",
+      values: this.featureFlags,
+      sources: this.featureFlagSources,
+      nonDefault: nonDefaultFeatureFlags(this.featureFlags)
+    });
     const rawRoot = process.env.THREADBASE_BROWSE_ROOT ?? loadBrowseRoot() ?? config.browseRoot;
     if (rawRoot) {
       (0, import_promises7.realpath)(rawRoot).then((resolved) => {
@@ -15686,7 +15736,11 @@ var StreamerServer = class {
    * the absence of that field is the signal that this endpoint is read-only.
    */
   getFeatureFlagsConfig() {
-    return { registry: FEATURE_FLAGS, values: this.featureFlags };
+    return {
+      registry: FEATURE_FLAGS,
+      values: this.featureFlags,
+      sources: this.featureFlagSources
+    };
   }
   getClaudeFlagsConfig() {
     return {
@@ -15859,13 +15913,17 @@ var StreamerServer = class {
         conv = await this.conversationHandlers.findConversationByUuid(boundId);
       }
     }
+    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 && (0, import_fs27.existsSync)(cachedPath) ? cachedPath : null;
     const jsonlCwd = jsonlPath ? await this.conversationHandlers.readCwdFromJsonl(jsonlPath) : null;
-    const projectPath = jsonlCwd ?? conv?.projectPath;
+    const projectPath = jsonlCwd ?? conv?.projectPath ?? (cachedCodexPath ? cachedConvMeta?.projectPath : null);
     if (!projectPath) {
-      if (!conv && !jsonlPath) return { ok: false, reason: "history_file_missing" };
+      if (!conv && !jsonlPath && !cachedCodexPath) {
+        return { ok: false, reason: "history_file_missing" };
+      }
       return { ok: false, reason: "no_project_path" };
     }
-    const cachedConvMeta = this.cache?.getMetaById(historyId);
     const provider = coerceProviderForRunner(
       conv?.provider ?? cachedConvMeta?.provider ?? registryProvider
     );
@@ -15879,7 +15937,7 @@ var StreamerServer = class {
       // conversation. Kept separate from `jsonlPath` deliberately: feeding it to
       // conversationBusy() would newly arm the mtime heuristic for Codex, which
       // is exactly the over-broad signal the report ruled out.
-      historyPath: jsonlPath ?? conv?.filePath ?? null,
+      historyPath: jsonlPath ?? conv?.filePath ?? cachedCodexPath ?? null,
       conv,
       projectPath,
       provider