negotium 0.2.26 → 0.2.28

package/dist/runtime/src/topics/personal-general.ts

@@ -3,8 +3,16 @@ import { getRegistry } from "#agents/registry";
 import { resolveDefaultModel } from "#platform/config";
 import { GENERAL_TOPIC_ID } from "#platform/constants";
 import { getApiTopicConfig, setApiTopicConfig } from "#storage/api-topic-config";
-import { getManagerTopicForUser, getTopic, upsertTopic } from "#storage/api-topics";
-import type { TopicDto } from "#types/api";
+import {
+  defaultSurfaceScope,
+  defaultTopicSurface,
+  getManagerTopicForUser,
+  getTopic,
+  normalizeSurfaceScope,
+  normalizeTopicSurface,
+  upsertTopic,
+} from "#storage/api-topics";
+import type { TopicDto, TopicSurface } from "#types/api";
 
 const LEGACY_PERSONAL_GENERAL_DESCRIPTION =
   "나만의 개인 공간이에요. 대화와 AI 작업은 다른 사용자에게 공개되지 않습니다.";
@@ -17,8 +25,22 @@ export const PERSONAL_GENERAL_DESCRIPTION =
  * The legacy `general` row is deliberately excluded: it was shared by every
  * user and remains untouched for an explicit, operator-controlled migration.
  */
