negotium 0.2.23 → 0.2.25

package/dist/main.js

@@ -273,7 +273,7 @@ function resolveDefaultModel(agent, registryDefaultModel) {
 function codexAuthFilePath() {
   return process.env.NEGOTIUM_CODEX_AUTH_FILE || join(process.env.CODEX_HOME || join(homedir(), ".codex"), "auth.json");
 }
-var HOME, PROJECT_ROOT, STATE_DIR_ENV, STATE_DIR, WORKSPACE_DIR, TOPIC_WORKSPACE_DIR, SHARED_WIKI_DIR, CRON_WORKSPACE_DIR, BROWSER_DIR, BROWSER_PROFILES_DIR, BINARIES_DIR, SECRETS_DIR, DM_WORKSPACE_DIR, SESSION_WORKSPACE_DIR, CLAUDE_EXECUTABLE_ENV, CLAUDE_EXECUTABLE, DEFAULT_OUTPUT_LANGUAGE = "English", BROWSER_RS_VERSION = "v0.1.19", BROWSER_RS_MIN_SECURE_VERSION = "0.1.15", BROWSER_RS_VERSION_PROBE_TIMEOUT_MS = 15000, SNIPPETS_API_URL, BROWSER_RS_BIN, BASH_RS_VERSION = "v0.1.5", BASH_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, TSX_LOADER, TSCONFIG_PATH, SESSION_COMM_SERVER, TASK_SERVER, BROWSER_MCP_SSE_PROXY_SERVER, CANONICAL_MCP_PROXY_SERVER, WIKI_SERVER, TOKEN_STATS_SERVER, COMPACTION_LOG_SERVER, SYSTEM_HEALTH_SERVER, AGENT_HEALTH_SERVER, VAULT_SERVER, BG_BASH_BASE_PORT, BG_BASH_MAX_PORT, RUNTIME_MCP_SECRET, NODE_CONTROL_TOKEN, VAULT_MASTER_KEY, NEGOTIUM_PORT, hostname, DATA_DIR, LOG_DIR, UPLOADS_DIR, VAULT_DIR, SESSIONS_DB, DEBUG_FILE, USERS_LOG_DIR, RUN_DIR, PROGRESS_DIR, DM_CMD_DIR, DM_RESP_DIR, SESSION_INBOX_DIR, SESSION_ASKS_DIR, BASHRS_SPILL_ROOT, PLAYWRIGHT_BASE_PORT, PLAYWRIGHT_MAX_PORT, PLAYWRIGHT_PORTS_DIR, ACTIVE_QUERY_STALE_MS, AGENTS_PROMPTS_DIR, RESOURCES_DIR, FILE_TAG_REGEX, MODEL_SONNET = "claude-sonnet-5", MODEL_OPUS = "claude-opus-5", MODEL_FABLE = "claude-fable-5", FALLBACK_AGENT, SESSION_AGENT, GATEWAY_AGENT, FALLBACK_MODEL, SESSION_MODEL, GATEWAY_MODEL, FFMPEG_BIN, FFPROBE_BIN, PYTHON_BIN, FASTER_WHISPER_WRAPPER, WHISPER_MODEL, TESSERACT_BIN, PDFTOTEXT_BIN, _envMaxTellDepth, MAX_TELL_DEPTH;
+var HOME, PROJECT_ROOT, STATE_DIR_ENV, STATE_DIR, WORKSPACE_DIR, TOPIC_WORKSPACE_DIR, SHARED_WIKI_DIR, CRON_WORKSPACE_DIR, BROWSER_DIR, BROWSER_PROFILES_DIR, BINARIES_DIR, SECRETS_DIR, DM_WORKSPACE_DIR, SESSION_WORKSPACE_DIR, CLAUDE_EXECUTABLE_ENV, CLAUDE_EXECUTABLE, DEFAULT_OUTPUT_LANGUAGE = "English", BROWSER_RS_VERSION = "v0.1.19", BROWSER_RS_MIN_SECURE_VERSION = "0.1.15", BROWSER_RS_VERSION_PROBE_TIMEOUT_MS = 15000, SNIPPETS_API_URL, BROWSER_RS_BIN, BASH_RS_VERSION = "v0.1.5", BASH_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, TSX_LOADER, TSCONFIG_PATH, SESSION_COMM_SERVER, TASK_SERVER, BROWSER_MCP_SSE_PROXY_SERVER, CANONICAL_MCP_PROXY_SERVER, WIKI_SERVER, TOKEN_STATS_SERVER, COMPACTION_LOG_SERVER, SYSTEM_HEALTH_SERVER, AGENT_HEALTH_SERVER, VAULT_SERVER, BG_BASH_BASE_PORT, BG_BASH_MAX_PORT, RUNTIME_MCP_SECRET, NODE_CONTROL_TOKEN, NODE_ID, VAULT_MASTER_KEY, NEGOTIUM_PORT, hostname, DATA_DIR, LOG_DIR, UPLOADS_DIR, VAULT_DIR, SESSIONS_DB, DEBUG_FILE, USERS_LOG_DIR, RUN_DIR, PROGRESS_DIR, DM_CMD_DIR, DM_RESP_DIR, SESSION_INBOX_DIR, SESSION_ASKS_DIR, BASHRS_SPILL_ROOT, PLAYWRIGHT_BASE_PORT, PLAYWRIGHT_MAX_PORT, PLAYWRIGHT_PORTS_DIR, ACTIVE_QUERY_STALE_MS, AGENTS_PROMPTS_DIR, RESOURCES_DIR, FILE_TAG_REGEX, MODEL_SONNET = "claude-sonnet-5", MODEL_OPUS = "claude-opus-5", MODEL_FABLE = "claude-fable-5", FALLBACK_AGENT, SESSION_AGENT, GATEWAY_AGENT, FALLBACK_MODEL, SESSION_MODEL, GATEWAY_MODEL, FFMPEG_BIN, FFPROBE_BIN, PYTHON_BIN, FASTER_WHISPER_WRAPPER, WHISPER_MODEL, TESSERACT_BIN, PDFTOTEXT_BIN, _envMaxTellDepth, MAX_TELL_DEPTH;
 var init_config = __esm(() => {
   init_config_helpers();
   init_logger();
@@ -315,6 +315,7 @@ var init_config = __esm(() => {
   BG_BASH_MAX_PORT = parsePortEnv(process.env.BG_BASH_MAX_PORT, 9799);
   RUNTIME_MCP_SECRET = loadOrCreateLocalSecret("RUNTIME_MCP_SECRET", "runtime-mcp-secret");
   NODE_CONTROL_TOKEN = loadOrCreateLocalSecret("NEGOTIUM_CONTROL_TOKEN", "node-control-token");
+  NODE_ID = loadOrCreateLocalSecret("NEGOTIUM_NODE_ID", "node-id");
   VAULT_MASTER_KEY = loadOrCreateLocalSecret("NEGOTIUM_VAULT_MASTER_KEY", "vault-master-key", { persistEnvValue: true });
   delete process.env.NEGOTIUM_VAULT_MASTER_KEY;
   NEGOTIUM_PORT = parseInt(process.env.NEGOTIUM_PORT || "7777", 10);
@@ -1867,7 +1868,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.2.23";
+var NEGOTIUM_VERSION = "0.2.25";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn } from "child_process";
@@ -7505,21 +7506,20 @@ var init_constants = __esm(() => {
 var exports_api_topics = {};
 __export(exports_api_topics, {
   upsertTopic: () => upsertTopic,
+  setTopicSurfaces: () => setTopicSurfaces,
   setTopicSessionId: () => setTopicSessionId,
-  setTopicAccessModes: () => setTopicAccessModes,
   setApiTopicAgent: () => setApiTopicAgent,
   revokeSubagentTellTarget: () => revokeSubagentTellTarget,
   reparentTopicChildren: () => reparentTopicChildren,
   removeParticipantFromDB: () => removeParticipantFromDB,
   normalizeTopicVisibility: () => normalizeTopicVisibility,
+  normalizeTopicSurface: () => normalizeTopicSurface,
   normalizeTopicState: () => normalizeTopicState,
   normalizeTopicKind: () => normalizeTopicKind,
-  normalizeTopicAccessMode: () => normalizeTopicAccessMode,
   normalizeAiMode: () => normalizeAiMode,
   listTopics: () => listTopics,
   listSubagentTellTargetIds: () => listSubagentTellTargetIds,
   isTopicVisible: () => isTopicVisible,
-  isTopicShared: () => isTopicShared,
   inferTopicKind: () => inferTopicKind,
   inferAiMode: () => inferAiMode,
   grantSubagentTellTarget: () => grantSubagentTellTarget,
@@ -7532,10 +7532,17 @@ __export(exports_api_topics, {
   getManagerTopicForUser: () => getManagerTopicForUser,
   findTopicTitleConflict: () => findTopicTitleConflict,
   deleteTopic: () => deleteTopic,
+  defaultTopicSurface: () => defaultTopicSurface,
   clearTopicSessionId: () => clearTopicSessionId,
   aiMentionFromMode: () => aiMentionFromMode,
   addParticipantToDB: () => addParticipantToDB
 });
+function defaultTopicSurface() {
+  return normalizeTopicSurface(process.env.NEGOTIUM_DEFAULT_SURFACE);
+}
+function normalizeTopicSurface(value) {
+  return value === "telegram" || value === "otium" || value === "terminal" ? value : "terminal";
+}
 function tableColumns2(table) {
   const rows = db.query(`PRAGMA table_info(${table})`).all();
   return new Set(rows.map((row) => row.name));
@@ -7666,7 +7673,7 @@ function initializeApiTopicsSchema() {
       is_fork INTEGER NOT NULL DEFAULT 0 CHECK (is_fork IN (0,1)),
       is_subagent INTEGER NOT NULL DEFAULT 0 CHECK (is_subagent IN (0,1)),
       visibility TEXT NOT NULL DEFAULT 'visible' CHECK (visibility IN ('visible','hidden')),
-      access_mode TEXT NOT NULL DEFAULT 'private' CHECK (access_mode IN ('private','shared')),
+      surface TEXT NOT NULL DEFAULT 'terminal' CHECK (surface IN ('terminal','telegram','otium')),
       browser_profile TEXT NOT NULL DEFAULT 'default',
       browser_profile_owner TEXT,
       session_id TEXT,
@@ -7712,8 +7719,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,access_mode,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.access_mode === "shared" ? "shared" : "private", 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,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);
         }
         db.exec("DROP TABLE IF EXISTS topic_members");
         db.exec("DROP TABLE api_topics");
@@ -7767,8 +7774,15 @@ function initializeApiTopicsSchema() {
   if (!tableColumns2("api_topics").has("visibility")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN visibility TEXT NOT NULL DEFAULT 'visible'");
   }
-  if (!tableColumns2("api_topics").has("access_mode")) {
-    db.exec("ALTER TABLE api_topics ADD COLUMN access_mode TEXT NOT NULL DEFAULT 'private'");
+  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("access_mode")) {
+    try {
+      db.exec("ALTER TABLE api_topics DROP COLUMN access_mode");
+    } catch (err) {
+      logger.warn({ err }, "api_topics: could not drop the retired access_mode column");
+    }
   }
   if (!tableColumns2("api_topics").has("browser_profile")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN browser_profile TEXT NOT NULL DEFAULT 'default'");
@@ -7795,7 +7809,48 @@ function initializeApiTopicsSchema() {
   )
   WHERE browser_profile_owner IS NULL
 `);
+  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)");
+}
+function backfillTopicSurfaces() {
+  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_BACKFILL_MIGRATION);
+  if (applied)
+    return;
+  const surface = defaultTopicSurface();
+  db.transaction(() => {
+    db.query("UPDATE api_topics SET surface = ?").run(surface);
+    renameSurfaceTitleCollisions();
+    db.query("INSERT INTO api_schema_migrations (key, applied_at) VALUES (?, ?)").run(SURFACE_BACKFILL_MIGRATION, new Date().toISOString());
+  })();
+  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 update = db.query("UPDATE api_topics SET title = ? WHERE id = ?");
+  for (const row of rows) {
+    const key = (title) => `${row.surface}\x00${row.kind}\x00${normalizedTitle(title)}`;
+    if (!taken.has(key(row.title))) {
+      taken.add(key(row.title));
+      continue;
+    }
+    let suffix = 2;
+    let candidate = `${row.title} (${suffix})`;
+    while (taken.has(key(candidate))) {
+      suffix += 1;
+      candidate = `${row.title} (${suffix})`;
+    }
+    taken.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");
+  }
 }
 function shortSessionId(sessionId) {
   return sessionId ? sessionId.slice(0, 8) : null;
@@ -7855,15 +7910,9 @@ 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),
-    accessMode: normalizeTopicAccessMode(r.access_mode)
+    surface: normalizeTopicSurface(r.surface)
   };
 }
-function normalizeTopicAccessMode(value) {
-  return value === "shared" ? "shared" : "private";
-}
-function isTopicShared(topic) {
-  return topic.accessMode === "shared";
-}
 function normalizeTopicVisibility(value) {
   return value === "hidden" ? "hidden" : "visible";
 }
@@ -7940,7 +7989,7 @@ function upsertTopic(t) {
   db.transaction(() => {
     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,access_mode,
+        created_at,last_message_at,parent_topic_id,memory_topic_id,memory_key,is_fork,is_subagent,visibility,surface,
         subagent_report_mode)
      VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
      ON CONFLICT(id) DO UPDATE SET
@@ -7959,8 +8008,8 @@ function upsertTopic(t) {
        is_fork = excluded.is_fork,
        is_subagent = excluded.is_subagent,
        visibility = excluded.visibility,
-       access_mode = excluded.access_mode,
-       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), normalizeTopicAccessMode(t.accessMode), t.subagentReportMode ?? "auto");
+       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), 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);
@@ -7973,18 +8022,8 @@ function upsertTopic(t) {
     }
   })();
 }
-function setTopicAccessModes(topicIds, accessMode) {
-  if (topicIds.length === 0)
-    return;
-  const normalized = normalizeTopicAccessMode(accessMode);
-  db.transaction(() => {
-    const update = db.query("UPDATE api_topics SET access_mode = ? WHERE id = ?");
-    for (const topicId of topicIds)
-      update.run(normalized, topicId);
-  })();
-}
-function listTopics() {
-  const rows = db.query("SELECT * FROM api_topics ORDER BY last_message_at DESC").all();
+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 participants = getAllTopicParticipants();
   const tellTargets = rows.some((row) => row.is_subagent !== 0) ? getAllSubagentTellTargets() : undefined;
   return rows.map((row) => rowToDto2(row, participants.get(row.id) ?? [], tellTargets));
@@ -8035,14 +8074,15 @@ function getTopicByNameAndKind(title, kind) {
 }
 function findTopicTitleConflict(title, kind, opts = {}) {
   const wanted = normalizedTitle(title);
+  const surface = normalizeTopicSurface(opts.surface ?? defaultTopicSurface());
   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];
-  let sql = "SELECT * FROM api_topics WHERE LOWER(TRIM(title)) = ?";
+  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);
@@ -8055,7 +8095,20 @@ function findTopicTitleConflict(title, kind, opts = {}) {
   const row = db.query(sql).get(...params);
   return row ? rowToDto2(row) : null;
 }
-function getTopicByNameForUser(title, userId) {
+function setTopicSurfaces(topicIds, surface) {
+  if (topicIds.length === 0)
+    return 0;
+  const normalized = normalizeTopicSurface(surface);
+  let changed = 0;
+  db.transaction(() => {
+    const update = db.query("UPDATE api_topics SET surface = ? WHERE id = ? AND surface != ?");
+    for (const topicId of topicIds) {
+      changed += Number(update.run(normalized, topicId, normalized).changes ?? 0);
+    }
+  })();
+  return changed;
+}
+function getTopicByNameForUser(title, userId, opts = {}) {
   const trimmed = title.trim();
   const qualified = /^(agent|channel|manager):(.+)$/i.exec(trimmed);
   const requestedKind = qualified ? normalizeTopicKind(qualified[1]?.toLowerCase()) : null;
@@ -8064,9 +8117,10 @@ function getTopicByNameForUser(title, userId) {
        WHERE LOWER(t.title) = LOWER(?)
          AND t.id != ?
          AND t.visibility != 'hidden'
+         AND (? IS NULL OR t.surface = ?)
          AND EXISTS (
            SELECT 1 FROM topic_members m WHERE m.topic_id = t.id AND m.user_id = ?
-         )`).all(requestedTitle, GENERAL_TOPIC_ID, userId);
+         )`).all(requestedTitle, GENERAL_TOPIC_ID, opts.surface ?? null, opts.surface ?? null, userId);
   const matches = requestedKind ? rows.filter((row) => row.kind === requestedKind) : rows;
   return matches.length === 1 ? rowToDto2(matches[0]) : null;
 }
@@ -8154,7 +8208,7 @@ function removeParticipantFromDB(topicId, userId) {
   db.query("DELETE FROM topic_members WHERE topic_id = ? AND user_id = ?").run(topicId, userId);
   return true;
 }
-var DEFAULT_AGENT_ROOM_AGENT = "maestro";
+var DEFAULT_AGENT_ROOM_AGENT = "maestro", SURFACE_BACKFILL_MIGRATION = "api_topics_surface_backfill_20260808";
 var init_api_topics = __esm(async () => {
   init_constants();
   init_logger();
@@ -14240,11 +14294,11 @@ __export(exports_derive, {
 });
 import { createHash as createHash5, randomUUID as randomUUID12 } from "crypto";
 import { mkdirSync as mkdirSync13, rmSync as rmSync5, unlinkSync as unlinkSync13 } from "fs";
-function getTopics() {
-  return listTopics().filter((topic) => !isLegacySharedGeneral(topic.id));
+function getTopics(opts = {}) {
+  return listTopics(opts).filter((topic) => !isLegacySharedGeneral(topic.id));
 }
-function getVisibleTopics() {
-  return getTopics().filter(isTopicVisible).map((topic) => {
+function getVisibleTopics(opts = {}) {
+  return getTopics(opts).filter(isTopicVisible).map((topic) => {
     if (!topic.agent)
       return topic;
     const registry = getRegistry(topic.agent);
@@ -14269,8 +14323,8 @@ function updateTopic(topicId, patch) {
 function isParticipant(topic, userId) {
   return topic.participants.some((p) => p.userId === userId);
 }
-function nextDerivedTopicTitle(sourceTitle, kind, suffix) {
-  const visibleTitles = new Set(listTopics().filter((topic) => topic.kind === kind).map((topic) => topic.title.toLowerCase()));
+function nextDerivedTopicTitle(sourceTitle, kind, suffix, surface) {
+  const visibleTitles = new Set(listTopics(surface ? { surface } : {}).filter((topic) => topic.kind === kind).map((topic) => topic.title.toLowerCase()));
   let n = 1;
   let title = `${sourceTitle}-${suffix}-${n}`;
   while (visibleTitles.has(title.toLowerCase())) {
@@ -14334,8 +14388,9 @@ async function createDerivedTopicImpl(topic, sourceTopicId, userId, copyHistory,
     { userId, role: "owner" }
   ] : [{ userId, role: "owner" }];
   const kind = topic.kind ?? inferTopicKind(topic);
-  const title = opts?.name?.trim() || nextDerivedTopicTitle(topic.title, kind, suffix);
-  const conflict = findTopicTitleConflict(title, kind);
+  const surface = topic.surface ?? defaultTopicSurface();
+  const title = opts?.name?.trim() || nextDerivedTopicTitle(topic.title, kind, suffix, surface);
+  const conflict = findTopicTitleConflict(title, kind, { surface });
   if (conflict) {
     logger.info({ sourceTopicId, title, kind, conflictTopicId: conflict.id }, "createDerivedTopic: title conflict");
     throw new TopicTitleConflictError(title);
@@ -14358,7 +14413,7 @@ async function createDerivedTopicImpl(topic, sourceTopicId, userId, copyHistory,
     isFork: copyHistory,
     ...subagent ? { isSubagent: true } : {},
     visibility: topic.visibility,
-    accessMode: topic.accessMode
+    surface
   };
   let sessionId;
   let rollbackHandle;
@@ -14466,7 +14521,7 @@ 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);
+      const transactionalConflict = findTopicTitleConflict(title, kind, { surface });
       if (transactionalConflict)
         throw new TopicTitleConflictError(title);
       upsertTopic(derived);
@@ -20357,74 +20412,6 @@ var init_submit_user_message = __esm(async () => {
   await init_api_messages();
 });
 
-// ../../packages/core/src/application/switch-topic-access-mode.ts
-function collectSubagentDescendants(rootTopicId) {
-  const all = listTopics();
-  const childrenByParent = new Map;
-  for (const topic of all) {
-    if (!topic.isSubagent || !topic.parentTopicId)
-      continue;
-    const siblings = childrenByParent.get(topic.parentTopicId);
-    if (siblings)
-      siblings.push(topic);
-    else
-      childrenByParent.set(topic.parentTopicId, [topic]);
-  }
-  const descendants = [];
-  const seen = new Set([rootTopicId]);
-  const queue = [rootTopicId];
-  while (queue.length > 0) {
-    const parentId = queue.shift();
-    for (const child of childrenByParent.get(parentId) ?? []) {
-      if (seen.has(child.id))
-        continue;
-      seen.add(child.id);
-      descendants.push(child);
-      queue.push(child.id);
-    }
-  }
-  return descendants;
-}
-function switchTopicAccessMode(params) {
-  const topic = getTopic(params.topicId);
-  if (!topic)
-    return { ok: false, error: "Topic not found" };
-  const owner = topic.participants.some((participant) => participant.userId === params.userId && participant.role === "owner");
-  if (!owner)
-    return { ok: false, error: "Only topic owners can change privacy" };
-  if (topic.isSubagent) {
-    return {
-      ok: false,
-      error: "Subagent rooms inherit privacy from their parent topic"
-    };
-  }
-  const descendants = collectSubagentDescendants(topic.id);
-  const changed = [topic, ...descendants].filter((candidate) => (candidate.accessMode ?? "private") !== params.accessMode);
-  if (changed.length === 0) {
-    return {
-      ok: true,
-      accessMode: params.accessMode,
-      text: params.accessMode === "shared" ? `"${topic.title}" is already public to the connected Otium Hub.` : `"${topic.title}" is already private to this worker.`,
-      topicIds: []
-    };
-  }
-  setTopicAccessModes(changed.map((candidate) => candidate.id), params.accessMode);
-  for (const candidate of changed)
-    WsHub.get().broadcastTopicUpdated(candidate.id);
-  const subagentCount = changed.filter((candidate) => candidate.id !== topic.id).length;
-  const suffix = subagentCount > 0 ? ` (${subagentCount} subagent room${subagentCount === 1 ? "" : "s"} updated)` : "";
-  return {
-    ok: true,
-    accessMode: params.accessMode,
-    topicIds: changed.map((candidate) => candidate.id),
-    text: (params.accessMode === "shared" ? `"${topic.title}" is public to the connected Otium Hub.` : `"${topic.title}" is private to this worker.`) + suffix
-  };
-}
-var init_switch_topic_access_mode = __esm(async () => {
-  await init_bus();
-  await init_api_topics();
-});
-
 // ../../packages/core/src/application/switch-topic-effort.ts
 function switchTopicEffort(params) {
   const topic = getTopic(params.topicId);
@@ -20538,9 +20525,10 @@ function registerTopic(opts) {
   if (requestedKind === "manager") {
     throw new TopicValidationError("Manager rooms are system-managed");
   }
-  const conflict = findTopicTitleConflict(title, requestedKind);
+  const surface = normalizeTopicSurface(opts.surface ?? defaultTopicSurface());
+  const conflict = findTopicTitleConflict(title, requestedKind, { surface });
   if (conflict) {
-    throw new TopicValidationError(`A topic named "${title}" already exists`);
+    throw new TopicValidationError(`A topic named "${title}" already exists on ${surface}`);
   }
   const rawAgent = opts.agent;
   if (requestedKind === "agent" && rawAgent === "none") {
@@ -20574,7 +20562,7 @@ function registerTopic(opts) {
     defaultEffort: defaultEffort ?? "medium",
     aiMode,
     participants: [{ userId: opts.userId, role: "owner" }],
-    accessMode: opts.accessMode ?? "private",
+    surface,
     createdAt: now,
     lastMessageAt: now
   };
@@ -22413,7 +22401,6 @@ __export(exports_src, {
   textResult: () => textResult,
   switchTopicModel: () => switchTopicModel,
   switchTopicEffort: () => switchTopicEffort,
-  switchTopicAccessMode: () => switchTopicAccessMode,
   sweepStaleSubagentCards: () => sweepStaleSubagentCards,
   submitUserMessage: () => submitUserMessage,
   submitRuntimeGatewayTurn: () => submitRuntimeGatewayTurn,
@@ -22426,6 +22413,7 @@ __export(exports_src, {
   startBashrsCompletionsWorker: () => startBashrsCompletionsWorker,
   startAskUserQuestionGateOwner: () => startAskUserQuestionGateOwner,
   startAiTurn: () => startAiTurn,
+  setTopicSurfaces: () => setTopicSurfaces,
   setTopicSessionId: () => setTopicSessionId,
   setRuntimeMcpPort: () => setRuntimeMcpPort,
   setRuntimeBus: () => setRuntimeBus,
@@ -22472,6 +22460,7 @@ __export(exports_src, {
   prepareDeliveryAck: () => prepareDeliveryAck,
   onShutdown: () => onShutdown,
   normalizeVaultKey: () => normalizeVaultKey,
+  normalizeTopicSurface: () => normalizeTopicSurface,
   nodeRequestHandlerNames: () => nodeRequestHandlerNames,
   modelOwner: () => modelOwner,
   markPlaywrightUnavailable: () => markPlaywrightUnavailable,
@@ -22498,7 +22487,6 @@ __export(exports_src, {
   isVaultCommandLine: () => isVaultCommandLine,
   isTranscriptionConfigured: () => isTranscriptionConfigured,
   isTopicVisible: () => isTopicVisible,
-  isTopicShared: () => isTopicShared,
   isTopicRunning: () => isTopicRunning,
   isSensitivePath: () => isSensitivePath,
   isParticipant: () => isParticipant,
@@ -22548,6 +22536,7 @@ __export(exports_src, {
   deliverAskCallbackToCaller: () => deliverAskCallbackToCaller,
   deleteVaultEntry: () => deleteVaultEntry,
   deleteTopicCascade: () => deleteTopicCascade,
+  defaultTopicSurface: () => defaultTopicSurface,
   db: () => db,
   createSubagentManagementToolDefinitions: () => createSubagentManagementToolDefinitions,
   createSpawnSubagentToolDefinition: () => createSpawnSubagentToolDefinition,
@@ -22639,7 +22628,6 @@ var init_src = __esm(async () => {
   await init_execute_external_user_turn();
   await init_submit_runtime_gateway_turn();
   await init_submit_user_message();
-  await init_switch_topic_access_mode();
   await init_switch_topic_effort();
   await init_switch_topic_model();
   await init_topic_service();
@@ -22805,10 +22793,10 @@ var init_conversation_migration = __esm(async () => {
 // ../../packages/core/src/node-host.ts
 var exports_node_host = {};
 __export(exports_node_host, {
+  upsertTopic: () => upsertTopic,
   topicService: () => topicService,
   switchTopicModel: () => switchTopicModel,
   switchTopicEffort: () => switchTopicEffort,
-  switchTopicAccessMode: () => switchTopicAccessMode,
   sweepStaleSubagentCards: () => sweepStaleSubagentCards,
   submitUserMessage: () => submitUserMessage,
   submitRuntimeGatewayTurn: () => submitRuntimeGatewayTurn,
@@ -22842,7 +22830,6 @@ __export(exports_node_host, {
   killOwnedCodexTreesForShutdown: () => killOwnedCodexTreesForShutdown,
   killAllPlaywright: () => killAllPlaywright,
   killAllBgBash: () => killAllBgBash,
-  isTopicShared: () => isTopicShared,
   isParticipant: () => isParticipant,
   getVisibleTopics: () => getVisibleTopics,
   getTopicStats: () => getTopicStats,
@@ -22852,6 +22839,7 @@ __export(exports_node_host, {
   ensurePersonalGeneral: () => ensurePersonalGeneral,
   deleteVaultEntry: () => deleteVaultEntry,
   compactTopicSession: () => compactTopicSession,
+  appendApiMessage: () => appendApiMessage,
   acquireRuntimeProcessLease: () => acquireRuntimeProcessLease,
   abortAllRooms: () => abortAllRooms,
   WsHub: () => WsHub,
@@ -22863,6 +22851,7 @@ __export(exports_node_host, {
   STATE_DIR: () => STATE_DIR,
   RuntimeGatewayIdempotencyConflictError: () => RuntimeGatewayIdempotencyConflictError,
   RUN_DIR: () => RUN_DIR,
+  NODE_ID: () => NODE_ID,
   NODE_CONTROL_TOKEN: () => NODE_CONTROL_TOKEN,
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION,
   NEGOTIUM_PORT: () => NEGOTIUM_PORT,
@@ -22874,7 +22863,6 @@ var init_node_host = __esm(async () => {
   await init_spawn_subagent();
   await init_submit_runtime_gateway_turn();
   await init_submit_user_message();
-  await init_switch_topic_access_mode();
   await init_switch_topic_effort();
   await init_switch_topic_model();
   await init_topic_service();
@@ -24150,7 +24138,8 @@ var init_session_comm = __esm(async () => {
 function createSessionTargetCatalog(host2) {
   const { currentTopicId, currentTopicName, isAgent, listRows } = host2;
   function listTargets() {
-    const eligibleRows = listRows().filter((row) => row.kind !== "manager");
+    const currentSurface = host2.currentSurface;
+    const eligibleRows = listRows().filter((row) => row.kind !== "manager" && (!currentSurface || (row.surface ?? currentSurface) === currentSurface));
     const titleCounts = new Map;
     const qualifiedCounts = new Map;
     for (const row of eligibleRows) {
@@ -24266,9 +24255,11 @@ function currentTopic(context) {
   return topic;
 }
 function targetCatalog(context) {
+  const surface = (context.currentTopicId ? getTopic(context.currentTopicId)?.surface : undefined) ?? defaultTopicSurface();
   return createSessionTargetCatalog({
     currentTopicId: context.currentTopicId,
     currentTopicName: context.currentTopic,
+    currentSurface: surface,
     isAgent: isAgentKind,
     listRows: () => listTopics().filter((topic) => topic.participants.some((p) => p.userId === context.userId)).map((topic) => ({
       id: topic.id,
@@ -24276,7 +24267,8 @@ function targetCatalog(context) {
       kind: topic.kind ?? null,
       agent: topic.agent ?? null,
       sessionId: null,
-      description: topic.description ?? null
+      description: topic.description ?? null,
+      surface: topic.surface ?? null
     }))
   });
 }
@@ -27512,6 +27504,7 @@ __export(exports_storage_public, {
   softDeleteApiMessagesByIdPrefix: () => softDeleteApiMessagesByIdPrefix,
   softDeleteApiMessage: () => softDeleteApiMessage,
   settleTopicArchiveJob: () => settleTopicArchiveJob,
+  setTopicSurfaces: () => setTopicSurfaces,
   setTopicSessionId: () => setTopicSessionId,
   setTopicMcpExtra: () => setTopicMcpExtra,
   setTopicMcpEnabled: () => setTopicMcpEnabled,
@@ -27522,7 +27515,6 @@ __export(exports_storage_public, {
   setTopicAgentAndSession: () => setTopicAgentAndSession,
   setTopicAgentAndClearSession: () => setTopicAgentAndClearSession,
   setTopicAgent: () => setTopicAgent,
-  setTopicAccessModes: () => setTopicAccessModes,
   setSessionForTopic: () => setSessionForTopic,
   setLastShownConfig: () => setLastShownConfig,
   setGlobalAiName: () => setGlobalAiName,
@@ -27556,9 +27548,9 @@ __export(exports_storage_public, {
   quarantineAskUserGate: () => quarantineAskUserGate,
   prepareAskUserGate: () => prepareAskUserGate,
   normalizeTopicVisibility: () => normalizeTopicVisibility,
+  normalizeTopicSurface: () => normalizeTopicSurface,
   normalizeTopicState: () => normalizeTopicState,
   normalizeTopicKind: () => normalizeTopicKind,
-  normalizeTopicAccessMode: () => normalizeTopicAccessMode,
   normalizeAiMode: () => normalizeAiMode,
   markPendingAskState: () => markPendingAskState,
   markPendingAskSources: () => markPendingAskSources,
@@ -27573,7 +27565,6 @@ __export(exports_storage_public, {
   listApiMessages: () => listApiMessages,
   isTopicVisible: () => isTopicVisible,
   isTopicSummaryFile: () => isTopicSummaryFile,
-  isTopicShared: () => isTopicShared,
   isTopicBriefFile: () => isTopicBriefFile,
   isRuntimeProcessLeaseAlive: () => isRuntimeProcessLeaseAlive,
   inferTopicKind: () => inferTopicKind,
@@ -27634,6 +27625,7 @@ __export(exports_storage_public, {
   deletePendingAsksForTopic: () => deletePendingAsksForTopic,
   deleteMessagesForTopic: () => deleteMessagesForTopic,
   deleteApiTopicConfig: () => deleteApiTopicConfig,
+  defaultTopicSurface: () => defaultTopicSurface,
   db: () => db2,
   createTasks: () => createTasks,
   createPendingAsk: () => createPendingAsk,
@@ -29347,13 +29339,19 @@ function requiredText(value, name) {
   }
   return value.trim();
 }
-function topicsForUser(userId) {
+function topicsForUser(userId, surface) {
   const runningTopics = listRunningTopicQueries();
-  return getVisibleTopics().filter((topic) => isParticipant(topic, userId)).map((topic) => {
+  return getVisibleTopics(surface ? { surface } : {}).filter((topic) => isParticipant(topic, userId)).map((topic) => {
     const runningQueryId = runningTopics.get(topic.id);
     return { ...topic, running: Boolean(runningQueryId), runningQueryId };
   });
 }
+function requestedSurface(url) {
+  const raw = url.searchParams.get("surface")?.trim();
+  if (!raw)
+    return;
+  return raw === "terminal" || raw === "telegram" || raw === "otium" ? raw : undefined;
+}
 function topicForUser(topicId, userId) {
   const topic = getTopic(topicId);
   return topic && isParticipant(topic, userId) ? topic : null;
@@ -29437,13 +29435,15 @@ function createNodeControlHandler(options) {
             ok: true,
             v: NODE_RUNTIME_CONTRACT_VERSION,
             nodeVersion: NODE_VERSION,
+            nodeId: NODE_ID,
             capabilities: [
               "turn-submit-idempotent",
               "turn-events-sse-resume",
               "canonical-topic-read",
               "canonical-message-read",
               "canonical-topic-list",
-              "canonical-topic-create"
+              "canonical-topic-create",
+              "canonical-history-import"
             ],
             cursor: latestRuntimeEventSeq()
           });
@@ -29508,11 +29508,7 @@ function createNodeControlHandler(options) {
           return Response.json({ ok: true, v: NODE_RUNTIME_CONTRACT_VERSION, ...result });
         }
         if (req.method === "GET" && runtimePath === "/topics") {
-          const accessMode = url.searchParams.get("accessMode")?.trim();
-          if (accessMode && accessMode !== "shared" && accessMode !== "private") {
-            return jsonError(400, "accessMode must be 'shared' or 'private'");
-          }
-          const topics = getVisibleTopics().filter((topic) => accessMode === "shared" ? isTopicShared(topic) : accessMode === "private" ? !isTopicShared(topic) : true);
+          const topics = getVisibleTopics({ surface: "otium" });
           return Response.json({
             ok: true,
             v: NODE_RUNTIME_CONTRACT_VERSION,
@@ -29534,11 +29530,60 @@ function createNodeControlHandler(options) {
             title,
             userId,
             kind: "agent",
-            accessMode: "shared",
+            surface: "otium",
             ...agent ? { agent } : {}
           });
           return Response.json({ ok: true, v: NODE_RUNTIME_CONTRACT_VERSION, topic }, { status: 201 });
         }
+        const importMatch = runtimePath.match(/^\/topics\/([^/]+)\/import$/);
+        if (importMatch && req.method === "POST") {
+          const body = await bodyRecord(req);
+          if (body.v !== NODE_RUNTIME_CONTRACT_VERSION)
+            return jsonError(400, "Unsupported v");
+          const topicId = decodeURIComponent(importMatch[1]);
+          const topic = getTopic(topicId);
+          if (!topic)
+            return jsonError(404, "Topic not found");
+          if (!Array.isArray(body.messages)) {
+            return jsonError(400, "messages must be an array");
+          }
+          if (listApiMessages(topicId, { limit: 1 }).page.length > 0) {
+            return jsonError(409, "topic already has messages");
+          }
+          const messages = body.messages;
+          for (const [index, message] of messages.entries()) {
+            if (typeof message?.id !== "string" || typeof message?.authorId !== "string" || typeof message?.text !== "string" || typeof message?.createdAt !== "string") {
+              return jsonError(400, `messages[${index}] needs id, authorId, text and createdAt`);
+            }
+          }
+          let imported = 0;
+          for (const message of messages) {
+            appendApiMessage({
+              id: message.id,
+              topicId,
+              authorId: message.authorId,
+              text: message.text,
+              createdAt: message.createdAt,
+              deleted: false,
+              ...typeof message.agentType === "string" ? { agentType: message.agentType } : {},
+              ...typeof message.model === "string" ? { model: message.model } : {}
+            }, { notify: false, updateTopicLastMessageAt: false });
+            imported += 1;
+          }
+          if (imported > 0) {
+            const stamps = messages.map((message) => message.createdAt).sort();
+            upsertTopic({
+              ...topic,
+              createdAt: stamps[0] < topic.createdAt ? stamps[0] : topic.createdAt,
+              lastMessageAt: stamps[stamps.length - 1]
+            });
+          }
+          return Response.json({
+            ok: true,
+            v: NODE_RUNTIME_CONTRACT_VERSION,
+            imported
+          });
+        }
         const runtimeTopicMatch = runtimePath.match(/^\/topics\/([^/]+)$/);
         if (runtimeTopicMatch && req.method === "GET") {
           const topic = getTopic(decodeURIComponent(runtimeTopicMatch[1]));
@@ -29570,13 +29615,13 @@ function createNodeControlHandler(options) {
           ok: true,
           protocolVersion: NODE_CONTROL_PROTOCOL_VERSION,
           nodeVersion: NODE_VERSION,
-          topics: topicsForUser(userId),
+          topics: topicsForUser(userId, requestedSurface(url)),
           cursor: latestRuntimeEventSeq()
         });
       }
       if (req.method === "GET" && path === "/topics") {
         const userId = requiredText(url.searchParams.get("user"), "user");
-        return Response.json({ ok: true, topics: topicsForUser(userId) });
+        return Response.json({ ok: true, topics: topicsForUser(userId, requestedSurface(url)) });
       }
       if (req.method === "GET" && path === "/background-sessions") {
         const userId = requiredText(url.searchParams.get("user"), "user");
@@ -29707,24 +29752,6 @@ function createNodeControlHandler(options) {
           return jsonError(400, result.error);
         return Response.json({ ok: true, model: result.model, result: result.text });
       }
-      const accessModeMatch = path.match(/^\/topics\/([^/]+)\/access-mode$/);
-      if (accessModeMatch && req.method === "POST") {
-        const topicId = decodeURIComponent(accessModeMatch[1]);
-        const body = await bodyRecord(req);
-        const userId = requiredText(body.userId, "userId");
-        const accessMode = requiredText(body.accessMode, "accessMode");
-        if (accessMode !== "private" && accessMode !== "shared") {
-          return jsonError(400, `Unknown access mode: ${accessMode}`);
-        }
-        const result = switchTopicAccessMode({ topicId, userId, accessMode });
-        if (!result.ok)
-          return jsonError(400, result.error);
-        return Response.json({
-          ok: true,
-          accessMode: result.accessMode,
-          result: result.text
-        });
-      }
       const effortMatch = path.match(/^\/topics\/([^/]+)\/effort$/);
       if (effortMatch && req.method === "POST") {
         const topicId = decodeURIComponent(effortMatch[1]);
@@ -32069,8 +32096,6 @@ var init_commands = __esm(() => {
     { name: "model", usage: "/model", description: "choose the model" },
     { name: "effort", usage: "/effort", description: "choose reasoning effort" },
     { name: "topics", usage: "/topics", description: "open topic picker" },
-    { name: "public", usage: "/public", description: "share this topic with Otium Hub" },
-    { name: "private", usage: "/private", description: "make this topic local-only" },
     {
       name: "fork",
       usage: "/fork [name]",
@@ -32416,8 +32441,7 @@ function topicPickerItems(state) {
   const indexedTopics = state.topics.map((topic, index) => ({ topic, index })).filter(({ topic }) => visible.has(topic.id));
   return [
     ...indexedTopics.filter(({ topic }) => topic.kind === "manager").map(({ topic, index }) => ({ kind: "topic", id: topic.id, index })),
-    ...indexedTopics.filter(({ topic }) => topic.kind !== "manager" && topic.accessMode !== "shared").map(({ topic, index }) => ({ kind: "topic", id: topic.id, index })),
-    ...indexedTopics.filter(({ topic }) => topic.kind !== "manager" && topic.accessMode === "shared").map(({ topic, index }) => ({ kind: "topic", id: topic.id, index })),
+    ...indexedTopics.filter(({ topic }) => topic.kind !== "manager").map(({ topic, index }) => ({ kind: "topic", id: topic.id, index })),
     ...visibleBackgroundSessions(state).map((session) => ({
       kind: "background",
       id: session.id
@@ -32496,7 +32520,7 @@ function setTopics(state, topics, preferredTitle) {
     activeTopicId: nextActive,
     scrollOffset: nextActive === state.activeTopicId ? state.scrollOffset : 0,
     askChoiceIndex: nextActive === state.activeTopicId ? state.askChoiceIndex : 0,
-    topicPickerIndex: state.overlay === "topics" || state.overlay === "confirm-share" ? pickedTopicIndex : Math.max(0, orderedTopics.findIndex((topic) => topic.id === nextActive)),
+    topicPickerIndex: state.overlay === "topics" ? pickedTopicIndex : Math.max(0, orderedTopics.findIndex((topic) => topic.id === nextActive)),
     topicPickerBackgroundId: state.topicPickerBackgroundId
   });
 }
@@ -34034,7 +34058,7 @@ function helpLines() {
     line(""),
     line("  Commands", { fg: theme.cyan, bold: true }),
     line("  /new  /model  /effort  /status  /context"),
-    line("  /topics  /public  /private  /fork  /spawn"),
+    line("  /topics  /fork  /spawn"),
     line("  /del  /copy  /abort  /help  /quit", { fg: theme.muted })
   ];
 }
@@ -34157,8 +34181,8 @@ function topicPickerHints(topicPickerRoot) {
   const exit = topicPickerRoot ? "Esc/Ctrl-C exit" : "Esc close \xB7 Ctrl-C exit; work continues";
   const shortExit = topicPickerRoot ? "Esc/Ctrl-C exit" : "Esc close";
   const candidates = [
-    `\u2191\u2193 select \xB7 Enter open \xB7 type to filter \xB7 Ctrl-N new \xB7 Ctrl-D delete \xB7 Ctrl-P public/private \xB7 ${exit}`,
-    `\u2191\u2193 select \xB7 Enter open \xB7 type to filter \xB7 Ctrl-N new \xB7 Ctrl-D delete \xB7 Ctrl-P public/private \xB7 ${shortExit}`,
+    `\u2191\u2193 select \xB7 Enter open \xB7 type to filter \xB7 Ctrl-N new \xB7 Ctrl-D delete \xB7 ${exit}`,
+    `\u2191\u2193 select \xB7 Enter open \xB7 type to filter \xB7 Ctrl-N new \xB7 Ctrl-D delete \xB7 ${shortExit}`,
     `\u2191\u2193 select \xB7 Enter open \xB7 type to filter \xB7 Ctrl-N new \xB7 Ctrl-D delete \xB7 ${exit}`,
     `\u2191\u2193 select \xB7 Enter open \xB7 type to filter \xB7 Ctrl-N/D/P \xB7 ${shortExit}`,
     "\u2191\u2193 \xB7 Enter \xB7 type to filter \xB7 Ctrl-N/D/P",
@@ -34180,13 +34204,11 @@ function topicOverlayLines(state, width, height, animationFrame = 0) {
   const visibleIds = visibleTopicPickerIds(state);
   const indexedTopics = state.topics.map((topic, topicIndex) => ({ topic, topicIndex })).filter(({ topic }) => visibleIds.has(topic.id));
   const managerTopics = indexedTopics.filter(({ topic }) => topic.kind === "manager");
-  const privateTopics = indexedTopics.filter(({ topic }) => topic.kind !== "manager" && topic.accessMode !== "shared");
-  const publicTopics = indexedTopics.filter(({ topic }) => topic.kind !== "manager" && topic.accessMode === "shared");
+  const regularTopics = indexedTopics.filter(({ topic }) => topic.kind !== "manager");
   const entries = [];
   for (const [label, topics] of [
     ["Manager", managerTopics],
-    ["Private", privateTopics],
-    ["Public", publicTopics]
+    ["Topics", regularTopics]
   ]) {
     if (topics.length === 0)
       continue;
@@ -34521,34 +34543,6 @@ function conversationLines(state, width, height, animationFrame = 0, nowMs = ter
       line("  Press y to delete or n to cancel.", { fg: theme.amber })
     ].slice(0, height);
   }
-  if (state.overlay === "confirm-share") {
-    const topic = state.topics.find((candidate) => candidate.id === state.pendingShareTopicId);
-    const subagents = (() => {
-      if (!topic)
-        return 0;
-      const reached = new Set([topic.id]);
-      for (;; ) {
-        const next = state.topics.filter((candidate) => candidate.isSubagent && !reached.has(candidate.id) && candidate.parentTopicId !== undefined && reached.has(candidate.parentTopicId));
-        if (next.length === 0)
-          break;
-        for (const candidate of next)
-          reached.add(candidate.id);
-      }
-      return reached.size - 1;
-    })();
-    const scope = subagents > 0 ? `  Its ${subagents} subagent room${subagents === 1 ? "" : "s"} become public too.` : "  Subagent rooms spawned from it will be public too.";
-    return [
-      line(""),
-      line(`  Make \u201C${topic?.title ?? "this topic"}\u201D public?`, {
-        fg: theme.amber,
-        bold: true
-      }),
-      line(""),
-      line("  The transcript becomes visible to the connected Otium Hub."),
-      line(scope),
-      line("  Press y to publish or n to cancel.", { fg: theme.amber })
-    ].slice(0, height);
-  }
   const all = conversationContentLines(state, width, animationFrame, nowMs, includeTasks);
   const { contentHeight, maxOffset, offset } = conversationViewport(all.length, height, state.scrollOffset);
   const end = all.length - offset;
@@ -34816,9 +34810,6 @@ function footerHintText(state) {
     }
     return state.topicPickerRoot ? ["Esc/Ctrl-C exit  ", "Esc exit  "] : ["Esc close \xB7 Ctrl-C exit; work continues  ", "Esc close \xB7 Ctrl-C exit  ", "Esc  "];
   }
-  if (state.overlay === "confirm-share") {
-    return ["Y make public \xB7 N cancel  ", "Y/N  "];
-  }
   if (state.overlay === "background-session") {
     return [
       "wheel/PgUp/PgDn scroll \xB7 Esc back \xB7 read-only  ",
@@ -35422,7 +35413,7 @@ class EmbeddedNegotiumClient {
   }
   listTopics() {
     const runningTopics = listRunningTopicQueries();
-    return getVisibleTopics().filter((topic) => topic.participants.some((participant) => participant.userId === this.#userId)).map((topic) => {
+    return getVisibleTopics({ surface: "terminal" }).filter((topic) => topic.participants.some((participant) => participant.userId === this.#userId)).map((topic) => {
       const runningQueryId = runningTopics.get(topic.id);
       return { ...topic, running: Boolean(runningQueryId), runningQueryId };
     });
@@ -35501,16 +35492,6 @@ class EmbeddedNegotiumClient {
       throw new Error(result.error);
     return result.text;
   }
-  setAccessMode(topic, accessMode) {
-    const result = switchTopicAccessMode({
-      topicId: topic.id,
-      userId: this.#userId,
-      accessMode
-    });
-    if (!result.ok)
-      throw new Error(result.error);
-    return result.text;
-  }
   async deleteTopic(topic) {
     await topicService.delete({ topicId: topic.id, userId: this.#userId });
   }
@@ -35595,7 +35576,7 @@ class RemoteNegotiumClient {
   async start(onEvent) {
     if (this.#started)
       return;
-    const session = await this.#request(`/session?user=${encodeURIComponent(this.#userId)}`);
+    const session = await this.#request(`/session?user=${encodeURIComponent(this.#userId)}&surface=terminal`);
     if (session.protocolVersion !== NODE_CONTROL_PROTOCOL_VERSION) {
       throw new Error(`Node protocol ${String(session.protocolVersion)} is incompatible with terminal protocol ${NODE_CONTROL_PROTOCOL_VERSION}`);
     }
@@ -35621,7 +35602,7 @@ class RemoteNegotiumClient {
     this.#onEvent = null;
   }
   async listTopics() {
-    const result = await this.#request(`/topics?user=${encodeURIComponent(this.#userId)}`);
+    const result = await this.#request(`/topics?user=${encodeURIComponent(this.#userId)}&surface=terminal`);
     return result.topics ?? [];
   }
   async listBackgroundSessions() {
@@ -35693,13 +35674,6 @@ class RemoteNegotiumClient {
     });
     return String(result.result ?? `Effort set to '${effort}'.`);
   }
-  async setAccessMode(topic, accessMode) {
-    const result = await this.#request(`/topics/${encodeURIComponent(topic.id)}/access-mode`, {
-      method: "POST",
-      body: JSON.stringify({ userId: this.#userId, accessMode })
-    });
-    return String(result.result ?? `Access mode set to '${accessMode}'.`);
-  }
   async deleteTopic(topic) {
     await this.#request(`/topics/${encodeURIComponent(topic.id)}?user=${encodeURIComponent(this.#userId)}`, { method: "DELETE" });
   }
@@ -36177,32 +36151,6 @@ async function runTerminalCommand(commandLine, context) {
     context.queueRender();
     return;
   }
-  if (command === "public" || command === "private") {
-    if (args.length > 0) {
-      context.state = { ...context.state, notice: `Usage: /${command}`, noticeLevel: "warn" };
-      context.queueRender();
-      return;
-    }
-    const topic = activeTopic(context.state);
-    if (!topic) {
-      context.state = { ...context.state, notice: "No topic selected", noticeLevel: "warn" };
-      context.queueRender();
-      return;
-    }
-    try {
-      const notice = await context.client.setAccessMode(topic, command === "public" ? "shared" : "private");
-      await context.refreshTopics(topic.title);
-      context.state = { ...context.state, notice, noticeLevel: "success" };
-    } catch (error2) {
-      context.state = {
-        ...context.state,
-        notice: error2 instanceof Error ? error2.message : String(error2),
-        noticeLevel: "error"
-      };
-    }
-    context.queueRender();
-    return;
-  }
   if (command === "compact") {
     const topic = activeTopic(context.state);
     if (!topic) {
@@ -37767,16 +37715,6 @@ class TerminalApp {
       }
       return;
     }
-    if (this.#state.overlay === "confirm-share") {
-      const key = chunk.toLowerCase();
-      if (CONFIRM_KEYS.has(key))
-        this.#confirmTopicShare();
-      else if (CANCEL_KEYS.has(key) || chunk === "\x1B") {
-        this.#state = { ...this.#state, overlay: "topics", pendingShareTopicId: undefined };
-        this.#queueRender();
-      }
-      return;
-    }
     if (this.#state.overlay === "background-session") {
       if (chunk === "\x1B") {
         this.#state = { ...this.#state, overlay: "topics" };
@@ -38085,22 +38023,6 @@ class TerminalApp {
       this.#queueRender();
       return;
     }
-    if (chunk === TOGGLE_ACCESS_MODE_KEY) {
-      const topic = pickedTopic(this.#state);
-      if (topic) {
-        this.#requestAccessModeToggle(topic);
-        return;
-      }
-      if (!this.#state.topicPickerBackgroundId)
-        return;
-      this.#state = {
-        ...this.#state,
-        notice: "Background sessions are read-only",
-        noticeLevel: "warn"
-      };
-      this.#queueRender();
-      return;
-    }
     if (FILTER_BACKSPACE_KEYS.has(chunk)) {
       if (this.#state.topicFilter.length === 0)
         return;
@@ -38543,65 +38465,6 @@ class TerminalApp {
     };
     this.#queueRender();
   }
-  async#requestAccessModeToggle(topic) {
-    if (topic.kind !== "agent") {
-      this.#state = {
-        ...this.#state,
-        notice: `${topic.kind === "manager" ? "Manager" : "Channel"} topics cannot be published`,
-        noticeLevel: "warn"
-      };
-      this.#queueRender();
-      return;
-    }
-    if (topic.isSubagent) {
-      this.#state = {
-        ...this.#state,
-        notice: "Subagent rooms inherit privacy from their parent topic",
-        noticeLevel: "warn"
-      };
-      this.#queueRender();
-      return;
-    }
-    if (topic.accessMode === "shared") {
-      await this.#applyAccessMode(topic, "private");
-      return;
-    }
-    this.#state = {
-      ...this.#state,
-      overlay: "confirm-share",
-      pendingShareTopicId: topic.id
-    };
-    this.#queueRender();
-  }
-  async#confirmTopicShare() {
-    const topic = this.#state.topics.find((candidate) => candidate.id === this.#state.pendingShareTopicId);
-    this.#state = { ...this.#state, overlay: "topics", pendingShareTopicId: undefined };
-    if (!topic) {
-      this.#state = {
-        ...this.#state,
-        notice: "That topic no longer exists",
-        noticeLevel: "warn"
-      };
-      this.#queueRender();
-      return;
-    }
-    await this.#applyAccessMode(topic, "shared");
-  }
-  async#applyAccessMode(topic, accessMode) {
-    this.#state = { ...this.#state, overlay: "topics" };
-    try {
-      const notice = await this.#client.setAccessMode(topic, accessMode);
-      await this.#refreshTopics();
-      this.#state = { ...this.#state, notice, noticeLevel: "success" };
-    } catch (error2) {
-      this.#state = {
-        ...this.#state,
-        notice: error2 instanceof Error ? error2.message : String(error2),
-        noticeLevel: "error"
-      };
-    }
-    this.#queueRender();
-  }
   #requestTopicDelete(topic) {
     if (!topic)
       return;
@@ -38880,7 +38743,6 @@ class TerminalApp {
         ...this.#state,
         overlay: null,
         pendingDeleteTopicId: undefined,
-        pendingShareTopicId: undefined,
         creatingTopic: false,
         notice: "Input cleared",
         noticeLevel: "info"
@@ -38943,7 +38805,7 @@ class TerminalApp {
       await this.#client.stop();
   }
 }
-var KITTY_KEYBOARD_PUSH = "\x1B[>1u", KITTY_KEYBOARD_POP = "\x1B[<u", CANVAS_RGB, ENTER_ALT_SCREEN, EXIT_ALT_SCREEN, ABORT_ENTER_ALT_SCREEN, NEW_TOPIC_KEY = "\x0E", DELETE_TOPIC_KEY = "\x04", TOGGLE_ACCESS_MODE_KEY = "\x10", FILTER_BACKSPACE_KEYS, CONFIRM_KEYS, CANCEL_KEYS, INPUT_CARRY_FLUSH_MS = 15;
+var KITTY_KEYBOARD_PUSH = "\x1B[>1u", KITTY_KEYBOARD_POP = "\x1B[<u", CANVAS_RGB, ENTER_ALT_SCREEN, EXIT_ALT_SCREEN, ABORT_ENTER_ALT_SCREEN, NEW_TOPIC_KEY = "\x0E", DELETE_TOPIC_KEY = "\x04", FILTER_BACKSPACE_KEYS, CONFIRM_KEYS, CANCEL_KEYS, INPUT_CARRY_FLUSH_MS = 15;
 var init_app = __esm(async () => {
   await init_src();
   await init_app_helpers();
@@ -39421,7 +39283,7 @@ function createTelegramCommandRouter(context) {
         return;
       }
       case "/topics": {
-        const topics = listTopics().filter((topic) => isTopicVisible(topic) && topic.participants.some((person) => person.userId === userId));
+        const topics = listTopics({ surface: "telegram" }).filter((topic) => isTopicVisible(topic) && topic.participants.some((person) => person.userId === userId));
         reply(chatId, threadId, topics.length ? topics.map((topic) => `- ${topic.title}${topic.agent ? ` (${topic.agent})` : ""}`).join(`
 `) : "no topics");
         return;
@@ -39451,6 +39313,7 @@ function createTelegramCommandRouter(context) {
             title: argument,
             userId,
             kind: "agent",
+            surface: "telegram",
             ...context.defaultAgent ? { agent: context.defaultAgent } : {}
           };
           const fromForumGeneral = context.forum?.enabled === true && chatId === context.forum.chatId && threadId === undefined;
@@ -39669,6 +39532,15 @@ function openMappingStore(path) {
     clearForumChatId() {
       db4.run("DELETE FROM settings WHERE key = 'forum_chat_id'");
     },
+    isFlagSet(key) {
+      return db4.query("SELECT 1 FROM settings WHERE key = ?").get(key) !== null;
+    },
+    setFlag(key) {
+      db4.run("INSERT OR REPLACE INTO settings (key, value) VALUES (?, ?)", [
+        key,
+        new Date().toISOString()
+      ]);
+    },
     outboxEnqueue(entry) {
       db4.run(`INSERT INTO outbox
            (chat_id, thread_id, runtime_message_id, footer, html, plain, attempts, next_try_at, last_error)
@@ -40238,6 +40110,14 @@ function startTelegramAdapter(opts) {
     bindMapping(chatId, threadId, topic.id);
     return true;
   }
+  if (!store.isFlagSet(SURFACE_BACKFILL_FLAG)) {
+    const mappedIds = [...new Set(store.load().map((mapping) => mapping.topicId))];
+    const moved = setTopicSurfaces(mappedIds, "telegram");
+    store.setFlag(SURFACE_BACKFILL_FLAG);
+    if (moved > 0) {
+      logger.info({ moved, mapped: mappedIds.length }, "telegram adapter: moved mapped topics onto the telegram surface");
+    }
+  }
   for (const persisted of store.load()) {
     const topic = getTopic(persisted.topicId);
     if (topic?.participants.some((participant) => participant.userId === userId)) {
@@ -40258,13 +40138,13 @@ function startTelegramAdapter(opts) {
   function registerTopicLocal(options) {
     suppressMaterialize++;
     try {
-      return topicService.create(options);
+      return topicService.create({ ...options, surface: "telegram" });
     } finally {
       suppressMaterialize--;
     }
   }
   function getOrCreateTopic(title, agent) {
-    return getTopicByNameForUser(title, userId) ?? registerTopicLocal({ title, userId, kind: "agent", ...agent ? { agent } : {} });
+    return getTopicByNameForUser(title, userId, { surface: "telegram" }) ?? registerTopicLocal({ title, userId, kind: "agent", ...agent ? { agent } : {} });
   }
   function resolveMapping(chatId, threadId) {
     const cached = byKey.get(mappingKey(chatId, threadId));
@@ -40855,7 +40735,7 @@ ${suffix}`;
   function materializeVisibleTopics() {
     if (!forumMode || !forumManageTopicsAvailable)
       return;
-    for (const topic of listTopics()) {
+    for (const topic of listTopics({ surface: "telegram" })) {
       if (isTopicVisible(topic) && topic.participants.some((participant) => participant.userId === userId)) {
         materializeTopic(topic);
       }
@@ -41276,7 +41156,7 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
     }
   };
 }
-var FORUM_TOPIC_NAME_MAX = 128, MAX_PARENT_HOPS = 5, DEFAULT_SEND_TIMEOUT_MS = 60000, PHOTO_EXTS;
+var SURFACE_BACKFILL_FLAG = "surface_backfill_20260808", FORUM_TOPIC_NAME_MAX = 128, MAX_PARENT_HOPS = 5, DEFAULT_SEND_TIMEOUT_MS = 60000, PHOTO_EXTS;
 var init_adapter = __esm(async () => {
   await init_src();
   await init_commands2();
@@ -43934,7 +43814,7 @@ function requirePrimaryOrigin(peer) {
   return peer.verified.fromIsPrimary ? null : jsonError2("only the workspace hub may call this endpoint", 403);
 }
 function peerAddressable(topic) {
-  return isTopicShared(topic);
+  return topic.surface === "otium";
 }
 function localCapabilities() {
   const agents = SUPPORTED_AGENTS.map((kind) => {
@@ -44104,7 +43984,7 @@ async function handleSessions(req) {
   const userId = str(body, "userId");
   if (!userId)
     return jsonError2("userId is required", 400);
-  const topics = listTopics().filter((topic) => topic.kind !== "manager" && !topic.isSubagent && peerAddressable(topic) && topic.participants.some((p) => p.userId === userId));
+  const topics = listTopics({ surface: "otium" }).filter((topic) => topic.kind !== "manager" && !topic.isSubagent && peerAddressable(topic) && topic.participants.some((p) => p.userId === userId));
   const titleCounts = new Map;
   for (const topic of topics) {
     const normalized = topic.title.toLowerCase();
@@ -44820,26 +44700,8 @@ async function runOtiumCli(args = process.argv.slice(2)) {
       const { loadJoin: loadJoin2, removeJoin: removeJoin2 } = await init_join().then(() => exports_join);
       if (!loadJoin2())
         throw new Error("not joined to an Otium workspace");
-      const { getVisibleTopics: getVisibleTopics2, isTopicShared: isTopicShared2, switchTopicAccessMode: switchTopicAccessMode2 } = await init_src().then(() => exports_src);
-      let downgraded = 0;
-      for (const topic of getVisibleTopics2()) {
-        if (!isTopicShared2(topic))
-          continue;
-        const owner = topic.participants.find((participant) => participant.role === "owner");
-        if (!owner)
-          continue;
-        if (topic.isSubagent)
-          continue;
-        const switched = switchTopicAccessMode2({
-          topicId: topic.id,
-          userId: owner.userId,
-          accessMode: "private"
-        });
-        if (switched.ok)
-          downgraded += switched.topicIds.length;
-      }
       removeJoin2();
-      console.log(`disconnected from Otium; workspace credentials removed` + (downgraded > 0 ? `; ${downgraded} topic(s) are now private` : ""));
+      console.log("disconnected from Otium; workspace credentials removed");
       break;
     }
     case "serve": {
@@ -44913,11 +44775,7 @@ function topicsCommand() {
   }
   for (const t of topics) {
     const model = t.effectiveModel ?? t.defaultModel;
-    const flags = [
-      t.accessMode ?? "private",
-      t.isSubagent ? "subagent" : null,
-      t.isFork ? "fork" : null
-    ].filter(Boolean).join(",");
+    const flags = [t.isSubagent ? "subagent" : null, t.isFork ? "fork" : null].filter(Boolean).join(",");
     console.log(`${t.title}  ${t.agent ?? "no-ai"}${model ? `/${model}` : ""}` + `${flags ? `  [${flags}]` : ""}  ${t.id}`);
   }
 }
@@ -45565,4 +45423,4 @@ switch (command) {
   }
 }
 
-//# debugId=4A37A5D1997871CA64756E2164756E21
+//# debugId=488B733FDB6D1AD164756E2164756E21