@threadbase-sh/streamer 1.38.0 → 1.39.0

package/dist/cli.cjs

@@ -1490,6 +1490,9 @@ function isPermissionMode(value) {
 function isDangerousPermissionMode(mode) {
   return DANGEROUS_PERMISSION_MODES.includes(mode);
 }
+function isEffortLevel(value) {
+  return typeof value === "string" && EFFORT_LEVELS.includes(value);
+}
 function findFlag(id) {
   return CLAUDE_FLAGS.find((f2) => f2.id === id);
 }
@@ -1554,7 +1557,7 @@ function buildFlagArgs(values, extraArgs) {
   const args = [];
   const safe = validateFlagValues(values ?? {});
   for (const def of CLAUDE_FLAGS) {
-    if (def.id === "permissionMode") continue;
+    if (SPAWN_POSITIONAL_FLAG_IDS.has(def.id)) continue;
     const value = safe[def.id];
     if (value === void 0) continue;
     if (def.valueType === "boolean") {
@@ -1577,7 +1580,7 @@ function buildSettingsJson(permissionMode) {
   }
   return JSON.stringify(settings);
 }
-var PERMISSION_MODES, DANGEROUS_PERMISSION_MODES, CLAUDE_FLAGS;
+var PERMISSION_MODES, DANGEROUS_PERMISSION_MODES, EFFORT_LEVELS, CLAUDE_FLAGS, SPAWN_POSITIONAL_FLAG_IDS;
 var init_claude_flags = __esm({
   "src/claude-flags.ts"() {
     "use strict";
@@ -1593,6 +1596,7 @@ var init_claude_flags = __esm({
       "bypassPermissions",
       "dontAsk"
     ];
+    EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"];
     CLAUDE_FLAGS = [
       {
         id: "permissionMode",
@@ -1604,9 +1608,10 @@ var init_claude_flags = __esm({
       { id: "addDir", flag: "--add-dir", valueType: "list", risk: "elevated" },
       { id: "allowedTools", flag: "--allowedTools", valueType: "list", risk: "elevated" },
       { id: "disallowedTools", flag: "--disallowedTools", valueType: "list", risk: "low" },
-      { id: "maxBudgetUsd", flag: "--max-budget-usd", valueType: "string", risk: "low" },
-      { id: "fallbackModel", flag: "--fallback-model", valueType: "string", risk: "low" }
+      { id: "model", flag: "--model", valueType: "string", risk: "low" },
+      { id: "effort", flag: "--effort", valueType: "enum", enumValues: EFFORT_LEVELS, risk: "low" }
     ];
+    SPAWN_POSITIONAL_FLAG_IDS = /* @__PURE__ */ new Set(["permissionMode", "model", "effort"]);
   }
 });
 
@@ -139499,6 +139504,14 @@ var createSessionRoutes = (deps) => {
     await deps.handleSetSessionName(c.req.param("id"), c.env.incoming, c.env.outgoing);
     return alreadyHandled6();
   });
+  app.patch("/:id/model", async (c) => {
+    await deps.handleSetSessionModel(c.req.param("id"), c.env.incoming, c.env.outgoing);
+    return alreadyHandled6();
+  });
+  app.patch("/:id/effort", async (c) => {
+    await deps.handleSetSessionEffort(c.req.param("id"), c.env.incoming, c.env.outgoing);
+    return alreadyHandled6();
+  });
   app.post("/:id/adopt", async (c) => {
     await deps.handleAdopt(c.req.param("id"), c.env.outgoing);
     return alreadyHandled6();
@@ -139838,6 +139851,7 @@ CREATE TABLE IF NOT EXISTS conversation_meta (
 );
 CREATE INDEX IF NOT EXISTS idx_meta_last_activity ON conversation_meta(last_activity DESC);
 CREATE INDEX IF NOT EXISTS idx_meta_project ON conversation_meta(project_path);
+CREATE INDEX IF NOT EXISTS idx_meta_file_path ON conversation_meta(file_path);
 
 CREATE TABLE IF NOT EXISTS conversation_tail (
   conversation_id TEXT PRIMARY KEY REFERENCES conversation_meta(id) ON DELETE CASCADE,
@@ -145915,6 +145929,24 @@ var WSHub = class {
       this.clients.delete(client);
     }
   }
+  // Scoped broadcast for high-frequency per-session messages (terminal_output,
+  // user_message). Sending to every connected client for every PTY output
+  // chunk made broadcast() cost scale with connections x active sessions;
+  // this bounds it to only that session's subscribers.
+  broadcastToClients(clients, message) {
+    const data = JSON.stringify(message);
+    for (const client of clients) {
+      try {
+        if (client.readyState === client.OPEN) {
+          client.send(data);
+        } else {
+          this.clients.delete(client);
+        }
+      } catch {
+        this.clients.delete(client);
+      }
+    }
+  }
   unicast(ws2, message) {
     try {
       if (ws2.readyState === ws2.OPEN) {
@@ -145977,6 +146009,7 @@ var ADOPT_KILL_TIMEOUT_MS = 5e3;
 var ADOPT_KILL_POLL_MS = 100;
 var REFRESH_TTL_MS = 2e3;
 var START_READY_TIMEOUT_MS = 1e4;
+var MODEL_NAME_RE = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
 var EXTERNAL_TAIL_RECENCY_MS = RESUME_BUSY_WINDOW_MS;
 var EXTERNAL_TAIL_MAX = 32;
 var EXTERNAL_TAIL_IDLE_MS = 3e5;
@@ -146080,6 +146113,8 @@ var StreamerServer = class {
   dbPool = null;
   dbInstanceId = null;
   disableDb = false;
+  // Skip the startup warm-up scan (test hook; see ServerConfig.skipStartupWarmup).
+  skipStartupWarmup;
   browseRoot = null;
   publicUrl = null;
   browserCors;
@@ -146119,6 +146154,11 @@ var StreamerServer = class {
   // every provider; read only by the idle reaper. Entries are dropped when the
   // session leaves the runner (reap/exit/hold).
   lastAgentChunkAt = /* @__PURE__ */ new Map();
+  // sessionId → last terminal_output seq broadcast (starts at 1, per session).
+  // Stamped on every terminal_output/terminal_replay so a client can detect a
+  // stale chunk delivered after a reconnect race instead of trusting raw WS
+  // arrival order. Entries dropped alongside lastAgentChunkAt.
+  terminalSeq = /* @__PURE__ */ new Map();
   // Recently accepted input idempotency keys (C4). A retried POST replays its
   // original outcome instead of submitting the prompt to the agent twice.
   idempotency = new IdempotencyStore();
@@ -146186,6 +146226,7 @@ var StreamerServer = class {
     }
     this.verbose = config2.verbose ?? false;
     this.disableDb = config2.disableDb ?? false;
+    this.skipStartupWarmup = config2.skipStartupWarmup ?? false;
     this.scannerPersistenceDisabled = config2.scannerPersistent === false;
     this.scanProfiles = config2.scanProfiles;
     this.codexRoots = config2.codexRoots ?? [(0, import_path29.join)((0, import_os12.homedir)(), ".codex", "sessions")];
@@ -146334,10 +146375,22 @@ var StreamerServer = class {
       logger: getLogger("pty"),
       onOutput: (sessionId, data) => {
         this.lastAgentChunkAt.set(sessionId, Date.now());
-        this.wsHub.broadcast({ type: "terminal_output", sessionId, data });
+        const seq = (this.terminalSeq.get(sessionId) ?? 0) + 1;
+        this.terminalSeq.set(sessionId, seq);
+        this.wsHub.broadcastToClients(this.sessionSubscribers.get(sessionId) ?? [], {
+          type: "terminal_output",
+          sessionId,
+          data,
+          seq
+        });
       },
       onUserMessage: (sessionId, text, ts2) => {
-        this.wsHub.broadcast({ type: "user_message", sessionId, text, ts: ts2 });
+        this.wsHub.broadcastToClients(this.sessionSubscribers.get(sessionId) ?? [], {
+          type: "user_message",
+          sessionId,
+          text,
+          ts: ts2
+        });
       },
       onPermissionChange: (sessionId, gate) => {
         this.handlePermissionChange(sessionId, gate);
@@ -146474,6 +146527,8 @@ var StreamerServer = class {
       handleCancel: (id, res) => this.handleCancel(id, res),
       handleStopSession: (id, res) => this.handleStopSession(id, res),
       handleSetSessionName: (id, req, res) => this.handleSetSessionName(id, req, res),
+      handleSetSessionModel: (id, req, res) => this.applyLiveSessionSetting(id, req, res, "model"),
+      handleSetSessionEffort: (id, req, res) => this.applyLiveSessionSetting(id, req, res, "effort"),
       handleUploadFile: (id, req, res) => this.handleUploadFile(id, req, res),
       handleAdopt: (id, res) => this.handleAdopt(id, res),
       handleResume: (req, res) => this.handleResume(req, res),
@@ -146520,7 +146575,8 @@ var StreamerServer = class {
                   type: "terminal_replay",
                   sessionId: msg.sessionId,
                   lines,
-                  userMessages
+                  userMessages,
+                  seq: this.terminalSeq.get(msg.sessionId)
                 })
               );
             }
@@ -146880,6 +146936,7 @@ var StreamerServer = class {
       );
       this.ptyManager.putOnHold(session.id);
       this.lastAgentChunkAt.delete(session.id);
+      this.terminalSeq.delete(session.id);
       this.idempotency.clear(session.id);
       this.sessionSubscribers.delete(session.id);
       reaped.push(session.id);
@@ -147054,6 +147111,14 @@ var StreamerServer = class {
           );
           this.scannerPersistenceDisabled = true;
         }
+        if (this.skipStartupWarmup) {
+          this.log.debug?.("startup warm-up scan skipped (skipStartupWarmup)", {
+            event: "cache.warmup_skipped"
+          });
+          this.finishWarmup(0);
+          resolveWarm();
+          return;
+        }
         const warmupStatCache = this.buildStatCache(null);
         const warmupScanner = this.newScanner(warmupStatCache ? { persistent: false } : void 0);
         this.allScanners.add(warmupScanner);
@@ -147245,6 +147310,7 @@ var StreamerServer = class {
       this.idleReaperTimer = null;
     }
     this.lastAgentChunkAt.clear();
+    this.terminalSeq.clear();
     this.recordShutdownState();
     this.markScannerStaleDebounced.cancel();
     await Promise.all([...this.inFlightCacheWrites]);
@@ -147426,6 +147492,30 @@ var StreamerServer = class {
       persisted: this.claudeFlagsPersistable
     };
   }
+  /**
+   * The three spawn options that a configured claude-flag can override, with
+   * the boot-time CLI/yaml default as the fallback. Spread into every
+   * start/resume/adopt call so all three paths agree.
+   *
+   * These ids are excluded from buildFlagArgs (SPAWN_POSITIONAL_FLAG_IDS)
+   * precisely because they arrive here instead — the PTY spawn paths pass them
+   * as explicit positionals, so emitting them from the allowlist too would
+   * duplicate the flag.
+   *
+   * Narrowed with the type guards rather than cast: ClaudeFlagValues is a loose
+   * Record by design, and while validateFlagValues already guarantees the shape
+   * on the way in, TypeScript cannot see that through the record.
+   */
+  spawnFlagOverrides() {
+    const mode = this.claudeFlags.permissionMode;
+    const model = this.claudeFlags.model;
+    const effort = this.claudeFlags.effort;
+    return {
+      permissionMode: isPermissionMode(mode) ? mode : this.defaultPermissionMode,
+      model: typeof model === "string" ? model : this.defaultModel,
+      effort: isEffortLevel(effort) ? effort : this.defaultEffort
+    };
+  }
   checkRateLimit(map2, key, limit, windowMs) {
     const now = Date.now();
     const arr = (map2.get(key) ?? []).filter((t) => now - t < windowMs);
@@ -148575,11 +148665,9 @@ var StreamerServer = class {
       projectPath,
       projectName: body.projectName,
       branch: body.branch,
-      permissionMode: this.defaultPermissionMode,
       claudeFlags: this.claudeFlags,
       claudeExtraArgs: this.claudeExtraArgs,
-      model: this.defaultModel,
-      effort: this.defaultEffort
+      ...this.spawnFlagOverrides()
     });
     this.sessionStore.addManaged(session);
     this.recordSessionSpawn(session);
@@ -149026,11 +149114,9 @@ var StreamerServer = class {
       projectPath,
       projectName,
       branch,
-      permissionMode: this.defaultPermissionMode,
       claudeFlags: this.claudeFlags,
       claudeExtraArgs: this.claudeExtraArgs,
-      model: this.defaultModel,
-      effort: this.defaultEffort
+      ...this.spawnFlagOverrides()
     });
     this.sessionStore.addManaged(session);
     this.recordSessionSpawn(session);
@@ -149103,11 +149189,9 @@ var StreamerServer = class {
         projectPath: resolvedPath,
         projectName: body.projectName,
         ...includeSystemPrompt && { systemPrompt: systemPromptParts.join("\n") },
-        permissionMode: this.defaultPermissionMode,
         claudeFlags: this.claudeFlags,
         claudeExtraArgs: this.claudeExtraArgs,
-        model: this.defaultModel,
-        effort: this.defaultEffort
+        ...this.spawnFlagOverrides()
       });
       this.sessionStore.addManaged(session);
       this.recordSessionSpawn(session);
@@ -149467,6 +149551,87 @@ var StreamerServer = class {
     this.cache.upsertSessionName(sessionId, name);
     json2(res, 200, { ok: true });
   }
+  /**
+   * Retarget a LIVE session's model or effort by typing the corresponding
+   * Claude Code slash command into its PTY.
+   *
+   * There is no CLI or IPC channel for this — `--model`/`--effort` are spawn
+   * arguments — so the interactive `/model <x>` / `/effort <y>` commands are the
+   * only way to change a session already running. Both accept an argument and
+   * apply it without opening the picker (verified against Claude Code v2.1.220).
+   *
+   * Answers 202, not 200: the value is applied by the TUI on its next render, so
+   * there is nothing truthful to echo back synchronously. Clients confirm with
+   * `GET /api/sessions/:id`, which scrapes the applied value off the live status
+   * line.
+   */
+  async applyLiveSessionSetting(sessionId, req, res, setting) {
+    const session = this.ptyManager.getSession(sessionId);
+    if (!session) {
+      const known = this.sessionStore.getManaged(sessionId);
+      if (known) {
+        json2(res, 409, {
+          error: "Session has no live PTY; resume it first",
+          code: "SESSION_IDLE"
+        });
+        return;
+      }
+      json2(res, 404, { error: "Session not found" });
+      return;
+    }
+    if ((session.provider ?? CLAUDE_CODE_PROVIDER2) !== CLAUDE_CODE_PROVIDER2) {
+      json2(res, 501, {
+        error: `Setting ${setting} on a ${session.provider} session is not supported`,
+        code: "UNSUPPORTED_PROVIDER"
+      });
+      return;
+    }
+    if (session.status === "running") {
+      json2(res, 409, {
+        error: "Session is mid-turn; retry once it is waiting for input",
+        code: "SESSION_BUSY"
+      });
+      return;
+    }
+    let parsed;
+    try {
+      parsed = await readBody(req);
+    } catch {
+      json2(res, 400, { error: "Invalid JSON" });
+      return;
+    }
+    let value;
+    if (setting === "effort") {
+      if (!isEffortLevel(parsed.effort)) {
+        json2(res, 400, {
+          error: `effort must be one of ${EFFORT_LEVELS.join(", ")}`
+        });
+        return;
+      }
+      value = parsed.effort;
+    } else {
+      if (typeof parsed.model !== "string" || !MODEL_NAME_RE.test(parsed.model)) {
+        json2(res, 400, {
+          error: "model must be an alias or full model name (letters, digits, dot, dash, underscore)"
+        });
+        return;
+      }
+      value = parsed.model;
+    }
+    try {
+      this.ptyManager.sendKeys(sessionId, `/${setting} ${value}\r`);
+    } catch (err) {
+      json2(res, 400, { error: err instanceof Error ? err.message : "Failed to write to session" });
+      return;
+    }
+    this.log.info(`Live session ${setting} set to ${value}`, {
+      event: "session.setting_applied",
+      sessionId,
+      setting,
+      value
+    });
+    json2(res, 202, { id: sessionId, [setting]: value });
+  }
   handleGetSessionNames(res) {
     if (!this.cache) {
       json2(res, 200, {});
@@ -153557,10 +153722,9 @@ program2.command("serve").description("Start the streamer server").option("-p, -
     }
     featureFlags = parsed.values;
   }
-  const validEfforts = ["low", "medium", "high", "xhigh", "max"];
-  if (opts.defaultEffort !== void 0 && !validEfforts.includes(opts.defaultEffort)) {
+  if (opts.defaultEffort !== void 0 && !isEffortLevel(opts.defaultEffort)) {
     log11.error(
-      `Invalid --default-effort: ${opts.defaultEffort} (expected one of ${validEfforts.join(", ")})`,
+      `Invalid --default-effort: ${opts.defaultEffort} (expected one of ${EFFORT_LEVELS.join(", ")})`,
       void 0,
       "console"
     );