@letta-ai/letta-code 0.24.8 → 0.24.10

package/letta.js

@@ -3269,7 +3269,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.24.8",
+    version: "0.24.10",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     bin: {
@@ -3310,6 +3310,7 @@ var init_package = __esm(() => {
       "node-pty": "^1.1.0",
       open: "^10.2.0",
       sharp: "^0.34.5",
+      "strip-ansi": "^7.2.0",
       ws: "^8.19.0"
     },
     optionalDependencies: {
@@ -4905,6 +4906,7 @@ function getClientDefaultHeaders() {
   return {
     "X-Letta-Source": "letta-code",
     "User-Agent": `letta-code/${package_default.version}`,
+    "X-Letta-Environment-Device-Id": settingsManager.getOrCreateDeviceId(),
     ...nodeExperiment.source === "override" ? { "x-letta-node": nodeExperiment.enabled ? "1" : "0" } : nodeExperiment.enabled ? { "x-letta-node": "1" } : {}
   };
 }
@@ -4966,7 +4968,7 @@ If you experience this issue multiple times, move ~/.letta to ~/.letta_backup, a
     console.error(new Error("getClient() called without credentials").stack);
     throw new Error("Missing LETTA_API_KEY. Run 'letta' to configure authentication, or set LETTA_API_KEY to your API key.");
   }
-  return new Letta({
+  const client = new Letta({
     apiKey,
     baseURL,
     logger: sdkLogger,
@@ -4974,6 +4976,28 @@ If you experience this issue multiple times, move ~/.letta to ~/.letta_backup, a
     defaultHeaders: getClientDefaultHeaders(),
     ...isTimingsEnabled() && { fetch: createTimingFetch(fetch) }
   });
+  const MESSAGE_CACHE_MAX = 32;
+  const messageCache = new Map;
+  const origRetrieveMessage = client.messages.retrieve.bind(client.messages);
+  client.messages.retrieve = (...args) => {
+    const messageId = args[0];
+    const cached = messageCache.get(messageId);
+    if (cached) {
+      messageCache.delete(messageId);
+      messageCache.set(messageId, cached);
+      return cached;
+    }
+    const promise = origRetrieveMessage(...args);
+    messageCache.set(messageId, promise);
+    if (messageCache.size > MESSAGE_CACHE_MAX) {
+      const oldest = messageCache.keys().next().value;
+      if (oldest !== undefined)
+        messageCache.delete(oldest);
+    }
+    promise.catch(() => messageCache.delete(messageId));
+    return promise;
+  };
+  return client;
 }
 var SDK_DIAGNOSTIC_MAX_LEN = 400, SDK_DIAGNOSTIC_MAX_LINES = 4, lastSDKDiagnostic = null, _cachedApiKey, _testClientOverride = null, sdkLogger, LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV = "LETTA_MEMFS_GIT_PROXY_BASE_URL";
 var init_client2 = __esm(() => {
@@ -9488,46 +9512,6 @@ var init_models2 = __esm(() => {
           parallel_tool_calls: true
         }
       },
-      {
-        id: "gpt-5.5-pro-medium",
-        handle: "openai/gpt-5.5-pro",
-        label: "GPT-5.5 Pro",
-        description: "GPT-5.5 Pro — max performance variant (med reasoning)",
-        updateArgs: {
-          reasoning_effort: "medium",
-          verbosity: "medium",
-          context_window: 272000,
-          max_output_tokens: 128000,
-          parallel_tool_calls: true
-        }
-      },
-      {
-        id: "gpt-5.5-pro-high",
-        handle: "openai/gpt-5.5-pro",
-        label: "GPT-5.5 Pro",
-        description: "GPT-5.5 Pro — max performance variant (high reasoning)",
-        updateArgs: {
-          reasoning_effort: "high",
-          verbosity: "medium",
-          context_window: 272000,
-          max_output_tokens: 128000,
-          parallel_tool_calls: true
-        },
-        isFeatured: true
-      },
-      {
-        id: "gpt-5.5-pro-xhigh",
-        handle: "openai/gpt-5.5-pro",
-        label: "GPT-5.5 Pro",
-        description: "GPT-5.5 Pro — max performance variant (max reasoning)",
-        updateArgs: {
-          reasoning_effort: "xhigh",
-          verbosity: "medium",
-          context_window: 272000,
-          max_output_tokens: 128000,
-          parallel_tool_calls: true
-        }
-      },
       {
         id: "gpt-5.4-pro-medium",
         handle: "openai/gpt-5.4-pro",
@@ -29854,7 +29838,7 @@ function ansiRegex({ onlyFirst = false } = {}) {
   return new RegExp(pattern, onlyFirst ? undefined : "g");
 }
 
-// node_modules/strip-ansi/index.js
+// node_modules/string-width/node_modules/strip-ansi/index.js
 function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
@@ -29994,6 +29978,18 @@ var init_measure_text = __esm(() => {
   measure_text_default = measureText;
 });
 
+// node_modules/wrap-ansi/node_modules/strip-ansi/index.js
+function stripAnsi2(string) {
+  if (typeof string !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
+  }
+  return string.replace(regex2, "");
+}
+var regex2;
+var init_strip_ansi2 = __esm(() => {
+  regex2 = ansiRegex();
+});
+
 // node_modules/ansi-styles/index.js
 function assembleStyles() {
   const codes = new Map;
@@ -30182,7 +30178,7 @@ var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
   const characters = [...word];
   let isInsideEscape = false;
   let isInsideLinkEscape = false;
-  let visible = stringWidth(stripAnsi(rows.at(-1)));
+  let visible = stringWidth(stripAnsi2(rows.at(-1)));
   for (const [index, character] of characters.entries()) {
     const characterLength = stringWidth(character);
     if (visible + characterLength <= columns) {
@@ -30318,7 +30314,7 @@ var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
 };
 var init_wrap_ansi = __esm(() => {
   init_string_width();
-  init_strip_ansi();
+  init_strip_ansi2();
   init_ansi_styles();
   ESCAPES = new Set([
     "\x1B",
@@ -31123,8 +31119,8 @@ function indentString(string, count = 1, options = {}) {
   if (count === 0) {
     return string;
   }
-  const regex2 = includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
-  return string.replace(regex2, indent.repeat(count));
+  const regex3 = includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
+  return string.replace(regex3, indent.repeat(count));
 }
 
 // node_modules/ink/build/get-max-width.js
@@ -37401,17 +37397,17 @@ var require_picomatch = __commonJS((exports, module) => {
     }
     const opts = options || {};
     const posix = utils.isWindows(options);
-    const regex2 = isState ? picomatch.compileRe(glob, options) : picomatch.makeRe(glob, options, false, true);
-    const state = regex2.state;
-    delete regex2.state;
+    const regex3 = isState ? picomatch.compileRe(glob, options) : picomatch.makeRe(glob, options, false, true);
+    const state = regex3.state;
+    delete regex3.state;
     let isIgnored = () => false;
     if (opts.ignore) {
       const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
       isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
     }
     const matcher = (input, returnObject = false) => {
-      const { isMatch, match, output } = picomatch.test(input, regex2, options, { glob, posix });
-      const result = { glob, state, regex: regex2, posix, input, output, match, isMatch };
+      const { isMatch, match, output } = picomatch.test(input, regex3, options, { glob, posix });
+      const result = { glob, state, regex: regex3, posix, input, output, match, isMatch };
       if (typeof opts.onResult === "function") {
         opts.onResult(result);
       }
@@ -37436,7 +37432,7 @@ var require_picomatch = __commonJS((exports, module) => {
     }
     return matcher;
   };
-  picomatch.test = (input, regex2, options, { glob, posix } = {}) => {
+  picomatch.test = (input, regex3, options, { glob, posix } = {}) => {
     if (typeof input !== "string") {
       throw new TypeError("Expected input to be a string");
     }
@@ -37453,16 +37449,16 @@ var require_picomatch = __commonJS((exports, module) => {
     }
     if (match === false || opts.capture === true) {
       if (opts.matchBase === true || opts.basename === true) {
-        match = picomatch.matchBase(input, regex2, options, posix);
+        match = picomatch.matchBase(input, regex3, options, posix);
       } else {
-        match = regex2.exec(output);
+        match = regex3.exec(output);
       }
     }
     return { isMatch: Boolean(match), match, output };
   };
   picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
-    const regex2 = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
-    return regex2.test(path2.basename(input));
+    const regex3 = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
+    return regex3.test(path2.basename(input));
   };
   picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
   picomatch.parse = (pattern, options) => {
@@ -37482,11 +37478,11 @@ var require_picomatch = __commonJS((exports, module) => {
     if (state && state.negated === true) {
       source = `^(?!${source}).*$`;
     }
-    const regex2 = picomatch.toRegex(source, options);
+    const regex3 = picomatch.toRegex(source, options);
     if (returnState === true) {
-      regex2.state = state;
+      regex3.state = state;
     }
-    return regex2;
+    return regex3;
   };
   picomatch.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
     if (!input || typeof input !== "string") {
@@ -39321,7 +39317,13 @@ async function cloneMemoryRepo(agentId) {
         operation: "clone memory repo (tmp migration)"
       });
       renameSync(join7(tmpDir, ".git"), join7(dir, ".git"));
-      await runGit(dir, ["checkout", "--", "."], token);
+      try {
+        await runGit(dir, ["rev-parse", "--verify", "HEAD"], token);
+        await runGit(dir, ["checkout", "--", "."], token);
+      } catch (checkoutErr) {
+        const msg = checkoutErr instanceof Error ? checkoutErr.message : String(checkoutErr);
+        debugLog("memfs-git", `Skipping checkout (likely empty remote, no HEAD yet): ${msg}`);
+      }
       debugLog("memfs-git", "Migrated existing memory directory to git repo");
     } finally {
       if (existsSync8(tmpDir)) {
@@ -40145,12 +40147,14 @@ var init_config = __esm(() => {
   };
   discordConfigCodec = {
     parse(parsed) {
+      const rawAllowedChannels = parsed.allowed_channels;
       return {
         channel: "discord",
         enabled: parsed.enabled !== false,
         token: String(parsed.token ?? ""),
         dmPolicy: parsed.dm_policy ?? "pairing",
-        allowedUsers: parsed.allowed_users ?? []
+        allowedUsers: parsed.allowed_users ?? [],
+        allowedChannels: Array.isArray(rawAllowedChannels) ? rawAllowedChannels : undefined
       };
     }
   };
@@ -40183,6 +40187,11 @@ function cloneAccount(account) {
   if (account.channel === "telegram") {
     cloned.binding = { ...account.binding };
   }
+  if (account.channel === "discord" && account.allowedChannels) {
+    cloned.allowedChannels = [
+      ...account.allowedChannels
+    ];
+  }
   return cloned;
 }
 function normalizeLoadedAccount(account) {
@@ -40226,6 +40235,7 @@ function makeDefaultLegacyAccount(channelId) {
       token: config.token,
       dmPolicy: config.dmPolicy,
       allowedUsers: [...config.allowedUsers],
+      allowedChannels: config.allowedChannels ? [...config.allowedChannels] : undefined,
       agentId: null,
       createdAt: now,
       updatedAt: now
@@ -44112,6 +44122,16 @@ var init_plugin2 = __esm(() => {
   };
 });
 
+// src/channels/discord/channelGating.ts
+function isDiscordGuildChannelAllowed(params) {
+  const { channelId, parentChannelId, isThread, allowedChannels } = params;
+  if (!allowedChannels || allowedChannels.length === 0) {
+    return true;
+  }
+  const gateChannelId = isThread ? parentChannelId ?? channelId : channelId;
+  return allowedChannels.includes(gateChannelId);
+}
+
 // src/channels/discord/media.ts
 import { randomUUID as randomUUID6 } from "node:crypto";
 import { mkdirSync as mkdirSync11 } from "node:fs";
@@ -44594,6 +44614,13 @@ function createDiscordAdapter(config) {
         }
         if (!isThread && !wasMentioned)
           return;
+        if (!isDiscordGuildChannelAllowed({
+          channelId: message.channelId,
+          parentChannelId: message.channel.parentId ?? null,
+          isThread,
+          allowedChannels: config.allowedChannels
+        }))
+          return;
         if (markIngressMessageSeen(message.channelId, message.id))
           return;
         let effectiveChatId = message.channelId;
@@ -44657,6 +44684,13 @@ function createDiscordAdapter(config) {
         const isThread = msg.channel && "isThread" in msg.channel && typeof msg.channel.isThread === "function" && msg.channel.isThread();
         if (chatType === "channel" && !isThread)
           return;
+        if (chatType === "channel" && isThread && !isDiscordGuildChannelAllowed({
+          channelId,
+          parentChannelId: msg.channel.parentId ?? null,
+          isThread: true,
+          allowedChannels: config.allowedChannels
+        }))
+          return;
         const inbound = {
           channel: "discord",
           accountId: config.accountId,
@@ -44973,12 +45007,12 @@ Bind to agent ${envAgentId}? [Y/n]: `);
     }
     if (!agentId) {
       const agentInput = await rl.question(`
-Agent ID to bind this bot to (required for @mention routing): `);
+Agent ID to bind this bot to (required for DM and @mention routing): `);
       agentId = agentInput.trim() || null;
     }
     if (!agentId) {
       console.log(`
-Warning: No agent bound. DM pairing will still work, but guild @mentions won't route until you bind an agent.`);
+Warning: No agent bound. DM pairing will still work, but open/allowlist DMs and guild @mentions won't route until you bind an agent.`);
       console.log("  You can bind later: letta channels bind --channel discord --agent <id>");
       console.log(`  Or set agentId in ~/.letta/channels/discord/accounts.json
 `);
@@ -45829,6 +45863,17 @@ function buildSlackConversationSummary(msg) {
   }
   return `[Slack] Thread${channelLabel || ` ${msg.chatId}`}`;
 }
+function buildDiscordConversationSummary(msg) {
+  if (msg.chatType === "direct") {
+    return `[Discord] DM with ${msg.senderName?.trim() || msg.senderId}`;
+  }
+  const preview = truncateChannelSummaryPreview(msg.text);
+  const channelLabel = msg.chatLabel && msg.chatLabel !== msg.chatId ? ` in ${msg.chatLabel}` : "";
+  if (preview) {
+    return `[Discord] Thread${channelLabel}: ${preview}`;
+  }
+  return `[Discord] Thread${channelLabel || ` ${msg.chatId}`}`;
+}
 function buildChannelTurnSource(route, msg) {
   return {
     channel: msg.channel,
@@ -46212,7 +46257,7 @@ class ChannelRegistry {
       });
       return;
     }
-    if (msg.channel === "discord" && config.channel === "discord" && msg.chatType === "channel") {
+    if (msg.channel === "discord" && config.channel === "discord" && (msg.chatType === "channel" || config.dmPolicy !== "pairing")) {
       const discordResult = await this.ensureDiscordRoute(adapter, msg, config);
       if (!discordResult) {
         return;
@@ -46361,7 +46406,7 @@ class ChannelRegistry {
     if (!config.agentId) {
       throw new Error("Discord bot is missing an agent binding.");
     }
-    const conversationId = await this.createConversationForAgent(config.agentId, `[Discord] Thread ${msg.chatLabel ?? msg.chatId}`);
+    const conversationId = await this.createConversationForAgent(config.agentId, buildDiscordConversationSummary(msg));
     const now = new Date().toISOString();
     const route = {
       accountId: config.accountId,
@@ -46384,6 +46429,10 @@ class ChannelRegistry {
 ` + "Open Channels > Discord in Letta Code, choose which agent this bot should represent, and try again.");
       return null;
     }
+    if (msg.chatType === "direct" && config.dmPolicy === "allowlist" && !config.allowedUsers.includes(msg.senderId)) {
+      await adapter.sendDirectReply(msg.chatId, "You are not on the allowed users list for this Discord bot.");
+      return null;
+    }
     const accountId = msg.accountId ?? LEGACY_CHANNEL_ACCOUNT_ID;
     const routeThreadId = msg.threadId ?? null;
     let route = getRoute(msg.channel, msg.chatId, accountId, routeThreadId);
@@ -46394,7 +46443,7 @@ class ChannelRegistry {
     if (route) {
       return { route, isFirstRouteTurn: false };
     }
-    if (!msg.isMention) {
+    if (msg.chatType === "channel" && !msg.isMention) {
       return null;
     }
     return {
@@ -46494,6 +46543,21 @@ var init_registry = __esm(() => {
   init_xml();
 });
 
+// node_modules/strip-ansi/index.js
+function stripAnsi3(string) {
+  if (typeof string !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
+  }
+  if (!string.includes("\x1B") && !string.includes("›")) {
+    return string;
+  }
+  return string.replace(regex3, "");
+}
+var regex3;
+var init_strip_ansi3 = __esm(() => {
+  regex3 = ansiRegex();
+});
+
 // src/agent/approval-execution.ts
 var exports_approval_execution = {};
 __export(exports_approval_execution, {
@@ -47534,6 +47598,9 @@ var init_session = __esm(() => {
 });
 
 // src/tools/impl/shellLaunchers.ts
+function isValidEnvAlias(name) {
+  return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name);
+}
 function pushUnique(list, seen, entry) {
   if (!entry.length || !entry[0])
     return;
@@ -47550,18 +47617,21 @@ function normalizePowerShellCommand(command) {
   }
   return trimmed;
 }
-function buildPowerShellCommand(command) {
+function buildPowerShellCommand(command, envAliases = []) {
   const powerShellCommand = normalizePowerShellCommand(command);
-  const aliasPrelude = POWERSHELL_ENV_ALIASES.map((name) => `$${name} = $env:${name}`).join("; ");
+  const aliases = [
+    ...new Set([...POWERSHELL_ENV_ALIASES, ...envAliases])
+  ].filter(isValidEnvAlias);
+  const aliasPrelude = aliases.map((name) => `$${name} = $env:${name}`).join("; ");
   return `${aliasPrelude}; ${powerShellCommand}`;
 }
-function windowsLaunchers(command) {
+function windowsLaunchers(command, envAliases = []) {
   const trimmed = command.trim();
   if (!trimmed)
     return [];
   const launchers = [];
   const seen = new Set;
-  const powerShellCommand = buildPowerShellCommand(trimmed);
+  const powerShellCommand = buildPowerShellCommand(trimmed, envAliases);
   pushUnique(launchers, seen, [
     "powershell.exe",
     "-NoProfile",
@@ -47641,7 +47711,7 @@ function unixLaunchers(command, login) {
 }
 function buildShellLaunchers(command, options) {
   const login = options?.login ?? false;
-  return process.platform === "win32" ? windowsLaunchers(command) : unixLaunchers(command, login);
+  return process.platform === "win32" ? windowsLaunchers(command, options?.powershellEnvAliases) : unixLaunchers(command, login);
 }
 var SEP2 = "\x00", POWERSHELL_ENV_ALIASES;
 var init_shellLaunchers = __esm(() => {
@@ -48207,8 +48277,8 @@ function matchesTool(pattern, toolName) {
     return true;
   }
   try {
-    const regex2 = new RegExp(`^(?:${pattern})$`);
-    return regex2.test(toolName);
+    const regex4 = new RegExp(`^(?:${pattern})$`);
+    return regex4.test(toolName);
   } catch (error) {
     debugLog("hooks", `matchesTool: Invalid regex pattern "${pattern}", falling back to exact match`, error);
     return pattern === toolName;
@@ -52123,26 +52193,30 @@ var init_mode = __esm(() => {
 });
 
 // src/tools/secret-substitution.ts
-function substituteSecretsInString(input) {
-  const secrets2 = loadSecrets();
-  return input.replace(SECRET_PATTERN, (match, name) => {
-    const value = secrets2[name];
-    return value !== undefined ? value : match;
-  });
-}
-function substituteSecretsInArgs(args) {
-  const result = {};
-  for (const [key, value] of Object.entries(args)) {
-    if (typeof value === "string") {
-      result[key] = substituteSecretsInString(value);
-    } else {
-      result[key] = value;
+function extractSecretEnvFromCommand(command, agentId) {
+  const secrets2 = loadSecrets(agentId);
+  const env3 = {};
+  const scan = (text) => {
+    for (const match of text.matchAll(SECRET_PATTERN)) {
+      const name = match[1];
+      if (name !== undefined && secrets2[name] !== undefined) {
+        env3[name] = secrets2[name];
+      }
+    }
+  };
+  if (typeof command === "string") {
+    scan(command);
+    return env3;
+  }
+  for (const part of command) {
+    if (typeof part === "string") {
+      scan(part);
     }
   }
-  return result;
+  return env3;
 }
-function scrubSecretsFromString(input) {
-  const secrets2 = loadSecrets();
+function scrubSecretsFromString(input, agentId) {
+  const secrets2 = loadSecrets(agentId);
   let result = input;
   const entries = Object.entries(secrets2).sort(([, a], [, b]) => b.length - a.length);
   for (const [name, value] of entries) {
@@ -55212,40 +55286,45 @@ function validateWorktreePath(command, cwd2) {
   }
   return null;
 }
-function rebuildCachedLauncher(command) {
+function rebuildCachedLauncher(command, secretEnv) {
   if (!cachedWorkingLauncher)
     return null;
   const cachedExecutable = cachedWorkingLauncher[0]?.toLowerCase();
   if (!cachedExecutable)
     return null;
-  const launchers = buildShellLaunchers(command);
+  const launchers = buildShellLaunchers(command, {
+    powershellEnvAliases: secretEnv ? Object.keys(secretEnv) : undefined
+  });
   return launchers.find((launcher) => launcher[0]?.toLowerCase() === cachedExecutable) ?? null;
 }
-function getBackgroundLauncher(command) {
-  const cachedLauncher = rebuildCachedLauncher(command);
+function getBackgroundLauncher(command, secretEnv) {
+  const cachedLauncher = rebuildCachedLauncher(command, secretEnv);
   if (cachedLauncher)
     return cachedLauncher;
-  const launchers = buildShellLaunchers(command);
+  const launchers = buildShellLaunchers(command, {
+    powershellEnvAliases: secretEnv ? Object.keys(secretEnv) : undefined
+  });
   return launchers[0] || [];
 }
 async function spawnCommand(command, options) {
+  const env3 = options.secretEnv ? { ...options.env, ...options.secretEnv } : options.env;
   if (process.platform !== "win32") {
     const executable = process.platform === "darwin" ? "/bin/zsh" : "bash";
     return spawnWithLauncher([executable, "-c", command], {
       cwd: options.cwd,
-      env: options.env,
+      env: env3,
       timeoutMs: options.timeout,
       signal: options.signal,
       onOutput: options.onOutput
     });
   }
   if (cachedWorkingLauncher) {
-    const newLauncher = rebuildCachedLauncher(command);
+    const newLauncher = rebuildCachedLauncher(command, options.secretEnv);
     if (newLauncher) {
       try {
         const result = await spawnWithLauncher(newLauncher, {
           cwd: options.cwd,
-          env: options.env,
+          env: env3,
           timeoutMs: options.timeout,
           signal: options.signal,
           onOutput: options.onOutput
@@ -55260,7 +55339,9 @@ async function spawnCommand(command, options) {
       }
     }
   }
-  const launchers = buildShellLaunchers(command);
+  const launchers = buildShellLaunchers(command, {
+    powershellEnvAliases: options.secretEnv ? Object.keys(options.secretEnv) : undefined
+  });
   if (launchers.length === 0) {
     throw new Error("No shell launchers available");
   }
@@ -55270,7 +55351,7 @@ async function spawnCommand(command, options) {
     try {
       const result = await spawnWithLauncher(launcher, {
         cwd: options.cwd,
-        env: options.env,
+        env: env3,
         timeoutMs: options.timeout,
         signal: options.signal,
         onOutput: options.onOutput
@@ -55299,7 +55380,8 @@ async function bash(args) {
     description: _description,
     run_in_background = false,
     signal,
-    onOutput
+    onOutput,
+    secretEnv
   } = args;
   const userCwd = getCurrentWorkingDirectory();
   const worktreeError = validateWorktreePath(command, userCwd);
@@ -55344,7 +55426,7 @@ async function bash(args) {
     }
     const bashId = getNextBashId();
     const outputFile = createBackgroundOutputFile(bashId);
-    const launcher = getBackgroundLauncher(command);
+    const launcher = getBackgroundLauncher(command, secretEnv);
     const [executable, ...launcherArgs] = launcher;
     if (!executable) {
       return {
@@ -55355,7 +55437,7 @@ async function bash(args) {
     const childProcess = spawn4(executable, launcherArgs, {
       shell: false,
       cwd: userCwd,
-      env: getShellEnv()
+      env: secretEnv ? { ...getShellEnv(), ...secretEnv } : getShellEnv()
     });
     backgroundProcesses.set(bashId, {
       process: childProcess,
@@ -55432,7 +55514,8 @@ Output file: ${outputFile}`
       env: getShellEnv(),
       timeout: effectiveTimeout,
       signal,
-      onOutput
+      onOutput,
+      secretEnv
     });
     let output = stdout;
     if (stderr)
@@ -71559,7 +71642,15 @@ async function runProcess(context3) {
 }
 async function shell(args) {
   validateRequiredParams(args, ["command"], "shell");
-  const { command, workdir, timeout_ms, env_overrides, signal, onOutput } = args;
+  const {
+    command,
+    workdir,
+    timeout_ms,
+    env_overrides,
+    secretEnv,
+    signal,
+    onOutput
+  } = args;
   if (!Array.isArray(command) || command.length === 0) {
     throw new Error("command must be a non-empty array of strings");
   }
@@ -71570,7 +71661,8 @@ async function shell(args) {
     cwd: cwd2,
     env: {
       ...getShellEnv(),
-      ...env_overrides ?? {}
+      ...env_overrides ?? {},
+      ...secretEnv ?? {}
     },
     timeout,
     signal,
@@ -71702,11 +71794,18 @@ async function shell_command(args) {
     timeout_ms,
     justification,
     signal,
-    onOutput
+    onOutput,
+    secretEnv
   } = args;
-  const envOverrides = getMemoryGitIdentityEnvOverrides(command, workdir);
+  const envOverrides = {
+    ...getMemoryGitIdentityEnvOverrides(command, workdir),
+    ...secretEnv ?? {}
+  };
   const resolvedWorkdir = resolveShellWorkdir(workdir);
-  const launchers = buildShellLaunchers(command, { login });
+  const launchers = buildShellLaunchers(command, {
+    login,
+    powershellEnvAliases: secretEnv ? Object.keys(secretEnv) : undefined
+  });
   if (launchers.length === 0) {
     throw new Error("Command must be a non-empty string");
   }
@@ -71836,7 +71935,8 @@ async function run_shell_command(args) {
     workdir: args.dir_path,
     timeout_ms: args.timeout_ms,
     signal: args.signal,
-    onOutput: args.onOutput
+    onOutput: args.onOutput,
+    secretEnv: args.secretEnv
   });
   const message = result.output.trim() || "(Command completed with no output)";
   return { message };
@@ -77988,9 +78088,9 @@ function detectSkillScript(command, workingDir) {
   }
   const normalizedWorkingDir = normalizePathSeparators(workingDir).replace(/\/$/, "");
   const normalizedHomeDir = normalizePathSeparators(homedir18()).replace(/\/$/, "");
-  const detect = (source, regex2) => {
+  const detect = (source, regex4) => {
     for (const candidate of pathCandidates) {
-      const match3 = candidate.match(regex2);
+      const match3 = candidate.match(regex4);
       if (!match3?.[1]) {
         continue;
       }
@@ -78959,11 +79059,15 @@ async function executeTool(name, args, options) {
           enhancedArgs = {
             ...enhancedArgs,
             onOutput: (chunk, stream2) => {
-              options.onOutput?.(scrubSecretsFromString(chunk), stream2);
+              options.onOutput?.(stripAnsi3(scrubSecretsFromString(chunk, scopedAgentId)), stream2);
             }
           };
         }
-        enhancedArgs = substituteSecretsInArgs(enhancedArgs);
+        const command = enhancedArgs.command;
+        const secretEnv = typeof command === "string" || Array.isArray(command) && command.every((part) => typeof part === "string") ? extractSecretEnvFromCommand(command, scopedAgentId) : {};
+        if (Object.keys(secretEnv).length > 0) {
+          enhancedArgs = { ...enhancedArgs, secretEnv };
+        }
       }
       if (internalName === "Task") {
         if (options?.toolCallId) {
@@ -79018,16 +79122,17 @@ async function executeTool(name, args, options) {
       const toolStatus = recordResult?.status === "error" ? "error" : "success";
       let flattenedResponse = flattenToolResponse(result);
       if (STREAMING_SHELL_TOOLS.has(internalName)) {
+        const sanitize = (text) => stripAnsi3(scrubSecretsFromString(text, scopedAgentId));
         if (typeof flattenedResponse === "string") {
-          flattenedResponse = scrubSecretsFromString(flattenedResponse);
+          flattenedResponse = sanitize(flattenedResponse);
         } else if (Array.isArray(flattenedResponse)) {
-          flattenedResponse = flattenedResponse.map((block) => block.type === "text" ? { ...block, text: scrubSecretsFromString(block.text) } : block);
+          flattenedResponse = flattenedResponse.map((block) => block.type === "text" ? { ...block, text: sanitize(block.text) } : block);
         }
         if (stdout) {
           for (let i = 0;i < stdout.length; i++) {
             const line = stdout[i];
             if (line !== undefined) {
-              stdout[i] = scrubSecretsFromString(line);
+              stdout[i] = sanitize(line);
             }
           }
         }
@@ -79035,7 +79140,7 @@ async function executeTool(name, args, options) {
           for (let i = 0;i < stderr.length; i++) {
             const line = stderr[i];
             if (line !== undefined) {
-              stderr[i] = scrubSecretsFromString(line);
+              stderr[i] = sanitize(line);
             }
           }
         }
@@ -79173,6 +79278,7 @@ function clearToolsWithLock() {
 }
 var TOOL_NAMES, STREAMING_SHELL_TOOLS, FILE_MUTATING_TOOLS, TOOL_NAME_MAPPINGS, ANTHROPIC_DEFAULT_TOOLS, OPENAI_DEFAULT_TOOLS, GEMINI_DEFAULT_TOOLS, OPENAI_PASCAL_TOOLS, GEMINI_PASCAL_TOOLS, REGISTRY_KEY, SWITCH_LOCK_KEY, EXECUTION_CONTEXTS_KEY, toolRegistry, toolExecutionContextCounter = 0, EXTERNAL_TOOLS_KEY, EXTERNAL_EXECUTOR_KEY;
 var init_manager4 = __esm(async () => {
+  init_strip_ansi3();
   init_context();
   init_model2();
   init_subagents();
@@ -79479,6 +79585,7 @@ function toAccountSnapshot(account) {
       running,
       dmPolicy: account.dmPolicy,
       allowedUsers: [...account.allowedUsers],
+      allowedChannels: [...account.allowedChannels ?? []],
       hasToken: account.token.trim().length > 0,
       agentId: account.agentId,
       createdAt: account.createdAt,
@@ -79533,6 +79640,7 @@ function createAccountFromPatch(channelId, accountId, patch) {
       agentId: patch.agentId ?? null,
       dmPolicy: patch.dmPolicy ?? "pairing",
       allowedUsers: patch.allowedUsers ?? [],
+      allowedChannels: patch.allowedChannels ?? [],
       createdAt: now,
       updatedAt: now
     };
@@ -79576,6 +79684,7 @@ function mergeAccountPatch(existing, patch) {
       agentId: patch.agentId ?? existing.agentId,
       dmPolicy: patch.dmPolicy ?? existing.dmPolicy,
       allowedUsers: patch.allowedUsers ?? existing.allowedUsers,
+      allowedChannels: patch.allowedChannels ?? existing.allowedChannels,
       updatedAt: nextUpdatedAt
     };
   }
@@ -79654,6 +79763,7 @@ function getChannelConfigSnapshot(channelId, accountId) {
       enabled: account.enabled,
       dmPolicy: account.dmPolicy,
       allowedUsers: [...account.allowedUsers],
+      allowedChannels: [...account.allowedChannels ?? []],
       hasToken: account.token.trim().length > 0
     };
   }
@@ -79683,6 +79793,7 @@ async function setChannelConfigLive(channelId, patch, accountId) {
       mode: patch.mode,
       dmPolicy: patch.dmPolicy,
       allowedUsers: patch.allowedUsers,
+      allowedChannels: patch.allowedChannels,
       displayName: existing.displayName
     });
     shouldRefreshDisplayName = channelId === "telegram" || channelId === "discord" ? patch.token !== undefined : patch.botToken !== undefined || patch.appToken !== undefined;
@@ -79694,7 +79805,8 @@ async function setChannelConfigLive(channelId, patch, accountId) {
       appToken: patch.appToken,
       mode: patch.mode,
       dmPolicy: patch.dmPolicy,
-      allowedUsers: patch.allowedUsers
+      allowedUsers: patch.allowedUsers,
+      allowedChannels: patch.allowedChannels
     }, accountId ? { accountId } : undefined);
     targetAccountId = created.accountId;
     shouldRefreshDisplayName = true;
@@ -89192,8 +89304,29 @@ var init_cwd = __esm(() => {
   init_remote_settings();
 });
 
-// src/websocket/listener/approval.ts
+// src/websocket/listener/transport.ts
 import WebSocket from "ws";
+
+class LocalListenerTransport {
+  kind = "local";
+  bufferedAmount = 0;
+  isOpen() {
+    return true;
+  }
+  send(_data) {}
+}
+function isListenerTransportOpen(transport) {
+  if ("isOpen" in transport && typeof transport.isOpen === "function") {
+    return transport.isOpen();
+  }
+  return transport.readyState === WebSocket.OPEN;
+}
+function getListenerTransportKind(transport) {
+  return "kind" in transport ? transport.kind : "websocket";
+}
+var init_transport = () => {};
+
+// src/websocket/listener/approval.ts
 function rememberPendingApprovalBatchIds(runtime, pendingApprovals, batchId) {
   for (const approval of pendingApprovals) {
     if (approval.toolCallId) {
@@ -89327,7 +89460,7 @@ function rejectPendingApprovalResolvers(runtime, reason) {
   evictConversationRuntimeIfIdle(runtime);
 }
 function requestApprovalOverWS(runtime, socket, requestId, controlRequest) {
-  if (socket.readyState !== WebSocket.OPEN) {
+  if (!isListenerTransportOpen(socket)) {
     return Promise.reject(new Error("WebSocket not open"));
   }
   const abortSignal = runtime.activeAbortController?.signal ?? null;
@@ -89390,6 +89523,7 @@ function requestApprovalOverWS(runtime, socket, requestId, controlRequest) {
 }
 var init_approval = __esm(async () => {
   init_runtime4();
+  init_transport();
   await init_protocol_outbound();
 });
 
@@ -90328,6 +90462,46 @@ var init_approval_suggestions = __esm(async () => {
   ]);
 });
 
+// src/websocket/listener/secrets-sync.ts
+var exports_secrets_sync = {};
+__export(exports_secrets_sync, {
+  ensureSecretsHydratedForAgent: () => ensureSecretsHydratedForAgent,
+  __testOverrideRefreshSecretsForAgent: () => __testOverrideRefreshSecretsForAgent
+});
+function __testOverrideRefreshSecretsForAgent(factory) {
+  _testRefreshSecretsForAgentOverride = factory;
+}
+async function refreshSecretsForAgent(agentId) {
+  if (_testRefreshSecretsForAgentOverride) {
+    await _testRefreshSecretsForAgentOverride(agentId);
+    debugLog("secrets-sync", `Refreshed secrets for agent ${agentId}`);
+    return;
+  }
+  const { initSecretsFromServer: initSecretsFromServer2 } = await Promise.resolve().then(() => (init_secretsStore(), exports_secretsStore));
+  await initSecretsFromServer2(agentId);
+  debugLog("secrets-sync", `Refreshed secrets for agent ${agentId}`);
+}
+async function ensureSecretsHydratedForAgent(listener, agentId) {
+  const existing = listener.secretsHydrationByAgent.get(agentId);
+  if (existing) {
+    await existing;
+    return;
+  }
+  const promise = refreshSecretsForAgent(agentId).catch((err) => {
+    debugWarn("secrets-sync", `Failed to refresh secrets for agent ${agentId}: ${err instanceof Error ? err.message : String(err)}`);
+  }).finally(() => {
+    if (listener.secretsHydrationByAgent.get(agentId) === promise) {
+      listener.secretsHydrationByAgent.delete(agentId);
+    }
+  });
+  listener.secretsHydrationByAgent.set(agentId, promise);
+  await promise;
+}
+var _testRefreshSecretsForAgentOverride = null;
+var init_secrets_sync = __esm(() => {
+  init_debug();
+});
+
 // src/websocket/listener/recovery.ts
 function isApprovalToolCallDesyncError(detail) {
   if (isInvalidToolCallIdsError(detail) || isApprovalPendingError(detail)) {
@@ -90668,6 +90842,7 @@ async function resolveRecoveredApprovalResponse(runtime, socket, response, proce
   });
   const recoveryAbortController = new AbortController;
   runtime.activeAbortController = recoveryAbortController;
+  await ensureSecretsHydratedForAgent(runtime.listener, recovered.agentId);
   const preparedToolContext = await prepareToolExecutionContextForScope({
     agentId: recovered.agentId,
     conversationId: recovered.conversationId,
@@ -90752,6 +90927,7 @@ var init_recovery = __esm(async () => {
   init_cwd();
   init_permissionMode();
   init_runtime4();
+  init_secrets_sync();
   await __promiseAll([
     init_approval_execution(),
     init_accumulator(),
@@ -91643,8 +91819,8 @@ var init_word = __esm(() => {
   wordDiff = new WordDiff;
   WordsWithSpaceDiff = class WordsWithSpaceDiff extends Diff {
     tokenize(value) {
-      const regex2 = new RegExp(`(\\r?\\n)|[${extendedWordChars}]+|[^\\S\\n\\r]+|[^${extendedWordChars}]`, "ug");
-      return value.match(regex2) || [];
+      const regex4 = new RegExp(`(\\r?\\n)|[${extendedWordChars}]+|[^\\S\\n\\r]+|[^${extendedWordChars}]`, "ug");
+      return value.match(regex4) || [];
     }
   };
   wordsWithSpaceDiff = new WordsWithSpaceDiff;
@@ -93226,7 +93402,6 @@ var init_diffPreview = __esm(() => {
 
 // src/websocket/listener/turn-approval.ts
 import { readFile as readFile12 } from "node:fs/promises";
-import WebSocket2 from "ws";
 function getChannelApprovalSourceScopeKey(source) {
   return [
     source.channel,
@@ -93512,7 +93687,7 @@ async function handleApprovalStop(params) {
     return interruptTermination();
   }
   const onFileWrite = (filePath, content) => {
-    if (socket.readyState === WebSocket2.OPEN) {
+    if (isListenerTransportOpen(socket)) {
       socket.send(JSON.stringify({
         type: "file_ops",
         path: filePath,
@@ -93525,6 +93700,9 @@ async function handleApprovalStop(params) {
   };
   let executionResults;
   try {
+    if (agentId) {
+      await ensureSecretsHydratedForAgent(runtime.listener, agentId);
+    }
     executionResults = await executeApprovalBatch(decisions, undefined, {
       toolContextId: turnToolContextId ?? undefined,
       abortSignal: abortController.signal,
@@ -93638,7 +93816,9 @@ var init_turn_approval = __esm(async () => {
   init_diffPreview();
   init_formatDenial();
   init_interactivePolicy();
+  init_secrets_sync();
   init_skill_injection();
+  init_transport();
   await __promiseAll([
     init_approval_execution(),
     init_approval(),
@@ -93877,8 +94057,11 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
       });
       return;
     }
-    const { ensureMemfsSyncedForAgent: ensureMemfsSyncedForAgent2 } = await Promise.resolve().then(() => (init_memfs_sync(), exports_memfs_sync));
-    await ensureMemfsSyncedForAgent2(runtime.listener, agentId);
+    const [{ ensureMemfsSyncedForAgent: ensureMemfsSyncedForAgent2 }, { ensureSecretsHydratedForAgent: ensureSecretsHydratedForAgent2 }] = await Promise.all([Promise.resolve().then(() => (init_memfs_sync(), exports_memfs_sync)), Promise.resolve().then(() => (init_secrets_sync(), exports_secrets_sync))]);
+    await Promise.all([
+      ensureMemfsSyncedForAgent2(runtime.listener, agentId),
+      ensureSecretsHydratedForAgent2(runtime.listener, agentId)
+    ]);
     setCurrentAgentId(agentId);
     setConversationId2(conversationId);
     if (isDebugEnabled()) {
@@ -94720,7 +94903,6 @@ var init_commands = __esm(async () => {
 import { appendFileSync as appendFileSync4, mkdirSync as mkdirSync22 } from "node:fs";
 import { dirname as dirname16 } from "node:path";
 import { performance as performance2 } from "node:perf_hooks";
-import WebSocket3 from "ws";
 function getProtocolPerfKey(message) {
   if (message.type === "stream_delta" && "delta" in message) {
     const delta = message.delta;
@@ -94942,10 +95124,11 @@ function buildDeviceStatus(runtime, params) {
     }
   })();
   const systemPromptDoctorState = scopedAgentId ? getSystemPromptDoctorState(scopedAgentId) : null;
+  const transport = listener.transport ?? listener.socket;
   return {
     current_connection_id: listener.connectionId,
     connection_name: listener.connectionName,
-    is_online: listener.socket?.readyState === WebSocket3.OPEN,
+    is_online: transport ? isListenerTransportOpen(transport) : false,
     is_processing: !!conversationRuntime?.isProcessing,
     current_permission_mode: conversationPermissionModeState.mode,
     current_working_directory: resolvedCwd,
@@ -95015,7 +95198,7 @@ function setLoopStatus(runtime, status, scope) {
   emitLoopStatusIfOpen(runtime, scope);
 }
 function emitProtocolV2Message(socket, runtime, message, scope) {
-  if (socket.readyState !== WebSocket3.OPEN) {
+  if (!isListenerTransportOpen(socket)) {
     return;
   }
   const listener = getListenerRuntime(runtime);
@@ -95083,14 +95266,16 @@ function emitLoopStatusUpdate(socket, runtime, scope) {
 }
 function emitLoopStatusIfOpen(runtime, scope) {
   const listener = getListenerRuntime(runtime);
-  if (listener?.socket?.readyState === WebSocket3.OPEN) {
-    emitLoopStatusUpdate(listener.socket, runtime, scope);
+  const transport = listener?.transport ?? listener?.socket;
+  if (transport && isListenerTransportOpen(transport)) {
+    emitLoopStatusUpdate(transport, runtime, scope);
   }
 }
 function emitDeviceStatusIfOpen(runtime, scope) {
   const listener = getListenerRuntime(runtime);
-  if (listener?.socket?.readyState === WebSocket3.OPEN) {
-    emitDeviceStatusUpdate(listener.socket, runtime, scope);
+  const transport = listener?.transport ?? listener?.socket;
+  if (transport && isListenerTransportOpen(transport)) {
+    emitDeviceStatusUpdate(transport, runtime, scope);
   }
 }
 function emitQueueUpdate(socket, runtime, scope) {
@@ -95148,8 +95333,9 @@ function emitDequeuedUserMessage(socket, runtime, incoming, batch) {
 }
 function emitQueueUpdateIfOpen(runtime, scope) {
   const listener = getListenerRuntime(runtime);
-  if (listener?.socket?.readyState === WebSocket3.OPEN) {
-    emitQueueUpdate(listener.socket, runtime, scope);
+  const transport = listener?.transport ?? listener?.socket;
+  if (transport && isListenerTransportOpen(transport)) {
+    emitQueueUpdate(transport, runtime, scope);
   }
 }
 function emitStateSync(socket, runtime, scope) {
@@ -95204,8 +95390,9 @@ function emitSubagentStateUpdate(socket, runtime, scope) {
 }
 function emitSubagentStateIfOpen(runtime, scope) {
   const listener = getListenerRuntime(runtime);
-  if (listener?.socket?.readyState === WebSocket3.OPEN) {
-    emitSubagentStateUpdate(listener.socket, runtime, scope);
+  const transport = listener?.transport ?? listener?.socket;
+  if (transport && isListenerTransportOpen(transport)) {
+    emitSubagentStateUpdate(transport, runtime, scope);
   }
 }
 function scheduleQueueEmit(runtime, scope) {
@@ -95301,6 +95488,7 @@ var init_protocol_outbound = __esm(async () => {
   init_cwd();
   init_permissionMode();
   init_runtime4();
+  init_transport();
   await init_commands();
   PROTOCOL_PERF_ENV_VALUES = new Set(["1", "true", "yes"]);
   PROTOCOL_PERF_ENABLED = PROTOCOL_PERF_ENV_VALUES.has((process.env.LETTA_LISTENER_PERF ?? "").toLowerCase());
@@ -95873,7 +96061,7 @@ var init_toolset_labels = __esm(() => {
 
 // src/websocket/terminalHandler.ts
 import * as os4 from "node:os";
-import WebSocket4 from "ws";
+import WebSocket2 from "ws";
 function getDefaultShell() {
   if (os4.platform() === "win32") {
     return process.env.COMSPEC || "cmd.exe";
@@ -95881,7 +96069,7 @@ function getDefaultShell() {
   return process.env.SHELL || "/bin/zsh";
 }
 function sendTerminalMessage(socket, message) {
-  if (socket.readyState === WebSocket4.OPEN) {
+  if (socket.readyState === WebSocket2.OPEN) {
     socket.send(JSON.stringify(message));
   }
 }
@@ -96596,9 +96784,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 hasValidAllowedUsers = config.allowed_users === undefined || Array.isArray(config.allowed_users) && config.allowed_users.every((entry) => typeof entry === "string");
+  const hasValidAllowedChannels = config.allowed_channels === undefined || Array.isArray(config.allowed_channels) && config.allowed_channels.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 && hasValidAllowedUsers && hasValidDisplayName && hasValidEnabled;
+  return hasValidDmPolicy && hasValidAllowedUsers && hasValidAllowedChannels && hasValidDisplayName && hasValidEnabled;
 }
 function isChannelsListCommand(value) {
   if (!value || typeof value !== "object")
@@ -97025,7 +97214,7 @@ import { execFile as execFile13 } from "node:child_process";
 import { lstat as lstat2, realpath as realpath3, stat as stat6 } from "node:fs/promises";
 import path25 from "node:path";
 import { promisify as promisify11 } from "node:util";
-import WebSocket5 from "ws";
+import WebSocket3 from "ws";
 async function isGitWorktreeRoot(dir) {
   try {
     const stats = await lstat2(path25.join(dir, ".git"));
@@ -97048,7 +97237,7 @@ function trackListenerError(errorType, error, context3) {
   });
 }
 function safeSocketSend(socket, payload, errorType, context3) {
-  if (socket.readyState !== WebSocket5.OPEN) {
+  if (socket.readyState !== WebSocket3.OPEN) {
     return false;
   }
   try {
@@ -97063,6 +97252,22 @@ function safeSocketSend(socket, payload, errorType, context3) {
     return false;
   }
 }
+function safeTransportSend(transport, payload, errorType, context3) {
+  if (!isListenerTransportOpen(transport)) {
+    return false;
+  }
+  try {
+    const serialized = typeof payload === "string" ? payload : JSON.stringify(payload);
+    transport.send(serialized);
+    return true;
+  } catch (error) {
+    trackListenerError(errorType, error, context3);
+    if (isDebugEnabled()) {
+      console.error(`[Listen] ${context3} send failed:`, error);
+    }
+    return false;
+  }
+}
 function runDetachedListenerTask(commandName, task2) {
   task2().catch((error) => {
     trackListenerError(`listener_${commandName}_failed`, error, `listener_${commandName}`);
@@ -97844,6 +98049,7 @@ async function handleChannelsProtocolCommand(parsed, socket, runtime, opts, proc
         enabled: snapshot.enabled,
         dm_policy: snapshot.dmPolicy,
         allowed_users: snapshot.allowedUsers,
+        allowed_channels: snapshot.allowedChannels,
         has_token: snapshot.hasToken
       };
     }
@@ -97889,6 +98095,7 @@ async function handleChannelsProtocolCommand(parsed, socket, runtime, opts, proc
         running: snapshot.running,
         dm_policy: snapshot.dmPolicy,
         allowed_users: snapshot.allowedUsers,
+        allowed_channels: snapshot.allowedChannels,
         has_token: snapshot.hasToken,
         agent_id: snapshot.agentId,
         created_at: snapshot.createdAt,
@@ -98004,7 +98211,8 @@ async function handleChannelsProtocolCommand(parsed, socket, runtime, opts, proc
         agentId: "agent_id" in parsed.account ? parsed.account.agent_id : undefined,
         defaultPermissionMode: "default_permission_mode" in parsed.account ? parsed.account.default_permission_mode : undefined,
         dmPolicy: parsed.account.dm_policy,
-        allowedUsers: parsed.account.allowed_users
+        allowedUsers: parsed.account.allowed_users,
+        allowedChannels: "allowed_channels" in parsed.account ? parsed.account.allowed_channels : undefined
       }, {
         accountId: "account_id" in parsed.account ? parsed.account.account_id : undefined
       });
@@ -98045,7 +98253,8 @@ async function handleChannelsProtocolCommand(parsed, socket, runtime, opts, proc
         agentId: "agent_id" in parsed.patch ? parsed.patch.agent_id : undefined,
         defaultPermissionMode: "default_permission_mode" in parsed.patch ? parsed.patch.default_permission_mode : undefined,
         dmPolicy: parsed.patch.dm_policy,
-        allowedUsers: parsed.patch.allowed_users
+        allowedUsers: parsed.patch.allowed_users,
+        allowedChannels: "allowed_channels" in parsed.patch ? parsed.patch.allowed_channels : undefined
       });
       const shouldRefreshDisplayName = !("display_name" in parsed.patch) && (parsed.channel_id === "telegram" ? "token" in parsed.patch : ("bot_token" in parsed.patch) || ("app_token" in parsed.patch));
       const account = shouldRefreshDisplayName ? await refreshChannelAccountDisplayNameLive2(parsed.channel_id, parsed.account_id, { force: true }) : updated;
@@ -98245,7 +98454,8 @@ async function handleChannelsProtocolCommand(parsed, socket, runtime, opts, proc
         appToken: "app_token" in parsed.config ? parsed.config.app_token : undefined,
         mode: "mode" in parsed.config ? parsed.config.mode : undefined,
         dmPolicy: parsed.config.dm_policy,
-        allowedUsers: parsed.config.allowed_users
+        allowedUsers: parsed.config.allowed_users,
+        allowedChannels: "allowed_channels" in parsed.config ? parsed.config.allowed_channels : undefined
       }, parsed.account_id);
       if (snapshot.enabled) {
         await wireChannelIngress(runtime, socket, opts, processQueuedTurn);
@@ -98833,13 +99043,17 @@ async function wireChannelIngress(listener, socket, opts, processQueuedTurn) {
 }
 function handleChannelRegistryEvent(event, socket, runtime) {
   if (event.type === "pairings_updated") {
-    emitChannelPairingsUpdated(socket, event.channelId);
-    emitChannelsUpdated(socket, event.channelId);
+    if (socket instanceof WebSocket3) {
+      emitChannelPairingsUpdated(socket, event.channelId);
+      emitChannelsUpdated(socket, event.channelId);
+    }
     return;
   }
   if (event.type === "targets_updated") {
-    emitChannelTargetsUpdated(socket, event.channelId);
-    emitChannelsUpdated(socket, event.channelId);
+    if (socket instanceof WebSocket3) {
+      emitChannelTargetsUpdated(socket, event.channelId);
+      emitChannelsUpdated(socket, event.channelId);
+    }
     return;
   }
   const permissionModeState = getOrCreateConversationPermissionModeStateRef(runtime, event.agentId, event.conversationId);
@@ -99184,6 +99398,7 @@ function createRuntime() {
   const bootWorkingDirectory = getCurrentWorkingDirectory();
   return {
     socket: null,
+    transport: null,
     heartbeatInterval: null,
     reconnectTimeout: null,
     intentionallyClosed: false,
@@ -99209,6 +99424,7 @@ function createRuntime() {
     conversationRuntimes: new Map,
     approvalRuntimeKeyByRequestId: new Map,
     memfsSyncedAgents: new Map,
+    secretsHydrationByAgent: new Map,
     lastEmittedStatus: null
   };
 }
@@ -99232,17 +99448,100 @@ function stopRuntime(runtime, suppressCallbacks) {
   runtime.queuedSystemPromptRecompileByConversation.clear();
   stopAllWorktreeWatchers(runtime);
   if (!runtime.socket) {
+    runtime.transport = null;
     return;
   }
   const socket = runtime.socket;
   runtime.socket = null;
+  runtime.transport = null;
   if (suppressCallbacks) {
     socket.removeAllListeners();
   }
-  if (socket.readyState === WebSocket5.OPEN || socket.readyState === WebSocket5.CONNECTING) {
+  if (socket.readyState === WebSocket3.OPEN || socket.readyState === WebSocket3.CONNECTING) {
     socket.close();
   }
 }
+async function startConnectedListenerRuntime(runtime, transport, opts, processQueuedTurn, options = {}) {
+  if (runtime !== getActiveRuntime() || runtime.intentionallyClosed) {
+    return;
+  }
+  const shouldStartHeartbeat = options.startHeartbeat !== false;
+  const shouldStartCronScheduler = options.startCronScheduler !== false;
+  runtime.transport = transport;
+  safeEmitWsEvent("recv", "lifecycle", {
+    type: getListenerTransportKind(transport) === "websocket" ? "_ws_open" : "_local_open"
+  });
+  runtime.hasSuccessfulConnection = true;
+  runtime.everConnected = true;
+  opts.onConnected(opts.connectionId);
+  if (runtime.conversationRuntimes.size === 0) {
+    emitLoopStatusUpdate(transport, runtime);
+  } else {
+    for (const reminderState of runtime.reminderStateByConversation.values()) {
+      resetSharedReminderState(reminderState);
+    }
+    for (const contextTracker of runtime.contextTrackerByConversation.values()) {
+      resetContextHistory(contextTracker);
+    }
+    for (const conversationRuntime of runtime.conversationRuntimes.values()) {
+      const scope = {
+        agent_id: conversationRuntime.agentId,
+        conversation_id: conversationRuntime.conversationId
+      };
+      emitDeviceStatusUpdate(transport, conversationRuntime, scope);
+      emitLoopStatusUpdate(transport, conversationRuntime, scope);
+    }
+  }
+  runtime._unsubscribeSubagentState?.();
+  runtime._unsubscribeSubagentState = subscribe2(() => {
+    if (runtime.conversationRuntimes.size === 0) {
+      emitSubagentStateIfOpen(runtime);
+      return;
+    }
+    for (const conversationRuntime of runtime.conversationRuntimes.values()) {
+      emitSubagentStateIfOpen(runtime, {
+        agent_id: conversationRuntime.agentId,
+        conversation_id: conversationRuntime.conversationId
+      });
+    }
+  });
+  runtime._unsubscribeSubagentStreamEvents?.();
+  runtime._unsubscribeSubagentStreamEvents = subscribeToStreamEvents((subagentId, event) => {
+    if (!isListenerTransportOpen(transport))
+      return;
+    const subagent = getSubagents().find((entry) => entry.id === subagentId);
+    if (subagent?.silent === true) {
+      return;
+    }
+    emitStreamDelta(transport, runtime, event, subagent?.parentAgentId ? {
+      agent_id: subagent.parentAgentId,
+      conversation_id: subagent.parentConversationId ?? "default"
+    } : undefined, subagentId);
+  });
+  setMessageQueueAdder((queuedMessage) => {
+    const targetRuntime = queuedMessage.agentId && queuedMessage.conversationId ? getOrCreateScopedRuntime(runtime, queuedMessage.agentId, queuedMessage.conversationId) : findFallbackRuntime(runtime);
+    if (!targetRuntime?.queueRuntime) {
+      return;
+    }
+    targetRuntime.queueRuntime.enqueue({
+      kind: "task_notification",
+      source: "task_notification",
+      text: queuedMessage.text,
+      agentId: queuedMessage.agentId ?? targetRuntime.agentId ?? undefined,
+      conversationId: queuedMessage.conversationId ?? targetRuntime.conversationId
+    });
+    scheduleQueuePump(targetRuntime, transport, opts, processQueuedTurn);
+  });
+  if (shouldStartHeartbeat) {
+    runtime.heartbeatInterval = setInterval(() => {
+      safeTransportSend(transport, { type: "ping" }, "listener_ping_send_failed", "listener_heartbeat");
+    }, 30000);
+  }
+  if (shouldStartCronScheduler) {
+    startScheduler(transport, opts, processQueuedTurn);
+  }
+  await wireChannelIngress(runtime, transport, opts, processQueuedTurn);
+}
 async function startListenerClient(opts) {
   const existingRuntime = getActiveRuntime();
   if (existingRuntime) {
@@ -99257,6 +99556,34 @@ async function startListenerClient(opts) {
   telemetry.init();
   await connectWithRetry(runtime, opts);
 }
+async function startLocalChannelListener(opts) {
+  const existingRuntime = getActiveRuntime();
+  if (existingRuntime) {
+    stopRuntime(existingRuntime, true);
+  }
+  const runtime = createRuntime();
+  runtime.onWsEvent = opts.onWsEvent;
+  runtime.connectionId = opts.connectionId;
+  runtime.connectionName = opts.connectionName;
+  setActiveRuntime(runtime);
+  telemetry.setSurface("websocket");
+  telemetry.init();
+  try {
+    await loadTools();
+    const transport = new LocalListenerTransport;
+    const processQueuedTurn = async (queuedTurn, dequeuedBatch) => {
+      const scopedRuntime = getOrCreateScopedRuntime(runtime, queuedTurn.agentId, queuedTurn.conversationId);
+      await handleIncomingMessage(queuedTurn, transport, scopedRuntime, opts.onStatusChange, opts.connectionId, dequeuedBatch.batchId);
+    };
+    await startConnectedListenerRuntime(runtime, transport, opts, processQueuedTurn, { startHeartbeat: false, startCronScheduler: true });
+  } catch (error) {
+    stopRuntime(runtime, true);
+    if (getActiveRuntime() === runtime) {
+      setActiveRuntime(null);
+    }
+    opts.onError(error instanceof Error ? error : new Error(String(error)));
+  }
+}
 async function listDirectoryHybrid(absDir, indexRoot3, includeFiles) {
   let indexedNames;
   const indexedFolders = [];
@@ -99339,7 +99666,7 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
   const url = new URL(opts.wsUrl);
   url.searchParams.set("deviceId", opts.deviceId);
   url.searchParams.set("connectionName", opts.connectionName);
-  const socket = new WebSocket5(url.toString(), {
+  const socket = new WebSocket3(url.toString(), {
     headers: {
       Authorization: `Bearer ${apiKey}`
     }
@@ -99348,83 +99675,13 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
   const watchDebounceTimers = new Map;
   const cancelledWatches = new Set;
   runtime.socket = socket;
+  const transport = socket;
   const processQueuedTurn = async (queuedTurn, dequeuedBatch) => {
     const scopedRuntime = getOrCreateScopedRuntime(runtime, queuedTurn.agentId, queuedTurn.conversationId);
-    await handleIncomingMessage(queuedTurn, socket, scopedRuntime, opts.onStatusChange, opts.connectionId, dequeuedBatch.batchId);
+    await handleIncomingMessage(queuedTurn, transport, scopedRuntime, opts.onStatusChange, opts.connectionId, dequeuedBatch.batchId);
   };
   socket.on("open", async () => {
-    if (runtime !== getActiveRuntime() || runtime.intentionallyClosed) {
-      return;
-    }
-    safeEmitWsEvent("recv", "lifecycle", { type: "_ws_open" });
-    runtime.hasSuccessfulConnection = true;
-    runtime.everConnected = true;
-    opts.onConnected(opts.connectionId);
-    if (runtime.conversationRuntimes.size === 0) {
-      emitLoopStatusUpdate(socket, runtime);
-    } else {
-      for (const reminderState of runtime.reminderStateByConversation.values()) {
-        resetSharedReminderState(reminderState);
-      }
-      for (const contextTracker of runtime.contextTrackerByConversation.values()) {
-        resetContextHistory(contextTracker);
-      }
-      for (const conversationRuntime of runtime.conversationRuntimes.values()) {
-        const scope = {
-          agent_id: conversationRuntime.agentId,
-          conversation_id: conversationRuntime.conversationId
-        };
-        emitDeviceStatusUpdate(socket, conversationRuntime, scope);
-        emitLoopStatusUpdate(socket, conversationRuntime, scope);
-      }
-    }
-    runtime._unsubscribeSubagentState?.();
-    runtime._unsubscribeSubagentState = subscribe2(() => {
-      if (runtime.conversationRuntimes.size === 0) {
-        emitSubagentStateIfOpen(runtime);
-        return;
-      }
-      for (const conversationRuntime of runtime.conversationRuntimes.values()) {
-        emitSubagentStateIfOpen(runtime, {
-          agent_id: conversationRuntime.agentId,
-          conversation_id: conversationRuntime.conversationId
-        });
-      }
-    });
-    runtime._unsubscribeSubagentStreamEvents?.();
-    runtime._unsubscribeSubagentStreamEvents = subscribeToStreamEvents((subagentId, event) => {
-      if (socket.readyState !== WebSocket5.OPEN)
-        return;
-      const subagent = getSubagents().find((entry) => entry.id === subagentId);
-      if (subagent?.silent === true) {
-        return;
-      }
-      emitStreamDelta(socket, runtime, event, subagent?.parentAgentId ? {
-        agent_id: subagent.parentAgentId,
-        conversation_id: subagent.parentConversationId ?? "default"
-      } : undefined, subagentId);
-    });
-    setMessageQueueAdder((queuedMessage) => {
-      const targetRuntime = queuedMessage.agentId && queuedMessage.conversationId ? getOrCreateScopedRuntime(runtime, queuedMessage.agentId, queuedMessage.conversationId) : findFallbackRuntime(runtime);
-      if (!targetRuntime?.queueRuntime) {
-        return;
-      }
-      targetRuntime.queueRuntime.enqueue({
-        kind: "task_notification",
-        source: "task_notification",
-        text: queuedMessage.text,
-        agentId: queuedMessage.agentId ?? targetRuntime.agentId ?? undefined,
-        conversationId: queuedMessage.conversationId ?? targetRuntime.conversationId
-      });
-      scheduleQueuePump(targetRuntime, socket, opts, processQueuedTurn);
-    });
-    runtime.heartbeatInterval = setInterval(() => {
-      if (socket.readyState === WebSocket5.OPEN) {
-        safeSocketSend(socket, { type: "ping" }, "listener_ping_send_failed", "listener_heartbeat");
-      }
-    }, 30000);
-    startScheduler(socket, opts, processQueuedTurn);
-    await wireChannelIngress(runtime, socket, opts, processQueuedTurn);
+    await startConnectedListenerRuntime(runtime, transport, opts, processQueuedTurn, { startHeartbeat: true, startCronScheduler: true });
   });
   socket.on("message", async (data) => {
     const raw = data.toString();
@@ -100458,7 +100715,7 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
 }
 function isListenerActive() {
   const runtime = getActiveRuntime();
-  return runtime !== null && runtime.socket !== null;
+  return runtime !== null && runtime.transport !== null;
 }
 function stopListenerClient() {
   const runtime = getActiveRuntime();
@@ -100621,6 +100878,12 @@ function createLegacyTestRuntime() {
         listener.memfsSyncedAgents = value;
       }
     },
+    secretsHydrationByAgent: {
+      get: () => listener.secretsHydrationByAgent,
+      set: (value) => {
+        listener.secretsHydrationByAgent = value;
+      }
+    },
     worktreeWatcherByConversation: {
       get: () => listener.worktreeWatcherByConversation,
       set: (value) => {
@@ -100686,6 +100949,7 @@ var init_client4 = __esm(async () => {
   init_grepInFiles();
   init_permissionMode();
   init_runtime4();
+  init_transport();
   await __promiseAll([
     init_scheduler(),
     init_manager4(),
@@ -100781,6 +101045,7 @@ var init_client4 = __esm(async () => {
 var exports_listen_client = {};
 __export(exports_listen_client, {
   stopListenerClient: () => stopListenerClient,
+  startLocalChannelListener: () => startLocalChannelListener,
   startListenerClient: () => startListenerClient,
   resolvePendingApprovalResolver: () => resolvePendingApprovalResolver,
   requestApprovalOverWS: () => requestApprovalOverWS,
@@ -107737,12 +108002,12 @@ var init_AgentSelector = __esm(async () => {
 
 // node_modules/highlight.js/es/languages/arduino.js
 function cPlusPlus(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const C_LINE_COMMENT_MODE = hljs.COMMENT("//", "$", { contains: [{ begin: /\\\n/ }] });
   const DECLTYPE_AUTO_RE = "decltype\\(auto\\)";
   const NAMESPACE_RE = "[a-zA-Z_]\\w*::";
   const TEMPLATE_ARGUMENT_RE = "<[^<>]+>";
-  const FUNCTION_TYPE_RE = "(?!struct)(" + DECLTYPE_AUTO_RE + "|" + regex2.optional(NAMESPACE_RE) + "[a-zA-Z_]\\w*" + regex2.optional(TEMPLATE_ARGUMENT_RE) + ")";
+  const FUNCTION_TYPE_RE = "(?!struct)(" + DECLTYPE_AUTO_RE + "|" + regex4.optional(NAMESPACE_RE) + "[a-zA-Z_]\\w*" + regex4.optional(TEMPLATE_ARGUMENT_RE) + ")";
   const CPP_PRIMITIVE_TYPES = {
     className: "type",
     begin: "\\b[a-z\\d_]*_t\\b"
@@ -107801,10 +108066,10 @@ function cPlusPlus(hljs) {
   };
   const TITLE_MODE = {
     className: "title",
-    begin: regex2.optional(NAMESPACE_RE) + hljs.IDENT_RE,
+    begin: regex4.optional(NAMESPACE_RE) + hljs.IDENT_RE,
     relevance: 0
   };
-  const FUNCTION_TITLE = regex2.optional(NAMESPACE_RE) + hljs.IDENT_RE + "\\s*\\(";
+  const FUNCTION_TITLE = regex4.optional(NAMESPACE_RE) + hljs.IDENT_RE + "\\s*\\(";
   const RESERVED_KEYWORDS = [
     "alignas",
     "alignof",
@@ -108094,7 +108359,7 @@ function cPlusPlus(hljs) {
     keywords: {
       _hint: FUNCTION_HINTS
     },
-    begin: regex2.concat(/\b/, /(?!decltype)/, /(?!if)/, /(?!for)/, /(?!switch)/, /(?!while)/, hljs.IDENT_RE, regex2.lookahead(/(<[^<>]+>|)\s*\(/))
+    begin: regex4.concat(/\b/, /(?!decltype)/, /(?!if)/, /(?!for)/, /(?!switch)/, /(?!while)/, hljs.IDENT_RE, regex4.lookahead(/(<[^<>]+>|)\s*\(/))
   };
   const EXPRESSION_CONTAINS = [
     FUNCTION_DISPATCH,
@@ -108636,7 +108901,7 @@ var init_arduino = () => {};
 
 // node_modules/highlight.js/es/languages/bash.js
 function bash2(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const VAR = {};
   const BRACED_VAR = {
     begin: /\$\{/,
@@ -108652,7 +108917,7 @@ function bash2(hljs) {
   Object.assign(VAR, {
     className: "variable",
     variants: [
-      { begin: regex2.concat(/\$[\w\d#@][\w\d_]*/, `(?![\\w\\d])(?![$])`) },
+      { begin: regex4.concat(/\$[\w\d#@][\w\d_]*/, `(?![\\w\\d])(?![$])`) },
       BRACED_VAR
     ]
   });
@@ -109017,12 +109282,12 @@ var init_bash = () => {};
 
 // node_modules/highlight.js/es/languages/c.js
 function c(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const C_LINE_COMMENT_MODE = hljs.COMMENT("//", "$", { contains: [{ begin: /\\\n/ }] });
   const DECLTYPE_AUTO_RE = "decltype\\(auto\\)";
   const NAMESPACE_RE = "[a-zA-Z_]\\w*::";
   const TEMPLATE_ARGUMENT_RE = "<[^<>]+>";
-  const FUNCTION_TYPE_RE = "(" + DECLTYPE_AUTO_RE + "|" + regex2.optional(NAMESPACE_RE) + "[a-zA-Z_]\\w*" + regex2.optional(TEMPLATE_ARGUMENT_RE) + ")";
+  const FUNCTION_TYPE_RE = "(" + DECLTYPE_AUTO_RE + "|" + regex4.optional(NAMESPACE_RE) + "[a-zA-Z_]\\w*" + regex4.optional(TEMPLATE_ARGUMENT_RE) + ")";
   const TYPES = {
     className: "type",
     variants: [
@@ -109082,10 +109347,10 @@ function c(hljs) {
   };
   const TITLE_MODE = {
     className: "title",
-    begin: regex2.optional(NAMESPACE_RE) + hljs.IDENT_RE,
+    begin: regex4.optional(NAMESPACE_RE) + hljs.IDENT_RE,
     relevance: 0
   };
-  const FUNCTION_TITLE = regex2.optional(NAMESPACE_RE) + hljs.IDENT_RE + "\\s*\\(";
+  const FUNCTION_TITLE = regex4.optional(NAMESPACE_RE) + hljs.IDENT_RE + "\\s*\\(";
   const C_KEYWORDS = [
     "asm",
     "auto",
@@ -109293,12 +109558,12 @@ var init_c = () => {};
 
 // node_modules/highlight.js/es/languages/cpp.js
 function cpp(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const C_LINE_COMMENT_MODE = hljs.COMMENT("//", "$", { contains: [{ begin: /\\\n/ }] });
   const DECLTYPE_AUTO_RE = "decltype\\(auto\\)";
   const NAMESPACE_RE = "[a-zA-Z_]\\w*::";
   const TEMPLATE_ARGUMENT_RE = "<[^<>]+>";
-  const FUNCTION_TYPE_RE = "(?!struct)(" + DECLTYPE_AUTO_RE + "|" + regex2.optional(NAMESPACE_RE) + "[a-zA-Z_]\\w*" + regex2.optional(TEMPLATE_ARGUMENT_RE) + ")";
+  const FUNCTION_TYPE_RE = "(?!struct)(" + DECLTYPE_AUTO_RE + "|" + regex4.optional(NAMESPACE_RE) + "[a-zA-Z_]\\w*" + regex4.optional(TEMPLATE_ARGUMENT_RE) + ")";
   const CPP_PRIMITIVE_TYPES = {
     className: "type",
     begin: "\\b[a-z\\d_]*_t\\b"
@@ -109357,10 +109622,10 @@ function cpp(hljs) {
   };
   const TITLE_MODE = {
     className: "title",
-    begin: regex2.optional(NAMESPACE_RE) + hljs.IDENT_RE,
+    begin: regex4.optional(NAMESPACE_RE) + hljs.IDENT_RE,
     relevance: 0
   };
-  const FUNCTION_TITLE = regex2.optional(NAMESPACE_RE) + hljs.IDENT_RE + "\\s*\\(";
+  const FUNCTION_TITLE = regex4.optional(NAMESPACE_RE) + hljs.IDENT_RE + "\\s*\\(";
   const RESERVED_KEYWORDS = [
     "alignas",
     "alignof",
@@ -109650,7 +109915,7 @@ function cpp(hljs) {
     keywords: {
       _hint: FUNCTION_HINTS
     },
-    begin: regex2.concat(/\b/, /(?!decltype)/, /(?!if)/, /(?!for)/, /(?!switch)/, /(?!while)/, hljs.IDENT_RE, regex2.lookahead(/(<[^<>]+>|)\s*\(/))
+    begin: regex4.concat(/\b/, /(?!decltype)/, /(?!if)/, /(?!for)/, /(?!switch)/, /(?!while)/, hljs.IDENT_RE, regex4.lookahead(/(<[^<>]+>|)\s*\(/))
   };
   const EXPRESSION_CONTAINS = [
     FUNCTION_DISPATCH,
@@ -110196,7 +110461,7 @@ var init_csharp = () => {};
 
 // node_modules/highlight.js/es/languages/css.js
 function css(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const modes = MODES(hljs);
   const VENDOR_PREFIX = { begin: /-(webkit|moz|ms|o)-(?=[a-z])/ };
   const AT_MODIFIERS = "and or not only";
@@ -110269,7 +110534,7 @@ function css(hljs) {
         ]
       },
       {
-        begin: regex2.lookahead(/@/),
+        begin: regex4.lookahead(/@/),
         end: "[{;]",
         relevance: 0,
         illegal: /:/,
@@ -111101,7 +111366,7 @@ var init_css2 = __esm(() => {
 
 // node_modules/highlight.js/es/languages/diff.js
 function diff2(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   return {
     name: "Diff",
     aliases: ["patch"],
@@ -111109,13 +111374,13 @@ function diff2(hljs) {
       {
         className: "meta",
         relevance: 10,
-        match: regex2.either(/^@@ +-\d+,\d+ +\+\d+,\d+ +@@/, /^\*\*\* +\d+,\d+ +\*\*\*\*$/, /^--- +\d+,\d+ +----$/)
+        match: regex4.either(/^@@ +-\d+,\d+ +\+\d+,\d+ +@@/, /^\*\*\* +\d+,\d+ +\*\*\*\*$/, /^--- +\d+,\d+ +----$/)
       },
       {
         className: "comment",
         variants: [
           {
-            begin: regex2.either(/Index: /, /^index/, /={3,}/, /^-{3}/, /^\*{3} /, /^\+{3}/, /^diff --git/),
+            begin: regex4.either(/Index: /, /^index/, /={3,}/, /^-{3}/, /^\*{3} /, /^\+{3}/, /^diff --git/),
             end: /$/
           },
           { match: /^\*{15}$/ }
@@ -111292,7 +111557,7 @@ var init_go = () => {};
 
 // node_modules/highlight.js/es/languages/graphql.js
 function graphql(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const GQL_NAME = /[_A-Za-z][_0-9A-Za-z]*/;
   return {
     name: "GraphQL",
@@ -111349,7 +111614,7 @@ function graphql(hljs) {
       },
       {
         scope: "symbol",
-        begin: regex2.concat(GQL_NAME, regex2.lookahead(/\s*:/)),
+        begin: regex4.concat(GQL_NAME, regex4.lookahead(/\s*:/)),
         relevance: 0
       }
     ],
@@ -111363,7 +111628,7 @@ var init_graphql = () => {};
 
 // node_modules/highlight.js/es/languages/ini.js
 function ini(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const NUMBERS = {
     className: "number",
     relevance: 0,
@@ -111434,8 +111699,8 @@ function ini(hljs) {
   const BARE_KEY = /[A-Za-z0-9_-]+/;
   const QUOTED_KEY_DOUBLE_QUOTE = /"(\\"|[^"])*"/;
   const QUOTED_KEY_SINGLE_QUOTE = /'[^']*'/;
-  const ANY_KEY = regex2.either(BARE_KEY, QUOTED_KEY_DOUBLE_QUOTE, QUOTED_KEY_SINGLE_QUOTE);
-  const DOTTED_KEY = regex2.concat(ANY_KEY, "(\\s*\\.\\s*", ANY_KEY, ")*", regex2.lookahead(/\s*=\s*[^#\s]/));
+  const ANY_KEY = regex4.either(BARE_KEY, QUOTED_KEY_DOUBLE_QUOTE, QUOTED_KEY_SINGLE_QUOTE);
+  const DOTTED_KEY = regex4.concat(ANY_KEY, "(\\s*\\.\\s*", ANY_KEY, ")*", regex4.lookahead(/\s*=\s*[^#\s]/));
   return {
     name: "TOML, also INI",
     aliases: ["toml"],
@@ -111477,7 +111742,7 @@ function recurRegex(re, substitution, depth) {
   });
 }
 function java(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const JAVA_IDENT_RE = "[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*";
   const GENERIC_IDENT_RE = JAVA_IDENT_RE + recurRegex("(?:<" + JAVA_IDENT_RE + "~~~(?:\\s*,\\s*" + JAVA_IDENT_RE + "~~~)*>)?", /~~~/g, 2);
   const MAIN_KEYWORDS = [
@@ -111622,7 +111887,7 @@ function java(hljs) {
       },
       {
         begin: [
-          regex2.concat(/(?!else)/, JAVA_IDENT_RE),
+          regex4.concat(/(?!else)/, JAVA_IDENT_RE),
           /\s+/,
           JAVA_IDENT_RE,
           /\s+/,
@@ -111708,7 +111973,7 @@ var init_java = __esm(() => {
 
 // node_modules/highlight.js/es/languages/javascript.js
 function javascript(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const hasClosingTag = (match3, { after }) => {
     const tag = "</" + match3[0].slice(1);
     const pos = match3.input.indexOf(tag, after);
@@ -111914,7 +112179,7 @@ function javascript(hljs) {
           /\s+/,
           /extends/,
           /\s+/,
-          regex2.concat(IDENT_RE$1, "(", regex2.concat(/\./, IDENT_RE$1), ")*")
+          regex4.concat(IDENT_RE$1, "(", regex4.concat(/\./, IDENT_RE$1), ")*")
         ],
         scope: {
           1: "keyword",
@@ -111938,7 +112203,7 @@ function javascript(hljs) {
   };
   const CLASS_REFERENCE = {
     relevance: 0,
-    match: regex2.either(/\bJSON/, /\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/, /\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/, /\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
+    match: regex4.either(/\bJSON/, /\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/, /\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/, /\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
     className: "title.class",
     keywords: {
       _: [
@@ -111984,19 +112249,19 @@ function javascript(hljs) {
     className: "variable.constant"
   };
   function noneOf(list) {
-    return regex2.concat("(?!", list.join("|"), ")");
+    return regex4.concat("(?!", list.join("|"), ")");
   }
   const FUNCTION_CALL = {
-    match: regex2.concat(/\b/, noneOf([
+    match: regex4.concat(/\b/, noneOf([
       ...BUILT_IN_GLOBALS,
       "super",
       "import"
-    ].map((x) => `${x}\\s*\\(`)), IDENT_RE$1, regex2.lookahead(/\s*\(/)),
+    ].map((x) => `${x}\\s*\\(`)), IDENT_RE$1, regex4.lookahead(/\s*\(/)),
     className: "title.function",
     relevance: 0
   };
   const PROPERTY_ACCESS = {
-    begin: regex2.concat(/\./, regex2.lookahead(regex2.concat(IDENT_RE$1, /(?![0-9A-Za-z$_(])/))),
+    begin: regex4.concat(/\./, regex4.lookahead(regex4.concat(IDENT_RE$1, /(?![0-9A-Za-z$_(])/))),
     end: IDENT_RE$1,
     excludeBegin: true,
     keywords: "prototype",
@@ -112030,7 +112295,7 @@ function javascript(hljs) {
       /\s*/,
       /=\s*/,
       /(async\s*)?/,
-      regex2.lookahead(FUNC_LEAD_IN_RE)
+      regex4.lookahead(FUNC_LEAD_IN_RE)
     ],
     keywords: "async",
     className: {
@@ -112066,7 +112331,7 @@ function javascript(hljs) {
       CLASS_REFERENCE,
       {
         scope: "attr",
-        match: IDENT_RE$1 + regex2.lookahead(":"),
+        match: IDENT_RE$1 + regex4.lookahead(":"),
         relevance: 0
       },
       FUNCTION_VARIABLE,
@@ -113677,7 +113942,7 @@ var init_makefile = () => {};
 
 // node_modules/highlight.js/es/languages/markdown.js
 function markdown(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const INLINE_HTML = {
     begin: /<\/?[A-Za-z_]/,
     end: ">",
@@ -113751,7 +114016,7 @@ function markdown(hljs) {
         relevance: 2
       },
       {
-        begin: regex2.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
+        begin: regex4.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
         relevance: 2
       },
       {
@@ -114141,7 +114406,7 @@ var init_objectivec = () => {};
 
 // node_modules/highlight.js/es/languages/perl.js
 function perl(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const KEYWORDS2 = [
     "abs",
     "accept",
@@ -114401,7 +114666,7 @@ function perl(hljs) {
     variants: [
       { begin: /\$\d/ },
       {
-        begin: regex2.concat(/[$%@](?!")(\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/, `(?![A-Za-z])(?![@$%])`)
+        begin: regex4.concat(/[$%@](?!")(\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/, `(?![A-Za-z])(?![@$%])`)
       },
       {
         begin: /[$%@](?!")[^\s\w{=]|\$=/,
@@ -114436,11 +114701,11 @@ function perl(hljs) {
     /#/
   ];
   const PAIRED_DOUBLE_RE = (prefix, open2, close = "\\1") => {
-    const middle = close === "\\1" ? close : regex2.concat(close, open2);
-    return regex2.concat(regex2.concat("(?:", prefix, ")"), open2, /(?:\\.|[^\\\/])*?/, middle, /(?:\\.|[^\\\/])*?/, close, REGEX_MODIFIERS);
+    const middle = close === "\\1" ? close : regex4.concat(close, open2);
+    return regex4.concat(regex4.concat("(?:", prefix, ")"), open2, /(?:\\.|[^\\\/])*?/, middle, /(?:\\.|[^\\\/])*?/, close, REGEX_MODIFIERS);
   };
   const PAIRED_RE = (prefix, open2, close) => {
-    return regex2.concat(regex2.concat("(?:", prefix, ")"), open2, /(?:\\.|[^\\\/])*?/, close, REGEX_MODIFIERS);
+    return regex4.concat(regex4.concat("(?:", prefix, ")"), open2, /(?:\\.|[^\\\/])*?/, close, REGEX_MODIFIERS);
   };
   const PERL_DEFAULT_CONTAINS = [
     VAR,
@@ -114515,7 +114780,7 @@ function perl(hljs) {
         {
           className: "regexp",
           variants: [
-            { begin: PAIRED_DOUBLE_RE("s|tr|y", regex2.either(...REGEX_DELIMS, { capture: true })) },
+            { begin: PAIRED_DOUBLE_RE("s|tr|y", regex4.either(...REGEX_DELIMS, { capture: true })) },
             { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\(", "\\)") },
             { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\[", "\\]") },
             { begin: PAIRED_DOUBLE_RE("s|tr|y", "\\{", "\\}") }
@@ -114530,7 +114795,7 @@ function perl(hljs) {
               relevance: 0
             },
             { begin: PAIRED_RE("(?:m|qr)?", /\//, /\//) },
-            { begin: PAIRED_RE("m|qr", regex2.either(...REGEX_DELIMS, { capture: true }), /\1/) },
+            { begin: PAIRED_RE("m|qr", regex4.either(...REGEX_DELIMS, { capture: true }), /\1/) },
             { begin: PAIRED_RE("m|qr", /\(/, /\)/) },
             { begin: PAIRED_RE("m|qr", /\[/, /\]/) },
             { begin: PAIRED_RE("m|qr", /\{/, /\}/) }
@@ -114587,11 +114852,11 @@ var init_perl = () => {};
 
 // node_modules/highlight.js/es/languages/php.js
 function php(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const NOT_PERL_ETC = /(?![A-Za-z0-9])(?![$])/;
-  const IDENT_RE2 = regex2.concat(/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/, NOT_PERL_ETC);
-  const PASCAL_CASE_CLASS_NAME_RE = regex2.concat(/(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/, NOT_PERL_ETC);
-  const UPCASE_NAME_RE = regex2.concat(/[A-Z]+/, NOT_PERL_ETC);
+  const IDENT_RE2 = regex4.concat(/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/, NOT_PERL_ETC);
+  const PASCAL_CASE_CLASS_NAME_RE = regex4.concat(/(\\?[A-Z][a-z0-9_\x7f-\xff]+|\\?[A-Z]+(?=[A-Z][a-z0-9_\x7f-\xff])){1,}/, NOT_PERL_ETC);
+  const UPCASE_NAME_RE = regex4.concat(/[A-Z]+/, NOT_PERL_ETC);
   const VARIABLE = {
     scope: "variable",
     match: "\\$+" + IDENT_RE2
@@ -114870,8 +115135,8 @@ function php(hljs) {
     {
       match: [
         /new/,
-        regex2.concat(WHITESPACE, "+"),
-        regex2.concat("(?!", normalizeKeywords(BUILT_INS2).join("\\b|"), "\\b)"),
+        regex4.concat(WHITESPACE, "+"),
+        regex4.concat("(?!", normalizeKeywords(BUILT_INS2).join("\\b|"), "\\b)"),
         PASCAL_CASE_CLASS_NAME_RE
       ],
       scope: {
@@ -114880,11 +115145,11 @@ function php(hljs) {
       }
     }
   ] };
-  const CONSTANT_REFERENCE = regex2.concat(IDENT_RE2, "\\b(?!\\()");
+  const CONSTANT_REFERENCE = regex4.concat(IDENT_RE2, "\\b(?!\\()");
   const LEFT_AND_RIGHT_SIDE_OF_DOUBLE_COLON = { variants: [
     {
       match: [
-        regex2.concat(/::/, regex2.lookahead(/(?!class\b)/)),
+        regex4.concat(/::/, regex4.lookahead(/(?!class\b)/)),
         CONSTANT_REFERENCE
       ],
       scope: { 2: "variable.constant" }
@@ -114899,7 +115164,7 @@ function php(hljs) {
     {
       match: [
         PASCAL_CASE_CLASS_NAME_RE,
-        regex2.concat(/::/, regex2.lookahead(/(?!class\b)/)),
+        regex4.concat(/::/, regex4.lookahead(/(?!class\b)/)),
         CONSTANT_REFERENCE
       ],
       scope: {
@@ -114910,7 +115175,7 @@ function php(hljs) {
     {
       match: [
         PASCAL_CASE_CLASS_NAME_RE,
-        regex2.concat("::", regex2.lookahead(/(?!class\b)/))
+        regex4.concat("::", regex4.lookahead(/(?!class\b)/))
       ],
       scope: { 1: "title.class" }
     },
@@ -114928,7 +115193,7 @@ function php(hljs) {
   ] };
   const NAMED_ARGUMENT = {
     scope: "attr",
-    match: regex2.concat(IDENT_RE2, regex2.lookahead(":"), regex2.lookahead(/(?!::)/))
+    match: regex4.concat(IDENT_RE2, regex4.lookahead(":"), regex4.lookahead(/(?!::)/))
   };
   const PARAMS_MODE = {
     relevance: 0,
@@ -114949,10 +115214,10 @@ function php(hljs) {
     relevance: 0,
     match: [
       /\b/,
-      regex2.concat("(?!fn\\b|function\\b|", normalizeKeywords(KWS).join("\\b|"), "|", normalizeKeywords(BUILT_INS2).join("\\b|"), "\\b)"),
+      regex4.concat("(?!fn\\b|function\\b|", normalizeKeywords(KWS).join("\\b|"), "|", normalizeKeywords(BUILT_INS2).join("\\b|"), "\\b)"),
       IDENT_RE2,
-      regex2.concat(WHITESPACE, "*"),
-      regex2.lookahead(/(?=\()/)
+      regex4.concat(WHITESPACE, "*"),
+      regex4.lookahead(/(?=\()/)
     ],
     scope: { 3: "title.function.invoke" },
     contains: [PARAMS_MODE]
@@ -114967,7 +115232,7 @@ function php(hljs) {
     CONSTRUCTOR_CALL
   ];
   const ATTRIBUTES3 = {
-    begin: regex2.concat(/#\[\s*\\?/, regex2.either(PASCAL_CASE_CLASS_NAME_RE, UPCASE_NAME_RE)),
+    begin: regex4.concat(/#\[\s*\\?/, regex4.either(PASCAL_CASE_CLASS_NAME_RE, UPCASE_NAME_RE)),
     beginScope: "meta",
     end: /]/,
     endScope: "meta",
@@ -115191,7 +115456,7 @@ var init_plaintext = () => {};
 
 // node_modules/highlight.js/es/languages/python.js
 function python(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const IDENT_RE2 = /[\p{XID_Start}_]\p{XID_Continue}*/u;
   const RESERVED_WORDS = [
     "and",
@@ -115459,7 +115724,7 @@ function python(hljs) {
   };
   const COMMENT_TYPE = {
     className: "comment",
-    begin: regex2.lookahead(/# type:/),
+    begin: regex4.lookahead(/# type:/),
     end: /$/,
     keywords: KEYWORDS2,
     contains: [
@@ -115607,11 +115872,11 @@ var init_python_repl = () => {};
 
 // node_modules/highlight.js/es/languages/r.js
 function r(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const IDENT_RE2 = /(?:(?:[a-zA-Z]|\.[._a-zA-Z])[._a-zA-Z0-9]*)|\.(?!\d)/;
-  const NUMBER_TYPES_RE = regex2.either(/0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/, /0[xX][0-9a-fA-F]+(?:[pP][+-]?\d+)?[Li]?/, /(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?[Li]?/);
+  const NUMBER_TYPES_RE = regex4.either(/0[xX][0-9a-fA-F]+\.[0-9a-fA-F]*[pP][+-]?\d+i?/, /0[xX][0-9a-fA-F]+(?:[pP][+-]?\d+)?[Li]?/, /(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?[Li]?/);
   const OPERATORS_RE = /[=!<>:]=|\|\||&&|:::?|<-|<<-|->>|->|\|>|[-+*\/?!$&|:<=>@^~]|\*\*/;
-  const PUNCTUATION_RE = regex2.either(/[()]/, /[{}]/, /\[\[/, /[[\]]/, /\\/, /,/);
+  const PUNCTUATION_RE = regex4.either(/[()]/, /[{}]/, /\[\[/, /[[\]]/, /\\/, /,/);
   return {
     name: "R",
     keywords: {
@@ -115626,7 +115891,7 @@ function r(hljs) {
           scope: "doctag",
           match: /@examples/,
           starts: {
-            end: regex2.lookahead(regex2.either(/\n^#'\s*(?=@[a-zA-Z]+)/, /\n^(?!#')/)),
+            end: regex4.lookahead(regex4.either(/\n^#'\s*(?=@[a-zA-Z]+)/, /\n^(?!#')/)),
             endsParent: true
           }
         },
@@ -115771,10 +116036,10 @@ var init_r = () => {};
 
 // node_modules/highlight.js/es/languages/ruby.js
 function ruby(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const RUBY_METHOD_RE = "([a-zA-Z_]\\w*[!?=]?|[-+~]@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?)";
-  const CLASS_NAME_RE = regex2.either(/\b([A-Z]+[a-z0-9]+)+/, /\b([A-Z]+[a-z0-9]+)+[A-Z]+/);
-  const CLASS_NAME_WITH_NAMESPACE_RE = regex2.concat(CLASS_NAME_RE, /(::\w+)*/);
+  const CLASS_NAME_RE = regex4.either(/\b([A-Z]+[a-z0-9]+)+/, /\b([A-Z]+[a-z0-9]+)+[A-Z]+/);
+  const CLASS_NAME_WITH_NAMESPACE_RE = regex4.concat(CLASS_NAME_RE, /(::\w+)*/);
   const PSEUDO_KWS = [
     "include",
     "extend",
@@ -115927,7 +116192,7 @@ function ruby(hljs) {
       { begin: /\B\?\\(c|C-)[\x20-\x7e]/ },
       { begin: /\B\?\\?\S/ },
       {
-        begin: regex2.concat(/<<[-~]?'?/, regex2.lookahead(/(\w+)(?=\W)[^\n]*\n(?:[^\n]*\n)*?\s*\1\b/)),
+        begin: regex4.concat(/<<[-~]?'?/, regex4.lookahead(/(\w+)(?=\W)[^\n]*\n(?:[^\n]*\n)*?\s*\1\b/)),
         contains: [
           hljs.END_SAME_AS_BEGIN({
             begin: /(\w+)/,
@@ -116156,14 +116421,14 @@ var init_ruby = () => {};
 
 // node_modules/highlight.js/es/languages/rust.js
 function rust(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const RAW_IDENTIFIER = /(r#)?/;
-  const UNDERSCORE_IDENT_RE = regex2.concat(RAW_IDENTIFIER, hljs.UNDERSCORE_IDENT_RE);
-  const IDENT_RE2 = regex2.concat(RAW_IDENTIFIER, hljs.IDENT_RE);
+  const UNDERSCORE_IDENT_RE = regex4.concat(RAW_IDENTIFIER, hljs.UNDERSCORE_IDENT_RE);
+  const IDENT_RE2 = regex4.concat(RAW_IDENTIFIER, hljs.IDENT_RE);
   const FUNCTION_INVOKE = {
     className: "title.function.invoke",
     relevance: 0,
-    begin: regex2.concat(/\b/, /(?!let|for|while|if|else|match\b)/, IDENT_RE2, regex2.lookahead(/\s*\(/))
+    begin: regex4.concat(/\b/, /(?!let|for|while|if|else|match\b)/, IDENT_RE2, regex4.lookahead(/\s*\(/))
   };
   const NUMBER_SUFFIX = "([ui](8|16|32|64|128|size)|f(32|64))?";
   const KEYWORDS2 = [
@@ -117383,7 +117648,7 @@ var init_shell = () => {};
 
 // node_modules/highlight.js/es/languages/sql.js
 function sql(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const COMMENT_MODE = hljs.COMMENT("--", "$");
   const STRING = {
     scope: "string",
@@ -117957,12 +118222,12 @@ function sql(hljs) {
     relevance: 0
   };
   const FUNCTION_CALL = {
-    match: regex2.concat(/\b/, regex2.either(...FUNCTIONS), /\s*\(/),
+    match: regex4.concat(/\b/, regex4.either(...FUNCTIONS), /\s*\(/),
     relevance: 0,
     keywords: { built_in: FUNCTIONS }
   };
   function kws_to_regex(list) {
-    return regex2.concat(/\b/, regex2.either(...list.map((kw) => {
+    return regex4.concat(/\b/, regex4.either(...list.map((kw) => {
       return kw.replace(/\s+/, "\\s+");
     })), /\b/);
   }
@@ -118774,7 +119039,7 @@ var init_swift = __esm(() => {
 
 // node_modules/highlight.js/es/languages/typescript.js
 function javascript2(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const hasClosingTag = (match3, { after }) => {
     const tag = "</" + match3[0].slice(1);
     const pos = match3.input.indexOf(tag, after);
@@ -118980,7 +119245,7 @@ function javascript2(hljs) {
           /\s+/,
           /extends/,
           /\s+/,
-          regex2.concat(IDENT_RE$1, "(", regex2.concat(/\./, IDENT_RE$1), ")*")
+          regex4.concat(IDENT_RE$1, "(", regex4.concat(/\./, IDENT_RE$1), ")*")
         ],
         scope: {
           1: "keyword",
@@ -119004,7 +119269,7 @@ function javascript2(hljs) {
   };
   const CLASS_REFERENCE = {
     relevance: 0,
-    match: regex2.either(/\bJSON/, /\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/, /\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/, /\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
+    match: regex4.either(/\bJSON/, /\b[A-Z][a-z]+([A-Z][a-z]*|\d)*/, /\b[A-Z]{2,}([A-Z][a-z]+|\d)+([A-Z][a-z]*)*/, /\b[A-Z]{2,}[a-z]+([A-Z][a-z]+|\d)*([A-Z][a-z]*)*/),
     className: "title.class",
     keywords: {
       _: [
@@ -119050,19 +119315,19 @@ function javascript2(hljs) {
     className: "variable.constant"
   };
   function noneOf(list) {
-    return regex2.concat("(?!", list.join("|"), ")");
+    return regex4.concat("(?!", list.join("|"), ")");
   }
   const FUNCTION_CALL = {
-    match: regex2.concat(/\b/, noneOf([
+    match: regex4.concat(/\b/, noneOf([
       ...BUILT_IN_GLOBALS2,
       "super",
       "import"
-    ].map((x) => `${x}\\s*\\(`)), IDENT_RE$1, regex2.lookahead(/\s*\(/)),
+    ].map((x) => `${x}\\s*\\(`)), IDENT_RE$1, regex4.lookahead(/\s*\(/)),
     className: "title.function",
     relevance: 0
   };
   const PROPERTY_ACCESS = {
-    begin: regex2.concat(/\./, regex2.lookahead(regex2.concat(IDENT_RE$1, /(?![0-9A-Za-z$_(])/))),
+    begin: regex4.concat(/\./, regex4.lookahead(regex4.concat(IDENT_RE$1, /(?![0-9A-Za-z$_(])/))),
     end: IDENT_RE$1,
     excludeBegin: true,
     keywords: "prototype",
@@ -119096,7 +119361,7 @@ function javascript2(hljs) {
       /\s*/,
       /=\s*/,
       /(async\s*)?/,
-      regex2.lookahead(FUNC_LEAD_IN_RE)
+      regex4.lookahead(FUNC_LEAD_IN_RE)
     ],
     keywords: "async",
     className: {
@@ -119132,7 +119397,7 @@ function javascript2(hljs) {
       CLASS_REFERENCE,
       {
         scope: "attr",
-        match: IDENT_RE$1 + regex2.lookahead(":"),
+        match: IDENT_RE$1 + regex4.lookahead(":"),
         relevance: 0
       },
       FUNCTION_VARIABLE,
@@ -119241,7 +119506,7 @@ function javascript2(hljs) {
   };
 }
 function typescript(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const tsLanguage = javascript2(hljs);
   const IDENT_RE$1 = IDENT_RE2;
   const TYPES3 = [
@@ -119317,7 +119582,7 @@ function typescript(hljs) {
   Object.assign(tsLanguage.keywords, KEYWORDS$1);
   tsLanguage.exports.PARAMS_CONTAINS.push(DECORATOR);
   const ATTRIBUTE_HIGHLIGHT = tsLanguage.contains.find((c2) => c2.scope === "attr");
-  const OPTIONAL_KEY_OR_ARGUMENT = Object.assign({}, ATTRIBUTE_HIGHLIGHT, { match: regex2.concat(IDENT_RE$1, regex2.lookahead(/\s*\?:/)) });
+  const OPTIONAL_KEY_OR_ARGUMENT = Object.assign({}, ATTRIBUTE_HIGHLIGHT, { match: regex4.concat(IDENT_RE$1, regex4.lookahead(/\s*\?:/)) });
   tsLanguage.exports.PARAMS_CONTAINS.push([
     tsLanguage.exports.CLASS_REFERENCE,
     ATTRIBUTE_HIGHLIGHT,
@@ -119482,7 +119747,7 @@ var init_typescript2 = __esm(() => {
 
 // node_modules/highlight.js/es/languages/vbnet.js
 function vbnet(hljs) {
-  const regex2 = hljs.regex;
+  const regex4 = hljs.regex;
   const CHARACTER = {
     className: "string",
     begin: /"(""|[^/n])"C\b/
@@ -119506,16 +119771,16 @@ function vbnet(hljs) {
     className: "literal",
     variants: [
       {
-        begin: regex2.concat(/# */, regex2.either(YYYY_MM_DD, MM_DD_YYYY), / *#/)
+        begin: regex4.concat(/# */, regex4.either(YYYY_MM_DD, MM_DD_YYYY), / *#/)
       },
       {
-        begin: regex2.concat(/# */, TIME_24H, / *#/)
+        begin: regex4.concat(/# */, TIME_24H, / *#/)
       },
       {
-        begin: regex2.concat(/# */, TIME_12H, / *#/)
+        begin: regex4.concat(/# */, TIME_12H, / *#/)
       },
       {
-        begin: regex2.concat(/# */, regex2.either(YYYY_MM_DD, MM_DD_YYYY), / +/, regex2.either(TIME_12H, TIME_24H), / *#/)
+        begin: regex4.concat(/# */, regex4.either(YYYY_MM_DD, MM_DD_YYYY), / +/, regex4.either(TIME_12H, TIME_24H), / *#/)
       }
     ]
   };
@@ -119711,8 +119976,8 @@ var init_wasm = () => {};
 
 // node_modules/highlight.js/es/languages/xml.js
 function xml(hljs) {
-  const regex2 = hljs.regex;
-  const TAG_NAME_RE = regex2.concat(/[\p{L}_]/u, regex2.optional(/[\p{L}0-9_.-]*:/u), /[\p{L}0-9_.-]*/u);
+  const regex4 = hljs.regex;
+  const TAG_NAME_RE = regex4.concat(/[\p{L}_]/u, regex4.optional(/[\p{L}0-9_.-]*:/u), /[\p{L}0-9_.-]*/u);
   const XML_IDENT_RE = /[\p{L}0-9._:-]+/u;
   const XML_ENTITIES = {
     className: "symbol",
@@ -119875,7 +120140,7 @@ function xml(hljs) {
       },
       {
         className: "tag",
-        begin: regex2.concat(/</, regex2.lookahead(regex2.concat(TAG_NAME_RE, regex2.either(/\/>/, />/, /\s/)))),
+        begin: regex4.concat(/</, regex4.lookahead(regex4.concat(TAG_NAME_RE, regex4.either(/\/>/, />/, /\s/)))),
         end: /\/?>/,
         contains: [
           {
@@ -119888,7 +120153,7 @@ function xml(hljs) {
       },
       {
         className: "tag",
-        begin: regex2.concat(/<\//, regex2.lookahead(regex2.concat(TAG_NAME_RE, />/))),
+        begin: regex4.concat(/<\//, regex4.lookahead(regex4.concat(TAG_NAME_RE, />/))),
         contains: [
           {
             className: "name",
@@ -120436,10 +120701,10 @@ var require_core = __commonJS((exports, module) => {
   var BACKREF_RE = /\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./;
   function _rewriteBackreferences(regexps, { joinWith }) {
     let numCaptures = 0;
-    return regexps.map((regex2) => {
+    return regexps.map((regex4) => {
       numCaptures += 1;
       const offset = numCaptures;
-      let re = source2(regex2);
+      let re = source2(regex4);
       let out = "";
       while (re.length > 0) {
         const match3 = BACKREF_RE.exec(re);
@@ -129187,6 +129452,7 @@ __export(exports_terminalKeybindingInstaller, {
   installWezTermDeleteFix: () => installWezTermDeleteFix,
   installKeybindingForCurrentTerminal: () => installKeybindingForCurrentTerminal,
   installKeybinding: () => installKeybinding,
+  injectWezTermDeleteFix: () => injectWezTermDeleteFix,
   getWezTermConfigPath: () => getWezTermConfigPath,
   getKeybindingsPath: () => getKeybindingsPath,
   detectTerminalType: () => detectTerminalType
@@ -129402,6 +129668,106 @@ function getWezTermConfigPath() {
     return configPath;
   return join46(homedir32(), ".wezterm.lua");
 }
+function stripLuaCommentsFromLine(line, blockCommentEnd) {
+  let code = "";
+  let index = 0;
+  let currentBlockCommentEnd = blockCommentEnd;
+  while (index < line.length) {
+    if (currentBlockCommentEnd) {
+      const closeIndex = line.indexOf(currentBlockCommentEnd, index);
+      if (closeIndex === -1) {
+        return { code, blockCommentEnd: currentBlockCommentEnd };
+      }
+      index = closeIndex + currentBlockCommentEnd.length;
+      currentBlockCommentEnd = null;
+      continue;
+    }
+    if (line.startsWith("--", index)) {
+      const longCommentMatch = line.slice(index).match(/^--\[(=*)\[/);
+      if (longCommentMatch) {
+        const equals = longCommentMatch[1] ?? "";
+        currentBlockCommentEnd = `]${equals}]`;
+        index += longCommentMatch[0].length;
+        continue;
+      }
+      break;
+    }
+    code += line.charAt(index);
+    index += 1;
+  }
+  return { code, blockCommentEnd: currentBlockCommentEnd };
+}
+function getLuaCodeLines(content) {
+  const lines = [];
+  let start = 0;
+  let blockCommentEnd = null;
+  while (start < content.length) {
+    const newlineIndex = content.indexOf(`
+`, start);
+    const end = newlineIndex === -1 ? content.length : newlineIndex + 1;
+    const rawLine = content.slice(start, end);
+    const lineEnding = rawLine.endsWith(`\r
+`) ? `\r
+` : rawLine.endsWith(`
+`) ? `
+` : "";
+    const line = lineEnding ? rawLine.slice(0, rawLine.length - lineEnding.length) : rawLine;
+    const stripped = stripLuaCommentsFromLine(line, blockCommentEnd);
+    blockCommentEnd = stripped.blockCommentEnd;
+    lines.push({
+      start,
+      end,
+      line,
+      lineEnding,
+      code: stripped.code
+    });
+    start = end;
+  }
+  return lines;
+}
+function findLastMatchingLuaLine(content, pattern) {
+  let result = null;
+  for (const line of getLuaCodeLines(content)) {
+    if (pattern.test(line.code)) {
+      result = line;
+    }
+  }
+  return result;
+}
+function hasMatchingLuaLine(content, pattern) {
+  return findLastMatchingLuaLine(content, pattern) !== null;
+}
+function replaceLuaLine(content, line, replacement) {
+  return `${content.slice(0, line.start)}${replacement}${line.lineEnding}${content.slice(line.end)}`;
+}
+function injectWezTermDeleteFix(content) {
+  let nextContent = content;
+  const returnTableLine = findLastMatchingLuaLine(nextContent, RETURN_TABLE_LINE);
+  if (returnTableLine && !hasMatchingLuaLine(nextContent, LOCAL_CONFIG_LINE)) {
+    nextContent = replaceLuaLine(nextContent, returnTableLine, returnTableLine.line.replace(/return\s*\{/, "local config = {"));
+    if (!hasMatchingLuaLine(nextContent, RETURN_CONFIG_LINE)) {
+      nextContent = `${nextContent.trimEnd()}
+
+return config
+`;
+    }
+  }
+  if (!nextContent.trim()) {
+    nextContent = `-- WezTerm configuration
+local config = {}
+
+return config
+`;
+  }
+  const returnConfigLine = findLastMatchingLuaLine(nextContent, RETURN_CONFIG_LINE);
+  if (returnConfigLine) {
+    return `${nextContent.slice(0, returnConfigLine.start)}${WEZTERM_DELETE_FIX}
+${nextContent.slice(returnConfigLine.start)}`;
+  }
+  return `${nextContent.trimEnd()}
+${WEZTERM_DELETE_FIX}
+`;
+}
 function wezTermDeleteFixExists(configPath) {
   if (!existsSync39(configPath))
     return false;
@@ -129425,30 +129791,7 @@ function installWezTermDeleteFix() {
       copyFileSync(configPath, backupPath);
       content = readFileSync26(configPath, { encoding: "utf-8" });
     }
-    if (content.includes("return {") && !content.includes("local config")) {
-      content = content.replace(/return\s*\{/, "local config = {");
-      if (!content.includes("return config")) {
-        content = `${content.trimEnd()}
-
-return config
-`;
-      }
-    }
-    if (!content.trim()) {
-      content = `-- WezTerm configuration
-local config = {}
-
-return config
-`;
-    }
-    if (content.includes("return config")) {
-      content = content.replace("return config", `${WEZTERM_DELETE_FIX}
-return config`);
-    } else {
-      content = `${content.trimEnd()}
-${WEZTERM_DELETE_FIX}
-`;
-    }
+    content = injectWezTermDeleteFix(content);
     const parentDir = dirname20(configPath);
     if (!existsSync39(parentDir)) {
       mkdirSync30(parentDir, { recursive: true });
@@ -129477,7 +129820,7 @@ table.insert(keys, {
   action = wezterm.action.SendString '\\x1b[3~',
 })
 config.keys = keys
-`;
+`, RETURN_CONFIG_LINE, RETURN_TABLE_LINE, LOCAL_CONFIG_LINE;
 var init_terminalKeybindingInstaller = __esm(() => {
   SHIFT_ENTER_KEYBINDING = {
     key: "shift+enter",
@@ -129485,6 +129828,9 @@ var init_terminalKeybindingInstaller = __esm(() => {
     args: { text: "\x1B\r" },
     when: "terminalFocus"
   };
+  RETURN_CONFIG_LINE = /^\s*return\s+config\s*$/;
+  RETURN_TABLE_LINE = /^\s*return\s*\{/;
+  LOCAL_CONFIG_LINE = /^\s*local\s+config\b/;
 });
 
 // src/cli/commands/registry.ts
@@ -134001,8 +134347,8 @@ function findCursorLine(cursorPos, visualLines) {
 function parseOsc8Line(line, keyPrefix) {
   const parts = [];
   let lastIndex = 0;
-  const regex2 = new RegExp(OSC8_REGEX.source, "g");
-  for (let match3 = regex2.exec(line);match3 !== null; match3 = regex2.exec(line)) {
+  const regex4 = new RegExp(OSC8_REGEX.source, "g");
+  for (let match3 = regex4.exec(line);match3 !== null; match3 = regex4.exec(line)) {
     if (match3.index > lastIndex) {
       parts.push(/* @__PURE__ */ jsx_dev_runtime53.jsxDEV(Text2, {
         children: line.slice(lastIndex, match3.index)
@@ -158996,6 +159342,7 @@ __export(exports_terminalKeybindingInstaller2, {
   installWezTermDeleteFix: () => installWezTermDeleteFix2,
   installKeybindingForCurrentTerminal: () => installKeybindingForCurrentTerminal2,
   installKeybinding: () => installKeybinding2,
+  injectWezTermDeleteFix: () => injectWezTermDeleteFix2,
   getWezTermConfigPath: () => getWezTermConfigPath2,
   getKeybindingsPath: () => getKeybindingsPath2,
   detectTerminalType: () => detectTerminalType2
@@ -159211,6 +159558,106 @@ function getWezTermConfigPath2() {
     return configPath;
   return join54(homedir38(), ".wezterm.lua");
 }
+function stripLuaCommentsFromLine2(line, blockCommentEnd) {
+  let code = "";
+  let index = 0;
+  let currentBlockCommentEnd = blockCommentEnd;
+  while (index < line.length) {
+    if (currentBlockCommentEnd) {
+      const closeIndex = line.indexOf(currentBlockCommentEnd, index);
+      if (closeIndex === -1) {
+        return { code, blockCommentEnd: currentBlockCommentEnd };
+      }
+      index = closeIndex + currentBlockCommentEnd.length;
+      currentBlockCommentEnd = null;
+      continue;
+    }
+    if (line.startsWith("--", index)) {
+      const longCommentMatch = line.slice(index).match(/^--\[(=*)\[/);
+      if (longCommentMatch) {
+        const equals = longCommentMatch[1] ?? "";
+        currentBlockCommentEnd = `]${equals}]`;
+        index += longCommentMatch[0].length;
+        continue;
+      }
+      break;
+    }
+    code += line.charAt(index);
+    index += 1;
+  }
+  return { code, blockCommentEnd: currentBlockCommentEnd };
+}
+function getLuaCodeLines2(content) {
+  const lines = [];
+  let start = 0;
+  let blockCommentEnd = null;
+  while (start < content.length) {
+    const newlineIndex = content.indexOf(`
+`, start);
+    const end = newlineIndex === -1 ? content.length : newlineIndex + 1;
+    const rawLine = content.slice(start, end);
+    const lineEnding = rawLine.endsWith(`\r
+`) ? `\r
+` : rawLine.endsWith(`
+`) ? `
+` : "";
+    const line = lineEnding ? rawLine.slice(0, rawLine.length - lineEnding.length) : rawLine;
+    const stripped = stripLuaCommentsFromLine2(line, blockCommentEnd);
+    blockCommentEnd = stripped.blockCommentEnd;
+    lines.push({
+      start,
+      end,
+      line,
+      lineEnding,
+      code: stripped.code
+    });
+    start = end;
+  }
+  return lines;
+}
+function findLastMatchingLuaLine2(content, pattern) {
+  let result = null;
+  for (const line of getLuaCodeLines2(content)) {
+    if (pattern.test(line.code)) {
+      result = line;
+    }
+  }
+  return result;
+}
+function hasMatchingLuaLine2(content, pattern) {
+  return findLastMatchingLuaLine2(content, pattern) !== null;
+}
+function replaceLuaLine2(content, line, replacement) {
+  return `${content.slice(0, line.start)}${replacement}${line.lineEnding}${content.slice(line.end)}`;
+}
+function injectWezTermDeleteFix2(content) {
+  let nextContent = content;
+  const returnTableLine = findLastMatchingLuaLine2(nextContent, RETURN_TABLE_LINE2);
+  if (returnTableLine && !hasMatchingLuaLine2(nextContent, LOCAL_CONFIG_LINE2)) {
+    nextContent = replaceLuaLine2(nextContent, returnTableLine, returnTableLine.line.replace(/return\s*\{/, "local config = {"));
+    if (!hasMatchingLuaLine2(nextContent, RETURN_CONFIG_LINE2)) {
+      nextContent = `${nextContent.trimEnd()}
+
+return config
+`;
+    }
+  }
+  if (!nextContent.trim()) {
+    nextContent = `-- WezTerm configuration
+local config = {}
+
+return config
+`;
+  }
+  const returnConfigLine = findLastMatchingLuaLine2(nextContent, RETURN_CONFIG_LINE2);
+  if (returnConfigLine) {
+    return `${nextContent.slice(0, returnConfigLine.start)}${WEZTERM_DELETE_FIX2}
+${nextContent.slice(returnConfigLine.start)}`;
+  }
+  return `${nextContent.trimEnd()}
+${WEZTERM_DELETE_FIX2}
+`;
+}
 function wezTermDeleteFixExists2(configPath) {
   if (!existsSync46(configPath))
     return false;
@@ -159234,30 +159681,7 @@ function installWezTermDeleteFix2() {
       copyFileSync2(configPath, backupPath);
       content = readFileSync30(configPath, { encoding: "utf-8" });
     }
-    if (content.includes("return {") && !content.includes("local config")) {
-      content = content.replace(/return\s*\{/, "local config = {");
-      if (!content.includes("return config")) {
-        content = `${content.trimEnd()}
-
-return config
-`;
-      }
-    }
-    if (!content.trim()) {
-      content = `-- WezTerm configuration
-local config = {}
-
-return config
-`;
-    }
-    if (content.includes("return config")) {
-      content = content.replace("return config", `${WEZTERM_DELETE_FIX2}
-return config`);
-    } else {
-      content = `${content.trimEnd()}
-${WEZTERM_DELETE_FIX2}
-`;
-    }
+    content = injectWezTermDeleteFix2(content);
     const parentDir = dirname23(configPath);
     if (!existsSync46(parentDir)) {
       mkdirSync33(parentDir, { recursive: true });
@@ -159286,7 +159710,7 @@ table.insert(keys, {
   action = wezterm.action.SendString '\\x1b[3~',
 })
 config.keys = keys
-`;
+`, RETURN_CONFIG_LINE2, RETURN_TABLE_LINE2, LOCAL_CONFIG_LINE2;
 var init_terminalKeybindingInstaller2 = __esm(() => {
   SHIFT_ENTER_KEYBINDING2 = {
     key: "shift+enter",
@@ -159294,6 +159718,9 @@ var init_terminalKeybindingInstaller2 = __esm(() => {
     args: { text: "\x1B\r" },
     when: "terminalFocus"
   };
+  RETURN_CONFIG_LINE2 = /^\s*return\s+config\s*$/;
+  RETURN_TABLE_LINE2 = /^\s*return\s*\{/;
+  LOCAL_CONFIG_LINE2 = /^\s*local\s+config\b/;
 });
 
 // src/settings.ts
@@ -160844,6 +161271,7 @@ function getClientDefaultHeaders2() {
   return {
     "X-Letta-Source": "letta-code",
     "User-Agent": `letta-code/${package_default.version}`,
+    "X-Letta-Environment-Device-Id": settingsManager.getOrCreateDeviceId(),
     ...nodeExperiment.source === "override" ? { "x-letta-node": nodeExperiment.enabled ? "1" : "0" } : nodeExperiment.enabled ? { "x-letta-node": "1" } : {}
   };
 }
@@ -160905,7 +161333,7 @@ If you experience this issue multiple times, move ~/.letta to ~/.letta_backup, a
     console.error(new Error("getClient() called without credentials").stack);
     throw new Error("Missing LETTA_API_KEY. Run 'letta' to configure authentication, or set LETTA_API_KEY to your API key.");
   }
-  return new Letta({
+  const client = new Letta({
     apiKey,
     baseURL,
     logger: sdkLogger2,
@@ -160913,6 +161341,28 @@ If you experience this issue multiple times, move ~/.letta to ~/.letta_backup, a
     defaultHeaders: getClientDefaultHeaders2(),
     ...isTimingsEnabled() && { fetch: createTimingFetch(fetch) }
   });
+  const MESSAGE_CACHE_MAX = 32;
+  const messageCache = new Map;
+  const origRetrieveMessage = client.messages.retrieve.bind(client.messages);
+  client.messages.retrieve = (...args) => {
+    const messageId = args[0];
+    const cached = messageCache.get(messageId);
+    if (cached) {
+      messageCache.delete(messageId);
+      messageCache.set(messageId, cached);
+      return cached;
+    }
+    const promise = origRetrieveMessage(...args);
+    messageCache.set(messageId, promise);
+    if (messageCache.size > MESSAGE_CACHE_MAX) {
+      const oldest = messageCache.keys().next().value;
+      if (oldest !== undefined)
+        messageCache.delete(oldest);
+    }
+    promise.catch(() => messageCache.delete(messageId));
+    return promise;
+  };
+  return client;
 }
 
 // src/agent/context.ts
@@ -165010,6 +165460,23 @@ function getListenerServerUrl(settings) {
   const oauthDeps = getListenerOAuthDeps();
   return process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || oauthDeps.LETTA_CLOUD_API_URL;
 }
+function normalizeListenerBaseUrl(url) {
+  return url.trim().replace(/\/+$/, "");
+}
+function isCloudListenerServerUrl(serverUrl) {
+  return normalizeListenerBaseUrl(serverUrl) === normalizeListenerBaseUrl(getListenerOAuthDeps().LETTA_CLOUD_API_URL);
+}
+async function resolveListenerStartupMode(channelNames) {
+  const settings = await settingsManager.getSettingsWithSecureTokens();
+  const serverUrl = getListenerServerUrl(settings);
+  if (isCloudListenerServerUrl(serverUrl)) {
+    return { kind: "remote", serverUrl };
+  }
+  if (channelNames.length > 0) {
+    return { kind: "local-channels", serverUrl };
+  }
+  return { kind: "unsupported-self-hosted", serverUrl };
+}
 async function refreshListenerAccessToken(settings, deviceId, connectionName) {
   const oauthDeps = getListenerOAuthDeps();
   const now = Date.now();
@@ -165065,7 +165532,7 @@ async function resolveListenerRegistrationOptions(deviceId, connectionName) {
     };
   }
   let apiKey = settings.env?.LETTA_API_KEY;
-  if (serverUrl === LETTA_CLOUD_API_URL) {
+  if (isCloudListenerServerUrl(serverUrl)) {
     const expiresAt = settings.tokenExpiresAt;
     if (settings.refreshToken && expiresAt) {
       const now = Date.now();
@@ -165190,6 +165657,52 @@ async function runListenSubcommand(argv) {
   console.log(`Log file: ${sessionLog.path}`);
   try {
     const deviceId = settingsManager.getOrCreateDeviceId();
+    const startupMode = await resolveListenerStartupMode(channelNames);
+    if (startupMode.kind === "unsupported-self-hosted") {
+      console.error(`Self-hosted listener registration is not available for ${startupMode.serverUrl}.`);
+      console.error("Start with --channels to run local channel adapters, or unset LETTA_BASE_URL to use Letta API remote environments.");
+      await flushListenerTelemetryEnd("listener_self_hosted_no_channels");
+      return 1;
+    }
+    sessionLog.log(`Session started (debug=${debugMode})`);
+    sessionLog.log(`deviceId: ${deviceId}`);
+    sessionLog.log(`connectionName: ${connectionName}`);
+    if (startupMode.kind === "local-channels") {
+      const connectionId2 = `local-${deviceId}`;
+      sessionLog.log(`Starting local channel listener for ${startupMode.serverUrl}`);
+      sessionLog.log("Skipping environment registration");
+      console.log(`Starting local channel listener for self-hosted server ${startupMode.serverUrl}`);
+      console.log(`Skipping environment registration. Press Ctrl+C to stop.
+`);
+      const { startLocalChannelListener: startLocalChannelListener2 } = await init_listen_client().then(() => exports_listen_client);
+      await startLocalChannelListener2({
+        connectionId: connectionId2,
+        deviceId,
+        connectionName,
+        onWsEvent: process.env.LETTA_LOG_WS_EVENTS === "1" ? (direction, label, event) => {
+          sessionLog.wsEvent(direction, label, event);
+        } : undefined,
+        onStatusChange: (status) => {
+          sessionLog.log(`status: ${status}`);
+          if (debugMode) {
+            console.log(`[${formatTimestamp3()}] status: ${status}`);
+          }
+        },
+        onConnected: () => {
+          sessionLog.log("Local channel listener ready.");
+          if (debugMode) {
+            console.log(`[${formatTimestamp3()}] Local channel listener ready.`);
+            console.log("");
+          }
+        },
+        onError: (error) => {
+          sessionLog.log(`Error: ${error.message}`);
+          console.error(`[${formatTimestamp3()}] Error: ${error.message}`);
+          exitWithTelemetry(1, "listener_error");
+        }
+      });
+      return new Promise(() => {});
+    }
     let registerOptions;
     try {
       registerOptions = await resolveListenerRegistrationOptions(deviceId, connectionName);
@@ -165204,9 +165717,6 @@ async function runListenSubcommand(argv) {
       await flushListenerTelemetryEnd("listener_oauth_failed");
       return 1;
     }
-    sessionLog.log(`Session started (debug=${debugMode})`);
-    sessionLog.log(`deviceId: ${deviceId}`);
-    sessionLog.log(`connectionName: ${connectionName}`);
     if (debugMode) {
       console.log(`[${formatTimestamp3()}] Registering with ${registerOptions.serverUrl}/v1/environments/register`);
       console.log(`[${formatTimestamp3()}]   deviceId: ${deviceId}`);
@@ -169599,4 +170109,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=C84A92912A26F4A364756E2164756E21
+//# debugId=1F73E48C6C64400464756E2164756E21