@letta-ai/letta-code 0.34.3 → 0.34.4

package/letta.js

@@ -5710,7 +5710,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.34.3",
+    version: "0.34.4",
     lettaStartupLogProtocol: 1,
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
@@ -161807,7 +161807,6 @@ function normalizeLoadedAccount(account) {
       next[camelKey] = raw2[snakeKey];
     }
   }
-  next.replyMode = next.replyMode === "relay" ? "relay" : "tool";
   if (isCustomChannelAccount(next) || !isFirstPartyChannelId(next.channel)) {
     next.config = isRecord2(next.config) ? { ...next.config } : {};
   }
@@ -161880,7 +161879,6 @@ function makeDefaultLegacyAccount(channelId) {
       enabled: config.enabled,
       token: config.token,
       dmPolicy: config.dmPolicy,
-      replyMode: "tool",
       allowedUsers: [...config.allowedUsers],
       transcribeVoice: config.transcribeVoice === true,
       richPrivateChatDefault: config.richPrivateChatDefault !== false,
@@ -161900,7 +161898,6 @@ function makeDefaultLegacyAccount(channelId) {
       enabled: config.enabled,
       token: config.token,
       dmPolicy: config.dmPolicy,
-      replyMode: "tool",
       allowedUsers: [...config.allowedUsers],
       allowedChannels: config.allowedChannels ? Array.isArray(config.allowedChannels) ? [...config.allowedChannels] : { ...config.allowedChannels } : undefined,
       autoThreadOnMention: config.autoThreadOnMention ?? true,
@@ -161918,7 +161915,6 @@ function makeDefaultLegacyAccount(channelId) {
       accountId: LEGACY_CHANNEL_ACCOUNT_ID,
       enabled: config.enabled,
       dmPolicy: config.dmPolicy,
-      replyMode: "tool",
       allowedUsers: [...config.allowedUsers],
       agentId: config.agentId,
       selfChatMode: config.selfChatMode !== false,
@@ -161951,7 +161947,6 @@ function makeDefaultLegacyAccount(channelId) {
       account: config.account,
       accountUuid: config.accountUuid,
       dmPolicy: config.dmPolicy,
-      replyMode: "tool",
       allowedUsers: [...config.allowedUsers],
       agentId: config.agentId,
       selfChatMode: config.selfChatMode === true,
@@ -162191,7 +162186,6 @@ var init_accounts = __esm(() => {
     remove_stale_routes: "removeStaleRoutes",
     rich_draft_streaming: "richDraftStreaming",
     rich_private_chat_default: "richPrivateChatDefault",
-    reply_mode: "replyMode",
     thread_policy_by_channel: "threadPolicyByChannel",
     transcribe_voice: "transcribeVoice",
     download_media: "downloadMedia",
@@ -169688,11 +169682,7 @@ function buildUnboundRouteInstructions(channelId, chatId) {
 
 ` + `Open Channels > ${displayName} in Letta Code and connect this chat there.
 
-` + `CLI on the listener machine:
-
-` + `letta channels route add --channel ${channelId} --chat-id ${chatId} --agent <agent-id>
-
-` + `Find your agent id with letta agents list.`;
+` + `Chat ID: ${chatId}`;
 }
 function buildSlackAppSetupInstructions() {
   return `This Slack app isn't connected to a Letta agent yet.
@@ -182569,7 +182559,6 @@ function createAccountFromPatch(channelId, accountId, patch2) {
       enabled: normalizedPatch.enabled ?? false,
       token: normalizedPatch.token ?? "",
       dmPolicy: normalizedPatch.dmPolicy ?? "pairing",
-      replyMode: normalizedPatch.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? [],
       groupMode: normalizeTelegramGroupMode(normalizedPatch.groupMode) ?? "open",
       transcribeVoice: normalizedPatch.transcribeVoice === true,
@@ -182594,7 +182583,6 @@ function createAccountFromPatch(channelId, accountId, patch2) {
       agentId: normalizedPatch.agentId ?? null,
       defaultPermissionMode: normalizedPatch.defaultPermissionMode ?? "standard",
       dmPolicy: normalizedPatch.dmPolicy ?? "pairing",
-      replyMode: normalizedPatch.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? [],
       allowedChannels: normalizedPatch.allowedChannels ?? [],
       autoThreadOnMention: normalizedPatch.autoThreadOnMention ?? false,
@@ -182615,7 +182603,6 @@ function createAccountFromPatch(channelId, accountId, patch2) {
       enabled: normalizedPatch.enabled ?? false,
       agentId: normalizedPatch.agentId ?? null,
       dmPolicy: normalizedPatch.dmPolicy ?? "pairing",
-      replyMode: normalizedPatch.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? [],
       selfChatMode: normalizedPatch.selfChatMode ?? true,
       groupMode: normalizeWhatsAppGroupMode(normalizedPatch.groupMode) ?? "disabled",
@@ -182648,7 +182635,6 @@ function createAccountFromPatch(channelId, accountId, patch2) {
       agentId: normalizedPatch.agentId ?? null,
       selfChatMode: normalizedPatch.selfChatMode === true,
       dmPolicy: normalizedPatch.dmPolicy ?? "pairing",
-      replyMode: normalizedPatch.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? [],
       groupMode: normalizeSignalGroupMode(normalizedPatch.groupMode) ?? "disabled",
       allowedGroups: normalizedPatch.allowedGroups ?? [],
@@ -182668,7 +182654,6 @@ function createAccountFromPatch(channelId, accountId, patch2) {
       displayName: normalizeDisplayName(normalizedPatch.displayName),
       enabled: normalizedPatch.enabled ?? false,
       dmPolicy: normalizedPatch.dmPolicy ?? "pairing",
-      replyMode: normalizedPatch.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? [],
       config: { ...normalizedPatch.config ?? {} },
       createdAt: now2,
@@ -182690,7 +182675,6 @@ function createAccountFromPatch(channelId, accountId, patch2) {
     mentionOnlyChannels: [...normalizedPatch.mentionOnlyChannels ?? []],
     allowBots: normalizedPatch.allowBots ?? false,
     dmPolicy: normalizedPatch.dmPolicy ?? "open",
-    replyMode: normalizedPatch.replyMode ?? "tool",
     allowedUsers: normalizedPatch.allowedUsers ?? [],
     createdAt: now2,
     updatedAt: now2
@@ -182706,7 +182690,6 @@ function mergeAccountPatch(existing, patch2) {
       enabled: normalizedPatch.enabled ?? existing.enabled,
       token: normalizedPatch.token ?? existing.token,
       dmPolicy: normalizedPatch.dmPolicy ?? existing.dmPolicy,
-      replyMode: normalizedPatch.replyMode ?? existing.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? existing.allowedUsers,
       groupMode: normalizeTelegramGroupMode(normalizedPatch.groupMode) ?? existing.groupMode ?? "open",
       transcribeVoice: normalizedPatch.transcribeVoice ?? existing.transcribeVoice ?? false,
@@ -182725,7 +182708,6 @@ function mergeAccountPatch(existing, patch2) {
       agentId: normalizedPatch.agentId ?? existing.agentId,
       defaultPermissionMode: normalizedPatch.defaultPermissionMode ?? existing.defaultPermissionMode ?? "standard",
       dmPolicy: normalizedPatch.dmPolicy ?? existing.dmPolicy,
-      replyMode: normalizedPatch.replyMode ?? existing.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? existing.allowedUsers,
       allowedChannels: normalizedPatch.allowedChannels ?? existing.allowedChannels,
       autoThreadOnMention: normalizedPatch.autoThreadOnMention ?? existing.autoThreadOnMention,
@@ -182744,7 +182726,6 @@ function mergeAccountPatch(existing, patch2) {
       enabled: normalizedPatch.enabled ?? existing.enabled,
       agentId: normalizedPatch.agentId ?? existing.agentId,
       dmPolicy: normalizedPatch.dmPolicy ?? existing.dmPolicy,
-      replyMode: normalizedPatch.replyMode ?? existing.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? existing.allowedUsers,
       selfChatMode: normalizedPatch.selfChatMode ?? existing.selfChatMode,
       groupMode: normalizeWhatsAppGroupMode(normalizedPatch.groupMode) ?? existing.groupMode,
@@ -182775,7 +182756,6 @@ function mergeAccountPatch(existing, patch2) {
       agentId: normalizedPatch.agentId ?? existing.agentId,
       selfChatMode: normalizedPatch.selfChatMode ?? existing.selfChatMode,
       dmPolicy: normalizedPatch.dmPolicy ?? existing.dmPolicy,
-      replyMode: normalizedPatch.replyMode ?? existing.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? existing.allowedUsers,
       groupMode: normalizeSignalGroupMode(normalizedPatch.groupMode) ?? existing.groupMode,
       allowedGroups: normalizedPatch.allowedGroups ?? existing.allowedGroups,
@@ -182793,7 +182773,6 @@ function mergeAccountPatch(existing, patch2) {
       displayName: normalizedPatch.displayName !== undefined ? normalizeDisplayName(normalizedPatch.displayName) : existing.displayName,
       enabled: normalizedPatch.enabled ?? existing.enabled,
       dmPolicy: normalizedPatch.dmPolicy ?? existing.dmPolicy,
-      replyMode: normalizedPatch.replyMode ?? existing.replyMode ?? "tool",
       allowedUsers: normalizedPatch.allowedUsers ?? existing.allowedUsers,
       config: normalizedPatch.config !== undefined ? { ...existing.config, ...normalizedPatch.config } : { ...existing.config },
       updatedAt: nextUpdatedAt
@@ -182815,7 +182794,6 @@ function mergeAccountPatch(existing, patch2) {
     ],
     allowBots: normalizedPatch.allowBots ?? existing.allowBots ?? false,
     dmPolicy: normalizedPatch.dmPolicy ?? existing.dmPolicy,
-    replyMode: normalizedPatch.replyMode ?? existing.replyMode ?? "tool",
     allowedUsers: normalizedPatch.allowedUsers ?? existing.allowedUsers,
     updatedAt: nextUpdatedAt
   };
@@ -182880,7 +182858,6 @@ function toAccountSnapshot(account) {
       configured: isAccountConfigured(account),
       running,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config,
       hasToken: account.token.trim().length > 0,
@@ -182903,7 +182880,6 @@ function toAccountSnapshot(account) {
       configured: isAccountConfigured(account),
       running,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelAccountProtocolConfig(account),
       allowedChannels: account.allowedChannels ? Array.isArray(account.allowedChannels) ? [...account.allowedChannels] : { ...account.allowedChannels } : [],
@@ -182929,7 +182905,6 @@ function toAccountSnapshot(account) {
       configured: isAccountConfigured(account),
       running,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelAccountProtocolConfig(account),
       agentId: account.agentId,
@@ -182963,7 +182938,6 @@ function toAccountSnapshot(account) {
       configured: isAccountConfigured(account),
       running,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelAccountProtocolConfig(account),
       agentId: account.agentId,
@@ -182988,7 +182962,6 @@ function toAccountSnapshot(account) {
       configured: isAccountConfigured(account),
       running,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelAccountProtocolConfig(account),
       createdAt: account.createdAt,
@@ -183004,7 +182977,6 @@ function toAccountSnapshot(account) {
     running,
     mode: account.mode,
     dmPolicy: account.dmPolicy,
-    replyMode: account.replyMode ?? "tool",
     allowedUsers: [...account.allowedUsers],
     config: toChannelAccountProtocolConfig(account),
     hasBotToken: account.botToken.trim().length > 0,
@@ -183068,7 +183040,6 @@ function getChannelConfigSnapshot(channelId, accountId) {
       displayName: account.displayName,
       enabled: account.enabled,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelConfigSnapshotProtocolConfig(account),
       hasToken: account.token.trim().length > 0,
@@ -183086,7 +183057,6 @@ function getChannelConfigSnapshot(channelId, accountId) {
       displayName: account.displayName,
       enabled: account.enabled,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelConfigSnapshotProtocolConfig(account),
       allowedChannels: account.allowedChannels ? Array.isArray(account.allowedChannels) ? [...account.allowedChannels] : { ...account.allowedChannels } : [],
@@ -183108,7 +183078,6 @@ function getChannelConfigSnapshot(channelId, accountId) {
       displayName: account.displayName,
       enabled: account.enabled,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelConfigSnapshotProtocolConfig(account),
       agentId: account.agentId,
@@ -183138,7 +183107,6 @@ function getChannelConfigSnapshot(channelId, accountId) {
       displayName: account.displayName,
       enabled: account.enabled,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelConfigSnapshotProtocolConfig(account),
       agentId: account.agentId,
@@ -183159,7 +183127,6 @@ function getChannelConfigSnapshot(channelId, accountId) {
       displayName: account.displayName,
       enabled: account.enabled,
       dmPolicy: account.dmPolicy,
-      replyMode: account.replyMode ?? "tool",
       allowedUsers: [...account.allowedUsers],
       config: toChannelConfigSnapshotProtocolConfig(account)
     };
@@ -183171,7 +183138,6 @@ function getChannelConfigSnapshot(channelId, accountId) {
     enabled: account.enabled,
     mode: account.mode,
     dmPolicy: account.dmPolicy,
-    replyMode: account.replyMode ?? "tool",
     allowedUsers: [...account.allowedUsers],
     config: toChannelConfigSnapshotProtocolConfig(account),
     hasBotToken: account.botToken.trim().length > 0,
@@ -183694,7 +183660,6 @@ async function setChannelConfigLive(channelId, patch2, accountId) {
       mode: normalizedPatch.mode,
       defaultPermissionMode: normalizedPatch.defaultPermissionMode,
       dmPolicy: normalizedPatch.dmPolicy,
-      replyMode: normalizedPatch.replyMode,
       allowedUsers: normalizedPatch.allowedUsers,
       allowedChannels: normalizedPatch.allowedChannels,
       agentId: normalizedPatch.agentId,
@@ -183733,7 +183698,6 @@ async function setChannelConfigLive(channelId, patch2, accountId) {
       mode: normalizedPatch.mode,
       defaultPermissionMode: normalizedPatch.defaultPermissionMode,
       dmPolicy: normalizedPatch.dmPolicy,
-      replyMode: normalizedPatch.replyMode,
       allowedUsers: normalizedPatch.allowedUsers,
       allowedChannels: normalizedPatch.allowedChannels,
       agentId: normalizedPatch.agentId,
@@ -220056,7 +220020,7 @@ class CodexAppServerClient {
     await this.request("initialize", {
       clientInfo: {
         name: "letta-code",
-        version: "0.34.3"
+        version: "0.34.4"
       },
       capabilities: null
     });
@@ -222478,9 +222442,14 @@ function wrapSubagentLauncher(input) {
   }
   const isLocal = input.backendMode === "local";
   const storageDir = input.localBackendStorageDir ?? undefined;
+  const scratchpadDir = input.scratchpadDir || undefined;
+  if (scratchpadDir) {
+    mkdirSync29(scratchpadDir, { recursive: true });
+  }
   const harnessWritableRoots = [
     getTranscriptRoot(),
-    ...isLocal && storageDir ? [storageDir] : []
+    ...isLocal && storageDir ? [storageDir] : [],
+    ...scratchpadDir ? [scratchpadDir] : []
   ];
   const policy = buildMemorySubagentSandboxPolicy({
     memoryRoots: writableMemoryRoots,
@@ -224113,7 +224082,8 @@ async function executeSubagent(type3, config, model, userPrompt, subagentId, isR
       memoryRoots: inheritedMemoryRoots.roots,
       inheritedPrimaryRoot,
       memoryScope,
-      localBackendStorageDir
+      localBackendStorageDir,
+      scratchpadDir: childEnv.LETTA_SCRATCHPAD
     });
     const spawnLauncher = sandbox ? { command: sandbox.command, args: sandbox.args } : launcher;
     const spawnEnv = sandbox ? { ...childEnv, ...sandbox.sandboxEnv } : childEnv;
@@ -231245,9 +231215,6 @@ function getQueueItemsScope(items3) {
 function hasSameQueueScope(a2, b3) {
   return (a2.agentId ?? null) === (b3.agentId ?? null) && (a2.conversationId ?? null) === (b3.conversationId ?? null);
 }
-function externalToolScopeSelection(message) {
-  return JSON.stringify(message?.externalToolScopeIds ?? []);
-}
 function getBatchActingUserId(items3) {
   const actingUserId = items3[0]?.actingUserId;
   if (!actingUserId || items3.some((item) => item.actingUserId !== actingUserId)) {
@@ -231331,20 +231298,12 @@ function consumeQueuedTurn(runtime) {
   let batchConnectionId;
   let batchImageFailureMode = null;
   let batchPreferences = JSON.stringify(getStoredClientPreferences(runtime.agentId, runtime.conversationId));
-  let batchExternalToolScopes = null;
   const isNoCoalesce = (candidate) => candidate.kind === "message" && candidate.noCoalesce === true;
   for (const item of queuedItems) {
     if (!isCoalescable(item.kind) || !hasSameQueueScope(firstQueuedItem, item)) {
       break;
     }
     const incoming = runtime.queuedMessagesByItemId.get(item.id);
-    if (item.kind === "message") {
-      const externalToolScopes = externalToolScopeSelection(incoming);
-      if (batchExternalToolScopes !== null && externalToolScopes !== batchExternalToolScopes) {
-        break;
-      }
-      batchExternalToolScopes = externalToolScopes;
-    }
     if (incoming?.clientPreferences !== undefined) {
       const preferences = JSON.stringify(normalizeClientPreferences(incoming.clientPreferences));
       if (preferences !== batchPreferences && (queueLen > 0 || runtime.turnLifecycle.kind !== "idle"))
@@ -235971,11 +235930,10 @@ function isChannelId(value) {
 }
 function hasValidChannelPolicyFields(config) {
   const hasValidDmPolicy = config.dm_policy === undefined || config.dm_policy === "pairing" || config.dm_policy === "allowlist" || config.dm_policy === "open";
-  const hasValidReplyMode = config.reply_mode === undefined || config.reply_mode === "tool" || config.reply_mode === "relay";
   const hasValidAllowedUsers = config.allowed_users === undefined || Array.isArray(config.allowed_users) && config.allowed_users.every((entry) => typeof entry === "string");
   const hasValidDisplayName = config.display_name === undefined || typeof config.display_name === "string";
   const hasValidEnabled = config.enabled === undefined || typeof config.enabled === "boolean";
-  return hasValidDmPolicy && hasValidReplyMode && hasValidAllowedUsers && hasValidDisplayName && hasValidEnabled;
+  return hasValidDmPolicy && hasValidAllowedUsers && hasValidDisplayName && hasValidEnabled;
 }
 function hasOnlyFields(value, allowedFields) {
   return Object.keys(value).every((field) => allowedFields.has(field));
@@ -235987,7 +235945,6 @@ var init_channel_service_validation = __esm(() => {
     "display_name",
     "enabled",
     "dm_policy",
-    "reply_mode",
     "allowed_users",
     "config"
   ]);
@@ -235995,13 +235952,11 @@ var init_channel_service_validation = __esm(() => {
     "display_name",
     "enabled",
     "dm_policy",
-    "reply_mode",
     "allowed_users",
     "config"
   ]);
   CHANNEL_SET_CONFIG_FIELDS = new Set([
     "dm_policy",
-    "reply_mode",
     "allowed_users",
     "plugin_config"
   ]);
@@ -453786,7 +453741,7 @@ var init_mcp_client = __esm(() => {
   init_streamableHttp();
   DEFAULT_CLIENT_INFO = {
     name: "letta-code",
-    version: "0.34.3"
+    version: "0.34.4"
   };
 });
 
@@ -463670,108 +463625,38 @@ var init_message_channel_formatting = __esm(() => {
 function isErrorResult(result3) {
   return result3.startsWith("Error:");
 }
-function createMessageChannelIdempotencyScope(state2) {
-  const inFlightActionKeys = new Map;
-  const inFlightTextDeliveryKeys = new Map;
-  const inFlightRelayTextDeliveryKeys = new Set;
-  const successfulActionKeys = new Set(state2?.successfulActionKeys ?? []);
-  const successfulTextDeliveryKeys = new Set(state2?.successfulTextDeliveryKeys ?? []);
-  const successfulRelayTextDeliveryKeys = new Set(state2?.successfulRelayTextDeliveryKeys ?? []);
-  let lastSuccessfulActionKey = state2?.lastSuccessfulActionKey ?? null;
+function createMessageChannelIdempotencyScope() {
+  const inFlight = new Map;
+  let lastSuccessful = null;
   let latestInvocation = 0;
-  const addInFlightTextDelivery = (key3) => {
-    if (key3) {
-      inFlightTextDeliveryKeys.set(key3, (inFlightTextDeliveryKeys.get(key3) ?? 0) + 1);
-    }
-  };
-  const removeInFlightTextDelivery = (key3) => {
-    if (!key3)
-      return;
-    const remaining = (inFlightTextDeliveryKeys.get(key3) ?? 1) - 1;
-    if (remaining > 0)
-      inFlightTextDeliveryKeys.set(key3, remaining);
-    else
-      inFlightTextDeliveryKeys.delete(key3);
-  };
   return {
-    async execute(actionKey, textDeliveryKey, effect) {
-      if (!actionKey) {
+    async execute(key3, effect) {
+      if (!key3) {
         latestInvocation += 1;
-        lastSuccessfulActionKey = null;
+        lastSuccessful = null;
         return await effect();
       }
-      if (inFlightActionKeys.has(actionKey) || textDeliveryKey && inFlightRelayTextDeliveryKeys.has(textDeliveryKey)) {
+      const pendingDuplicate = inFlight.get(key3);
+      if (pendingDuplicate) {
         throw new MessageChannelDuplicateActionError("in-flight");
       }
-      if (lastSuccessfulActionKey === actionKey || textDeliveryKey && successfulRelayTextDeliveryKeys.has(textDeliveryKey)) {
+      if (lastSuccessful?.key === key3) {
         throw new MessageChannelDuplicateActionError("completed");
       }
       const invocation = ++latestInvocation;
-      lastSuccessfulActionKey = null;
-      const pending = Promise.resolve().then(effect);
-      inFlightActionKeys.set(actionKey, pending);
-      addInFlightTextDelivery(textDeliveryKey);
-      try {
-        const result3 = await pending;
-        if (!isErrorResult(result3)) {
-          successfulActionKeys.add(actionKey);
-          if (textDeliveryKey)
-            successfulTextDeliveryKeys.add(textDeliveryKey);
-          if (invocation === latestInvocation) {
-            lastSuccessfulActionKey = actionKey;
-          }
-        }
-        return result3;
-      } finally {
-        if (inFlightActionKeys.get(actionKey) === pending) {
-          inFlightActionKeys.delete(actionKey);
-        }
-        removeInFlightTextDelivery(textDeliveryKey);
-      }
-    },
-    async executeRelay(actionKey, textDeliveryKey, effect) {
-      if (!actionKey)
-        return await effect();
-      if (inFlightActionKeys.has(actionKey) || textDeliveryKey && inFlightTextDeliveryKeys.has(textDeliveryKey)) {
-        throw new MessageChannelDuplicateActionError("in-flight");
-      }
-      if (successfulActionKeys.has(actionKey) || textDeliveryKey && successfulTextDeliveryKeys.has(textDeliveryKey)) {
-        throw new MessageChannelDuplicateActionError("completed");
-      }
+      lastSuccessful = null;
       const pending = Promise.resolve().then(effect);
-      inFlightActionKeys.set(actionKey, pending);
-      addInFlightTextDelivery(textDeliveryKey);
-      if (textDeliveryKey)
-        inFlightRelayTextDeliveryKeys.add(textDeliveryKey);
+      inFlight.set(key3, pending);
       try {
         const result3 = await pending;
-        if (!isErrorResult(result3)) {
-          successfulActionKeys.add(actionKey);
-          if (textDeliveryKey) {
-            successfulTextDeliveryKeys.add(textDeliveryKey);
-            successfulRelayTextDeliveryKeys.add(textDeliveryKey);
-          }
+        if (invocation === latestInvocation && !isErrorResult(result3)) {
+          lastSuccessful = { key: key3 };
         }
         return result3;
       } finally {
-        if (inFlightActionKeys.get(actionKey) === pending) {
-          inFlightActionKeys.delete(actionKey);
-        }
-        removeInFlightTextDelivery(textDeliveryKey);
-        if (textDeliveryKey)
-          inFlightRelayTextDeliveryKeys.delete(textDeliveryKey);
+        if (inFlight.get(key3) === pending)
+          inFlight.delete(key3);
       }
-    },
-    snapshot() {
-      if (inFlightActionKeys.size > 0 || inFlightTextDeliveryKeys.size > 0) {
-        return null;
-      }
-      return {
-        successfulActionKeys: [...successfulActionKeys],
-        successfulTextDeliveryKeys: [...successfulTextDeliveryKeys],
-        successfulRelayTextDeliveryKeys: [...successfulRelayTextDeliveryKeys],
-        lastSuccessfulActionKey
-      };
     }
   };
 }
@@ -463985,20 +463870,6 @@ function messageIdempotencyKey(request2, route) {
     replyToMessageId: effectiveTextReplyId(request2, route)
   });
 }
-function textDeliveryFingerprint(request2, route) {
-  if (request2.action !== "send" && request2.action !== "send-rich" || request2.mediaPath) {
-    return null;
-  }
-  return JSON.stringify({
-    channel: request2.channel,
-    chatId: route.chatId,
-    accountId: route.accountId ?? null,
-    chatType: route.chatType ?? null,
-    threadId: effectiveTextThreadId(request2, route),
-    message: request2.message?.trim() ?? null,
-    replyToMessageId: effectiveTextReplyId(request2, route)
-  });
-}
 async function executeMessageChannel(input, options) {
   const normalized = normalizeMessageChannelInput(input, options.resolver);
   if (typeof normalized === "string")
@@ -464067,7 +463938,7 @@ async function executeMessageChannel(input, options) {
       });
       const requestThreadId = normalized.action === "download-file" ? normalized.threadId : inferredThreadId ?? (normalized.channel === "telegram" && context4.route.chatType === "direct" ? normalized.threadId : context4.route.threadId ?? normalized.threadId);
       const request3 = buildMessageChannelRequest(normalized, normalized.chatId, requestThreadId);
-      return await dispatchWithIdempotency(request3, context4, options.idempotencyScope, options.idempotencyMode);
+      return await dispatchWithIdempotency(request3, context4, options.idempotencyScope);
     }
     if (normalized.channel !== "slack") {
       return `Error: Explicit MessageChannel targets are not supported on ${normalized.channel}.`;
@@ -464100,13 +463971,10 @@ async function executeMessageChannel(input, options) {
 async function executeMessageChannelExternalTool(input, options) {
   return createMessageChannelExternalToolResult(await executeMessageChannel(input, options));
 }
-function dispatchWithIdempotency(request2, context3, scope, mode = "explicit") {
+function dispatchWithIdempotency(request2, context3, scope) {
   const dispatch = () => dispatchMessageChannelAction({ request: request2, context: context3 });
-  const actionKey = messageIdempotencyKey(request2, context3.route);
-  const deliveryKey = textDeliveryFingerprint(request2, context3.route);
-  if (!scope)
-    return dispatch();
-  return mode === "relay" ? scope.executeRelay(actionKey, deliveryKey, dispatch) : scope.execute(actionKey, deliveryKey, dispatch);
+  const key3 = messageIdempotencyKey(request2, context3.route);
+  return scope ? scope.execute(key3, dispatch) : dispatch();
 }
 var init_message_channel_executor = __esm(() => {
   init_message_channel_formatting();
@@ -464282,7 +464150,7 @@ function createLocalMessageChannelResolver() {
     }
   };
 }
-function resolveLocalMessageChannelExecution(args, idempotencyScope, idempotencyMode = "explicit") {
+function resolveLocalMessageChannelExecution(args, idempotencyScope) {
   if (!getChannelRegistry()) {
     return "Error: Channel system is not initialized. Start with --channels flag.";
   }
@@ -464293,14 +464161,9 @@ function resolveLocalMessageChannelExecution(args, idempotencyScope, idempotency
     scope: args.parentScope,
     resolver: createLocalMessageChannelResolver(),
     channelTurnSources: args.channelTurnSources,
-    idempotencyScope,
-    idempotencyMode
+    idempotencyScope
   };
 }
-async function relayLocalMessageChannel(args, idempotencyScope) {
-  const execution = resolveLocalMessageChannelExecution(args, idempotencyScope, "relay");
-  return typeof execution === "string" ? execution : await executeMessageChannel(args, execution);
-}
 async function executeLocalMessageChannelExternalTool(args, idempotencyScope) {
   const execution = resolveLocalMessageChannelExecution(args, idempotencyScope);
   return typeof execution === "string" ? createMessageChannelExternalToolResult(execution) : await executeMessageChannelExternalTool(args, execution);
@@ -464819,117 +464682,6 @@ var init_channel_rich_draft_streamer = __esm(() => {
   ]);
 });
 
-// src/channels/gateway-assistant-relay.ts
-class GatewayAssistantTextAccumulator {
-  currentMessageId;
-  currentText;
-  deltaKeys;
-  finalizedMessageIds;
-  constructor(state2) {
-    this.currentMessageId = state2?.currentMessageId ?? null;
-    this.currentText = state2?.currentText ?? "";
-    this.deltaKeys = new Set(state2?.deltaKeys ?? []);
-    this.finalizedMessageIds = new Set(state2?.finalizedMessageIds ?? []);
-  }
-  snapshot() {
-    return {
-      currentMessageId: this.currentMessageId,
-      currentText: this.currentText,
-      deltaKeys: [...this.deltaKeys],
-      finalizedMessageIds: [...this.finalizedMessageIds]
-    };
-  }
-  handleDelta(message) {
-    const delta2 = message.delta;
-    if (delta2.message_type === "assistant_message") {
-      const messageId2 = delta2.otid || delta2.id;
-      if (!messageId2 || this.finalizedMessageIds.has(messageId2))
-        return [];
-      const finalized = this.currentMessageId && this.currentMessageId !== messageId2 ? this.finalizeCurrent() : null;
-      if (!this.currentMessageId)
-        this.currentMessageId = messageId2;
-      if (!this.deltaKeys.has(message.idempotency_key)) {
-        const text2 = typeof delta2.content === "string" ? delta2.content : delta2.content.map((part) => part.text ?? "").join("");
-        this.deltaKeys.add(message.idempotency_key);
-        this.currentText += text2;
-      }
-      return finalized ? [finalized] : [];
-    }
-    if (delta2.message_type === "tool_call_message" || delta2.message_type === "approval_request_message") {
-      const finalized = this.finalizeCurrent();
-      return finalized ? [finalized] : [];
-    }
-    if (delta2.message_type === "reasoning_message") {
-      const boundaryId = delta2.otid || delta2.id;
-      if (this.currentMessageId && (!boundaryId || boundaryId !== this.currentMessageId)) {
-        const finalized = this.finalizeCurrent();
-        return finalized ? [finalized] : [];
-      }
-    }
-    return [];
-  }
-  finalizeCurrent() {
-    const messageId2 = this.currentMessageId;
-    if (!messageId2)
-      return null;
-    const text2 = this.currentText.trim();
-    this.currentMessageId = null;
-    this.currentText = "";
-    this.finalizedMessageIds.add(messageId2);
-    return text2 ? { messageId: messageId2, text: text2 } : null;
-  }
-}
-function relayFinalizedAssistantMessage(options) {
-  if (options.sources.length !== 1 || !options.relay)
-    return;
-  const warn = (error5) => {
-    const detail = error5 instanceof Error ? error5.message : String(error5);
-    console.warn(`[channels] Automatic relay failed: ${detail}`);
-  };
-  try {
-    const pending = options.relay({
-      text: options.message.text,
-      sources: options.sources,
-      idempotencyScope: options.idempotencyScope
-    });
-    if (pending)
-      return pending.catch(warn);
-  } catch (error5) {
-    warn(error5);
-  }
-}
-function stopReasonFromDelta(message) {
-  const delta2 = message.delta;
-  return delta2.message_type === "stop_reason" && "stop_reason" in delta2 && typeof delta2.stop_reason === "string" ? delta2.stop_reason : null;
-}
-function runIdFromDelta(message) {
-  const runId = "run_id" in message.delta ? message.delta.run_id : undefined;
-  return typeof runId === "string" && runId.length > 0 ? runId : undefined;
-}
-function channelTurnOutcome(stopReason) {
-  if (stopReason === "cancelled")
-    return "cancelled";
-  return stopReason === "end_turn" || stopReason === "tool_rule" ? "completed" : "error";
-}
-
-// src/channels/gateway-registration-policy.ts
-async function prepareGatewayRegistrationPolicy(options) {
-  const automaticRelay = options.override ?? (options.hooks.resolveAssistantRelayPolicy ? await options.hooks.resolveAssistantRelayPolicy(options.runtime, options.sources) : Boolean(options.hooks.relayAssistantText));
-  const tool = await options.hooks.buildExternalTool(options.runtime, options.sources, { automaticRelay });
-  return { automaticRelay, tool };
-}
-function modelStatusFromRuntimeStart(response, runtime) {
-  const agent = response.agent;
-  const conversation = response.conversation;
-  const agentModel = typeof agent?.model === "string" ? agent.model : response.agent?.llm_config?.model ?? null;
-  const conversationModel = typeof conversation?.model === "string" ? conversation.model : null;
-  const isAgentScope = runtime.conversation_id === "default";
-  return {
-    modelHandle: isAgentScope ? agentModel : conversationModel ?? agentModel,
-    scope: isAgentScope ? "agent" : "conversation"
-  };
-}
-
 // src/channels/gateway-sources.ts
 function sourceRouteKey(source) {
   return [
@@ -464959,231 +464711,6 @@ function uniqueRoutedSources(sources) {
 function uniqueLifecycleSources(sources) {
   return uniqueSourcesBy(sources, sourceLifecycleKey);
 }
-function channelTagsForSources(sources) {
-  return [...new Set(sources.map((source) => `channel:${source.channel}`))];
-}
-
-// src/channels/gateway-runtime-registration.ts
-async function performGatewayRuntimeRegistration(options) {
-  const {
-    client,
-    hooks,
-    state: state2,
-    delivery,
-    policyOverride,
-    externalToolsOverride
-  } = options;
-  const prepared = externalToolsOverride ? { automaticRelay: policyOverride ?? false, tool: null } : await prepareGatewayRegistrationPolicy({
-    hooks,
-    runtime: delivery.runtime,
-    sources: delivery.sources,
-    ...policyOverride === undefined ? {} : { override: policyOverride }
-  });
-  const { automaticRelay, tool } = prepared;
-  const externalTools = externalToolsOverride ?? (tool ? [{ tools: [tool] }] : []);
-  const conversationTags2 = channelTagsForSources(delivery.sources);
-  const signature = JSON.stringify({
-    mode: delivery.defaultPermissionMode ?? null,
-    automaticRelay,
-    externalTools,
-    conversationTags: conversationTags2
-  });
-  if (state2.registrationSignature === signature && state2.registration) {
-    await state2.registration;
-    return automaticRelay;
-  }
-  const registration = client.runtimeStart({
-    agent_id: delivery.runtime.agent_id,
-    conversation_id: delivery.runtime.conversation_id,
-    ...conversationTags2.length > 0 ? { conversation_source_tags: conversationTags2 } : {},
-    ...delivery.defaultPermissionMode ? { mode: delivery.defaultPermissionMode } : {},
-    recover_approvals: true,
-    force_device_status: false,
-    wait_for_replay: true,
-    preserve_skill_sources: true,
-    client_info: { name: "channel-gateway", title: "Channel Gateway" },
-    external_tools: externalTools
-  }).then((response) => {
-    if (!response.success) {
-      throw new Error(response.error ?? "Failed to register channel runtime");
-    }
-    state2.modelStatus = modelStatusFromRuntimeStart(response, delivery.runtime);
-  });
-  state2.registrationSignature = signature;
-  state2.registration = registration;
-  try {
-    await registration;
-  } catch (error5) {
-    if (state2.registration === registration) {
-      state2.registration = null;
-      state2.registrationSignature = null;
-    }
-    throw error5;
-  }
-  return automaticRelay;
-}
-var init_gateway_runtime_registration = () => {};
-
-// src/channels/gateway-runtime-state.ts
-function gatewayRuntimeKey(runtime) {
-  return `${runtime.agent_id}:${runtime.conversation_id}`;
-}
-function hasAgentRuntime(value) {
-  return !!value.runtime?.agent_id;
-}
-function hasGatewayRuntimeWork(state2) {
-  return Boolean(state2 && (state2.active || state2.pendingSourcesByClientMessageId.size > 0));
-}
-function rememberAcceptedClientMessageId(state2, clientMessageId) {
-  state2.acceptedClientMessageIds.delete(clientMessageId);
-  state2.acceptedClientMessageIds.add(clientMessageId);
-  if (state2.acceptedClientMessageIds.size <= MAX_ACCEPTED_CLIENT_MESSAGE_IDS)
-    return;
-  const oldest = state2.acceptedClientMessageIds.values().next().value;
-  if (oldest)
-    state2.acceptedClientMessageIds.delete(oldest);
-}
-function remainingGatewaySources(state2) {
-  return uniqueLifecycleSources([
-    ...state2.active?.lifecycleSources ?? [],
-    ...Array.from(state2.pendingSourcesByClientMessageId.values()).flatMap((pending) => pending.sources)
-  ]);
-}
-var MAX_ACCEPTED_CLIENT_MESSAGE_IDS = 2048;
-var init_gateway_runtime_state = () => {};
-
-// src/channels/gateway-runtime-tool-scopes.ts
-function runtimeKey(runtime) {
-  return `${runtime.agent_id}:${runtime.conversation_id}`;
-}
-
-class GatewayRuntimeToolScopes {
-  client;
-  states = new Map;
-  retryTimers = new Set;
-  closed = false;
-  constructor(client) {
-    this.client = client;
-  }
-  create(runtime, sources, automaticRelay, tool) {
-    const id2 = `channel-turn-${crypto.randomUUID()}`;
-    const scope = {
-      id: id2,
-      runtime,
-      sources: structuredClone(sources),
-      automaticRelay,
-      ...tool ? { group: { scope_id: id2, tools: [structuredClone(tool)] } } : {}
-    };
-    this.retain(scope);
-    return scope;
-  }
-  retain(scope) {
-    this.getState(scope.runtime).scopes.set(scope.id, scope);
-  }
-  detach(scope) {
-    this.states.get(runtimeKey(scope.runtime))?.scopes.delete(scope.id);
-    return scope;
-  }
-  release(scope) {
-    this.states.get(runtimeKey(scope.runtime))?.scopes.delete(scope.id);
-  }
-  resolve(runtime, scopeId) {
-    return this.states.get(runtimeKey(runtime))?.scopes.get(scopeId) ?? null;
-  }
-  selection(scope) {
-    return [scope.id];
-  }
-  hasRetainedScopes(runtime) {
-    return (this.states.get(runtimeKey(runtime))?.scopes.size ?? 0) > 0;
-  }
-  registrationGroups(runtime, includeUnscoped) {
-    const state2 = this.states.get(runtimeKey(runtime));
-    if (!state2)
-      return [];
-    const scoped = [...state2.scopes.values()].flatMap((scope) => scope.group ? [scope.group] : []);
-    return includeUnscoped ? [...scoped, ...state2.desiredUnscoped] : scoped;
-  }
-  setDesiredUnscoped(runtime, groups) {
-    this.getState(runtime).desiredUnscoped = groups;
-  }
-  async updateDesiredUnscoped(updates, isBusy) {
-    const immediateByTools = new Map;
-    for (const update3 of updates) {
-      for (const runtime of update3.runtimes) {
-        this.getState(runtime).desiredUnscoped = update3.external_tools;
-        if (!isBusy(runtime)) {
-          const externalTools = this.registrationGroups(runtime, true);
-          const signature = JSON.stringify(externalTools);
-          const existing = immediateByTools.get(signature);
-          if (existing)
-            existing.runtimes.push(runtime);
-          else
-            immediateByTools.set(signature, {
-              runtimes: [runtime],
-              external_tools: externalTools
-            });
-        }
-      }
-    }
-    const immediate = [...immediateByTools.values()];
-    if (immediate.length === 0)
-      return;
-    const response = await this.client.runtimeExternalToolsUpdate({
-      updates: immediate
-    });
-    if (!response.success) {
-      throw new Error(response.error ?? "Failed to update routed runtime tools");
-    }
-  }
-  flushWhenIdle(runtime, isBusy, schedule) {
-    if (isBusy() || this.closed)
-      return;
-    schedule(async () => {
-      if (isBusy())
-        return;
-      const response = await this.client.runtimeExternalToolsUpdate({
-        updates: [
-          {
-            runtimes: [runtime],
-            external_tools: this.registrationGroups(runtime, true)
-          }
-        ]
-      });
-      if (!response.success) {
-        throw new Error(response.error ?? "Failed to update routed runtime tools");
-      }
-    }).catch(() => {
-      if (this.closed)
-        return;
-      const timer = setTimeout(() => {
-        this.retryTimers.delete(timer);
-        this.flushWhenIdle(runtime, isBusy, schedule);
-      }, RETRY_DELAY_MS);
-      timer.unref?.();
-      this.retryTimers.add(timer);
-    });
-  }
-  forgetRuntime(runtime) {
-    this.states.delete(runtimeKey(runtime));
-  }
-  close() {
-    this.closed = true;
-    for (const timer of this.retryTimers)
-      clearTimeout(timer);
-    this.retryTimers.clear();
-    this.states.clear();
-  }
-  getState(runtime) {
-    const key3 = runtimeKey(runtime);
-    let state2 = this.states.get(key3);
-    if (!state2) {
-      state2 = { runtime, scopes: new Map, desiredUnscoped: [] };
-      this.states.set(key3, state2);
-    }
-    return state2;
-  }
-}
-var RETRY_DELAY_MS = 1000;
 
 // src/channels/progress-builder.ts
 function getMessageType(delta2) {
@@ -465590,40 +465117,49 @@ var init_progress_builder = __esm(() => {
 });
 
 // src/channels/gateway-core.ts
+function runtimeKey(runtime) {
+  return `${runtime.agent_id}:${runtime.conversation_id}`;
+}
+function hasAgentRuntime(value) {
+  return !!value.runtime?.agent_id;
+}
+function channelTagsForSources(sources) {
+  return [...new Set(sources.map((source) => `channel:${source.channel}`))];
+}
+function stopReasonFromDelta(message) {
+  const delta2 = message.delta;
+  return delta2.message_type === "stop_reason" && "stop_reason" in delta2 && typeof delta2.stop_reason === "string" ? delta2.stop_reason : null;
+}
+function runIdFromDelta(message) {
+  const runId = "run_id" in message.delta ? message.delta.run_id : undefined;
+  return typeof runId === "string" && runId.length > 0 ? runId : undefined;
+}
+function lifecycleOutcome(stopReason) {
+  if (stopReason === "cancelled")
+    return "cancelled";
+  if (stopReason === "end_turn" || stopReason === "tool_rule") {
+    return "completed";
+  }
+  return "error";
+}
+
 class ChannelGateway {
   client;
   hooks;
   states = new Map;
   disposers = [];
-  runtimeToolScopes;
   registrationQueue = Promise.resolve();
   constructor(client, hooks) {
     this.client = client;
     this.hooks = hooks;
-    this.runtimeToolScopes = new GatewayRuntimeToolScopes(client);
-    this.disposers.push(client.onMessage((message) => this.handleMessage(message)), client.onExternalToolCall(async (request2) => {
-      const state2 = hasAgentRuntime(request2) ? this.states.get(gatewayRuntimeKey(request2.runtime)) : undefined;
+    this.disposers.push(client.onMessage((message) => this.handleMessage(message)), client.onExternalToolCall((request2) => {
+      const state2 = hasAgentRuntime(request2) ? this.states.get(runtimeKey(request2.runtime)) : undefined;
       const active = state2?.active;
-      const scoped = hasAgentRuntime(request2) && request2.scope_id ? this.runtimeToolScopes.resolve(request2.runtime, request2.scope_id) : null;
-      if (request2.scope_id && !scoped) {
-        throw new Error(`Unknown or stale external tool scope: ${request2.scope_id}`);
-      }
-      const sources = scoped?.sources ?? active?.routingSources ?? state2?.routedSources ?? [];
-      const activeOwnsScope = Boolean(scoped && active?.toolScopes.some((scope) => scope.id === scoped.id));
-      try {
-        return await hooks.executeExternalTool(request2, sources, activeOwnsScope || !request2.scope_id && active ? active?.idempotencyScope : null);
-      } catch (error5) {
-        if (!(error5 instanceof MessageChannelDuplicateActionError))
-          throw error5;
-        return {
-          content: [{ type: "text", text: error5.message }],
-          is_error: true
-        };
-      }
+      const sources = active?.routingSources ?? state2?.routedSources ?? [];
+      return hooks.executeExternalTool(request2, sources, active?.idempotencyScope ?? null);
     }));
   }
   close() {
-    this.runtimeToolScopes.close();
     for (const dispose of this.disposers.splice(0))
       dispose();
     this.client.close();
@@ -465648,34 +465184,16 @@ class ChannelGateway {
     const workAtSubmit = state2.active || state2.pendingSourcesByClientMessageId.size > 0;
     state2.pendingSourcesByClientMessageId.set(delivery.clientMessageId, {
       sources: uniqueLifecycleSources(delivery.sources),
-      disposition: "submitting",
-      automaticRelay: false
+      disposition: "submitting"
     });
     try {
-      const toolScope = await this.enqueueRegistration(async () => {
+      await this.enqueueRegistration(async () => {
         state2.routedSources = uniqueRoutedSources([
           ...state2.routedSources,
           ...delivery.sources
         ]);
-        const { automaticRelay, tool } = await prepareGatewayRegistrationPolicy({
-          hooks: this.hooks,
-          runtime: delivery.runtime,
-          sources: delivery.sources
-        });
-        const scope = this.runtimeToolScopes.create(delivery.runtime, delivery.sources, automaticRelay, tool);
-        try {
-          await this.performRuntimeRegistration(state2, delivery, automaticRelay, this.runtimeToolScopes.registrationGroups(delivery.runtime, false));
-          return scope;
-        } catch (error5) {
-          this.runtimeToolScopes.release(scope);
-          throw error5;
-        }
+        await this.performRuntimeRegistration(state2, delivery);
       });
-      const submitted = state2.pendingSourcesByClientMessageId.get(delivery.clientMessageId);
-      if (submitted) {
-        submitted.automaticRelay = toolScope.automaticRelay;
-        submitted.toolScope = toolScope;
-      }
       const response = await this.client.submitInput({
         runtime: delivery.runtime,
         payload: {
@@ -465688,24 +465206,21 @@ class ChannelGateway {
             }
           ],
           image_failure_mode: "drop",
-          client_preferences: {},
-          external_tool_scope_ids: this.runtimeToolScopes.selection(toolScope)
+          client_preferences: {}
         }
       });
       if (!response.accepted) {
         state2.pendingSourcesByClientMessageId.delete(delivery.clientMessageId);
-        this.runtimeToolScopes.release(toolScope);
-        this.finishToolScopesIfIdle(state2);
         if (workAtSubmit && !state2.active)
           this.finishRejectedDelivery(state2, delivery);
         return false;
       }
-      rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
+      this.rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
       for (const source of delivery.sources) {
         this.enqueueHook(state2, () => this.hooks.onLifecycle({ type: "queued", source }));
       }
       if (response.disposition === "started") {
-        this.activateSources(state2, delivery.clientMessageId, delivery.sources, toolScope.automaticRelay, toolScope);
+        this.activateSources(state2, delivery.clientMessageId, delivery.sources);
         state2.pendingSourcesByClientMessageId.delete(delivery.clientMessageId);
       } else if (response.disposition === "queued") {
         const pending = state2.pendingSourcesByClientMessageId.get(delivery.clientMessageId);
@@ -465716,19 +465231,20 @@ class ChannelGateway {
       }
       return true;
     } catch (error5) {
-      const failed2 = state2.pendingSourcesByClientMessageId.get(delivery.clientMessageId);
       state2.pendingSourcesByClientMessageId.delete(delivery.clientMessageId);
-      if (failed2?.toolScope) {
-        this.runtimeToolScopes.release(failed2.toolScope);
-      }
-      this.finishToolScopesIfIdle(state2);
       if (workAtSubmit && !state2.active)
         this.finishRejectedDelivery(state2, delivery);
       throw error5;
     }
   }
+  remainingSources(state2) {
+    return uniqueLifecycleSources([
+      ...state2.active?.lifecycleSources ?? [],
+      ...Array.from(state2.pendingSourcesByClientMessageId.values()).flatMap((pending) => pending.sources)
+    ]);
+  }
   finishRejectedDelivery(state2, delivery) {
-    const remainingSources = remainingGatewaySources(state2);
+    const remainingSources = this.remainingSources(state2);
     this.enqueueHook(state2, () => this.hooks.onLifecycle({
       type: "finished",
       batchId: `channel-${delivery.clientMessageId}`,
@@ -465753,14 +465269,13 @@ class ChannelGateway {
     }
     state2.pendingSourcesByClientMessageId.set(delivery.clientMessageId, {
       sources,
-      disposition: "queued",
-      automaticRelay: false
+      disposition: "queued"
     });
     state2.routedSources = uniqueRoutedSources([
       ...state2.routedSources,
       ...delivery.sources
     ]);
-    rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
+    this.rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
   }
   async restoreRuntime(runtime, sources) {
     const state2 = this.getState(runtime);
@@ -465773,10 +465288,7 @@ class ChannelGateway {
         lifecycleSources: uniqueLifecycleSources(sources),
         progress: createChannelTurnProgressBuilder(),
         richDraft: null,
-        assistantText: new GatewayAssistantTextAccumulator,
-        idempotencyScope: createMessageChannelIdempotencyScope(),
-        relayEligible: false,
-        toolScopes: []
+        idempotencyScope: createMessageChannelIdempotencyScope()
       };
       state2.active = recoveredTurn;
     }
@@ -465794,7 +465306,7 @@ class ChannelGateway {
     return replayedRequestIds;
   }
   async adoptActiveDelivery(delivery) {
-    const key3 = gatewayRuntimeKey(delivery.runtime);
+    const key3 = runtimeKey(delivery.runtime);
     const stateExisted = this.states.has(key3);
     const state2 = this.getState(delivery.runtime);
     const batchId = `channel-${delivery.clientMessageId}`;
@@ -465803,8 +465315,8 @@ class ChannelGateway {
         if (state2.active.batchId !== batchId) {
           throw new Error(`Cannot adopt ${batchId}; ${state2.active.batchId} is already active`);
         }
-        this.activateSources(state2, delivery.clientMessageId, delivery.sources, state2.active.relayEligible);
-        rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
+        this.activateSources(state2, delivery.clientMessageId, delivery.sources);
+        this.rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
         return;
       }
       const previousRoutedSources = state2.routedSources;
@@ -465816,21 +465328,19 @@ class ChannelGateway {
         lifecycleSources: uniqueLifecycleSources(delivery.sources),
         progress: createChannelTurnProgressBuilder(),
         richDraft: null,
-        assistantText: new GatewayAssistantTextAccumulator(delivery.activeTurnState?.assistantText),
-        idempotencyScope: createMessageChannelIdempotencyScope(delivery.activeTurnState?.idempotency),
-        relayEligible: delivery.activeTurnState?.automaticRelay ?? Boolean(delivery.activeTurnState),
-        toolScopes: delivery.activeTurnState?.toolScopes ?? []
+        idempotencyScope: createMessageChannelIdempotencyScope()
       };
       state2.active = active;
-      for (const scope of active.toolScopes)
-        this.runtimeToolScopes.retain(scope);
       state2.routedSources = uniqueRoutedSources([
         ...state2.routedSources,
         ...delivery.sources
       ]);
-      rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
+      this.rememberAcceptedClientMessageId(state2, delivery.clientMessageId);
       try {
-        await this.performRuntimeRegistration(state2, { ...delivery, content: "" }, active.relayEligible, this.runtimeToolScopes.registrationGroups(delivery.runtime, false));
+        await this.performRuntimeRegistration(state2, {
+          ...delivery,
+          content: ""
+        });
         if (state2.active !== active)
           return;
         active.richDraft = this.hooks.createRichDraft?.({
@@ -465844,9 +465354,6 @@ class ChannelGateway {
         }));
       } catch (error5) {
         active.richDraft?.dispose();
-        for (const scope of active.toolScopes) {
-          this.runtimeToolScopes.release(scope);
-        }
         if (state2.active === active)
           state2.active = null;
         state2.routedSources = previousRoutedSources;
@@ -465860,67 +465367,51 @@ class ChannelGateway {
     });
   }
   releaseActiveDelivery(runtime, clientMessageId) {
-    const key3 = gatewayRuntimeKey(runtime);
+    const key3 = runtimeKey(runtime);
     const state2 = this.states.get(key3);
     const active = state2?.active;
     if (!state2 || active?.batchId !== `channel-${clientMessageId}`) {
-      return null;
+      return false;
     }
-    if (state2.hookQueue)
-      return null;
-    const idempotency = active.idempotencyScope.snapshot();
-    if (!idempotency)
-      return null;
-    const toolScopes = active.toolScopes.map((scope) => this.runtimeToolScopes.detach(scope));
-    const handoffState = {
-      assistantText: active.assistantText.snapshot(),
-      idempotency,
-      automaticRelay: active.relayEligible,
-      ...toolScopes.length > 0 ? { toolScopes } : {}
-    };
     active.richDraft?.dispose();
     this.states.delete(key3);
-    return handoffState;
+    return true;
   }
   async registerRuntime(runtime, sources = [], defaultPermissionMode) {
     const state2 = this.getState(runtime);
     await this.enqueueRegistration(async () => {
       this.setRoutedSources(runtime, sources);
-      const prepared = await prepareGatewayRegistrationPolicy({
-        hooks: this.hooks,
-        runtime,
-        sources
-      });
-      const externalTools = prepared.tool ? [{ tools: [prepared.tool] }] : [];
-      this.runtimeToolScopes.setDesiredUnscoped(runtime, externalTools);
-      if (this.runtimeToolScopes.hasRetainedScopes(runtime))
-        return;
       await this.performRuntimeRegistration(state2, {
         runtime,
         content: "",
         sources,
         clientMessageId: "recovered",
         ...defaultPermissionMode ? { defaultPermissionMode } : {}
-      }, prepared.automaticRelay, externalTools);
+      });
     });
   }
   async publishRuntimeTools(runtime, sources = []) {
     return await this.enqueueRegistration(async () => {
-      if (this.states.has(gatewayRuntimeKey(runtime)))
+      if (this.states.has(runtimeKey(runtime)))
         return false;
       const tool = await this.hooks.buildExternalTool(runtime, sources);
-      await this.runtimeToolScopes.updateDesiredUnscoped([
-        {
-          runtimes: [runtime],
-          external_tools: tool ? [{ tools: [tool] }] : []
-        }
-      ], () => false);
+      const response = await this.client.runtimeExternalToolsUpdate({
+        updates: [
+          {
+            runtimes: [runtime],
+            external_tools: tool ? [{ tools: [tool] }] : []
+          }
+        ]
+      });
+      if (!response.success) {
+        throw new Error(response.error ?? "Failed to publish channel runtime tools");
+      }
       return tool !== null;
     });
   }
   async releaseRuntimeTools(runtime, routedSources = [], options = {}) {
     await this.enqueueRegistration(async () => {
-      const key3 = gatewayRuntimeKey(runtime);
+      const key3 = runtimeKey(runtime);
       const state2 = this.states.get(key3);
       if (options.cleanupIdleRuntime) {
         if (routedSources.length > 0 || (state2?.routedSources.length ?? 0) > 0) {
@@ -465942,7 +465433,6 @@ class ChannelGateway {
       if (!response.success) {
         throw new Error(response.error ?? "Failed to release channel runtime tools");
       }
-      this.runtimeToolScopes.forgetRuntime(runtime);
     });
   }
   async submitApprovalResponse(runtime, response) {
@@ -465960,14 +465450,21 @@ class ChannelGateway {
   }
   updateRoutedRuntimeTools(updates, routedSources) {
     return this.enqueueRegistration(async () => {
-      await this.runtimeToolScopes.updateDesiredUnscoped(updates, (runtime) => hasGatewayRuntimeWork(this.states.get(gatewayRuntimeKey(runtime))));
+      if (updates.length > 0) {
+        const response = await this.client.runtimeExternalToolsUpdate({
+          updates
+        });
+        if (!response.success) {
+          throw new Error(response.error ?? "Failed to update routed runtime tools");
+        }
+      }
       for (const update3 of routedSources) {
         this.setRoutedSources(update3.runtime, update3.sources);
       }
     });
   }
   getModelStatus(runtime) {
-    return this.states.get(gatewayRuntimeKey(runtime))?.modelStatus ?? null;
+    return this.states.get(runtimeKey(runtime))?.modelStatus ?? null;
   }
   updateModelStatus(runtime, modelHandle) {
     const state2 = this.getState(runtime);
@@ -465977,7 +465474,7 @@ class ChannelGateway {
     };
   }
   getState(runtime) {
-    const key3 = gatewayRuntimeKey(runtime);
+    const key3 = runtimeKey(runtime);
     let state2 = this.states.get(key3);
     if (!state2) {
       state2 = {
@@ -465997,10 +465494,14 @@ class ChannelGateway {
     }
     return state2;
   }
-  finishToolScopesIfIdle(state2) {
-    if (state2.active || state2.pendingSourcesByClientMessageId.size > 0)
+  rememberAcceptedClientMessageId(state2, clientMessageId) {
+    state2.acceptedClientMessageIds.delete(clientMessageId);
+    state2.acceptedClientMessageIds.add(clientMessageId);
+    if (state2.acceptedClientMessageIds.size <= MAX_ACCEPTED_CLIENT_MESSAGE_IDS)
       return;
-    this.runtimeToolScopes.flushWhenIdle(state2.runtime, () => hasGatewayRuntimeWork(this.states.get(gatewayRuntimeKey(state2.runtime))), (task2) => this.enqueueRegistration(task2));
+    const oldest = state2.acceptedClientMessageIds.values().next().value;
+    if (oldest)
+      state2.acceptedClientMessageIds.delete(oldest);
   }
   enqueueHook(state2, hook) {
     let pending;
@@ -466034,15 +465535,52 @@ class ChannelGateway {
     });
     return result3;
   }
-  async performRuntimeRegistration(state2, delivery, policyOverride, externalToolsOverride) {
-    return await performGatewayRuntimeRegistration({
-      client: this.client,
-      hooks: this.hooks,
-      state: state2,
-      delivery,
-      ...policyOverride === undefined ? {} : { policyOverride },
-      ...externalToolsOverride === undefined ? {} : { externalToolsOverride }
+  async performRuntimeRegistration(state2, delivery) {
+    const tool = await this.hooks.buildExternalTool(delivery.runtime, delivery.sources);
+    const conversationTags2 = channelTagsForSources(delivery.sources);
+    const signature = JSON.stringify({
+      mode: delivery.defaultPermissionMode ?? null,
+      tool,
+      conversationTags: conversationTags2
+    });
+    if (state2.registrationSignature === signature && state2.registration) {
+      return state2.registration;
+    }
+    const registration = this.client.runtimeStart({
+      agent_id: delivery.runtime.agent_id,
+      conversation_id: delivery.runtime.conversation_id,
+      ...conversationTags2.length > 0 ? { conversation_source_tags: conversationTags2 } : {},
+      ...delivery.defaultPermissionMode ? { mode: delivery.defaultPermissionMode } : {},
+      recover_approvals: true,
+      force_device_status: false,
+      wait_for_replay: true,
+      preserve_skill_sources: true,
+      client_info: { name: "channel-gateway", title: "Channel Gateway" },
+      external_tools: tool ? [{ tools: [tool] }] : []
+    }).then((response) => {
+      if (!response.success) {
+        throw new Error(response.error ?? "Failed to register channel runtime");
+      }
+      const agentRecord = response.agent;
+      const conversationRecord = response.conversation;
+      const agentModel = typeof agentRecord?.model === "string" ? agentRecord.model : response.agent?.llm_config?.model ?? null;
+      const conversationModel = typeof conversationRecord?.model === "string" ? conversationRecord.model : null;
+      state2.modelStatus = {
+        modelHandle: delivery.runtime.conversation_id === "default" ? agentModel : conversationModel ?? agentModel,
+        scope: delivery.runtime.conversation_id === "default" ? "agent" : "conversation"
+      };
     });
+    state2.registrationSignature = signature;
+    state2.registration = registration;
+    try {
+      await registration;
+    } catch (error5) {
+      if (state2.registration === registration) {
+        state2.registration = null;
+        state2.registrationSignature = null;
+      }
+      throw error5;
+    }
   }
   handleMessage(message) {
     if (message.type === "update_queue") {
@@ -466090,25 +465628,15 @@ class ChannelGateway {
         continue;
       }
       const target2 = pending.removalDisposition === "dequeued" ? dequeued : cancelled;
-      target2.push({
-        clientMessageId,
-        sources: pending.sources,
-        automaticRelay: pending.automaticRelay,
-        ...pending.toolScope ? { toolScope: pending.toolScope } : {}
-      });
+      target2.push({ clientMessageId, sources: pending.sources });
       state2.pendingSourcesByClientMessageId.delete(clientMessageId);
     }
     const firstDequeued = dequeued[0];
     if (firstDequeued) {
-      const dequeuedScopes = dequeued.flatMap((entry) => entry.toolScope ? [entry.toolScope] : []);
-      this.activateSources(state2, firstDequeued.clientMessageId, dequeued.flatMap((entry) => entry.sources), dequeued.every((entry) => entry.automaticRelay), dequeuedScopes[0]);
-      if (state2.active)
-        state2.active.toolScopes.push(...dequeuedScopes.slice(1));
+      this.activateSources(state2, firstDequeued.clientMessageId, dequeued.flatMap((entry) => entry.sources));
     }
     for (const entry of cancelled) {
-      if (entry.toolScope)
-        this.runtimeToolScopes.release(entry.toolScope);
-      const remainingSources = remainingGatewaySources(state2);
+      const remainingSources = this.remainingSources(state2);
       this.enqueueHook(state2, () => this.hooks.onLifecycle({
         type: "finished",
         batchId: `channel-${entry.clientMessageId}`,
@@ -466118,12 +465646,9 @@ class ChannelGateway {
         ...remainingSources.length ? { remainingSources } : {}
       }));
     }
-    this.finishToolScopesIfIdle(state2);
   }
-  activateSources(state2, clientMessageId, sources, automaticRelay, toolScope) {
+  activateSources(state2, clientMessageId, sources) {
     if (state2.active) {
-      if (toolScope)
-        state2.active.toolScopes.push(toolScope);
       const knownLifecycleKeys = new Set(state2.active.lifecycleSources.map(sourceLifecycleKey));
       const addedLifecycleSources = uniqueLifecycleSources(sources).filter((source) => !knownLifecycleKeys.has(sourceLifecycleKey(source)));
       if (addedLifecycleSources.length === 0)
@@ -466136,7 +465661,6 @@ class ChannelGateway {
         ...state2.active.routingSources,
         ...sources
       ]);
-      state2.active.relayEligible &&= automaticRelay;
       const processingEvent2 = {
         type: "processing",
         batchId: state2.active.batchId,
@@ -466156,10 +465680,7 @@ class ChannelGateway {
         batchId: `channel-${clientMessageId}`,
         sources: routingSources
       }) ?? null,
-      assistantText: new GatewayAssistantTextAccumulator,
-      idempotencyScope: createMessageChannelIdempotencyScope(),
-      relayEligible: automaticRelay,
-      toolScopes: toolScope ? [toolScope] : []
+      idempotencyScope: createMessageChannelIdempotencyScope()
     };
     const processingEvent = {
       type: "processing",
@@ -466178,7 +465699,6 @@ class ChannelGateway {
     const runId = runIdFromDelta(message);
     if (runId)
       active.runId = runId;
-    this.enqueueFinalizedAssistantMessages(state2, active, active.assistantText.handleDelta(message));
     for (const update3 of active.progress.buildUpdates(message.delta)) {
       this.enqueueHook(state2, () => this.hooks.onProgress({
         type: "progress",
@@ -466189,46 +465709,23 @@ class ChannelGateway {
     }
     active.richDraft?.handleDelta(message.delta);
     const stopReason = stopReasonFromDelta(message);
-    if (stopReason === "requires_approval" || stopReason === "end_turn" || stopReason === "tool_rule") {
+    if (stopReason === "requires_approval" || stopReason === "end_turn") {
       active.richDraft?.flushPending();
-      const finalized = active.assistantText.finalizeCurrent();
-      if (finalized) {
-        this.enqueueFinalizedAssistantMessages(state2, active, [finalized]);
-      }
     }
   }
-  enqueueFinalizedAssistantMessages(state2, active, messages) {
-    const relay = active.relayEligible ? this.hooks.relayAssistantText : undefined;
-    for (const message of messages)
-      this.enqueueHook(state2, () => relayFinalizedAssistantMessage({
-        message,
-        sources: active.routingSources,
-        idempotencyScope: active.idempotencyScope,
-        relay
-      }));
-  }
   handleTurnFinished(runtime, terminal) {
     const state2 = this.getState(runtime);
     const active = state2.active;
     if (!active)
       return;
-    if (terminal.stopReason === "end_turn" || terminal.stopReason === "tool_rule") {
-      const finalized = active.assistantText.finalizeCurrent();
-      if (finalized) {
-        this.enqueueFinalizedAssistantMessages(state2, active, [finalized]);
-      }
-    }
     state2.active = null;
     active.richDraft?.dispose();
-    for (const scope of active.toolScopes)
-      this.runtimeToolScopes.release(scope);
-    this.finishToolScopesIfIdle(state2);
-    const remainingSources = channelTurnOutcome(terminal.stopReason) === "completed" ? remainingGatewaySources(state2) : [];
+    const remainingSources = lifecycleOutcome(terminal.stopReason) === "completed" ? this.remainingSources(state2) : [];
     this.enqueueHook(state2, () => this.hooks.onLifecycle({
       type: "finished",
       batchId: active.batchId,
       sources: active.lifecycleSources,
-      outcome: channelTurnOutcome(terminal.stopReason),
+      outcome: lifecycleOutcome(terminal.stopReason),
       stopReason: terminal.stopReason,
       ...remainingSources.length ? { remainingSources } : {},
       ...terminal.runId ?? active.runId ? { runId: terminal.runId ?? active.runId } : {},
@@ -466238,7 +465735,7 @@ class ChannelGateway {
   handleControlRequest(message) {
     if (!message.agent_id || !message.conversation_id)
       return;
-    const state2 = this.states.get(gatewayRuntimeKey({
+    const state2 = this.states.get(runtimeKey({
       agent_id: message.agent_id,
       conversation_id: message.conversation_id
     }));
@@ -466261,9 +465758,8 @@ class ChannelGateway {
     }));
   }
 }
+var MAX_ACCEPTED_CLIENT_MESSAGE_IDS = 2048;
 var init_gateway_core = __esm(() => {
-  init_gateway_runtime_registration();
-  init_gateway_runtime_state();
   init_message_channel_idempotency();
   init_progress_builder();
 });
@@ -466368,15 +465864,12 @@ function resolveMessageChannelToolChannels(channels) {
       actions.add(action3);
     schemaContributions.push(...asSchemaContributionArray(discovery?.schema));
   }
-  const routedDestinationKeys = new Set(channels.map((channel) => channel.routedDestinationKey).filter(Boolean));
-  const hasCompleteDestinationKeys = channels.every((channel) => channel.routedDestinationKey);
   return {
     activeChannels: [...uniqueChannels.keys()],
     displayNames: [...uniqueChannels.values()].map((channel) => channel.displayName),
     accountIds: [...accountIds],
     actions: [...actions],
-    schemaContributions,
-    automaticRelay: channels.length > 0 && channels.every((channel) => channel.replyMode === "relay") && (hasCompleteDestinationKeys ? routedDestinationKeys.size === 1 : channels.length === 1)
+    schemaContributions
   };
 }
 function mergeSchemaContributions(schema5, contributions) {
@@ -466454,9 +465947,7 @@ No external channel adapters are currently running.`;
   const channelList = discovery.displayNames.join(", ");
   const actionList = discovery.actions.join(", ");
   const hasAction = (action3) => discovery.actions.includes(action3);
-  const scopedReplyContract = scoped ? discovery.automaticRelay ? `
-
-This routed external channel turn uses automatic relay. Plain assistant text is delivered to the external user as each assistant message is finalized, so write the user-visible reply normally and do not make a duplicate MessageChannel send. When a host exposes MessageChannel alongside relay, use it only for explicit actions such as reactions and files; exact duplicate final text is suppressed.` : '\n\nThis tool is currently scoped to a routed external channel turn. Plain assistant text is not delivered to that external user. If a user-visible reply is appropriate, your final action for the turn must be one MessageChannel call with action="send", channel from the notification, chat_id from the notification, and message containing the reply. After that final send succeeds, do not repeat or paraphrase the sent message in assistant text; finish with only `Sent.` as the internal confirmation. This does not apply to a short acknowledgement sent before continuing substantive work. If no user-visible response is appropriate, do not call MessageChannel and do not send an empty acknowledgement. For lightweight acknowledgement, prefer action="react" when supported. If the useful response belongs later, schedule the follow-up instead of sending a placeholder.' : "";
+  const scopedReplyContract = scoped ? '\n\nThis tool is currently scoped to a routed external channel turn. Plain assistant text is not delivered to that external user. If a user-visible reply is appropriate, your final action for the turn must be one MessageChannel call with action="send", channel from the notification, chat_id from the notification, and message containing the reply. After that final send succeeds, do not repeat or paraphrase the sent message in assistant text; finish with only `Sent.` as the internal confirmation. This does not apply to a short acknowledgement sent before continuing substantive work. If no user-visible response is appropriate, do not call MessageChannel and do not send an empty acknowledgement. For lightweight acknowledgement, prefer action="react" when supported. If the useful response belongs later, schedule the follow-up instead of sending a placeholder.' : "";
   const slackWorkAcknowledgement = discovery.activeChannels.includes("slack") ? `
 
 For Slack requests that require nontrivial work or several tool calls, send one short MessageChannel call with action="send" before starting other tools. This gives the Slack user verbal acknowledgement and a View in web link. Do not do this for no-ops, reaction-only responses, or simple no-tool answers.` : "";
@@ -466542,13 +466033,11 @@ async function resolveLocalMessageChannelToolChannels(scope) {
     accountId: null
   }));
   const channels = [];
-  for (const { channelId, accountId, routedDestinationKey } of targets) {
+  for (const { channelId, accountId } of targets) {
     const channel = {
       channelId,
       displayName: getChannelDisplayName(channelId),
-      accountId,
-      routedDestinationKey,
-      replyMode: accountId ? getChannelAccount(channelId, accountId)?.replyMode ?? "tool" : "tool"
+      accountId
     };
     try {
       const plugin = await loadChannelPlugin(channelId);
@@ -466565,7 +466054,6 @@ async function resolveLocalMessageChannelToolChannels(scope) {
 }
 var loggedDiscoveryErrors;
 var init_message_tool = __esm(() => {
-  init_accounts();
   init_message_channel_tool_definition();
   init_plugin_registry();
   init_registry();
@@ -466573,46 +466061,34 @@ var init_message_tool = __esm(() => {
 });
 
 // src/channels/message-channel-gateway-tool.ts
-async function buildGatewayMessageChannelTool(sources, runtime, policy) {
-  const routed = sources.length > 0;
-  const channelScopes = routed ? sources.map((source) => ({
+async function buildGatewayMessageChannelTool(sources, runtime) {
+  const seen = new Set;
+  const channelScopes = (sources.length > 0 ? sources.map((source) => ({
     channelId: source.channel,
-    accountId: source.accountId ?? null,
-    routedDestinationKey: sourceRouteKey(source)
+    accountId: source.accountId ?? null
   })) : runtime ? listEligibleProactiveSlackAccounts({
     agentId: runtime.agent_id
   }).map(({ account }) => ({
     channelId: "slack",
     accountId: account.accountId
-  })) : [];
-  const toolScopes = routed && policy?.automaticRelay === true ? [] : routed && policy?.automaticRelay === false ? channelScopes : channelScopes.filter(({ channelId, accountId }) => !accountId || getChannelAccount(channelId, accountId)?.replyMode !== "relay");
-  const routedDestinations = new Set(sources.map(sourceRouteKey));
-  const exposedScopes = routed && routedDestinations.size > 1 ? channelScopes : toolScopes;
-  if (exposedScopes.length === 0)
+  })) : []).filter(({ channelId, accountId }) => {
+    const key3 = `${channelId}:${accountId ?? ""}`;
+    if (seen.has(key3))
+      return false;
+    seen.add(key3);
+    return true;
+  });
+  if (channelScopes.length === 0)
     return null;
-  const resolvedChannels = await resolveLocalMessageChannelToolChannels({
-    channels: exposedScopes
-  });
-  const tool = await buildMessageChannelExternalToolDefinition({
-    channels: routed && policy?.automaticRelay === false ? resolvedChannels.map((channel) => ({
-      ...channel,
-      replyMode: "tool"
-    })) : resolvedChannels,
-    scoped: routed,
+  return buildMessageChannelExternalToolDefinition({
+    channels: await resolveLocalMessageChannelToolChannels({
+      channels: channelScopes
+    }),
+    scoped: sources.length > 0,
     allowProactiveTargets: true
   });
-  const accountIds = [
-    ...new Set(exposedScopes.map(({ accountId }) => accountId?.trim()).filter((accountId) => Boolean(accountId)))
-  ];
-  if (routed && accountIds.length > 1) {
-    tool.description += `
-
-Currently routed accounts: ${accountIds.join(", ")}.`;
-  }
-  return tool;
 }
 var init_message_channel_gateway_tool = __esm(() => {
-  init_accounts();
   init_message_channel_tool_definition();
   init_message_tool();
   init_proactive_accounts();
@@ -466717,7 +466193,6 @@ function mapChannelConfig(snapshot2) {
     display_name: snapshot2.displayName,
     enabled: snapshot2.enabled,
     dm_policy: snapshot2.dmPolicy,
-    reply_mode: snapshot2.replyMode ?? "tool",
     allowed_users: snapshot2.allowedUsers,
     config: snapshot2.config ?? {}
   };
@@ -466731,7 +466206,6 @@ function mapChannelAccount(snapshot2) {
     configured: snapshot2.configured,
     running: snapshot2.running,
     dm_policy: snapshot2.dmPolicy,
-    reply_mode: snapshot2.replyMode ?? "tool",
     allowed_users: snapshot2.allowedUsers,
     config: snapshot2.config ?? {},
     created_at: snapshot2.createdAt,
@@ -466856,7 +466330,6 @@ async function handleAccountConfigLifecycleCommand(parsed, socket, runDetachedLi
         displayName: "display_name" in parsed.account ? parsed.account.display_name : undefined,
         enabled: "enabled" in parsed.account ? parsed.account.enabled : undefined,
         dmPolicy: parsed.account.dm_policy,
-        replyMode: parsed.account.reply_mode,
         allowedUsers: parsed.account.allowed_users,
         config: pluginConfig
       }, {
@@ -466897,7 +466370,6 @@ async function handleAccountConfigLifecycleCommand(parsed, socket, runDetachedLi
         displayName: "display_name" in parsed.patch ? parsed.patch.display_name : undefined,
         enabled: "enabled" in parsed.patch ? parsed.patch.enabled : undefined,
         dmPolicy: parsed.patch.dm_policy,
-        replyMode: parsed.patch.reply_mode,
         allowedUsers: parsed.patch.allowed_users,
         config: pluginConfig
       };
@@ -467098,7 +466570,6 @@ async function handleAccountConfigLifecycleCommand(parsed, socket, runDetachedLi
       const pluginConfig = getChannelPluginConfig(parsed.config, "plugin_config") ?? {};
       const snapshot2 = await setChannelConfigLive2(parsed.channel_id, {
         dmPolicy: parsed.config.dm_policy,
-        replyMode: parsed.config.reply_mode,
         allowedUsers: parsed.config.allowed_users,
         config: pluginConfig
       }, parsed.account_id);
@@ -467435,9 +466906,7 @@ function groupSourcesByRuntime(sources) {
 function toolScopeKey(sources, runtime) {
   if (sources.length === 0)
     return `proactive:${runtime.agent_id}`;
-  const destinationClass = new Set(sources.map(sourceRouteKey)).size > 1 ? "multiple" : "single";
   return JSON.stringify([
-    destinationClass,
     ...new Set(sources.map((source) => `${source.channel}:${source.accountId ?? ""}`))
   ].sort());
 }
@@ -467748,76 +467217,6 @@ function isUpdateModelResponse(message) {
 function isExecuteCommandResponse(message) {
   return !!message && typeof message === "object" && message.type === "execute_command_response";
 }
-async function deliverLocalAssistantText(options) {
-  const source = options.sources.length === 1 ? options.sources[0] : undefined;
-  if (!source?.accountId)
-    return;
-  try {
-    const result3 = await relayLocalMessageChannel({
-      channel: source.channel,
-      action: "send",
-      chat_id: source.chatId,
-      accountId: source.accountId,
-      message: options.text,
-      parentScope: {
-        agentId: source.agentId,
-        conversationId: source.conversationId
-      },
-      channelTurnSources: options.sources
-    }, options.idempotencyScope);
-    if (result3.startsWith("Error:"))
-      throw new Error(result3);
-  } catch (error5) {
-    if (error5 instanceof MessageChannelDuplicateActionError)
-      return;
-    throw error5;
-  }
-}
-function createLocalChannelGatewayHooks(registry4) {
-  return {
-    createRichDraft: ({ batchId, sources }) => {
-      const streamer = createChannelRichDraftStreamer({ batchId, sources });
-      return streamer ? {
-        handleDelta: (delta2) => {
-          streamer.handleChunk(delta2);
-        },
-        flushPending: () => streamer.flushPending(),
-        dispose: () => streamer.dispose()
-      } : null;
-    },
-    resolveAssistantRelayPolicy: (_runtime, sources) => {
-      const routedSources = uniqueRoutedSources(sources);
-      if (routedSources.length !== 1)
-        return false;
-      const source = routedSources[0];
-      if (!source?.accountId)
-        return false;
-      return getChannelAccount(source.channel, source.accountId)?.replyMode === "relay";
-    },
-    buildExternalTool: async (runtime, sources, policy) => {
-      return buildGatewayMessageChannelTool(sources, runtime, policy);
-    },
-    executeExternalTool: async (request2, sources, idempotencyScope) => {
-      if (request2.tool_name !== "MessageChannel" || !request2.runtime?.agent_id) {
-        throw new Error(`Unsupported gateway tool: ${request2.tool_name}`);
-      }
-      return await executeLocalMessageChannelExternalTool({
-        ...request2.input,
-        channel: String(request2.input.channel ?? ""),
-        action: String(request2.input.action ?? ""),
-        parentScope: {
-          agentId: request2.runtime.agent_id,
-          conversationId: request2.runtime.conversation_id
-        },
-        channelTurnSources: sources
-      }, idempotencyScope);
-    },
-    relayAssistantText: deliverLocalAssistantText,
-    onLifecycle: (event) => registry4.dispatchTurnLifecycleEvent(event),
-    onProgress: (event) => registry4.dispatchTurnProgressEvent(event),
-    onControlRequest: (event) => registry4.registerPendingControlRequest(event)
-  };
-}
 async function startLocalChannelGateway(options) {
   await settingsManager.initialize();
   const client = createAppServerClient({
@@ -467855,7 +467254,39 @@ async function startLocalChannelGateway(options) {
     throw new Error("Channel registry did not initialize");
   }
   let gateway;
-  gateway = new ChannelGateway(client, createLocalChannelGatewayHooks(registry4));
+  gateway = new ChannelGateway(client, {
+    createRichDraft: ({ batchId, sources }) => {
+      const streamer = createChannelRichDraftStreamer({ batchId, sources });
+      return streamer ? {
+        handleDelta: (delta2) => {
+          streamer.handleChunk(delta2);
+        },
+        flushPending: () => streamer.flushPending(),
+        dispose: () => streamer.dispose()
+      } : null;
+    },
+    buildExternalTool: async (runtime, sources) => {
+      return buildGatewayMessageChannelTool(sources, runtime);
+    },
+    executeExternalTool: async (request2, sources, idempotencyScope) => {
+      if (request2.tool_name !== "MessageChannel" || !request2.runtime?.agent_id) {
+        throw new Error(`Unsupported gateway tool: ${request2.tool_name}`);
+      }
+      return await executeLocalMessageChannelExternalTool({
+        ...request2.input,
+        channel: String(request2.input.channel ?? ""),
+        action: String(request2.input.action ?? ""),
+        parentScope: {
+          agentId: request2.runtime.agent_id,
+          conversationId: request2.runtime.conversation_id
+        },
+        channelTurnSources: sources
+      }, idempotencyScope);
+    },
+    onLifecycle: (event) => registry4.dispatchTurnLifecycleEvent(event),
+    onProgress: (event) => registry4.dispatchTurnProgressEvent(event),
+    onControlRequest: (event) => registry4.registerPendingControlRequest(event)
+  });
   const routedRuntimeRegistrationRefresher = createRoutedRuntimeRegistrationRefresher({
     registry: registry4,
     channelNames: options.channelNames,
@@ -468149,13 +467580,11 @@ var init_gateway_local = __esm(() => {
   init_app_server_client();
   init_settings_manager();
   init_message_channel();
-  init_accounts();
   init_channel_rich_draft_streamer();
   init_command_runtime_executor();
   init_commands();
   init_gateway_core();
   init_message_channel_gateway_tool();
-  init_message_channel_idempotency();
   init_plugin_registry();
   init_protocol_command_handler();
   init_registry();
@@ -522161,4 +521590,4 @@ function registerBunOAuthFlows() {
 registerBunOAuthFlows();
 await init_src5().then(() => exports_src2);
 
-//# debugId=8ABF0F41F824320764756E2164756E21
+//# debugId=C2333FD748A08D4B64756E2164756E21