negotium 0.2.24 → 0.2.26

package/dist/storage.js

@@ -1204,21 +1204,20 @@ function deleteApiTopicConfig(topicId) {
 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,
@@ -1231,6 +1230,7 @@ __export(exports_api_topics, {
   getManagerTopicForUser: () => getManagerTopicForUser,
   findTopicTitleConflict: () => findTopicTitleConflict,
   deleteTopic: () => deleteTopic,
+  defaultTopicSurface: () => defaultTopicSurface,
   clearTopicSessionId: () => clearTopicSessionId,
   aiMentionFromMode: () => aiMentionFromMode,
   addParticipantToDB: () => addParticipantToDB
@@ -1248,6 +1248,12 @@ var GENERAL_TOPIC_ID = "general";
 
 // ../../packages/core/src/storage/api-topics.ts
 var DEFAULT_AGENT_ROOM_AGENT = "maestro";
+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));
@@ -1378,7 +1384,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,
@@ -1424,8 +1430,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");
@@ -1479,8 +1485,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'");
@@ -1507,7 +1520,49 @@ 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)");
+}
+var SURFACE_BACKFILL_MIGRATION = "api_topics_surface_backfill_20260808";
+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, row.kind, normalizedTitle(title)].join("\x00");
+    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");
+  }
 }
 registerStorageSchemaInitializer(initializeApiTopicsSchema, 20);
 function shortSessionId(sessionId) {
@@ -1568,15 +1623,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";
 }
@@ -1653,7 +1702,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
@@ -1672,8 +1721,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 ?? defaultTopicSurface()), 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);
@@ -1686,18 +1735,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));
@@ -1748,14 +1787,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);
@@ -1768,7 +1808,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;
@@ -1777,9 +1830,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;
 }
@@ -4052,6 +4106,7 @@ export {
   softDeleteApiMessagesByIdPrefix,
   softDeleteApiMessage,
   settleTopicArchiveJob,
+  setTopicSurfaces,
   setTopicSessionId,
   setTopicMcpExtra,
   setTopicMcpEnabled,
@@ -4062,7 +4117,6 @@ export {
   setTopicAgentAndSession,
   setTopicAgentAndClearSession,
   setTopicAgent,
-  setTopicAccessModes,
   setSessionForTopic,
   setLastShownConfig,
   setGlobalAiName,
@@ -4096,9 +4150,9 @@ export {
   quarantineAskUserGate,
   prepareAskUserGate,
   normalizeTopicVisibility,
+  normalizeTopicSurface,
   normalizeTopicState,
   normalizeTopicKind,
-  normalizeTopicAccessMode,
   normalizeAiMode,
   markPendingAskState,
   markPendingAskSources,
@@ -4113,7 +4167,6 @@ export {
   listApiMessages,
   isTopicVisible,
   isTopicSummaryFile,
-  isTopicShared,
   isTopicBriefFile,
   isRuntimeProcessLeaseAlive,
   inferTopicKind,
@@ -4174,6 +4227,7 @@ export {
   deletePendingAsksForTopic,
   deleteMessagesForTopic,
   deleteApiTopicConfig,
+  defaultTopicSurface,
   db2 as db,
   createTasks,
   createPendingAsk,
@@ -4218,4 +4272,4 @@ export {
   ConversationLogDivergedError
 };
 
-//# debugId=F0363958E9B9826264756E2164756E21
+//# debugId=5FCBA76877162FB364756E2164756E21