negotium 0.2.26 → 0.2.28

package/dist/mcp-factories.js

@@ -1016,7 +1016,7 @@ var init_claude_registry = __esm(() => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.2.26";
+var NEGOTIUM_VERSION = "0.2.28";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -4065,6 +4065,15 @@ function defaultTopicSurface() {
 function normalizeTopicSurface(value2) {
   return value2 === "telegram" || value2 === "otium" || value2 === "terminal" ? value2 : "terminal";
 }
+function normalizeSurfaceScope(value2) {
+  if (typeof value2 !== "string")
+    return null;
+  const trimmed = value2.trim();
+  return trimmed ? trimmed : null;
+}
+function defaultSurfaceScope() {
+  return activeSurfaceScope ?? normalizeSurfaceScope(process.env.NEGOTIUM_SURFACE_SCOPE);
+}
 function tableColumns(table) {
   const rows = db.query(`PRAGMA table_info(${table})`).all();
   return new Set(rows.map((row) => row.name));
@@ -4189,6 +4198,7 @@ function initializeApiTopicsSchema() {
       is_subagent INTEGER NOT NULL DEFAULT 0 CHECK (is_subagent IN (0,1)),
       visibility TEXT NOT NULL DEFAULT 'visible' CHECK (visibility IN ('visible','hidden')),
       surface TEXT NOT NULL DEFAULT 'terminal' CHECK (surface IN ('terminal','telegram','otium')),
+      surface_scope TEXT,
       browser_profile TEXT NOT NULL DEFAULT 'default',
       browser_profile_owner TEXT,
       session_id TEXT,
@@ -4234,8 +4244,8 @@ function initializeApiTopicsSchema() {
           const legacyBaseEffort = row.base_effort ?? row.default_effort;
           db.query(`INSERT INTO api_topics_next
              (id,title,kind,description,agent,base_model,base_effort,response_policy,
-              created_at,last_message_at,parent_topic_id,memory_topic_id,memory_key,is_fork,is_subagent,visibility,surface,session_id)
-           VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`).run(String(row.id), String(row.title), normalized.kind, typeof row.description === "string" ? row.description : null, normalized.agent ?? null, typeof legacyBaseModel === "string" ? legacyBaseModel : null, typeof legacyBaseEffort === "string" ? legacyBaseEffort : null, normalized.aiMode, String(row.created_at), typeof row.last_message_at === "string" ? row.last_message_at : null, typeof row.parent_topic_id === "string" ? row.parent_topic_id : null, typeof row.memory_topic_id === "string" ? row.memory_topic_id : null, typeof row.memory_key === "string" ? row.memory_key : null, Number(row.is_fork ?? 0) !== 0 ? 1 : 0, Number(row.is_subagent ?? 0) !== 0 ? 1 : 0, row.visibility === "hidden" ? "hidden" : "visible", row.surface === undefined ? defaultTopicSurface() : normalizeTopicSurface(row.surface), typeof row.session_id === "string" ? row.session_id : null);
+              created_at,last_message_at,parent_topic_id,memory_topic_id,memory_key,is_fork,is_subagent,visibility,surface,surface_scope,session_id)
+           VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`).run(String(row.id), String(row.title), normalized.kind, typeof row.description === "string" ? row.description : null, normalized.agent ?? null, typeof legacyBaseModel === "string" ? legacyBaseModel : null, typeof legacyBaseEffort === "string" ? legacyBaseEffort : null, normalized.aiMode, String(row.created_at), typeof row.last_message_at === "string" ? row.last_message_at : null, typeof row.parent_topic_id === "string" ? row.parent_topic_id : null, typeof row.memory_topic_id === "string" ? row.memory_topic_id : null, typeof row.memory_key === "string" ? row.memory_key : null, Number(row.is_fork ?? 0) !== 0 ? 1 : 0, Number(row.is_subagent ?? 0) !== 0 ? 1 : 0, row.visibility === "hidden" ? "hidden" : "visible", row.surface === undefined ? defaultTopicSurface() : normalizeTopicSurface(row.surface), normalizeSurfaceScope(row.surface_scope), typeof row.session_id === "string" ? row.session_id : null);
         }
         db.exec("DROP TABLE IF EXISTS topic_members");
         db.exec("DROP TABLE api_topics");
@@ -4292,6 +4302,9 @@ function initializeApiTopicsSchema() {
   if (!tableColumns("api_topics").has("surface")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN surface TEXT NOT NULL DEFAULT 'terminal'");
   }
+  if (!tableColumns("api_topics").has("surface_scope")) {
+    db.exec("ALTER TABLE api_topics ADD COLUMN surface_scope TEXT");
+  }
   if (tableColumns("api_topics").has("access_mode")) {
     try {
       db.exec("ALTER TABLE api_topics DROP COLUMN access_mode");
@@ -4327,6 +4340,7 @@ function initializeApiTopicsSchema() {
   backfillTopicSurfaces();
   db.exec("CREATE INDEX IF NOT EXISTS idx_api_topics_last_message ON api_topics(last_message_at DESC)");
   db.exec("CREATE INDEX IF NOT EXISTS idx_api_topics_surface ON api_topics(surface)");
+  db.exec("CREATE INDEX IF NOT EXISTS idx_api_topics_surface_scope ON api_topics(surface, surface_scope)");
 }
 function backfillTopicSurfaces() {
   db.exec(`
@@ -4347,22 +4361,24 @@ function backfillTopicSurfaces() {
   logger.info({ surface }, "api_topics: surface backfilled");
 }
 function renameSurfaceTitleCollisions() {
-  const rows = db.query("SELECT id, title, kind, surface FROM api_topics ORDER BY created_at ASC, rowid ASC").all();
-  const taken = new Set;
+  const rows = db.query("SELECT id, title, kind, surface FROM api_topics WHERE kind != 'manager' ORDER BY created_at ASC, rowid ASC").all();
+  const keyOf = (surface, kind, title) => [surface, kind, normalizedTitle(title)].join("\x00");
+  const reserved = new Set(rows.map((row) => keyOf(row.surface, row.kind, row.title)));
+  const used = new Set;
   const update = db.query("UPDATE api_topics SET title = ? WHERE id = ?");
   for (const row of rows) {
-    const key = (title) => [row.surface, row.kind, normalizedTitle(title)].join("\x00");
-    if (!taken.has(key(row.title))) {
-      taken.add(key(row.title));
+    const key = (title) => keyOf(row.surface, row.kind, title);
+    if (!used.has(key(row.title))) {
+      used.add(key(row.title));
       continue;
     }
     let suffix = 2;
     let candidate = `${row.title} (${suffix})`;
-    while (taken.has(key(candidate))) {
+    while (reserved.has(key(candidate)) || used.has(key(candidate))) {
       suffix += 1;
       candidate = `${row.title} (${suffix})`;
     }
-    taken.add(key(candidate));
+    used.add(key(candidate));
     update.run(candidate, row.id);
     logger.warn({ topicId: row.id, surface: row.surface, from: row.title, to: candidate }, "api_topics: renamed a duplicate title for surface-scoped uniqueness");
   }
@@ -4425,7 +4441,8 @@ function rowToDto2(r, participants = getTopicParticipants(r.id), tellTargets) {
       subagentReportMode: r.subagent_report_mode === "tell" || r.subagent_report_mode === "status-only" ? r.subagent_report_mode : "auto"
     } : {},
     visibility: normalizeTopicVisibility(r.visibility),
-    surface: normalizeTopicSurface(r.surface)
+    surface: normalizeTopicSurface(r.surface),
+    surfaceScope: normalizeSurfaceScope(r.surface_scope)
   };
 }
 function normalizeTopicVisibility(value2) {
@@ -4473,6 +4490,13 @@ function normalizeTopicState(input) {
 function normalizedTitle(title) {
   return title.trim().toLowerCase();
 }
+function surfaceScopeForWrite(t) {
+  if (normalizeTopicSurface(t.surface ?? defaultTopicSurface()) !== "otium")
+    return null;
+  if (t.surfaceScope !== undefined)
+    return normalizeSurfaceScope(t.surfaceScope);
+  return defaultSurfaceScope();
+}
 function upsertTopic(t) {
   const normalized = normalizeTopicState({
     id: t.id,
@@ -4485,8 +4509,8 @@ function upsertTopic(t) {
     db.query(`INSERT INTO api_topics
        (id,title,kind,description,agent,base_model,base_effort,response_policy,
         created_at,last_message_at,parent_topic_id,memory_topic_id,memory_key,is_fork,is_subagent,visibility,surface,
-        subagent_report_mode)
-     VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+        surface_scope,subagent_report_mode)
+     VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
      ON CONFLICT(id) DO UPDATE SET
        title = excluded.title,
        kind = excluded.kind,
@@ -4504,7 +4528,11 @@ function upsertTopic(t) {
        is_subagent = excluded.is_subagent,
        visibility = excluded.visibility,
        surface = excluded.surface,
-       subagent_report_mode = excluded.subagent_report_mode`).run(t.id, t.title, normalized.kind, t.description ?? null, normalized.agent ?? null, t.defaultModel ?? null, t.defaultEffort ?? null, normalized.aiMode, t.createdAt, t.lastMessageAt ?? null, t.parentTopicId ?? null, t.memoryTopicId ?? null, t.memoryKey ?? null, t.isFork ? 1 : 0, t.isSubagent ? 1 : 0, normalizeTopicVisibility(t.visibility), normalizeTopicSurface(t.surface ?? defaultTopicSurface()), t.subagentReportMode ?? "auto");
+       -- A room's workspace is fixed at creation (M-1). COALESCE, not
+       -- assignment: an update may fill in a scope that was unknown when the
+       -- room was created, but may never move a room to another workspace.
+       surface_scope = COALESCE(api_topics.surface_scope, excluded.surface_scope),
+       subagent_report_mode = excluded.subagent_report_mode`).run(t.id, t.title, normalized.kind, t.description ?? null, normalized.agent ?? null, t.defaultModel ?? null, t.defaultEffort ?? null, normalized.aiMode, t.createdAt, t.lastMessageAt ?? null, t.parentTopicId ?? null, t.memoryTopicId ?? null, t.memoryKey ?? null, t.isFork ? 1 : 0, t.isSubagent ? 1 : 0, normalizeTopicVisibility(t.visibility), normalizeTopicSurface(t.surface ?? defaultTopicSurface()), surfaceScopeForWrite(t), t.subagentReportMode ?? "auto");
     db.query("DELETE FROM topic_members WHERE topic_id = ?").run(t.id);
     for (const participant of t.participants) {
       db.query("INSERT INTO topic_members (topic_id,user_id,role) VALUES (?,?,?)").run(t.id, participant.userId, participant.role);
@@ -4518,7 +4546,8 @@ function upsertTopic(t) {
   })();
 }
 function listTopics(opts = {}) {
-  const rows = opts.surface ? db.query("SELECT * FROM api_topics WHERE surface = ? ORDER BY last_message_at DESC").all(normalizeTopicSurface(opts.surface)) : db.query("SELECT * FROM api_topics ORDER BY last_message_at DESC").all();
+  const scoped = Object.hasOwn(opts, "surfaceScope");
+  const rows = opts.surface ? db.query(`SELECT * FROM api_topics WHERE surface = ?${scoped ? " AND surface_scope IS ?" : ""} ORDER BY last_message_at DESC`).all(...scoped ? [normalizeTopicSurface(opts.surface), normalizeSurfaceScope(opts.surfaceScope)] : [normalizeTopicSurface(opts.surface)]) : db.query("SELECT * FROM api_topics ORDER BY last_message_at DESC").all();
   const participants = getAllTopicParticipants();
   const tellTargets = rows.some((row) => row.is_subagent !== 0) ? getAllSubagentTellTargets() : undefined;
   return rows.map((row) => rowToDto2(row, participants.get(row.id) ?? [], tellTargets));
@@ -4527,15 +4556,24 @@ function getTopic(id) {
   const r = db.query("SELECT * FROM api_topics WHERE id = ?").get(id);
   return r ? rowToDto2(r) : null;
 }
-function getManagerTopicForUser(userId) {
-  const row = db.query(`SELECT t.* FROM api_topics t
+function getManagerTopicForUser(userId, surface, opts = {}) {
+  const scoped = Object.hasOwn(opts, "surfaceScope");
+  const sql = `SELECT t.* FROM api_topics t
        JOIN topic_members m ON m.topic_id = t.id
        WHERE t.kind = 'manager'
          AND t.id != ?
          AND m.user_id = ?
          AND m.role = 'owner'
+         ${surface ? "AND t.surface = ?" : ""}
+         ${scoped ? "AND t.surface_scope IS ?" : ""}
        ORDER BY t.created_at ASC
-       LIMIT 1`).get(GENERAL_TOPIC_ID, userId);
+       LIMIT 1`;
+  const params = [GENERAL_TOPIC_ID, userId];
+  if (surface)
+    params.push(surface);
+  if (scoped)
+    params.push(normalizeSurfaceScope(opts.surfaceScope));
+  const row = db.query(sql).get(...params);
   return row ? rowToDto2(row) : null;
 }
 function getTopicMemoryOrigin(id) {
@@ -4566,18 +4604,17 @@ function getTopicByName(title) {
 function findTopicTitleConflict(title, kind, opts = {}) {
   const wanted = normalizedTitle(title);
   const surface = normalizeTopicSurface(opts.surface ?? defaultTopicSurface());
+  const surfaceScope = Object.hasOwn(opts, "surfaceScope") ? normalizeSurfaceScope(opts.surfaceScope) : surface === "otium" ? defaultSurfaceScope() : null;
   const generalTitleRequested = wanted === normalizedTitle(GENERAL_TOPIC_ID);
   if (generalTitleRequested && opts.excludeTopicId !== GENERAL_TOPIC_ID) {
     const general = db.query("SELECT * FROM api_topics WHERE id = ?").get(GENERAL_TOPIC_ID);
     if (general)
       return rowToDto2(general);
   }
-  const params = [wanted, surface];
-  let sql = "SELECT * FROM api_topics WHERE LOWER(TRIM(title)) = ? AND surface = ?";
-  if (kind !== "manager") {
-    sql += " AND (kind = ? OR id = ?)";
-    params.push(kind, GENERAL_TOPIC_ID);
-  }
+  if (kind === "manager")
+    return null;
+  const params = [wanted, surface, surfaceScope, kind, GENERAL_TOPIC_ID];
+  let sql = "SELECT * FROM api_topics WHERE LOWER(TRIM(title)) = ? AND surface = ? AND surface_scope IS ? AND (kind = ? OR id = ?)";
   if (opts.excludeTopicId) {
     sql += " AND id != ?";
     params.push(opts.excludeTopicId);
@@ -4658,7 +4695,7 @@ function reparentTopicChildren(deletedTopicId, replacementParentTopicId) {
   }
   return rows.map((row) => row.id);
 }
-var DEFAULT_AGENT_ROOM_AGENT = "maestro", SURFACE_BACKFILL_MIGRATION = "api_topics_surface_backfill_20260808";
+var DEFAULT_AGENT_ROOM_AGENT = "maestro", activeSurfaceScope = null, SURFACE_BACKFILL_MIGRATION = "api_topics_surface_backfill_20260808";
 var init_api_topics = __esm(async () => {
   init_constants();
   init_logger();
@@ -4989,7 +5026,8 @@ function mergeRuntimeUserTurnRequest(input) {
   const now = Date.now();
   return db.transaction(() => {
     const rows = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? ORDER BY created_at ASC, rowid ASC").all(input.topicId);
-    const previous = rows.map(rowToRequest);
+    const thread = input.execution.threadRootId;
+    const previous = rows.map(rowToRequest).filter((request) => request.execution?.threadRootId === thread);
     const omittedRequestIds = new Set([
       ...input.omitRequestIds ?? [],
       ...previous.filter((request) => Boolean(request.execution?.providerSessionId)).map((request) => request.requestId)
@@ -5025,7 +5063,11 @@ function mergeRuntimeUserTurnRequest(input) {
       execution.sessionIdSpecified = true;
     }
     const attachments = flattenUserTurnAttachments(userMessages);
-    db.query("DELETE FROM runtime_user_turn_requests WHERE topic_id = ?").run(input.topicId);
+    const absorbed = previous.map((request) => request.requestId);
+    if (absorbed.length > 0) {
+      db.query(`DELETE FROM runtime_user_turn_requests
+           WHERE topic_id = ? AND request_id IN (${absorbed.map(() => "?").join(",")})`).run(input.topicId, ...absorbed);
+    }
     db.query(`INSERT INTO runtime_user_turn_requests
          (request_id, topic_id, user_id, prompt, user_messages_json, attachments_json,
           allow_auto_continue, execution_json, topic_epoch, created_at,
@@ -7480,8 +7522,10 @@ var init_conversations = __esm(async () => {
 
 // ../../packages/core/src/topics/personal-general.ts
 import { randomUUID as randomUUID8 } from "crypto";
-function ensurePersonalGeneral(userId) {
-  const existing = getManagerTopicForUser(userId);
+function ensurePersonalGeneral(userId, surface, opts = {}) {
+  const scope = normalizeTopicSurface(surface ?? defaultTopicSurface());
+  const surfaceScope = opts.surfaceScope !== undefined ? normalizeSurfaceScope(opts.surfaceScope) : scope === "otium" ? defaultSurfaceScope() : null;
+  const existing = getManagerTopicForUser(userId, scope, { surfaceScope });
   if (existing) {
     if (existing.description === LEGACY_PERSONAL_GENERAL_DESCRIPTION) {
       existing.description = PERSONAL_GENERAL_DESCRIPTION;
@@ -7505,6 +7549,8 @@ function ensurePersonalGeneral(userId) {
     aiMode: "always",
     aiMention: false,
     participants: [{ userId, role: "owner" }],
+    surface: scope,
+    surfaceScope,
     createdAt: now,
     lastMessageAt: now
   };
@@ -12046,8 +12092,8 @@ function updateTopic(topicId, patch) {
 function isParticipant(topic, userId) {
   return topic.participants.some((p) => p.userId === userId);
 }
-function nextDerivedTopicTitle(sourceTitle, kind, suffix, surface) {
-  const visibleTitles = new Set(listTopics(surface ? { surface } : {}).filter((topic) => topic.kind === kind).map((topic) => topic.title.toLowerCase()));
+function nextDerivedTopicTitle(sourceTitle, kind, suffix, surface, surfaceScope) {
+  const visibleTitles = new Set(listTopics(surface ? { surface, surfaceScope: surfaceScope ?? null } : {}).filter((topic) => topic.kind === kind).map((topic) => topic.title.toLowerCase()));
   let n = 1;
   let title = `${sourceTitle}-${suffix}-${n}`;
   while (visibleTitles.has(title.toLowerCase())) {
@@ -12112,8 +12158,9 @@ async function createDerivedTopicImpl(topic, sourceTopicId, userId, copyHistory,
   ] : [{ userId, role: "owner" }];
   const kind = topic.kind ?? inferTopicKind(topic);
   const surface = topic.surface ?? defaultTopicSurface();
-  const title = opts?.name?.trim() || nextDerivedTopicTitle(topic.title, kind, suffix, surface);
-  const conflict = findTopicTitleConflict(title, kind, { surface });
+  const surfaceScope = topic.surfaceScope ?? null;
+  const title = opts?.name?.trim() || nextDerivedTopicTitle(topic.title, kind, suffix, surface, surfaceScope);
+  const conflict = findTopicTitleConflict(title, kind, { surface, surfaceScope });
   if (conflict) {
     logger.info({ sourceTopicId, title, kind, conflictTopicId: conflict.id }, "createDerivedTopic: title conflict");
     throw new TopicTitleConflictError(title);
@@ -12136,7 +12183,8 @@ async function createDerivedTopicImpl(topic, sourceTopicId, userId, copyHistory,
     isFork: copyHistory,
     ...subagent ? { isSubagent: true } : {},
     visibility: topic.visibility,
-    surface
+    surface,
+    surfaceScope
   };
   let sessionId;
   let rollbackHandle;
@@ -12244,7 +12292,10 @@ async function createDerivedTopicImpl(topic, sourceTopicId, userId, copyHistory,
       if (!currentSource || currentSource.kind === "manager" || !isParticipant(currentSource, userId) || subagent && isRuntimeTopicMaintenance(sourceTopicId)) {
         throw new TopicDeriveBusyError("Source topic changed while deriving; try again");
       }
-      const transactionalConflict = findTopicTitleConflict(title, kind, { surface });
+      const transactionalConflict = findTopicTitleConflict(title, kind, {
+        surface,
+        surfaceScope
+      });
       if (transactionalConflict)
         throw new TopicTitleConflictError(title);
       upsertTopic(derived);
@@ -12533,13 +12584,14 @@ async function forwardToPeer(args) {
     error: forwarded.configured ? "remote session bridge is configured but unavailable" : "remote nodes are not connected on this negotium node (standalone mode)"
   };
 }
-async function peerSessionsForUser(userId, sourceQueryId) {
+async function peerSessionsForUser(userId, sourceQueryId, fromTopicId) {
   if (activeBridge)
-    return activeBridge.sessions(userId, sourceQueryId);
+    return activeBridge.sessions(userId, sourceQueryId, fromTopicId);
   const sessions = await callLoopbackBridge({
     action: "sessions",
     userId,
-    sourceQueryId
+    sourceQueryId,
+    fromTopicId
   });
   if (sessions.result)
     return sessions.result;
@@ -13324,6 +13376,190 @@ var init_self_schedules = __esm(async () => {
   });
 });
 
+// ../../packages/core/src/storage/token-stats.ts
+import { createHash as createHash6 } from "crypto";
+import { mkdirSync as mkdirSync17, writeFileSync as writeFileSync15 } from "fs";
+import { join as join26 } from "path";
+function emptyBucket() {
+  return {
+    inputTokens: 0,
+    outputTokens: 0,
+    cacheCreationInputTokens: 0,
+    cacheReadInputTokens: 0,
+    queries: 0,
+    estimatedCostUsd: 0
+  };
+}
+function tokenStatsFileId(userId) {
+  const rawUserId = String(userId);
+  return /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..") ? rawUserId : `sha256-${createHash6("sha256").update(rawUserId).digest("hex")}`;
+}
+function queriesPath(userId) {
+  const fileId = tokenStatsFileId(userId);
+  const logDir = resolveStorageLogDir();
+  mkdirSync17(logDir, { recursive: true });
+  return join26(logDir, `token-queries-${fileId}.jsonl`);
+}
+function loadRecords(userId) {
+  try {
+    return readJsonlLines(queriesPath(userId)).flatMap((line) => {
+      try {
+        return [JSON.parse(line)];
+      } catch {
+        return [];
+      }
+    });
+  } catch {
+    return [];
+  }
+}
+function calcCost(b) {
+  return b.estimatedCostUsd;
+}
+function estimateUsageCost(agent, model, usage) {
+  const prices = TOKEN_PRICES[`${agent}:${model}`];
+  if (!prices)
+    return 0;
+  return (usage.inputTokens * prices.input + usage.outputTokens * prices.output + (agent === "claude" ? usage.cacheCreationInputTokens * (prices.cacheWrite ?? prices.input) : 0) + usage.cacheReadInputTokens * prices.cacheRead) / 1e6;
+}
+function isQueryRecord(value2) {
+  if (!value2 || typeof value2 !== "object")
+    return false;
+  const record = value2;
+  return record.schemaVersion === 2 && typeof record.timestamp === "string" && typeof record.session === "string" && typeof record.topicId === "string" && typeof record.agent === "string" && typeof record.model === "string" && typeof record.inputTokens === "number" && typeof record.outputTokens === "number" && typeof record.cacheCreationInputTokens === "number" && typeof record.cacheReadInputTokens === "number" && typeof record.estimatedCostUsd === "number";
+}
+function recordUsage(userId, session, usage, context) {
+  const cacheReadInputTokens = usage.cacheReadInputTokens ?? 0;
+  const inputTokens = context.agent === "claude" ? usage.inputTokens : Math.max(0, usage.inputTokens - cacheReadInputTokens);
+  const normalized = {
+    inputTokens,
+    outputTokens: usage.outputTokens,
+    cacheCreationInputTokens: usage.cacheCreationInputTokens ?? 0,
+    cacheReadInputTokens
+  };
+  const record = {
+    schemaVersion: 2,
+    timestamp: new Date().toISOString(),
+    session,
+    topicId: context.topicId,
+    ...context.providerSessionId ? { providerSessionId: context.providerSessionId } : {},
+    agent: context.agent,
+    model: context.model,
+    ...normalized,
+    ...usage.contextTokens !== undefined ? { contextTokens: usage.contextTokens } : {},
+    ...usage.contextWindow !== undefined ? { contextWindow: usage.contextWindow } : {},
+    estimatedCostUsd: usage.costUsd ?? estimateUsageCost(context.agent, context.model, normalized)
+  };
+  try {
+    appendJsonlEntry(queriesPath(userId), record);
+  } catch (e) {
+    logger.warn({ err: e, userId }, "token-stats: Failed to record");
+  }
+}
+function deleteTopicStats(userId, topicId) {
+  const path = queriesPath(userId);
+  try {
+    const kept = readJsonlLines(path).filter((line) => {
+      try {
+        const record = JSON.parse(line);
+        return record.topicId !== topicId;
+      } catch {
+        return true;
+      }
+    });
+    writeFileSync15(path, kept.length > 0 ? `${kept.join(`
+`)}
+` : "", "utf-8");
+  } catch (e) {
+    if (e.code === "ENOENT")
+      return;
+    logger.warn({ err: e, userId, topicId }, "token-stats: Failed to delete topic stats");
+  }
+}
+function getStats(userId, from, to) {
+  const records = loadRecords(userId);
+  const fromTs = from ? new Date(from).getTime() : 0;
+  const toTs = to ? new Date(to).getTime() : Infinity;
+  if (from && Number.isNaN(fromTs) || to && Number.isNaN(toTs)) {
+    logger.warn({ from, to }, "token-stats: Invalid date range, returning empty");
+    return {
+      total: emptyBucket(),
+      byHour: {},
+      bySession: {},
+      currentSessions: [],
+      ignoredLegacyRecords: 0,
+      estimatedCostUsd: 0
+    };
+  }
+  const total = emptyBucket();
+  const byHour = {};
+  const bySession = {};
+  const currentSessions = new Map;
+  let ignoredLegacyRecords = 0;
+  for (const raw of records) {
+    if (!isQueryRecord(raw)) {
+      ignoredLegacyRecords += 1;
+      continue;
+    }
+    const r = raw;
+    const ts = new Date(r.timestamp).getTime();
+    if (ts < fromTs || ts > toTs)
+      continue;
+    const hourKey = r.timestamp.slice(0, 13);
+    if (!byHour[hourKey])
+      byHour[hourKey] = emptyBucket();
+    if (!bySession[r.session])
+      bySession[r.session] = emptyBucket();
+    for (const bucket of [total, byHour[hourKey], bySession[r.session]]) {
+      bucket.inputTokens += r.inputTokens;
+      bucket.outputTokens += r.outputTokens;
+      bucket.cacheCreationInputTokens += r.cacheCreationInputTokens;
+      bucket.cacheReadInputTokens += r.cacheReadInputTokens;
+      bucket.queries += 1;
+      bucket.estimatedCostUsd += r.estimatedCostUsd;
+    }
+    if (r.contextTokens !== undefined && r.contextWindow !== undefined && r.contextWindow > 0) {
+      currentSessions.set(r.topicId, {
+        timestamp: r.timestamp,
+        topicId: r.topicId,
+        topicTitle: r.session,
+        ...r.providerSessionId ? { providerSessionId: r.providerSessionId } : {},
+        agent: r.agent,
+        model: r.model,
+        contextTokens: r.contextTokens,
+        contextWindow: r.contextWindow
+      });
+    }
+  }
+  return {
+    total,
+    byHour,
+    bySession,
+    currentSessions: [...currentSessions.values()].sort((a, b) => b.timestamp.localeCompare(a.timestamp)),
+    ignoredLegacyRecords,
+    estimatedCostUsd: calcCost(total)
+  };
+}
+var TOKEN_PRICES;
+var init_token_stats = __esm(async () => {
+  init_jsonl();
+  init_logger();
+  await init_api_topics();
+  await init_storage_host();
+  TOKEN_PRICES = {
+    "codex:gpt-5.6-sol": { input: 5, cacheRead: 0.5, output: 30 },
+    "codex:gpt-5.6-terra": { input: 2.5, cacheRead: 0.25, output: 15 },
+    "codex:gpt-5.6-luna": { input: 1, cacheRead: 0.1, output: 6 },
+    "claude:fable": { input: 10, cacheWrite: 12.5, cacheRead: 1, output: 50 },
+    "claude:opus": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
+    "claude:sonnet": { input: 2, cacheWrite: 2.5, cacheRead: 0.2, output: 10 },
+    "maestro:kimi-k3": { input: 3, cacheRead: 0.3, output: 15 },
+    "maestro:kimi-k2.7-code": { input: 0.95, cacheRead: 0.19, output: 4 },
+    "maestro:deepseek-pro": { input: 0.435, cacheRead: 0.003625, output: 0.87 },
+    "maestro:deepseek-flash": { input: 0.14, cacheRead: 0.0028, output: 0.28 }
+  };
+});
+
 // ../../packages/core/src/topics/lifecycle.ts
 var exports_lifecycle = {};
 __export(exports_lifecycle, {
@@ -13373,6 +13609,7 @@ async function cleanupParticipantResources(topic, userIds, sessionId, cwd, purge
     cleanupSessionInboxFiles(participantUserId, topic.id, topic.title);
     clearQueryState(participantUserId, topic.id, topic.title);
     clearQueryUsageAlert(participantUserId, topic.id);
+    deleteTopicStats(participantUserId, topic.id);
     deletePendingAsksForTopic({ userId: participantUserId, topicName: topic.title });
   }
   return true;
@@ -13527,6 +13764,7 @@ var init_lifecycle = __esm(async () => {
   await init_runtime_turn_requests();
   await init_self_schedules();
   await init_session_asks();
+  await init_token_stats();
   await init_topic_archive();
   await init_topic_archive_state();
   TopicArchiveRequiredError = class TopicArchiveRequiredError extends Error {
@@ -13561,8 +13799,8 @@ var init_lifecycle = __esm(async () => {
 
 // ../../packages/core/src/runtime/attachments.ts
 import { randomUUID as randomUUID13 } from "crypto";
-import { copyFileSync as copyFileSync2, mkdirSync as mkdirSync17, writeFileSync as writeFileSync15 } from "fs";
-import { basename as basename6, join as join26 } from "path";
+import { copyFileSync as copyFileSync2, mkdirSync as mkdirSync18, writeFileSync as writeFileSync16 } from "fs";
+import { basename as basename6, join as join27 } from "path";
 function workspaceCwdFor(topicId) {
   return resolveTopicWorkspaceDir(topicId);
 }
@@ -13575,7 +13813,7 @@ function materializePromptAttachments(topicId, queryId, attachmentIds) {
   if (!attachmentIds?.length)
     return [];
   const out = [];
-  const destDir = join26(workspaceCwdFor(topicId), "attachments", queryId);
+  const destDir = join27(workspaceCwdFor(topicId), "attachments", queryId);
   for (const rawId of attachmentIds) {
     if (typeof rawId !== "string")
       continue;
@@ -13589,10 +13827,10 @@ function materializePromptAttachments(topicId, queryId, attachmentIds) {
       continue;
     }
     try {
-      mkdirSync17(destDir, { recursive: true });
+      mkdirSync18(destDir, { recursive: true });
       const index = String(out.length + 1).padStart(2, "0");
       const safeName = safeAttachmentFilename(attachment.filename, fileId);
-      const destPath = join26(destDir, `${index}-${fileId.slice(0, 8)}-${safeName}`);
+      const destPath = join27(destDir, `${index}-${fileId.slice(0, 8)}-${safeName}`);
       copyFileSync2(sourcePath, destPath);
       out.push({
         id: attachment.id,
@@ -13622,14 +13860,14 @@ function promptWithAttachments(prompt, attachments) {
   return composeAttachmentPrompt(prompt, attachments.map(({ filename, path }) => attachmentPromptLine(filename, path)));
 }
 function ingestAttachment(args) {
-  const destDir = join26(UPLOADS_DIR, args.topicId);
-  mkdirSync17(destDir, { recursive: true });
+  const destDir = join27(UPLOADS_DIR, args.topicId);
+  mkdirSync18(destDir, { recursive: true });
   const safeName = safeAttachmentFilename(args.filename, "upload");
-  const destPath = join26(destDir, `${Date.now()}-${randomUUID13().slice(0, 8)}-${safeName}`);
+  const destPath = join27(destDir, `${Date.now()}-${randomUUID13().slice(0, 8)}-${safeName}`);
   if (args.sourcePath !== undefined) {
     copyFileSync2(args.sourcePath, destPath);
   } else if (args.bytes !== undefined) {
-    writeFileSync15(destPath, args.bytes);
+    writeFileSync16(destPath, args.bytes);
   } else {
     throw new Error("ingestAttachment: provide sourcePath or bytes");
   }
@@ -14097,7 +14335,7 @@ var init_ask_user_gates = __esm(async () => {
 });
 
 // ../../packages/core/src/agents/mcp-tools/ask-user.ts
-import { createHash as createHash6, randomUUID as randomUUID14 } from "crypto";
+import { createHash as createHash7, randomUUID as randomUUID14 } from "crypto";
 import { z as z3 } from "zod";
 function normalizeAskText(value2, maxChars) {
   if (typeof value2 !== "string")
@@ -14134,7 +14372,7 @@ function normalizeAskUserQuestionInput(input) {
   return { question, choices };
 }
 function askBodyHash(question, choices) {
-  return createHash6("sha256").update(JSON.stringify({ question, choices })).digest("hex");
+  return createHash7("sha256").update(JSON.stringify({ question, choices })).digest("hex");
 }
 function answerToolResult(answer) {
   if (!answer.userId)
@@ -14755,169 +14993,6 @@ var init_visuals = __esm(async () => {
   init_visual_html();
 });
 
-// ../../packages/core/src/storage/token-stats.ts
-import { createHash as createHash7 } from "crypto";
-import { mkdirSync as mkdirSync18 } from "fs";
-import { join as join27 } from "path";
-function emptyBucket() {
-  return {
-    inputTokens: 0,
-    outputTokens: 0,
-    cacheCreationInputTokens: 0,
-    cacheReadInputTokens: 0,
-    queries: 0,
-    estimatedCostUsd: 0
-  };
-}
-function tokenStatsFileId(userId) {
-  const rawUserId = String(userId);
-  return /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..") ? rawUserId : `sha256-${createHash7("sha256").update(rawUserId).digest("hex")}`;
-}
-function queriesPath(userId) {
-  const fileId = tokenStatsFileId(userId);
-  const logDir = resolveStorageLogDir();
-  mkdirSync18(logDir, { recursive: true });
-  return join27(logDir, `token-queries-${fileId}.jsonl`);
-}
-function loadRecords(userId) {
-  try {
-    return readJsonlLines(queriesPath(userId)).flatMap((line) => {
-      try {
-        return [JSON.parse(line)];
-      } catch {
-        return [];
-      }
-    });
-  } catch {
-    return [];
-  }
-}
-function calcCost(b) {
-  return b.estimatedCostUsd;
-}
-function estimateUsageCost(agent, model, usage) {
-  const prices = TOKEN_PRICES[`${agent}:${model}`];
-  if (!prices)
-    return 0;
-  return (usage.inputTokens * prices.input + usage.outputTokens * prices.output + (agent === "claude" ? usage.cacheCreationInputTokens * (prices.cacheWrite ?? prices.input) : 0) + usage.cacheReadInputTokens * prices.cacheRead) / 1e6;
-}
-function isQueryRecord(value2) {
-  if (!value2 || typeof value2 !== "object")
-    return false;
-  const record = value2;
-  return record.schemaVersion === 2 && typeof record.timestamp === "string" && typeof record.session === "string" && typeof record.topicId === "string" && typeof record.agent === "string" && typeof record.model === "string" && typeof record.inputTokens === "number" && typeof record.outputTokens === "number" && typeof record.cacheCreationInputTokens === "number" && typeof record.cacheReadInputTokens === "number" && typeof record.estimatedCostUsd === "number";
-}
-function recordUsage(userId, session, usage, context) {
-  const cacheReadInputTokens = usage.cacheReadInputTokens ?? 0;
-  const inputTokens = context.agent === "claude" ? usage.inputTokens : Math.max(0, usage.inputTokens - cacheReadInputTokens);
-  const normalized = {
-    inputTokens,
-    outputTokens: usage.outputTokens,
-    cacheCreationInputTokens: usage.cacheCreationInputTokens ?? 0,
-    cacheReadInputTokens
-  };
-  const record = {
-    schemaVersion: 2,
-    timestamp: new Date().toISOString(),
-    session,
-    topicId: context.topicId,
-    ...context.providerSessionId ? { providerSessionId: context.providerSessionId } : {},
-    agent: context.agent,
-    model: context.model,
-    ...normalized,
-    ...usage.contextTokens !== undefined ? { contextTokens: usage.contextTokens } : {},
-    ...usage.contextWindow !== undefined ? { contextWindow: usage.contextWindow } : {},
-    estimatedCostUsd: usage.costUsd ?? estimateUsageCost(context.agent, context.model, normalized)
-  };
-  try {
-    appendJsonlEntry(queriesPath(userId), record);
-  } catch (e) {
-    logger.warn({ err: e, userId }, "token-stats: Failed to record");
-  }
-}
-function getStats(userId, from, to) {
-  const records = loadRecords(userId);
-  const fromTs = from ? new Date(from).getTime() : 0;
-  const toTs = to ? new Date(to).getTime() : Infinity;
-  if (from && Number.isNaN(fromTs) || to && Number.isNaN(toTs)) {
-    logger.warn({ from, to }, "token-stats: Invalid date range, returning empty");
-    return {
-      total: emptyBucket(),
-      byHour: {},
-      bySession: {},
-      currentSessions: [],
-      ignoredLegacyRecords: 0,
-      estimatedCostUsd: 0
-    };
-  }
-  const total = emptyBucket();
-  const byHour = {};
-  const bySession = {};
-  const currentSessions = new Map;
-  let ignoredLegacyRecords = 0;
-  for (const raw of records) {
-    if (!isQueryRecord(raw)) {
-      ignoredLegacyRecords += 1;
-      continue;
-    }
-    const r = raw;
-    const ts = new Date(r.timestamp).getTime();
-    if (ts < fromTs || ts > toTs)
-      continue;
-    const hourKey = r.timestamp.slice(0, 13);
-    if (!byHour[hourKey])
-      byHour[hourKey] = emptyBucket();
-    if (!bySession[r.session])
-      bySession[r.session] = emptyBucket();
-    for (const bucket of [total, byHour[hourKey], bySession[r.session]]) {
-      bucket.inputTokens += r.inputTokens;
-      bucket.outputTokens += r.outputTokens;
-      bucket.cacheCreationInputTokens += r.cacheCreationInputTokens;
-      bucket.cacheReadInputTokens += r.cacheReadInputTokens;
-      bucket.queries += 1;
-      bucket.estimatedCostUsd += r.estimatedCostUsd;
-    }
-    if (r.contextTokens !== undefined && r.contextWindow !== undefined && r.contextWindow > 0) {
-      currentSessions.set(r.topicId, {
-        timestamp: r.timestamp,
-        topicId: r.topicId,
-        topicTitle: r.session,
-        ...r.providerSessionId ? { providerSessionId: r.providerSessionId } : {},
-        agent: r.agent,
-        model: r.model,
-        contextTokens: r.contextTokens,
-        contextWindow: r.contextWindow
-      });
-    }
-  }
-  return {
-    total,
-    byHour,
-    bySession,
-    currentSessions: [...currentSessions.values()].sort((a, b) => b.timestamp.localeCompare(a.timestamp)),
-    ignoredLegacyRecords,
-    estimatedCostUsd: calcCost(total)
-  };
-}
-var TOKEN_PRICES;
-var init_token_stats = __esm(async () => {
-  init_jsonl();
-  init_logger();
-  await init_storage_host();
-  TOKEN_PRICES = {
-    "codex:gpt-5.6-sol": { input: 5, cacheRead: 0.5, output: 30 },
-    "codex:gpt-5.6-terra": { input: 2.5, cacheRead: 0.25, output: 15 },
-    "codex:gpt-5.6-luna": { input: 1, cacheRead: 0.1, output: 6 },
-    "claude:fable": { input: 10, cacheWrite: 12.5, cacheRead: 1, output: 50 },
-    "claude:opus": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
-    "claude:sonnet": { input: 2, cacheWrite: 2.5, cacheRead: 0.2, output: 10 },
-    "maestro:kimi-k3": { input: 3, cacheRead: 0.3, output: 15 },
-    "maestro:kimi-k2.7-code": { input: 0.95, cacheRead: 0.19, output: 4 },
-    "maestro:deepseek-pro": { input: 0.435, cacheRead: 0.003625, output: 0.87 },
-    "maestro:deepseek-flash": { input: 0.14, cacheRead: 0.0028, output: 0.28 }
-  };
-});
-
 // ../../packages/core/src/runtime/turn-event-stream.ts
 import { randomUUID as randomUUID15 } from "crypto";
 import { realpathSync as realpathSync6, statSync as statSync9 } from "fs";
@@ -15033,10 +15108,11 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
       agentType,
       model,
       sourceNode: execution?.sourceNode,
+      ...execution?.threadRootId ? { threadRootId: execution.threadRootId } : {},
       usage,
       createdAt: new Date().toISOString()
     };
-    appendApiMessage(message);
+    appendApiMessage(message, execution?.threadRootId ? { updateTopicLastMessageAt: false } : undefined);
     hub.broadcastMessage(topicId, message);
     lastVisibleMessageId = message.id;
     visibleMessageIds.push(message.id);
@@ -15552,7 +15628,7 @@ var init_turn_session = __esm(async () => {
 });
 
 // ../../packages/core/src/storage/app-settings.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync19, readFileSync as readFileSync19, writeFileSync as writeFileSync16 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync19, readFileSync as readFileSync19, writeFileSync as writeFileSync17 } from "fs";
 import { dirname as dirname15, join as join28 } from "path";
 function settingsFile() {
   return join28(resolveStorageDataDir(), "otium-settings.json");
@@ -16070,6 +16146,7 @@ async function drainOneDurableUserTurn() {
       bridgeSessionFromHistory: execution?.bridgeSessionFromHistory,
       peerBridge: execution?.peerBridge,
       from: execution?.from,
+      threadRootId: execution?.threadRootId,
       _queryId: request.requestId,
       _runtimeEpoch: execution?.runtimeEpoch ?? request.topicEpoch,
       onSettled: () => {
@@ -16142,6 +16219,7 @@ function startAiTurn(params) {
   let sessionId = sessionResolution.sessionId;
   const deferredSessionId = params.sessionId === undefined && !sessionResolution.isolated ? undefined : sessionId;
   const sourceNode = params.sourceNode;
+  const threadRootId = params.threadRootId;
   const topicId = topic.id;
   const requestId = params.requestId;
   const depth = params.depth;
@@ -16670,7 +16748,7 @@ function startAiTurn(params) {
     WsHub.get().broadcastTyping(topicId, "ai");
     WsHub.get().broadcastAiActive(topicId, queryId);
   }
-  streamAgentEvents(topicId, topic.title, queryId, events, control, agentKind, resolvedModel, resolvedEffort, userId, !sessionRetried, onSessionId, { silent, peerBridge, sourceNode }).then(async (streamOutcome) => {
+  streamAgentEvents(topicId, topic.title, queryId, events, control, agentKind, resolvedModel, resolvedEffort, userId, !sessionRetried, onSessionId, { silent, peerBridge, sourceNode, ...threadRootId ? { threadRootId } : {} }).then(async (streamOutcome) => {
     let outcome = streamOutcome;
     if (outcome.kind === "session-expired") {
       const retry = resolveSessionRetry({
@@ -21078,4 +21156,4 @@ export {
   createAgentHealthMcpServer
 };
 
-//# debugId=A3645A70D023CC9C64756E2164756E21
+//# debugId=D1868E45E4303D2164756E2164756E21