-export function ensurePersonalGeneral(userId: string): TopicDto {
-  const existing = getManagerTopicForUser(userId);
+export function ensurePersonalGeneral(
+  userId: string,
+  surface?: TopicSurface,
+  opts: { surfaceScope?: string | null } = {},
+): TopicDto {
+  const scope = normalizeTopicSurface(surface ?? defaultTopicSurface());
+  // One General per user *per workspace*. A manager room is exempt from title
+  // conflicts precisely because several may share the name, and two workspaces
+  // sharing one private room would merge two customers' transcripts.
+  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;
@@ -43,6 +65,8 @@ export function ensurePersonalGeneral(userId: string): TopicDto {
     aiMode: "always",
     aiMention: false,
     participants: [{ userId, role: "owner" }],
+    surface: scope,
+    surfaceScope,
     createdAt: now,
     lastMessageAt: now,
   };

package/dist/runtime/src/types/api.ts

@@ -130,6 +130,13 @@ export interface TopicDto {
   visibility?: TopicVisibility;
   /** The product surface that owns this topic (terminal / telegram / otium). */
   surface?: TopicSurface;
+  /**
+   * Which instance of the surface owns this topic — for `otium`, the workspace
+   * (M-1/M-2). Fixed at creation, exactly like `surface`. Null/absent on
+   * `terminal` and `telegram`, which have exactly one instance each, and on
+   * Otium rooms created before the scope was known.
+   */
+  surfaceScope?: string | null;
   /** Stable execution placement. Absent means the hub runs this topic locally. */
   executionNode?: {
     nodeId: string;

package/dist/runtime/src/version.ts

@@ -1 +1 @@
-export const NEGOTIUM_VERSION = "0.2.26";
+export const NEGOTIUM_VERSION = "0.2.28";

package/dist/storage.js

@@ -1204,8 +1204,11 @@ function deleteApiTopicConfig(topicId) {
 var exports_api_topics = {};
 __export(exports_api_topics, {
   upsertTopic: () => upsertTopic,
+  stampUnscopedOtiumTopics: () => stampUnscopedOtiumTopics,
   setTopicSurfaces: () => setTopicSurfaces,
   setTopicSessionId: () => setTopicSessionId,
+  setSurfaceScopeRequired: () => setSurfaceScopeRequired,
+  setDefaultSurfaceScope: () => setDefaultSurfaceScope,
   setApiTopicAgent: () => setApiTopicAgent,
   revokeSubagentTellTarget: () => revokeSubagentTellTarget,
   reparentTopicChildren: () => reparentTopicChildren,
@@ -1214,10 +1217,12 @@ __export(exports_api_topics, {
   normalizeTopicSurface: () => normalizeTopicSurface,
   normalizeTopicState: () => normalizeTopicState,
   normalizeTopicKind: () => normalizeTopicKind,
+  normalizeSurfaceScope: () => normalizeSurfaceScope,
   normalizeAiMode: () => normalizeAiMode,
   listTopics: () => listTopics,
   listSubagentTellTargetIds: () => listSubagentTellTargetIds,
   isTopicVisible: () => isTopicVisible,
+  isSurfaceScopeRequired: () => isSurfaceScopeRequired,
   inferTopicKind: () => inferTopicKind,
   inferAiMode: () => inferAiMode,
   grantSubagentTellTarget: () => grantSubagentTellTarget,
@@ -1231,6 +1236,7 @@ __export(exports_api_topics, {
   findTopicTitleConflict: () => findTopicTitleConflict,
   deleteTopic: () => deleteTopic,
   defaultTopicSurface: () => defaultTopicSurface,
+  defaultSurfaceScope: () => defaultSurfaceScope,
   clearTopicSessionId: () => clearTopicSessionId,
   aiMentionFromMode: () => aiMentionFromMode,
   addParticipantToDB: () => addParticipantToDB
@@ -1254,6 +1260,28 @@ function defaultTopicSurface() {
 function normalizeTopicSurface(value) {
   return value === "telegram" || value === "otium" || value === "terminal" ? value : "terminal";
 }
+var activeSurfaceScope = null;
+function normalizeSurfaceScope(value) {
+  if (typeof value !== "string")
+    return null;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : null;
+}
+function defaultSurfaceScope() {
+  return activeSurfaceScope ?? normalizeSurfaceScope(process.env.NEGOTIUM_SURFACE_SCOPE);
+}
+function setDefaultSurfaceScope(scope) {
+  const previous = activeSurfaceScope;
+  activeSurfaceScope = normalizeSurfaceScope(scope);
+  return previous;
+}
+var surfaceScopeRequired = false;
+function setSurfaceScopeRequired(required) {
+  surfaceScopeRequired = required;
+}
+function isSurfaceScopeRequired() {
+  return surfaceScopeRequired;
+}
 function tableColumns2(table) {
   const rows = db.query(`PRAGMA table_info(${table})`).all();
   return new Set(rows.map((row) => row.name));
@@ -1385,6 +1413,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,
@@ -1430,8 +1459,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");
@@ -1488,6 +1517,9 @@ function initializeApiTopicsSchema() {
   if (!tableColumns2("api_topics").has("surface")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN surface TEXT NOT NULL DEFAULT 'terminal'");
   }
+  if (!tableColumns2("api_topics").has("surface_scope")) {
+    db.exec("ALTER TABLE api_topics ADD COLUMN surface_scope TEXT");
+  }
   if (tableColumns2("api_topics").has("access_mode")) {
     try {
       db.exec("ALTER TABLE api_topics DROP COLUMN access_mode");
@@ -1523,6 +1555,31 @@ 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)");
+}
+var SURFACE_SCOPE_STAMP_MIGRATION = "api_topics_surface_scope_stamp_20260809";
+function stampUnscopedOtiumTopics(scope) {
+  const normalized = normalizeSurfaceScope(scope);
+  if (!normalized)
+    return 0;
+  db.exec(`
+  CREATE TABLE IF NOT EXISTS api_schema_migrations (
+    key TEXT PRIMARY KEY,
+    applied_at TEXT NOT NULL
+  )
+`);
+  const applied = db.query("SELECT key FROM api_schema_migrations WHERE key = ?").get(SURFACE_SCOPE_STAMP_MIGRATION);
+  if (applied)
+    return 0;
+  let stamped = 0;
+  db.transaction(() => {
+    stamped = Number(db.query("UPDATE api_topics SET surface_scope = ? WHERE surface = 'otium' AND surface_scope IS NULL").run(normalized).changes ?? 0);
+    db.query("INSERT INTO api_schema_migrations (key, applied_at) VALUES (?, ?)").run(SURFACE_SCOPE_STAMP_MIGRATION, new Date().toISOString());
+  })();
+  if (stamped > 0) {
+    logger.info({ scope: normalized, stamped }, "api_topics: surface scope stamped");
+  }
+  return stamped;
 }
 var SURFACE_BACKFILL_MIGRATION = "api_topics_surface_backfill_20260808";
 function backfillTopicSurfaces() {
@@ -1544,22 +1601,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");
   }
@@ -1623,7 +1682,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(value) {
@@ -1691,6 +1751,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,
@@ -1703,8 +1770,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,
@@ -1722,7 +1789,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);
@@ -1736,7 +1807,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));
@@ -1745,15 +1817,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) {
@@ -1788,18 +1869,17 @@ function getTopicByNameAndKind(title, kind) {
 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);
@@ -1826,14 +1906,16 @@ function getTopicByNameForUser(title, userId, opts = {}) {
   const qualified = /^(agent|channel|manager):(.+)$/i.exec(trimmed);
   const requestedKind = qualified ? normalizeTopicKind(qualified[1]?.toLowerCase()) : null;
   const requestedTitle = qualified ? qualified[2].trim() : trimmed;
+  const scoped = Object.hasOwn(opts, "surfaceScope");
   const rows = db.query(`SELECT t.* FROM api_topics t
        WHERE LOWER(t.title) = LOWER(?)
          AND t.id != ?
          AND t.visibility != 'hidden'
          AND (? IS NULL OR t.surface = ?)
+         ${scoped ? "AND t.surface_scope IS ?" : ""}
          AND EXISTS (
            SELECT 1 FROM topic_members m WHERE m.topic_id = t.id AND m.user_id = ?
-         )`).all(requestedTitle, GENERAL_TOPIC_ID, opts.surface ?? null, opts.surface ?? null, userId);
+         )`).all(requestedTitle, GENERAL_TOPIC_ID, opts.surface ?? null, opts.surface ?? null, ...scoped ? [normalizeSurfaceScope(opts.surfaceScope)] : [], userId);
   const matches = requestedKind ? rows.filter((row) => row.kind === requestedKind) : rows;
   return matches.length === 1 ? rowToDto2(matches[0]) : null;
 }
@@ -3468,10 +3550,11 @@ __export(exports_token_stats, {
   recordUsage: () => recordUsage,
   getTopicStats: () => getTopicStats,
   getStats: () => getStats,
+  deleteTopicStats: () => deleteTopicStats,
   calcCost: () => calcCost
 });
 import { createHash as createHash2 } from "crypto";
-import { mkdirSync as mkdirSync8 } from "fs";
+import { mkdirSync as mkdirSync8, writeFileSync as writeFileSync7 } from "fs";
 import { join as join7 } from "path";
 function emptyBucket() {
   return {
@@ -3561,6 +3644,26 @@ function recordUsage(userId, session, usage, context) {
     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;
+      }
+    });
+    writeFileSync7(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;
@@ -3625,7 +3728,7 @@ function getStats(userId, from, to) {
     estimatedCostUsd: calcCost(total)
   };
 }
-function getTopicStats(userId, topicId) {
+function getTopicStats(userId, topicId, activeProviderSessionId = getTopicSessionId(topicId) ?? undefined) {
   const total = emptyBucket();
   let currentSession;
   for (const raw of loadRecords(userId)) {
@@ -3637,7 +3740,7 @@ function getTopicStats(userId, topicId) {
     total.cacheReadInputTokens += raw.cacheReadInputTokens;
     total.queries += 1;
     total.estimatedCostUsd += raw.estimatedCostUsd;
-    if (raw.contextTokens !== undefined && raw.contextWindow !== undefined && raw.contextWindow > 0 && (!currentSession || raw.timestamp > currentSession.timestamp)) {
+    if (raw.contextTokens !== undefined && raw.contextWindow !== undefined && raw.contextWindow > 0 && activeProviderSessionId !== undefined && raw.providerSessionId === activeProviderSessionId && (!currentSession || raw.timestamp > currentSession.timestamp)) {
       currentSession = {
         timestamp: raw.timestamp,
         topicId: raw.topicId,
@@ -3658,7 +3761,7 @@ __export(exports_topic_archive, {
   archiveTopicMessages: () => archiveTopicMessages,
   archiveConversationEvents: () => archiveConversationEvents
 });
-import { mkdirSync as mkdirSync9, writeFileSync as writeFileSync7 } from "fs";
+import { mkdirSync as mkdirSync9, writeFileSync as writeFileSync8 } from "fs";
 import { join as join9 } from "path";
 
 // ../../packages/core/src/agents/memory-archive-policy.ts
@@ -3818,7 +3921,7 @@ function archiveTopicMessages(topicId, topicTitle, options = {}) {
     filename = `${safeTopic}_${date}${reasonSuffix}${counter === 1 ? "" : `_${counter}`}.jsonl`;
     path = join9(archiveDir, filename);
     try {
-      writeFileSync7(path, body, { flag: "wx" });
+      writeFileSync8(path, body, { flag: "wx" });
       break;
     } catch (err) {
       if (err.code !== "EEXIST")
@@ -3891,7 +3994,7 @@ function archiveConversationEvents(topicId, topicTitle, userId, options = {}) {
     const suffix = counter === 1 ? "" : `_${counter}`;
     const path = join9(archiveDir, `${safeTopic}_${date}${reasonSuffix}_events${suffix}.jsonl`);
     try {
-      writeFileSync7(path, body, { flag: "wx" });
+      writeFileSync8(path, body, { flag: "wx" });
       logger.info({ topicId, topicTitle, archive: path, eventCount: entries.length }, "archiveConversationEvents: archived raw conversation events");
       return { path, eventCount: entries.length };
     } catch (error) {
@@ -4103,6 +4206,7 @@ export {
   exports_tasks as tasks,
   taskScopeKey,
   taskFileMtimeNs,
+  stampUnscopedOtiumTopics,
   softDeleteApiMessagesByIdPrefix,
   softDeleteApiMessage,
   settleTopicArchiveJob,
@@ -4117,10 +4221,12 @@ export {
   setTopicAgentAndSession,
   setTopicAgentAndClearSession,
   setTopicAgent,
+  setSurfaceScopeRequired,
   setSessionForTopic,
   setLastShownConfig,
   setGlobalAiName,
   setDmSessionId,
+  setDefaultSurfaceScope,
   setApiTopicConfig,
   setApiTopicAgent,
   setApiMessageReactions,
@@ -4153,6 +4259,7 @@ export {
   normalizeTopicSurface,
   normalizeTopicState,
   normalizeTopicKind,
+  normalizeSurfaceScope,
   normalizeAiMode,
   markPendingAskState,
   markPendingAskSources,
@@ -4168,6 +4275,7 @@ export {
   isTopicVisible,
   isTopicSummaryFile,
   isTopicBriefFile,
+  isSurfaceScopeRequired,
   isRuntimeProcessLeaseAlive,
   inferTopicKind,
   inferAiMode,
@@ -4220,6 +4328,7 @@ export {
   findRecentUserMessage,
   findLastSessionIdForAgent,
   describePendingAskState,
+  deleteTopicStats,
   deleteTopicBrief,
   deleteTopicArchiveState,
   deleteTopic,
@@ -4228,6 +4337,7 @@ export {
   deleteMessagesForTopic,
   deleteApiTopicConfig,
   defaultTopicSurface,
+  defaultSurfaceScope,
   db2 as db,
   createTasks,
   createPendingAsk,
@@ -4272,4 +4382,4 @@ export {
   ConversationLogDivergedError
 };
 
-//# debugId=5FCBA76877162FB364756E2164756E21
+//# debugId=6AE30BDF1C411C3464756E2164756E21