@letta-ai/letta-code 0.24.9 → 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.9",
+    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(() => {
@@ -29814,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}\``);
@@ -29954,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;
@@ -30142,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) {
@@ -30278,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",
@@ -31083,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
@@ -37361,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);
       }
@@ -37396,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");
     }
@@ -37413,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) => {
@@ -37442,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") {
@@ -39281,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)) {
@@ -46501,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, {
@@ -47541,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;
@@ -47557,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",
@@ -47648,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(() => {
@@ -48214,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;
@@ -52130,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;
   }
-  return result;
+  for (const part of command) {
+    if (typeof part === "string") {
+      scan(part);
+    }
+  }
+  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) {
@@ -55219,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
@@ -55267,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");
   }
@@ -55277,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
@@ -55306,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);
@@ -55351,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 {
@@ -55362,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,
@@ -55439,7 +55514,8 @@ Output file: ${outputFile}`
       env: getShellEnv(),
       timeout: effectiveTimeout,
       signal,
-      onOutput
+      onOutput,
+      secretEnv
     });
     let output = stdout;
     if (stderr)
@@ -71566,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");
   }
@@ -71577,7 +71661,8 @@ async function shell(args) {
     cwd: cwd2,
     env: {
       ...getShellEnv(),
-      ...env_overrides ?? {}
+      ...env_overrides ?? {},
+      ...secretEnv ?? {}
     },
     timeout,
     signal,
@@ -71709,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");
   }
@@ -71843,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 };
@@ -77995,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;
       }
@@ -78966,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) {
@@ -79025,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);
             }
           }
         }
@@ -79042,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);
             }
           }
         }
@@ -79180,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();
@@ -90363,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)) {
@@ -90703,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,
@@ -90787,6 +90927,7 @@ var init_recovery = __esm(async () => {
   init_cwd();
   init_permissionMode();
   init_runtime4();
+  init_secrets_sync();
   await __promiseAll([
     init_approval_execution(),
     init_accumulator(),
@@ -91678,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;
@@ -93559,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,
@@ -93672,6 +93816,7 @@ var init_turn_approval = __esm(async () => {
   init_diffPreview();
   init_formatDenial();
   init_interactivePolicy();
+  init_secrets_sync();
   init_skill_injection();
   init_transport();
   await __promiseAll([
@@ -93912,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()) {
@@ -99276,6 +99424,7 @@ function createRuntime() {
     conversationRuntimes: new Map,
     approvalRuntimeKeyByRequestId: new Map,
     memfsSyncedAgents: new Map,
+    secretsHydrationByAgent: new Map,
     lastEmittedStatus: null
   };
 }
@@ -100729,6 +100878,12 @@ function createLegacyTestRuntime() {
         listener.memfsSyncedAgents = value;
       }
     },
+    secretsHydrationByAgent: {
+      get: () => listener.secretsHydrationByAgent,
+      set: (value) => {
+        listener.secretsHydrationByAgent = value;
+      }
+    },
     worktreeWatcherByConversation: {
       get: () => listener.worktreeWatcherByConversation,
       set: (value) => {
@@ -107847,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"
@@ -107911,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",
@@ -108204,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,
@@ -108746,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: /\$\{/,
@@ -108762,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
     ]
   });
@@ -109127,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: [
@@ -109192,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",
@@ -109403,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"
@@ -109467,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",
@@ -109760,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,
@@ -110306,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";
@@ -110379,7 +110534,7 @@ function css(hljs) {
         ]
       },
       {
-        begin: regex2.lookahead(/@/),
+        begin: regex4.lookahead(/@/),
         end: "[{;]",
         relevance: 0,
         illegal: /:/,
@@ -111211,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"],
@@ -111219,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}$/ }
@@ -111402,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",
@@ -111459,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
       }
     ],
@@ -111473,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,
@@ -111544,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"],
@@ -111587,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 = [
@@ -111732,7 +111887,7 @@ function java(hljs) {
       },
       {
         begin: [
-          regex2.concat(/(?!else)/, JAVA_IDENT_RE),
+          regex4.concat(/(?!else)/, JAVA_IDENT_RE),
           /\s+/,
           JAVA_IDENT_RE,
           /\s+/,
@@ -111818,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);
@@ -112024,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",
@@ -112048,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: {
       _: [
@@ -112094,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",
@@ -112140,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: {
@@ -112176,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,
@@ -113787,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: ">",
@@ -113861,7 +114016,7 @@ function markdown(hljs) {
         relevance: 2
       },
       {
-        begin: regex2.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
+        begin: regex4.concat(/\[.+?\]\(/, URL_SCHEME, /:\/\/.*?\)/),
         relevance: 2
       },
       {
@@ -114251,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",
@@ -114511,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{=]|\$=/,
@@ -114546,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,
@@ -114625,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", "\\{", "\\}") }
@@ -114640,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", /\{/, /\}/) }
@@ -114697,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
@@ -114980,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: {
@@ -114990,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" }
@@ -115009,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: {
@@ -115020,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" }
     },
@@ -115038,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,
@@ -115059,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]
@@ -115077,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",
@@ -115301,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",
@@ -115569,7 +115724,7 @@ function python(hljs) {
   };
   const COMMENT_TYPE = {
     className: "comment",
-    begin: regex2.lookahead(/# type:/),
+    begin: regex4.lookahead(/# type:/),
     end: /$/,
     keywords: KEYWORDS2,
     contains: [
@@ -115717,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: {
@@ -115736,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
           }
         },
@@ -115881,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",
@@ -116037,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+)/,
@@ -116266,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 = [
@@ -117493,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",
@@ -118067,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/);
   }
@@ -118884,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);
@@ -119090,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",
@@ -119114,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: {
       _: [
@@ -119160,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",
@@ -119206,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: {
@@ -119242,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,
@@ -119351,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 = [
@@ -119427,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,
@@ -119592,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/
@@ -119616,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), / *#/)
       }
     ]
   };
@@ -119821,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",
@@ -119985,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: [
           {
@@ -119998,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",
@@ -120546,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);
@@ -129297,6 +129452,7 @@ __export(exports_terminalKeybindingInstaller, {
   installWezTermDeleteFix: () => installWezTermDeleteFix,
   installKeybindingForCurrentTerminal: () => installKeybindingForCurrentTerminal,
   installKeybinding: () => installKeybinding,
+  injectWezTermDeleteFix: () => injectWezTermDeleteFix,
   getWezTermConfigPath: () => getWezTermConfigPath,
   getKeybindingsPath: () => getKeybindingsPath,
   detectTerminalType: () => detectTerminalType
@@ -129512,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;
@@ -129535,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 });
@@ -129587,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",
@@ -129595,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
@@ -134111,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)
@@ -159106,6 +159342,7 @@ __export(exports_terminalKeybindingInstaller2, {
   installWezTermDeleteFix: () => installWezTermDeleteFix2,
   installKeybindingForCurrentTerminal: () => installKeybindingForCurrentTerminal2,
   installKeybinding: () => installKeybinding2,
+  injectWezTermDeleteFix: () => injectWezTermDeleteFix2,
   getWezTermConfigPath: () => getWezTermConfigPath2,
   getKeybindingsPath: () => getKeybindingsPath2,
   detectTerminalType: () => detectTerminalType2
@@ -159321,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;
@@ -159344,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 });
@@ -159396,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",
@@ -159404,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
@@ -160954,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" } : {}
   };
 }
@@ -161015,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,
@@ -161023,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
@@ -169769,4 +170109,4 @@ Error during initialization: ${message}`);
 }
 main();
 
-//# debugId=5F460A87866AF15264756E2164756E21
+//# debugId=1F73E48C6C64400464756E2164756E21