negotium 0.7.1 → 0.8.0

package/dist/main.js

@@ -3708,7 +3708,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.7.1";
+var NEGOTIUM_VERSION = "0.8.0";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -7884,6 +7884,7 @@ __export(exports_api_topics, {
   upsertTopic: () => upsertTopic,
   stampUnscopedOtiumTopics: () => stampUnscopedOtiumTopics,
   setTopicSurfaces: () => setTopicSurfaces,
+  setTopicSurfaceScope: () => setTopicSurfaceScope,
   setTopicSessionId: () => setTopicSessionId,
   setSurfaceScopeRequired: () => setSurfaceScopeRequired,
   setDefaultSurfaceScope: () => setDefaultSurfaceScope,
@@ -8412,11 +8413,9 @@ 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();
+  return normalizeTopicSurface(t.surface ?? defaultTopicSurface()) === "otium" ? defaultSurfaceScope() : null;
 }
 function upsertTopic(t) {
   const normalized = normalizeTopicState({
@@ -8561,6 +8560,13 @@ function setTopicSurfaces(topicIds, surface) {
   })();
   return changed;
 }
+function setTopicSurfaceScope(topicId, surface, surfaceScope) {
+  const normalizedSurface = normalizeTopicSurface(surface);
+  const normalizedScope = normalizeSurfaceScope(surfaceScope);
+  const result = db.query(`UPDATE api_topics SET surface = ?, surface_scope = ?
+       WHERE id = ? AND (surface IS NOT ? OR surface_scope IS NOT ?)`).run(normalizedSurface, normalizedScope, topicId, normalizedSurface, normalizedScope);
+  return Number(result.changes ?? 0) > 0;
+}
 function getTopicByNameForUser(title, userId, lookupScope) {
   const opts = "scope" in lookupScope ? {} : lookupScope;
   const trimmed = title.trim();
@@ -11511,9 +11517,17 @@ var init_manager2 = __esm(async () => {
   }, 30 * 60 * 1000).unref();
 });
 
+// ../../packages/core/src/identifiers.ts
+function asTurnId(value) {
+  return value;
+}
+function asTurnSlotKey(value) {
+  return value;
+}
+
 // ../../packages/core/src/query/room-query-registry.ts
 function isolatedTurnRoomId(topicId, queryId) {
-  return `${topicId}${ISOLATED_TURN_ROOM_MARKER}${queryId}`;
+  return asTurnSlotKey(`${topicId}${ISOLATED_TURN_ROOM_MARKER}${queryId}`);
 }
 function isIsolatedTurnRoomId(roomId) {
   return roomId.includes(ISOLATED_TURN_ROOM_MARKER);
@@ -11642,6 +11656,7 @@ function createRoomQueryRegistry(host) {
   };
 }
 var ISOLATED_TURN_ROOM_MARKER = "::isolated-turn::";
+var init_room_query_registry = () => {};
 
 // ../../packages/core/src/query/types.ts
 var AbortReason;
@@ -11867,7 +11882,9 @@ var roomQueryRegistry, interSessionQueue;
 var init_active_rooms = __esm(async () => {
   init_logger();
   await init_runtime_leases();
+  init_room_query_registry();
   init_types2();
+  init_room_query_registry();
   roomQueryRegistry = createRoomQueryRegistry({
     instanceId: RUNTIME_INSTANCE_ID,
     internalAbortReason: "internal" /* Internal */,
@@ -19713,8 +19730,8 @@ function startAiTurn(params) {
   const askReplySources = params.askReplySources;
   const sessionRetried = params._sessionRetried === true;
   const emptyResponseRetried = params._emptyResponseRetried === true;
-  const queryId = params._queryId ?? randomUUID17();
-  const roomId = turnConcurrency === "isolated" ? isolatedTurnRoomId(topicId, queryId) : topicId;
+  const queryId = asTurnId(params._queryId ?? randomUUID17());
+  const roomId = turnConcurrency === "isolated" ? isolatedTurnRoomId(topicId, queryId) : asTurnSlotKey(topicId);
   const currentRuntimeEpoch = getRuntimeTopicEpoch(topic.id);
   const runtimeEpoch = params._runtimeEpoch ?? currentRuntimeEpoch;
   if (params._runtimeEpoch !== undefined && params._runtimeEpoch !== currentRuntimeEpoch) {
@@ -24134,6 +24151,7 @@ __export(exports_src, {
   startAiTurn: () => startAiTurn,
   stampUnscopedOtiumTopics: () => stampUnscopedOtiumTopics,
   setTopicSurfaces: () => setTopicSurfaces,
+  setTopicSurfaceScope: () => setTopicSurfaceScope,
   setTopicSessionId: () => setTopicSessionId,
   setSurfaceScopeRequired: () => setSurfaceScopeRequired,
   setRuntimeMcpPort: () => setRuntimeMcpPort,
@@ -29407,7 +29425,6 @@ __export(exports_storage_public, {
   waitForRequiredRuntimeProcessLease: () => waitForRequiredRuntimeProcessLease,
   validateDecisionGraph: () => validateDecisionGraph,
   upsertTopic: () => upsertTopic,
-  updateTopicThreadId: () => updateTopicThreadId,
   updateTasks: () => updateTasks,
   updateDecisions: () => updateDecisions,
   updateApiMessageUsage: () => updateApiMessageUsage,
@@ -29429,21 +29446,12 @@ __export(exports_storage_public, {
   softDeleteApiMessage: () => softDeleteApiMessage,
   settleTopicArchiveJob: () => settleTopicArchiveJob,
   setTopicSurfaces: () => setTopicSurfaces,
+  setTopicSurfaceScope: () => setTopicSurfaceScope,
   setTopicSessionId: () => setTopicSessionId,
-  setTopicMcpExtra: () => setTopicMcpExtra,
-  setTopicMcpEnabled: () => setTopicMcpEnabled,
-  setTopicForkOrigin: () => setTopicForkOrigin,
-  setTopicDescription: () => setTopicDescription,
   setTopicBrief: () => setTopicBrief,
   setTopicArchiveState: () => setTopicArchiveState,
-  setTopicAgentAndSession: () => setTopicAgentAndSession,
-  setTopicAgentAndClearSession: () => setTopicAgentAndClearSession,
-  setTopicAgent: () => setTopicAgent,
   setSurfaceScopeRequired: () => setSurfaceScopeRequired,
-  setSessionForTopic: () => setSessionForTopic,
-  setLastShownConfig: () => setLastShownConfig,
   setGlobalAiName: () => setGlobalAiName,
-  setDmSessionId: () => setDmSessionId,
   setDefaultSurfaceScope: () => setDefaultSurfaceScope,
   setApiTopicConfig: () => setApiTopicConfig,
   setApiTopicAgent: () => setApiTopicAgent,
@@ -29459,8 +29467,6 @@ __export(exports_storage_public, {
   reparentTopicChildren: () => reparentTopicChildren,
   renderTaskList: () => renderTaskList,
   renderDecisionList: () => renderDecisionList,
-  renameTopic: () => renameTopic,
-  removeTopic: () => removeTopic,
   removeSentFilesForTopic: () => removeSentFilesForTopic,
   removeParticipantFromDB: () => removeParticipantFromDB,
   removeDeadRuntimeProcessLeases: () => removeDeadRuntimeProcessLeases,
@@ -29503,49 +29509,34 @@ __export(exports_storage_public, {
   hasActiveConversation: () => hasActiveConversation,
   grantSubagentTellTarget: () => grantSubagentTellTarget,
   getWikiDir: () => getWikiDir,
-  getUserConfig: () => getUserConfig,
   getTopicStats: () => getTopicStats,
   getTopicSessionId: () => getTopicSessionId,
-  getTopicNames: () => getTopicNames,
   getTopicMemoryOrigin: () => getTopicMemoryOrigin,
   getTopicMemoryFilePaths: () => getTopicMemoryFilePaths,
-  getTopicMcpConfig: () => getTopicMcpConfig,
-  getTopicDescription: () => getTopicDescription,
   getTopicByNameForUser: () => getTopicByNameForUser,
   getTopicByNameAndKind: () => getTopicByNameAndKind,
   getTopicByName: () => getTopicByName,
   getTopicBrief: () => getTopicBrief,
   getTopicArchiveState: () => getTopicArchiveState,
-  getTopicAgentSwitchState: () => getTopicAgentSwitchState,
-  getTopicAgent: () => getTopicAgent,
   getTopic: () => getTopic,
   getThreadSummaries: () => getThreadSummaries,
   getTaskFilePath: () => getTaskFilePath,
   getStats: () => getStats,
   getSharedWikiDir: () => getSharedWikiDir,
-  getSessionForTopic: () => getSessionForTopic,
   getRuntimeProcessLease: () => getRuntimeProcessLease,
   getMessagesForTopicAfterRowid: () => getMessagesForTopicAfterRowid,
   getManagerTopicForUser: () => getManagerTopicForUser,
-  getLastShownConfig: () => getLastShownConfig,
   getLastMessagePreviews: () => getLastMessagePreviews,
   getGlobalAiName: () => getGlobalAiName,
-  getForumTopicByName: () => getTopicByName2,
-  getDmSessionId: () => getDmSessionId,
   getDecisionGraphSvgPath: () => getDecisionGraphSvgPath,
   getDecisionFilePath: () => getDecisionFilePath,
   getConversationPath: () => getConversationPath,
-  getCommunicateThreadId: () => getCommunicateThreadId,
   getApiTopicConfig: () => getApiTopicConfig,
   getApiMessage: () => getApiMessage,
-  getAllUserIds: () => getAllUserIds,
-  getAllTopics: () => getAllTopics,
   getAllMessagesForTopic: () => getAllMessagesForTopic,
   getActiveConversationPath: () => getActiveConversationPath,
   forum: () => exports_forum,
   formatTopicArchiveTranscriptRecord: () => formatTopicArchiveTranscriptRecord,
-  flushSessionCache: () => flushSessionCache,
-  findUserByThread: () => findUserByThread,
   findTopicTitleConflict: () => findTopicTitleConflict,
   findRecentUserMessage: () => findRecentUserMessage,
   findLastSessionIdForAgent: () => findLastSessionIdForAgent,
@@ -29573,10 +29564,8 @@ __export(exports_storage_public, {
   configureStorageHost: () => configureStorageHost2,
   cloneConversationLog: () => cloneConversationLog,
   clearTopicSessionId: () => clearTopicSessionId,
-  clearSessionForTopic: () => clearSessionForTopic,
   clearPendingAskSources: () => clearPendingAskSources,
   clearPendingAsk: () => clearPendingAsk,
-  clearDmSessionId: () => clearDmSessionId,
   claimTopicArchiveJob: () => claimTopicArchiveJob,
   claimAskUserGateAndSelect: () => claimAskUserGateAndSelect,
   captureMessageSnapshotForTopic: () => captureMessageSnapshotForTopic,
@@ -29596,7 +29585,6 @@ __export(exports_storage_public, {
   apiMessages: () => exports_api_messages,
   anonymizeApiMessages: () => anonymizeApiMessages,
   aiMentionFromMode: () => aiMentionFromMode,
-  addTopic: () => addTopic,
   addParticipantToDB: () => addParticipantToDB,
   activityLog: () => exports_activity_log,
   acquireRuntimeProcessLease: () => acquireRuntimeProcessLease,
@@ -29628,7 +29616,6 @@ var init_storage_public = __esm(async () => {
   await init_decisions();
   init_decisions();
   await init_forum();
-  await init_forum();
   await init_runtime_process_leases();
   init_runtime_process_leases();
   await init_session_asks();
@@ -29643,7 +29630,6 @@ var init_storage_public = __esm(async () => {
   await init_topic_archive_state();
   init_topic_archive_state();
   await init_topic_settings();
-  init_topic_settings();
   await init_wiki();
   init_wiki();
   init_wiki_summary_names();
@@ -42719,12 +42705,15 @@ var init_telegram_api = __esm(() => {
 });
 
 // ../../adapters/telegram/src/commands.ts
-function resolveTelegramTopicArg(argument, userId) {
-  const byName = getTopicByNameForUser(argument, userId, { surface: "telegram" });
+function resolveTelegramTopicArg(argument, userId, surfaceScope) {
+  const byName = getTopicByNameForUser(argument, userId, {
+    surface: "telegram",
+    surfaceScope
+  });
   if (byName)
     return byName;
   const byId = getTopic(argument);
-  return byId?.surface === "telegram" ? byId : null;
+  return byId?.surface === "telegram" && (byId.surfaceScope ?? null) === surfaceScope ? byId : null;
 }
 function createTelegramCommandRouter(context) {
   const { userId, reply, currentTopicId, bindMapping, loadTopic, unloadTopic, abortTurn } = context;
@@ -42762,7 +42751,7 @@ function createTelegramCommandRouter(context) {
           return;
         }
         try {
-          const topic = context.getOrCreateTopic(`${context.titleFor(chatId, threadId)}-${argument}`, argument);
+          const topic = context.getOrCreateTopic(chatId, `${context.titleFor(chatId, threadId)}-${argument}`, argument);
           bindMapping(chatId, threadId, topic.id);
           reply(chatId, threadId, `agent set to ${argument} \u2014 topic "${topic.title}"`);
         } catch (err2) {
@@ -42771,7 +42760,10 @@ function createTelegramCommandRouter(context) {
         return;
       }
       case "/topics": {
-        const topics = listTopics({ surface: "telegram" }).filter((topic) => isTopicVisible(topic) && topic.participants.some((person) => person.userId === userId));
+        const topics = listTopics({
+          surface: "telegram",
+          surfaceScope: context.surfaceScopeFor(chatId)
+        }).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;
@@ -42802,9 +42794,10 @@ function createTelegramCommandRouter(context) {
             userId,
             kind: "agent",
             surface: "telegram",
+            surfaceScope: context.surfaceScopeFor(chatId),
             ...context.defaultAgent ? { agent: context.defaultAgent } : {}
           };
-          const fromForumGeneral = context.forum?.enabled === true && chatId === context.forum.chatId && threadId === undefined;
+          const fromForumGeneral = context.isForumGeneral(chatId, threadId);
           const topic = fromForumGeneral ? topicService.create(createOptions) : context.registerTopic(createOptions);
           if (fromForumGeneral) {
             reply(chatId, threadId, `creating new topic "${topic.title}"`);
@@ -42822,7 +42815,7 @@ function createTelegramCommandRouter(context) {
           reply(chatId, threadId, "usage: /load <topic>");
           return;
         }
-        const candidate = resolveTelegramTopicArg(argument, userId);
+        const candidate = resolveTelegramTopicArg(argument, userId, context.surfaceScopeFor(chatId));
         const topic = candidate && isTopicVisible(candidate) ? candidate : null;
         if (!topic || !loadTopic(chatId, topic.id, threadId)) {
           reply(chatId, threadId, `no visible topic matching "${argument}"`);
@@ -42867,7 +42860,7 @@ function createTelegramCommandRouter(context) {
       case "/del!": {
         const force = command === "/del!";
         const topicId = currentTopicId(chatId, threadId);
-        const topic = argument ? resolveTelegramTopicArg(argument, userId) : topicId ? getTopic(topicId) : null;
+        const topic = argument ? resolveTelegramTopicArg(argument, userId, context.surfaceScopeFor(chatId)) : topicId ? getTopic(topicId) : null;
         if (!topic) {
           reply(chatId, threadId, argument ? `no topic named "${argument}"` : "this chat has no topic \u2014 usage: /del [name]");
           return;
@@ -42952,6 +42945,12 @@ function createTables(db4) {
       key TEXT PRIMARY KEY,
       value TEXT NOT NULL
     )`);
+  db4.run(`CREATE TABLE IF NOT EXISTS telegram_groups (
+      chat_id INTEGER PRIMARY KEY,
+      title TEXT,
+      owner_telegram_user_id INTEGER,
+      created_at TEXT NOT NULL
+    )`);
   db4.run(`CREATE TABLE IF NOT EXISTS runtime_inbox (
       seq INTEGER PRIMARY KEY,
       runtime_message_id TEXT,
@@ -42981,6 +42980,14 @@ function openMappingStore(path) {
   const db4 = new Database2(dbPath);
   migrateLegacySchema(db4);
   createTables(db4);
+  const legacyForum = db4.query("SELECT value FROM settings WHERE key = 'forum_chat_id'").get();
+  if (legacyForum) {
+    const chatId = Number.parseInt(legacyForum.value, 10);
+    if (Number.isSafeInteger(chatId)) {
+      db4.run(`INSERT OR IGNORE INTO telegram_groups (chat_id, created_at)
+         VALUES (?, ?)`, [chatId, new Date().toISOString()]);
+    }
+  }
   migrateOutboxSchema(db4);
   migrateRuntimeInboxSchema(db4);
   return {
@@ -43033,6 +43040,32 @@ function openMappingStore(path) {
     clearForumChatId() {
       db4.run("DELETE FROM settings WHERE key = 'forum_chat_id'");
     },
+    loadGroups() {
+      const rows = db4.query("SELECT chat_id, title, owner_telegram_user_id FROM telegram_groups ORDER BY created_at").all();
+      return rows.map((row) => ({
+        chatId: row.chat_id,
+        ...row.title ? { title: row.title } : {},
+        ...row.owner_telegram_user_id !== null ? { ownerTelegramUserId: row.owner_telegram_user_id } : {}
+      }));
+    },
+    saveGroup(group) {
+      db4.run(`INSERT INTO telegram_groups (chat_id, title, owner_telegram_user_id, created_at)
+         VALUES (?, ?, ?, ?)
+         ON CONFLICT(chat_id) DO UPDATE SET
+           title = COALESCE(excluded.title, telegram_groups.title),
+           owner_telegram_user_id = COALESCE(
+             excluded.owner_telegram_user_id,
+             telegram_groups.owner_telegram_user_id
+           )`, [
+        group.chatId,
+        group.title ?? null,
+        group.ownerTelegramUserId ?? null,
+        new Date().toISOString()
+      ]);
+    },
+    deleteGroup(chatId) {
+      db4.run("DELETE FROM telegram_groups WHERE chat_id = ?", [chatId]);
+    },
     isFlagSet(key) {
       return db4.query("SELECT 1 FROM settings WHERE key = ?").get(key) !== null;
     },
@@ -43372,6 +43405,15 @@ function renderOutbound(text2, maxLen = 4096) {
 // ../../adapters/telegram/src/adapter.ts
 import { existsSync as existsSync37 } from "fs";
 import { basename as basename13, extname as extname6 } from "path";
+function telegramGroupScope(chatId) {
+  return `tg:${chatId}`;
+}
+function telegramGroupIdFromScope(scope) {
+  if (!scope?.startsWith("tg:"))
+    return null;
+  const chatId = Number(scope.slice(3));
+  return Number.isSafeInteger(chatId) ? chatId : null;
+}
 function startTelegramAdapter(opts) {
   const { client, forumChatId } = opts;
   const userId = opts.userId ?? "local";
@@ -43390,16 +43432,42 @@ function startTelegramAdapter(opts) {
   const dispatchTurn = opts.startTurn ?? startAiTurn;
   const store = openMappingStore(opts.mappingDbPath);
   const restoredForumChatId = store.loadForumChatId();
-  const initialForumChatId = forumChatId ?? restoredForumChatId;
-  let forumChat = initialForumChatId ?? 0;
-  let forumMode = initialForumChatId !== undefined && typeof client.createForumTopic === "function";
-  let forumManageTopicsAvailable = forumMode && forumChatId !== undefined;
-  if (forumChatId !== undefined)
+  if (forumChatId !== undefined) {
+    store.saveGroup({ chatId: forumChatId });
     store.saveForumChatId(forumChatId);
-  if (initialForumChatId !== undefined && !forumMode) {
-    logger.warn({ forumChatId: initialForumChatId }, "telegram adapter: forumChatId set but client lacks createForumTopic \u2014 forum mode disabled");
+  }
+  const forumGroups = new Map;
+  for (const group of store.loadGroups()) {
+    forumGroups.set(group.chatId, {
+      chatId: group.chatId,
+      manageTopicsAvailable: group.chatId === forumChatId,
+      configured: group.chatId === forumChatId,
+      permissionRevision: 0
+    });
+  }
+  if (restoredForumChatId !== undefined && !forumGroups.has(restoredForumChatId)) {
+    forumGroups.set(restoredForumChatId, {
+      chatId: restoredForumChatId,
+      manageTopicsAvailable: false,
+      configured: false,
+      permissionRevision: 0
+    });
+  }
+  if (forumGroups.size > 0 && typeof client.createForumTopic !== "function") {
+    logger.warn({ forumChatIds: [...forumGroups.keys()] }, "telegram adapter: forum groups configured but client lacks createForumTopic");
   }
   const personalGeneral = ensurePersonalGeneral(userId, "telegram");
+  const groupGenerals = new Map;
+  const generalForGroup = (chatId) => {
+    const existing = groupGenerals.get(chatId);
+    if (existing)
+      return existing;
+    const general = ensurePersonalGeneral(userId, "telegram", {
+      surfaceScope: telegramGroupScope(chatId)
+    });
+    groupGenerals.set(chatId, general);
+    return general;
+  };
   const byKey = new Map;
   const byTopic = new Map;
   const targetByQueryId = new Map;
@@ -43573,6 +43641,22 @@ function startTelegramAdapter(opts) {
   }
   function bindMapping(chatId, threadId, topicId, { persist = true } = {}) {
     const key = mappingKey(chatId, threadId);
+    if (forumGroups.has(chatId)) {
+      const topic = getTopic(topicId);
+      const expectedScope = telegramGroupScope(chatId);
+      if (!topic || topic.surface !== "telegram" || (topic.surfaceScope ?? null) !== expectedScope) {
+        throw new Error(`refusing to bind Telegram group ${chatId} to topic ${topicId} outside ${expectedScope}`);
+      }
+      for (const existing of [...byTopic.get(topicId) ?? []]) {
+        if (existing.chatId !== chatId || mappingKey(existing.chatId, existing.threadId) === key) {
+          continue;
+        }
+        detachFromTopic(existing);
+        byKey.delete(mappingKey(existing.chatId, existing.threadId));
+        if (persist)
+          store.deleteByChat(existing.chatId, existing.threadId);
+      }
+    }
     const prev = byKey.get(key);
     if (prev) {
       if (prev.topicId === topicId)
@@ -43639,7 +43723,8 @@ function startTelegramAdapter(opts) {
   }
   function loadExistingTopic(chatId, topicId, threadId) {
     const topic = getTopic(topicId);
-    if (!topic?.participants.some((participant) => participant.userId === userId)) {
+    const expectedScope = forumGroups.has(chatId) ? telegramGroupScope(chatId) : null;
+    if (!topic?.participants.some((participant) => participant.userId === userId) || topic.surface !== "telegram" || (topic.surfaceScope ?? null) !== expectedScope) {
       return false;
     }
     bindMapping(chatId, threadId, topic.id);
@@ -43647,7 +43732,10 @@ function startTelegramAdapter(opts) {
   }
   if (!store.isFlagSet(SURFACE_BACKFILL_FLAG)) {
     const mappedIds = [
-      ...new Set(store.load().map((mapping) => mapping.topicId).filter((topicId) => getTopic(topicId)?.kind !== "manager"))
+      ...new Set(store.load().flatMap((mapping) => {
+        const topic = getTopic(mapping.topicId);
+        return topic && topic.kind !== "manager" && topic.participants.some((participant) => participant.userId === userId) ? [topic.id] : [];
+      }))
     ];
     const moved = setTopicSurfaces(mappedIds, "telegram");
     store.setFlag(SURFACE_BACKFILL_FLAG);
@@ -43655,12 +43743,70 @@ function startTelegramAdapter(opts) {
       logger.info({ moved, mapped: mappedIds.length }, "telegram adapter: moved mapped topics onto the telegram surface");
     }
   }
+  if (!store.isFlagSet(GROUP_SCOPE_BACKFILL_FLAG)) {
+    const groupIds = new Set(forumGroups.keys());
+    const groupsByTopic = new Map;
+    for (const mapping of store.load()) {
+      if (!groupIds.has(mapping.chatId))
+        continue;
+      const groups = groupsByTopic.get(mapping.topicId) ?? new Set;
+      groups.add(mapping.chatId);
+      groupsByTopic.set(mapping.topicId, groups);
+    }
+    let filed = 0;
+    for (const [topicId, groups] of groupsByTopic) {
+      if (groups.size !== 1) {
+        logger.warn({ topicId, groupIds: [...groups] }, "telegram adapter: legacy topic spans multiple groups; scope migration skipped");
+        continue;
+      }
+      const topic = getTopic(topicId);
+      if (!topic || topic.kind === "manager" || topic.surface !== "telegram" || !topic.participants.some((participant) => participant.userId === userId)) {
+        continue;
+      }
+      const [chatId] = groups;
+      if (chatId !== undefined) {
+        const targetScope = telegramGroupScope(chatId);
+        const currentScope = topic.surfaceScope ?? null;
+        if (currentScope !== null && currentScope !== targetScope) {
+          logger.warn({ topicId, currentScope, targetScope }, "telegram adapter: legacy mapping conflicts with an existing topic namespace");
+          continue;
+        }
+        const titleConflict = findTopicTitleConflict(topic.title, topic.kind ?? "agent", {
+          excludeTopicId: topic.id,
+          surface: "telegram",
+          surfaceScope: targetScope
+        });
+        if (titleConflict) {
+          logger.warn({ topicId, conflictTopicId: titleConflict.id, targetScope }, "telegram adapter: legacy topic title conflicts in target namespace");
+          continue;
+        }
+        filed += Number(setTopicSurfaceScope(topicId, "telegram", targetScope));
+      }
+    }
+    store.setFlag(GROUP_SCOPE_BACKFILL_FLAG);
+    if (filed > 0) {
+      logger.info({ filed }, "telegram adapter: filed legacy topics into group namespaces");
+    }
+  }
   for (const persisted of store.load()) {
     const topic = getTopic(persisted.topicId);
-    if (topic?.participants.some((participant) => participant.userId === userId)) {
+    const expectedScope = forumGroups.has(persisted.chatId) ? telegramGroupScope(persisted.chatId) : null;
+    if (topic?.participants.some((participant) => participant.userId === userId) && topic.surface === "telegram" && (topic.surfaceScope ?? null) === expectedScope) {
       bindMapping(persisted.chatId, persisted.threadId, persisted.topicId, { persist: false });
       continue;
     }
+    if (topic) {
+      store.deleteByChat(persisted.chatId, persisted.threadId);
+      logger.warn({
+        chatId: persisted.chatId,
+        threadId: persisted.threadId,
+        topicId: persisted.topicId,
+        topicSurface: topic.surface,
+        topicSurfaceScope: topic.surfaceScope ?? null,
+        expectedScope
+      }, "telegram adapter: quarantined mapping outside its topic namespace");
+      continue;
+    }
     cleanupPersistedMapping(persisted, "telegram adapter: stale forum thread cleanup failed");
   }
   function reconcileStaleMappings() {
@@ -43680,8 +43826,15 @@ function startTelegramAdapter(opts) {
       suppressMaterialize--;
     }
   }
-  function getOrCreateTopic(title, agent) {
-    return getTopicByNameForUser(title, userId, { surface: "telegram" }) ?? registerTopicLocal({ title, userId, kind: "agent", ...agent ? { agent } : {} });
+  function getOrCreateTopic(chatId, title, agent) {
+    const surfaceScope = forumGroups.has(chatId) ? telegramGroupScope(chatId) : null;
+    return getTopicByNameForUser(title, userId, { surface: "telegram", surfaceScope }) ?? registerTopicLocal({
+      title,
+      userId,
+      kind: "agent",
+      surfaceScope,
+      ...agent ? { agent } : {}
+    });
   }
   function resolveMapping(chatId, threadId) {
     const cached = byKey.get(mappingKey(chatId, threadId));
@@ -43691,7 +43844,7 @@ function startTelegramAdapter(opts) {
         return topic2;
       unbindTopic(cached.topicId);
     }
-    const topic = getOrCreateTopic(titleFor(chatId, threadId), opts.defaultAgent);
+    const topic = getOrCreateTopic(chatId, titleFor(chatId, threadId), opts.defaultAgent);
     bindMapping(chatId, threadId, topic.id);
     return topic;
   }
@@ -44009,12 +44162,16 @@ function startTelegramAdapter(opts) {
   const pendingByTopic = new Map;
   const permissionBlockedTopics = new Map;
   const materializeTombstones = new Map;
-  if (forumMode) {
+  if (forumGroups.size > 0) {
     for (const t of store.loadTombstones())
       materializeTombstones.set(t.topicId, t.title);
   }
   function deliverFallback(topicId, title, payload) {
-    return deliverToTargets(topicId, [{ chatId: forumChat, topicId }], {
+    const topic = getTopic(topicId);
+    const chatId = telegramGroupIdFromScope(topic?.surfaceScope);
+    if (chatId === null)
+      return Promise.resolve();
+    return deliverToTargets(topicId, [{ chatId, topicId }], {
       text: payload.text ? `[${title}] ${payload.text}` : "",
       files: payload.files,
       runtimeMessageId: payload.runtimeMessageId,
@@ -44027,16 +44184,18 @@ function startTelegramAdapter(opts) {
     }
   }
   function materializeTopic(topic) {
-    if (!forumManageTopicsAvailable || suppressMaterialize > 0 || byTopic.has(topic.id) || pendingByTopic.has(topic.id) || permissionBlockedTopics.has(topic.id) || materializeTombstones.has(topic.id)) {
+    if (topic.surface !== "telegram" || !topic.participants?.some((participant) => participant.userId === userId)) {
       return false;
     }
-    if (!isTopicVisible(topic))
+    const materializationChat = telegramGroupIdFromScope(topic.surfaceScope);
+    if (materializationChat === null)
       return false;
-    if (!topic.participants?.some((p) => p.userId === userId))
+    const group = forumGroups.get(materializationChat);
+    if (!group?.manageTopicsAvailable || suppressMaterialize > 0 || byTopic.has(topic.id) || pendingByTopic.has(topic.id) || permissionBlockedTopics.has(topic.id) || materializeTombstones.has(topic.id)) {
       return false;
-    if (topic.surface !== "telegram")
+    }
+    if (!isTopicVisible(topic))
       return false;
-    const materializationChat = forumChat;
     const pending2 = { buffer: [], cancelled: false };
     pendingByTopic.set(topic.id, pending2);
     (async () => {
@@ -44050,12 +44209,12 @@ function startTelegramAdapter(opts) {
           return;
         const errorInfo = telegramErrorInfo(err2);
         if (isManageTopicsPermissionError(errorInfo)) {
-          const permissionWasAvailable = forumManageTopicsAvailable;
-          forumManageTopicsAvailable = false;
+          const permissionWasAvailable = group.manageTopicsAvailable;
+          group.manageTopicsAvailable = false;
           permissionBlockedTopics.set(topic.id, topic.title);
           logger.warn({ err: err2, topicId: topic.id, title: topic.title }, "telegram adapter: Manage Topics unavailable \u2014 waiting for permission recovery");
           if (permissionWasAvailable) {
-            reply(forumChat, undefined, 'Forum topic creation is paused. Enable the bot administrator permission "Manage Topics"; pending topics will be retried automatically.');
+            reply(materializationChat, undefined, 'Forum topic creation is paused. Enable the bot administrator permission "Manage Topics"; pending topics will be retried automatically.');
           }
           flushBuffered(topic.id, pending2.buffer, (payload) => deliverFallback(topic.id, topic.title, payload));
           return;
@@ -44144,8 +44303,10 @@ function startTelegramAdapter(opts) {
     const topic = getTopic(topicId);
     if (!topic)
       return false;
-    if (forumMode) {
-      if (!forumManageTopicsAvailable || permissionBlockedTopics.has(topicId)) {
+    const groupId = telegramGroupIdFromScope(topic.surfaceScope);
+    const group = groupId === null ? undefined : forumGroups.get(groupId);
+    if (group) {
+      if (!group.manageTopicsAvailable || permissionBlockedTopics.has(topicId)) {
         enqueueSend(topicId, () => deliverFallback(topicId, topic.title, payload)).then(payload.onSettled);
         return true;
       }
@@ -44291,32 +44452,52 @@ ${suffix}`;
       return;
     await client.sendMessage(chatId, onboardingGuide(bot?.username), threadOpts(threadId)).catch((err2) => logger.warn({ err: err2, chatId }, "telegram adapter: onboarding guide failed"));
   }
-  function materializeVisibleTopics() {
-    if (!forumMode || !forumManageTopicsAvailable)
+  function materializeVisibleTopics(chatId) {
+    const group = forumGroups.get(chatId);
+    if (!group?.manageTopicsAvailable)
       return;
-    for (const topic of listTopics({ surface: "telegram" })) {
+    const topics = listTopics({
+      surface: "telegram",
+      surfaceScope: telegramGroupScope(chatId)
+    });
+    for (const topic of topics) {
+      if (topic.kind === "manager")
+        continue;
       if (isTopicVisible(topic) && topic.participants.some((participant) => participant.userId === userId)) {
         materializeTopic(topic);
       }
     }
   }
-  function restoreForumTopicCreation({ retryPermanent = false } = {}) {
-    forumManageTopicsAvailable = true;
-    permissionBlockedTopics.clear();
+  function restoreForumTopicCreation(chatId, { retryPermanent = false } = {}) {
+    const group = forumGroups.get(chatId);
+    if (!group)
+      return;
+    group.manageTopicsAvailable = true;
+    for (const topicId of [...permissionBlockedTopics.keys()]) {
+      if (telegramGroupIdFromScope(getTopic(topicId)?.surfaceScope) === chatId) {
+        permissionBlockedTopics.delete(topicId);
+      }
+    }
     if (retryPermanent) {
-      materializeTombstones.clear();
-      store.clearTombstones();
+      for (const topicId of [...materializeTombstones.keys()]) {
+        if (telegramGroupIdFromScope(getTopic(topicId)?.surfaceScope) === chatId) {
+          materializeTombstones.delete(topicId);
+          store.deleteTombstone(topicId);
+        }
+      }
     }
     reconcileStaleMappings();
-    materializeVisibleTopics();
+    materializeVisibleTopics(chatId);
   }
   async function notifyOwnerDms(text2) {
     await Promise.allSettled([...ownerDmChatIds].map((chatId) => client.sendMessage(chatId, text2)));
   }
   async function disconnectForum(chatId) {
-    if (!forumMode || forumChat !== chatId)
+    if (!forumGroups.has(chatId))
       return false;
     for (const [topicId, pending2] of pendingByTopic) {
+      if (telegramGroupIdFromScope(getTopic(topicId)?.surfaceScope) !== chatId)
+        continue;
       pending2.cancelled = true;
       if (pendingByTopic.get(topicId) === pending2)
         pendingByTopic.delete(topicId);
@@ -44329,14 +44510,23 @@ ${suffix}`;
       if (target.chatId === chatId)
         targetByQueryId.delete(queryId);
     }
-    permissionBlockedTopics.clear();
-    materializeTombstones.clear();
-    store.clearTombstones();
+    for (const topicId of [...permissionBlockedTopics.keys()]) {
+      if (telegramGroupIdFromScope(getTopic(topicId)?.surfaceScope) === chatId) {
+        permissionBlockedTopics.delete(topicId);
+      }
+    }
+    for (const topicId of [...materializeTombstones.keys()]) {
+      if (telegramGroupIdFromScope(getTopic(topicId)?.surfaceScope) === chatId) {
+        materializeTombstones.delete(topicId);
+        store.deleteTombstone(topicId);
+      }
+    }
     store.outboxDeleteByChat(chatId);
-    store.clearForumChatId();
-    forumMode = false;
-    forumManageTopicsAvailable = false;
-    forumChat = 0;
+    store.deleteGroup(chatId);
+    if (store.loadForumChatId() === chatId)
+      store.clearForumChatId();
+    forumGroups.delete(chatId);
+    groupGenerals.delete(chatId);
     await notifyOwnerDms("The Telegram forum was disconnected because the bot left or was removed. Your Negotium topics were preserved; promote the bot in a forum group to reconnect.");
     logger.info({ userId, forumChatId: chatId }, "telegram adapter: forum disconnected");
     return true;
@@ -44346,16 +44536,14 @@ ${suffix}`;
       reply(ownerTelegramId, undefined, "This Telegram client cannot create forum topics, so the group was not connected.");
       return false;
     }
-    if (forumMode && forumChat !== chat.id) {
-      reply(ownerTelegramId, undefined, `A different forum group (${forumChat}) is already connected to this Negotium node.`);
-      return false;
-    }
     const hasManageTopics = canManageTopics(botMember);
-    if (forumMode && forumChat === chat.id) {
-      const recovered = hasManageTopics && !forumManageTopicsAvailable;
-      const lostPermission = !hasManageTopics && forumManageTopicsAvailable;
+    const existingGroup = forumGroups.get(chat.id);
+    if (existingGroup) {
+      existingGroup.permissionRevision += 1;
+      const recovered = hasManageTopics && !existingGroup.manageTopicsAvailable;
+      const lostPermission = !hasManageTopics && existingGroup.manageTopicsAvailable;
       if (hasManageTopics) {
-        restoreForumTopicCreation({ retryPermanent: recovered });
+        restoreForumTopicCreation(chat.id, { retryPermanent: recovered });
         if (recovered) {
           await Promise.allSettled([
             client.sendMessage(chat.id, "Manage Topics permission confirmed. Pending Negotium topics are being created now."),
@@ -44363,23 +44551,29 @@ ${suffix}`;
           ]);
         }
       } else {
-        forumManageTopicsAvailable = false;
+        existingGroup.manageTopicsAvailable = false;
         if (lostPermission) {
           await notifyOwnerDms(`Manage Topics permission was removed from \u201C${chat.title?.trim() || chat.id}\u201D. Existing topics are preserved; restore the permission to resume topic creation.`);
         }
       }
       return true;
     }
-    forumChat = chat.id;
-    forumMode = true;
-    forumManageTopicsAvailable = hasManageTopics;
-    permissionBlockedTopics.clear();
-    materializeTombstones.clear();
-    store.clearTombstones();
-    store.saveForumChatId(chat.id);
-    bindMapping(chat.id, undefined, personalGeneral.id);
+    forumGroups.set(chat.id, {
+      chatId: chat.id,
+      manageTopicsAvailable: hasManageTopics,
+      configured: chat.id === forumChatId,
+      permissionRevision: 1
+    });
+    store.saveGroup({
+      chatId: chat.id,
+      title: chat.title?.trim(),
+      ownerTelegramUserId: ownerTelegramId
+    });
+    if (store.loadForumChatId() === undefined)
+      store.saveForumChatId(chat.id);
+    bindMapping(chat.id, undefined, generalForGroup(chat.id).id);
     ownerDmChatIds.add(ownerTelegramId);
-    materializeVisibleTopics();
+    materializeVisibleTopics(chat.id);
     const title = chat.title?.trim() || String(chat.id);
     const permissionWarning = hasManageTopics ? "" : `
 
@@ -44401,9 +44595,8 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
     if (msg.chat.type !== "supergroup" || !msg.chat.is_forum || senderId === undefined || !isAllowed(senderId)) {
       return false;
     }
-    if (forumMode && msg.chat.id !== forumChat)
-      return false;
-    if (forumMode && forumManageTopicsAvailable)
+    const connected = forumGroups.get(msg.chat.id);
+    if (connected?.manageTopicsAvailable)
       return true;
     if (typeof client.getMe !== "function" || typeof client.getChatMember !== "function") {
       return false;
@@ -44419,38 +44612,49 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
       if (!isChatAdmin(botMember) || !isChatAdmin(senderMember))
         return false;
       await linkForumAndAnnounce(senderId, msg.chat, botMember);
-      return forumMode && forumChat === msg.chat.id;
+      return forumGroups.has(msg.chat.id);
     } catch (err2) {
       logger.debug({ err: err2, groupId: msg.chat.id, senderId }, "telegram adapter: lazy forum auto-connect check failed");
       return false;
     }
   }
   async function verifyInitialForumPermissions() {
-    if (!forumMode)
-      return;
-    if (forumChatId !== undefined)
+    const initialGroups = [...forumGroups.values()];
+    if (initialGroups.length === 0)
       return;
     if (typeof client.getMe !== "function" || typeof client.getChatMember !== "function") {
-      forumManageTopicsAvailable = true;
+      for (const group of initialGroups) {
+        if (forumGroups.get(group.chatId) === group)
+          group.manageTopicsAvailable = true;
+      }
       return;
     }
-    try {
-      const bot = await resolveBotIdentity();
-      if (!bot || stopped || !forumMode)
-        return;
-      const member = await client.getChatMember(forumChat, bot.id);
-      if (member.status === "left" || member.status === "kicked") {
-        await disconnectForum(forumChat);
-        return;
-      }
-      if (canManageTopics(member)) {
-        const restoredAutoConnection = forumChatId === undefined && restoredForumChatId !== undefined;
-        restoreForumTopicCreation({ retryPermanent: restoredAutoConnection });
-      } else {
-        forumManageTopicsAvailable = false;
+    const bot = await resolveBotIdentity();
+    if (!bot || stopped)
+      return;
+    for (const group of initialGroups) {
+      if (forumGroups.get(group.chatId) !== group)
+        continue;
+      if (group.configured)
+        continue;
+      try {
+        const permissionRevision = group.permissionRevision;
+        const member = await client.getChatMember(group.chatId, bot.id);
+        if (forumGroups.get(group.chatId) !== group || group.permissionRevision !== permissionRevision) {
+          continue;
+        }
+        if (member.status === "left" || member.status === "kicked") {
+          await disconnectForum(group.chatId);
+          continue;
+        }
+        if (canManageTopics(member)) {
+          restoreForumTopicCreation(group.chatId, { retryPermanent: !group.configured });
+        } else {
+          group.manageTopicsAvailable = false;
+        }
+      } catch (err2) {
+        logger.warn({ err: err2, forumChatId: group.chatId }, "telegram adapter: initial forum permission check failed");
       }
-    } catch (err2) {
-      logger.warn({ err: err2, forumChatId: forumChat }, "telegram adapter: initial forum permission check failed");
     }
   }
   verifyInitialForumPermissions();
@@ -44502,7 +44706,8 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
   const handleCommand = createTelegramCommandRouter({
     userId,
     defaultAgent: opts.defaultAgent,
-    forum: forumMode ? { enabled: true, chatId: forumChat } : undefined,
+    surfaceScopeFor: (chatId) => forumGroups.has(chatId) ? telegramGroupScope(chatId) : null,
+    isForumGeneral: (chatId, threadId) => forumGroups.has(chatId) && threadId === undefined,
     resolveBotUsername: async () => (await resolveBotIdentity())?.username,
     isVaultOwner,
     reply,
@@ -44528,8 +44733,10 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
     const firstPrivateContact = privateDm && !byKey.has(mappingKey(chatId));
     if (privateDm)
       ownerDmChatIds.add(chatId);
-    if (privateDm || forumMode && chatId === forumChat && threadId === undefined) {
+    if (privateDm) {
       bindMapping(chatId, threadId, personalGeneral.id);
+    } else if (forumGroups.has(chatId) && threadId === undefined) {
+      bindMapping(chatId, threadId, generalForGroup(chatId).id);
     }
     if (firstPrivateContact && text2 !== "/start") {
       sendOnboardingGuide(chatId);
@@ -44561,9 +44768,7 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
     if (!isAllowed(msg.from?.id))
       return;
     if (msg.chat.type === "supergroup" && msg.chat.is_forum) {
-      if (forumMode && msg.chat.id !== forumChat)
-        return;
-      if (!forumMode || !forumManageTopicsAvailable) {
+      if (!forumGroups.get(msg.chat.id)?.manageTopicsAvailable) {
         tryAutoConnectFromMessage(msg).then((connected) => {
           if (connected && !stopped)
             handleIncomingMessage(msg);
@@ -44577,19 +44782,21 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
     if (stopped || update.chat.type !== "supergroup" || !update.chat.is_forum)
       return;
     const status = update.new_chat_member?.status;
-    if ((status === "left" || status === "kicked") && forumChat === update.chat.id) {
+    if ((status === "left" || status === "kicked") && forumGroups.has(update.chat.id)) {
       disconnectForum(update.chat.id).catch((err2) => logger.warn({ err: err2, groupId: update.chat.id }, "telegram adapter: forum disconnect failed"));
       return;
     }
-    if (forumMode && forumChat === update.chat.id && status !== "administrator" && status !== "creator") {
-      const permissionWasAvailable = forumManageTopicsAvailable;
-      forumManageTopicsAvailable = false;
+    if (forumGroups.has(update.chat.id) && status !== "administrator" && status !== "creator") {
+      const group = forumGroups.get(update.chat.id);
+      group.permissionRevision += 1;
+      const permissionWasAvailable = group.manageTopicsAvailable;
+      group.manageTopicsAvailable = false;
       if (permissionWasAvailable) {
         notifyOwnerDms('The bot no longer has forum administrator access. Existing topics are preserved; restore administrator + "Manage Topics" to resume topic creation.');
       }
       return;
     }
-    if (status !== "administrator" && status !== "creator" || update.from?.id === undefined || !isAllowed(update.from.id) && (!forumMode || forumChat !== update.chat.id)) {
+    if (status !== "administrator" && status !== "creator" || update.from?.id === undefined || !isAllowed(update.from.id) && !forumGroups.has(update.chat.id)) {
       return;
     }
     linkForumAndAnnounce(update.from.id, update.chat, update.new_chat_member).catch((err2) => logger.warn({ err: err2, groupId: update.chat.id }, "telegram adapter: forum auto-connect failed"));
@@ -44704,7 +44911,7 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
   const unsubscribe = runtimeBus().subscribe((event) => {
     if (stopped)
       return;
-    if (event.type === "topic-created" && forumMode) {
+    if (event.type === "topic-created") {
       materializeTopic(event.payload);
       return;
     }
@@ -44755,9 +44962,9 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
   pollRuntimeEvents();
   const runtimeEventPollTimer = setInterval(pollRuntimeEvents, 100);
   runtimeEventPollTimer.unref?.();
-  if (forumMode) {
-    bindMapping(forumChat, undefined, personalGeneral.id);
-    materializeVisibleTopics();
+  for (const group of forumGroups.values()) {
+    bindMapping(group.chatId, undefined, generalForGroup(group.chatId).id);
+    materializeVisibleTopics(group.chatId);
   }
   return {
     name: "telegram",
@@ -44780,7 +44987,7 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
     }
   };
 }
-var SURFACE_BACKFILL_FLAG = "surface_backfill_20260808", FORUM_TOPIC_NAME_MAX = 128, MAX_PARENT_HOPS = 5, DEFAULT_SEND_TIMEOUT_MS = 60000, PHOTO_EXTS;
+var SURFACE_BACKFILL_FLAG = "surface_backfill_20260808", GROUP_SCOPE_BACKFILL_FLAG = "telegram_group_scope_backfill_20260829", 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();
@@ -49743,4 +49950,4 @@ switch (command) {
   }
 }
 
-//# debugId=3B82619F70BCB0E864756E2164756E21
+//# debugId=37C7DCC041D0DB9F64756E2164756E21