@threadbase-sh/streamer 1.52.3 → 1.52.5

package/dist/cli.cjs

@@ -6160,11 +6160,12 @@ function validateFeatureFlagValues(raw2) {
   const out = {};
   const dropped = [];
   for (const [id, value] of Object.entries(raw2)) {
-    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(
@@ -6184,7 +6185,8 @@ function parseFeatureFlagArgs(entries) {
     const eq = entry.indexOf("=");
     const id = (eq === -1 ? entry : entry.slice(0, eq)).trim();
     const rawValue = eq === -1 ? "true" : entry.slice(eq + 1).trim().toLowerCase();
-    if (!findFeatureFlag(id)) {
+    const def = findFeatureFlag(id);
+    if (!def) {
       errors.push(
         `Unknown feature flag "${id}". Known flags: ${FEATURE_FLAGS.map((f2) => f2.id).join(", ")}`
       );
@@ -6194,21 +6196,35 @@ function parseFeatureFlagArgs(entries) {
       errors.push(`Invalid value "${rawValue}" for feature flag "${id}" \u2014 expected true/false`);
       continue;
     }
-    values[id] = rawValue === "true";
+    values[def.id] = rawValue === "true";
   }
   return { values, errors };
 }
 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(([, v2]) => v2 !== 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((f2) => values[f2.id] !== f2.default).map((f2) => f2.id);
 }
+function describeFeatureFlags(resolution) {
+  return FEATURE_FLAGS.map(
+    (f2) => `${f2.id}=${resolution.values[f2.id]}(${resolution.sources[f2.id]})`
+  ).join(" ");
+}
 var FEATURE_FLAGS;
 var init_feature_flags = __esm({
   "src/feature-flags.ts"() {
@@ -151031,6 +151047,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) {
@@ -151292,7 +151309,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_fs36.existsSync });
+    const now = Date.now();
+    const baseOptions = { now, projectExists: import_fs36.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;
@@ -152290,6 +152334,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;
@@ -152403,10 +152451,13 @@ var StreamerServer = class {
     this.codexRoots = config2.codexRoots ?? [(0, import_path33.join)((0, import_os15.homedir)(), ".codex", "sessions")];
     this.ptyGracePeriodMs = config2.ptyGracePeriodMs ?? DEFAULT_PTY_GRACE_PERIOD_MS;
     this.defaultSystemPrompt = config2.defaultSystemPrompt ?? DEFAULT_SYSTEM_PROMPT;
-    this.featureFlags = resolveFeatureFlags({ cli: config2.featureFlags, yaml: loadFeatureFlags() });
-    if (config2.codexSystemPromptEnabled !== void 0) {
-      this.featureFlags.codexSystemPrompt = config2.codexSystemPromptEnabled;
-    }
+    const flagResolution = resolveFeatureFlags({
+      override: config2.codexSystemPromptEnabled === void 0 ? void 0 : { codexSystemPrompt: config2.codexSystemPromptEnabled },
+      cli: config2.featureFlags,
+      yaml: loadFeatureFlags()
+    });
+    this.featureFlags = flagResolution.values;
+    this.featureFlagSources = flagResolution.sources;
     this.codexSystemPromptEnabled = this.featureFlags.codexSystemPrompt;
     this.defaultPermissionMode = config2.defaultPermissionMode ?? loadDefaultPermissionMode() ?? "acceptEdits";
     this.defaultModel = config2.defaultModel ?? "sonnet";
@@ -152447,17 +152498,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() ?? config2.browseRoot;
     if (rawRoot) {
       (0, import_promises16.realpath)(rawRoot).then((resolved) => {
@@ -153480,7 +153531,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 {
@@ -153653,13 +153708,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_fs38.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
     );
@@ -153673,7 +153732,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
@@ -157684,7 +157743,7 @@ async function runProdDoctor(opts, deps = {}) {
       );
     }
   }
-  const featureFlags = deps.featureFlags ?? resolveFeatureFlags({ yaml: loadFeatureFlags() });
+  const featureFlags = deps.featureFlags ?? resolveFeatureFlags({ yaml: loadFeatureFlags() }).values;
   if (featureFlags.ptyHost) {
     const probe = deps.probePtyHost ?? (() => probePtyHostStatus(hostSocketPath(getInstanceId())));
     try {
@@ -157705,6 +157764,33 @@ async function runProdDoctor(opts, deps = {}) {
 function toPowerShellLiteral(value) {
   return `'${value.replace(/'/g, "''")}'`;
 }
+function windowsFollowScript(paths, lines) {
+  const list = `@(${paths.map(toPowerShellLiteral).join(", ")})`;
+  return [
+    "$ErrorActionPreference = 'Stop'",
+    `$paths = ${list}`,
+    `foreach ($f in $paths) { Get-Content -LiteralPath $f -Tail ${lines} }`,
+    "$offsets = @{}",
+    "foreach ($f in $paths) { $offsets[$f] = (Get-Item -LiteralPath $f).Length }",
+    "while ($true) {",
+    "  foreach ($f in $paths) {",
+    "    try {",
+    "      $len = (Get-Item -LiteralPath $f).Length",
+    "      if ($len -lt $offsets[$f]) { $offsets[$f] = 0 }",
+    "      if ($len -gt $offsets[$f]) {",
+    "        $stream = [IO.File]::Open($f, 'Open', 'Read', 'ReadWrite')",
+    "        [void]$stream.Seek($offsets[$f], 'Begin')",
+    "        $reader = New-Object IO.StreamReader($stream)",
+    "        $reader.ReadToEnd()",
+    "        $reader.Dispose(); $stream.Dispose()",
+    "        $offsets[$f] = $len",
+    "      }",
+    "    } catch { }",
+    "  }",
+    "  Start-Sleep -Milliseconds 400",
+    "}"
+  ].join("; ");
+}
 var defaultSpawnTail = ({ files, lines, follow }) => {
   const existing = files.filter((f2) => (0, import_node_fs23.existsSync)(f2));
   if (existing.length === 0) {
@@ -157719,13 +157805,17 @@ var defaultSpawnTail = ({ files, lines, follow }) => {
     "-NoProfile",
     "-NonInteractive",
     "-Command",
-    `Get-Content -LiteralPath @(${existing.map(toPowerShellLiteral).join(", ")}) -Tail ${lines}${follow ? " -Wait" : ""}`
+    follow ? windowsFollowScript(existing, lines) : `$ErrorActionPreference = 'Stop'; Get-Content -LiteralPath @(${existing.map(toPowerShellLiteral).join(", ")}) -Tail ${lines}`
   ] : ["-n", String(lines), ...follow ? ["-F"] : [], ...existing];
+  const program3 = isWindows3 ? "powershell.exe" : "tail";
   return new Promise((resolve4) => {
-    const child = (0, import_node_child_process8.spawn)(isWindows3 ? "powershell.exe" : "tail", args, {
+    const child = (0, import_node_child_process8.spawn)(program3, args, {
       stdio: ["ignore", "inherit", "inherit"]
     });
-    child.on("error", (err) => resolve4({ ok: false, message: `tail failed: ${err.message}` }));
+    child.on(
+      "error",
+      (err) => resolve4({ ok: false, message: `${program3} failed: ${err.message}` })
+    );
     child.on("exit", (code) => resolve4({ ok: code === 0 }));
   });
 };