@letta-ai/letta-code 0.31.0 → 0.31.2

package/letta.js

@@ -5509,7 +5509,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.31.0",
+    version: "0.31.2",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.10",
@@ -84634,21 +84634,24 @@ function stripPowerShellUtf8OutputPrefix(command) {
   const leadingWhitespace = command.slice(0, command.length - trimmed.length);
   return `${leadingWhitespace}${trimmed.slice(POWERSHELL_UTF8_OUTPUT_PREFIX.length)}`;
 }
-function buildPowerShellCommand(command, envAliases = []) {
+function buildPowerShellCommand(command, envAliases = [], preserveExitCode = false) {
   const powerShellCommand = stripPowerShellUtf8OutputPrefix(normalizePowerShellCommand(command));
   const aliases = [
     ...new Set([...POWERSHELL_ENV_ALIASES, ...envAliases])
   ].filter(isValidEnvAlias);
   const aliasPrelude = aliases.map((name) => `$${name} = $env:${name}`).join("; ");
-  return prefixPowerShellCommandWithUtf8Output(`${aliasPrelude}; ${powerShellCommand}`);
+  const encodedCommand = Buffer.from(powerShellCommand, "utf16le").toString("base64");
+  const exitCodePrefix = preserveExitCode ? "$global:LASTEXITCODE = $null; " + `$__lettaHookText = [System.Text.Encoding]::Unicode.GetString([System.Convert]::FromBase64String('${encodedCommand}')); ` + "$__lettaTokens = $null; $__lettaParseErrors = $null; " + "$__lettaHookAst = [System.Management.Automation.Language.Parser]::ParseInput($__lettaHookText, [ref]$__lettaTokens, [ref]$__lettaParseErrors); " + "$__lettaStatements = $__lettaHookAst.EndBlock.Statements; " + "$__lettaFinalStatement = if ($__lettaStatements.Count -gt 0) { $__lettaStatements[$__lettaStatements.Count - 1] } else { $null }; " + "$__lettaFinalPipelineElement = if ($__lettaFinalStatement -is [System.Management.Automation.Language.PipelineAst]) { $__lettaFinalStatement.PipelineElements[$__lettaFinalStatement.PipelineElements.Count - 1] } else { $null }; " + "$__lettaFinalCommandName = if ($__lettaFinalPipelineElement -is [System.Management.Automation.Language.CommandAst]) { $__lettaFinalPipelineElement.GetCommandName() } else { $null }; " : "";
+  const exitCodeSuffix = preserveExitCode ? POWERSHELL_EXIT_CODE_SUFFIX : "";
+  return prefixPowerShellCommandWithUtf8Output(`${aliasPrelude}; ${exitCodePrefix}${powerShellCommand}${exitCodeSuffix}`);
 }
-function windowsLaunchers(command, envAliases = []) {
+function windowsLaunchers(command, envAliases = [], preserveExitCode = false) {
   const trimmed = command.trim();
   if (!trimmed)
     return [];
   const launchers = [];
   const seen = new Set;
-  const powerShellCommand = buildPowerShellCommand(trimmed, envAliases);
+  const powerShellCommand = buildPowerShellCommand(trimmed, envAliases, preserveExitCode);
   pushUnique(launchers, seen, [
     "pwsh",
     "-NoProfile",
@@ -84786,11 +84789,13 @@ function unixLaunchers(command, login) {
 function buildShellLaunchers(command, options) {
   const login = options?.login ?? false;
   const commandToRun = withStrictShellPrelude(command, options?.env);
-  return process.platform === "win32" ? windowsLaunchers(commandToRun, options?.powershellEnvAliases) : unixLaunchers(commandToRun, login);
+  return process.platform === "win32" ? windowsLaunchers(commandToRun, options?.powershellEnvAliases, options?.preservePowerShellExitCode) : unixLaunchers(commandToRun, login);
 }
 var SEP = "\x00", STRICT_SHELL_ENV_VAR = "LETTA_BASH_STRICT", STRICT_SHELL_PRELUDE = "set -euo pipefail", POWERSHELL_UTF8_OUTPUT_PREFIX = `try { [Console]::OutputEncoding=[System.Text.Encoding]::UTF8 } catch {}
-`, POWERSHELL_ENV_ALIASES, WINDOWS_PWSH_FALLBACK_PATH = "C:\\Program Files\\PowerShell\\7\\pwsh.exe", WINDOWS_POWERSHELL_FALLBACK_PATH = "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe";
+`, POWERSHELL_EXIT_CODE_SUFFIX, POWERSHELL_ENV_ALIASES, WINDOWS_PWSH_FALLBACK_PATH = "C:\\Program Files\\PowerShell\\7\\pwsh.exe", WINDOWS_POWERSHELL_FALLBACK_PATH = "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe";
 var init_shell_launchers = __esm(() => {
+  POWERSHELL_EXIT_CODE_SUFFIX = `
+$__lettaCommandSucceeded = $?; ` + "if ($__lettaCommandSucceeded) { exit 0 }; " + "$__lettaFinalCommand = $null; " + "if ($null -ne $__lettaFinalCommandName) { try { $__lettaFinalCommand = $ExecutionContext.InvokeCommand.GetCommand($__lettaFinalCommandName, [System.Management.Automation.CommandTypes]::All) } catch {} }; " + "while ($__lettaFinalCommand -is [System.Management.Automation.AliasInfo]) { $__lettaFinalCommand = $__lettaFinalCommand.ResolvedCommand }; " + "if (($__lettaFinalCommand.CommandType -eq [System.Management.Automation.CommandTypes]::Application) -and ($null -ne $LASTEXITCODE) -and ($LASTEXITCODE -ne 0)) { exit $LASTEXITCODE }; " + "exit 1";
   POWERSHELL_ENV_ALIASES = [
     "MEMORY_DIR",
     "LETTA_MEMORY_DIR",
@@ -85050,7 +85055,9 @@ async function executeCommandHook(hook, input, workingDirectory = process.cwd())
   const startTime = Date.now();
   const timeout = hook.timeout ?? DEFAULT_TIMEOUT_MS;
   const inputJson = JSON.stringify(input);
-  const launchers = buildShellLaunchers(hook.command);
+  const launchers = buildShellLaunchers(hook.command, {
+    preservePowerShellExitCode: true
+  });
   if (launchers.length === 0) {
     return {
       exitCode: 1 /* ERROR */,
@@ -92337,6 +92344,27 @@ var init_shell_env = __esm(() => {
   init_ripgrep_manager();
 });
 
+// src/utils/systemd-workload-scope.ts
+function wrapManagedWorkloadLauncher(launcher, options = {}) {
+  const env2 = options.env ?? process.env;
+  const platform2 = options.platform ?? process.platform;
+  const slice = env2[WORKLOAD_SYSTEMD_SLICE_ENV]?.trim();
+  if (launcher.length === 0 || platform2 !== "linux" || !slice) {
+    return launcher;
+  }
+  return [
+    "systemd-run",
+    "--scope",
+    "--quiet",
+    "--collect",
+    "--property=TimeoutStopSec=5s",
+    `--slice=${slice}`,
+    "--",
+    ...launcher
+  ];
+}
+var WORKLOAD_SYSTEMD_SLICE_ENV = "LETTA_WORKLOAD_SYSTEMD_SLICE";
+
 // src/tools/impl/github-pull-request-tracker.ts
 function conversationTags(conversation) {
   const tags = typeof conversation === "object" && conversation !== null ? Reflect.get(conversation, "tags") : undefined;
@@ -92772,7 +92800,10 @@ function spawnPtyProcess(launcher, options, events) {
   return typeof Bun !== "undefined" ? spawnPtyBridgeProcess(launcher, options, events) : spawnNativePtyProcess(launcher, options, events);
 }
 function startShellProcess(launcher, options) {
-  const [executable] = launcher;
+  const managedLauncher = wrapManagedWorkloadLauncher(launcher, {
+    env: options.env
+  });
+  const [executable] = managedLauncher;
   if (!executable) {
     throw new ShellExecutionError("Executable is required");
   }
@@ -92878,7 +92909,7 @@ function startShellProcess(launcher, options) {
     }
   };
   try {
-    processHandle = options.tty ? spawnPtyProcess(launcher, options, events) : spawnPipeProcess(launcher, options, events);
+    processHandle = options.tty ? spawnPtyProcess(managedLauncher, options, events) : spawnPipeProcess(managedLauncher, options, events);
   } catch (error4) {
     completed = true;
     cleanup();
@@ -113258,7 +113289,12 @@ async function executeSubagent(type3, config, model, userPrompt, subagentId, isR
     if (sandbox) {
       debugLog("subagent", `memory subagent child sandboxed via ${sandbox.backend}`);
     }
-    const proc2 = spawn5(spawnLauncher.command, spawnLauncher.args, {
+    const managedLauncher = wrapManagedWorkloadLauncher([spawnLauncher.command, ...spawnLauncher.args], { env: spawnEnv });
+    const [managedCommand, ...managedArgs] = managedLauncher;
+    if (!managedCommand) {
+      throw new Error("Subagent executable is required");
+    }
+    const proc2 = spawn5(managedCommand, managedArgs, {
       cwd: subagentWorkingDirectory,
       env: spawnEnv
     });
@@ -415677,6 +415713,330 @@ var init_server = __esm(async () => {
   ]);
 });
 
+// src/backend/api/mcp-servers.ts
+function getString2(record3, key2) {
+  const value = record3[key2];
+  return typeof value === "string" ? value : null;
+}
+function parseAgentConnectedMcpServer(value) {
+  if (!isRecord(value)) {
+    return null;
+  }
+  const id2 = getString2(value, "id");
+  const serverName = getString2(value, "server_name");
+  const serverType = getString2(value, "mcp_server_type");
+  if (!id2 || !serverName || !serverType) {
+    return null;
+  }
+  const target2 = getString2(value, "server_url") ?? [
+    getString2(value, "command"),
+    ...Array.isArray(value.args) ? value.args : []
+  ].filter((item) => typeof item === "string").join(" ");
+  return { id: id2, serverName, serverType, target: target2 };
+}
+function parseAgentConnectedMcpTool(value) {
+  if (!isRecord(value)) {
+    return null;
+  }
+  const id2 = getString2(value, "id");
+  const name = getString2(value, "name");
+  if (!id2 || !name) {
+    return null;
+  }
+  const description = getString2(value, "description");
+  return { id: id2, name, description };
+}
+function parseAgentMcpToolRunResult(value) {
+  if (!isRecord(value)) {
+    throw new Error("MCP tool run returned an invalid response");
+  }
+  const status = getString2(value, "status") ?? "unknown";
+  return {
+    status,
+    funcReturn: value.func_return,
+    stdout: value.stdout,
+    stderr: value.stderr
+  };
+}
+function withTimeout2(promise, timeoutMs, label) {
+  let timer;
+  const timeout = new Promise((_4, reject2) => {
+    timer = setTimeout(() => reject2(new Error(`${label} timed out after ${timeoutMs}ms`)), timeoutMs);
+  });
+  return Promise.race([promise, timeout]).finally(() => {
+    if (timer !== undefined)
+      clearTimeout(timer);
+  });
+}
+function listServerMcpServers(client, timeoutMs = 1e4) {
+  return withTimeout2(client.mcpServers.list(), timeoutMs, "Listing server-side MCP servers");
+}
+async function listAgentConnectedMcpServers(client, agentId, timeoutMs = 1e4) {
+  const result2 = await withTimeout2(client.get(`/v1/agents/${encodeURIComponent(agentId)}/mcp-servers`), timeoutMs, "Listing agent-connected MCP servers");
+  if (!Array.isArray(result2)) {
+    return [];
+  }
+  return result2.map(parseAgentConnectedMcpServer).filter((server2) => server2 !== null);
+}
+async function listAgentConnectedMcpTools(client, agentId, mcpServerId, timeoutMs = 1e4) {
+  const result2 = await withTimeout2(client.get(`/v1/agents/${encodeURIComponent(agentId)}/mcp-servers/${encodeURIComponent(mcpServerId)}/tools`), timeoutMs, "Listing agent-connected MCP server tools");
+  if (!Array.isArray(result2)) {
+    return [];
+  }
+  return result2.map(parseAgentConnectedMcpTool).filter((tool) => tool !== null);
+}
+async function runAgentConnectedMcpTool(params) {
+  const result2 = await withTimeout2(params.client.post(`/v1/agents/${encodeURIComponent(params.agentId)}/mcp-servers/${encodeURIComponent(params.mcpServerId)}/tools/${encodeURIComponent(params.toolId)}/run`, { args: params.args }), params.timeoutMs ?? 60000, "Running agent-connected MCP tool");
+  return parseAgentMcpToolRunResult(result2);
+}
+async function listLiveServerMcpTools(client, serverName, timeoutMs = 15000) {
+  const result2 = await withTimeout2(client.get(`/v1/tools/mcp/servers/${encodeURIComponent(serverName)}/tools`), timeoutMs, `Listing tools for MCP server "${serverName}"`);
+  if (!Array.isArray(result2))
+    return [];
+  return result2.filter((tool) => typeof tool === "object" && tool !== null && typeof tool.name === "string");
+}
+async function loadServerMcpEntries(client, timeoutMs = 15000) {
+  const servers = await listServerMcpServers(client, timeoutMs);
+  return Promise.all(servers.map(async (server2) => {
+    try {
+      const tools = await listLiveServerMcpTools(client, server2.server_name, timeoutMs);
+      return { server: server2, tools };
+    } catch (cause) {
+      return {
+        server: server2,
+        tools: [],
+        toolsError: cause instanceof Error ? cause.message : String(cause)
+      };
+    }
+  }));
+}
+function parseMcpMetadata(tool) {
+  const metadata = tool.metadata_;
+  const mcp = metadata?.mcp;
+  if (typeof mcp !== "object" || mcp === null)
+    return null;
+  const { server_id, server_name } = mcp;
+  return {
+    ...typeof server_id === "string" && { serverId: server_id },
+    ...typeof server_name === "string" && { serverName: server_name }
+  };
+}
+async function listAgentMcpAttachments(client, agentId) {
+  const attachments = [];
+  for await (const tool of client.agents.tools.list(agentId, { limit: 100 })) {
+    if (tool.tool_type !== "external_mcp" || !tool.id || !tool.name)
+      continue;
+    attachments.push({
+      toolId: tool.id,
+      toolName: tool.name,
+      ...parseMcpMetadata(tool)
+    });
+  }
+  return attachments;
+}
+function attachmentsForEntry(entry, attachments) {
+  return attachments.filter((attachment) => attachment.serverId && entry.server.id ? attachment.serverId === entry.server.id : attachment.serverName === entry.server.server_name);
+}
+function attachedToolNamesForEntry(entry, attachments) {
+  return new Set(attachmentsForEntry(entry, attachments).map((attachment) => attachment.toolName));
+}
+async function registerServerMcpTool(client, serverName, toolName) {
+  const result2 = await client.post(`/v1/tools/mcp/servers/${encodeURIComponent(serverName)}/${encodeURIComponent(toolName)}`);
+  if (typeof result2?.id !== "string") {
+    throw new Error(`Registering MCP tool "${toolName}" on server "${serverName}" returned no tool id`);
+  }
+  return { id: result2.id };
+}
+async function attachServerMcpTools(client, agentId, serverName, toolNames) {
+  await Promise.all(toolNames.map(async (toolName) => {
+    const { id: id2 } = await registerServerMcpTool(client, serverName, toolName);
+    await client.agents.tools.attach(id2, { agent_id: agentId });
+  }));
+}
+async function detachServerMcpTools(client, agentId, toolIds) {
+  await Promise.all(toolIds.map((toolId) => client.agents.tools.detach(toolId, { agent_id: agentId })));
+}
+function refreshServerMcpServer(client, mcpServerId, agentId) {
+  return client.mcpServers.refresh(mcpServerId, { agent_id: agentId });
+}
+function planServerMcpToggle(entry, attachments) {
+  const attached = attachmentsForEntry(entry, attachments);
+  if (attached.length > 0) {
+    return {
+      action: "detach",
+      toolIds: attached.map((attachment) => attachment.toolId)
+    };
+  }
+  return { action: "attach", toolNames: entry.tools.map((tool) => tool.name) };
+}
+function describeServerMcpTarget(server2) {
+  if ("server_url" in server2 && server2.server_url) {
+    return server2.server_url;
+  }
+  if ("command" in server2 && server2.command) {
+    return [server2.command, ...server2.args ?? []].join(" ");
+  }
+  return "";
+}
+var init_mcp_servers2 = () => {};
+
+// src/cli/subcommands/server-mcp.ts
+import { parseArgs as parseArgs16 } from "node:util";
+function printUsage13(stdout = console.log) {
+  stdout(`
+Usage:
+  letta server-mcp list [--agent <id>]
+  letta server-mcp tools <mcp-server-id> [--agent <id>]
+  letta server-mcp run <mcp-server-id> <tool-id> [--args '<json>'] [--agent <id>]
+
+Actions:
+  list      List MCP servers connected to the agent
+  tools     List registered tools for one connected MCP server
+  run       Run one registered MCP tool through the agent-scoped server route
+
+Aliases:
+  list-servers, list_servers  Alias for list
+  list-tools, list_tools      Alias for tools
+  call, run-tool, run_tool     Alias for run
+
+Options:
+  --agent <id>      Agent ID. Defaults to LETTA_AGENT_ID or AGENT_ID
+  --agent-id <id>   Alias for --agent
+  --args '<json>'   JSON object passed as MCP tool arguments for run
+  -h, --help        Show this help
+
+Notes:
+  - Output is JSON only.
+  - Requires a signed-in Letta Cloud agent with server-side MCP support.
+  - Uses CLI auth; override with LETTA_API_KEY/LETTA_BASE_URL if needed.
+`.trim());
+}
+function parseServerMcpArgs(argv) {
+  return parseArgs16({
+    args: argv,
+    options: {
+      help: { type: "boolean", short: "h" },
+      agent: { type: "string" },
+      "agent-id": { type: "string" },
+      args: { type: "string" }
+    },
+    strict: true,
+    allowPositionals: true
+  });
+}
+function stringValue4(value) {
+  return typeof value === "string" ? value : undefined;
+}
+function resolveServerMcpAgentId(agent, agentId, env4 = process.env) {
+  return (agent || agentId || env4.LETTA_AGENT_ID || env4.AGENT_ID || "").trim();
+}
+function parseToolArgs2(value) {
+  const raw2 = stringValue4(value);
+  if (!raw2) {
+    return {};
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw2);
+  } catch (error4) {
+    const message = error4 instanceof Error ? error4.message : String(error4);
+    throw new Error(`Invalid --args JSON: ${message}`);
+  }
+  if (!isRecord(parsed)) {
+    throw new Error("Invalid --args JSON: expected a JSON object");
+  }
+  return parsed;
+}
+function printJson2(stdout, result2) {
+  stdout(JSON.stringify(result2, null, 2));
+}
+async function defaultGetClient() {
+  const client = await getClient();
+  return client;
+}
+async function runServerMcpSubcommand(argv, deps = {}) {
+  const stdout = deps.stdout ?? console.log;
+  const stderr = deps.stderr ?? console.error;
+  let parsed;
+  try {
+    parsed = parseServerMcpArgs(argv);
+  } catch (error4) {
+    const message = error4 instanceof Error ? error4.message : String(error4);
+    stderr(`Error: ${message}`);
+    printUsage13(stdout);
+    return 1;
+  }
+  const [action3, mcpServerId, toolId] = parsed.positionals;
+  if (parsed.values.help || !action3 || action3 === "help") {
+    printUsage13(stdout);
+    return 0;
+  }
+  const isAvailable = deps.isServerSideMcpAvailable ?? (() => getBackend().capabilities.serverSideToolManagement);
+  if (!isAvailable()) {
+    stderr("Server-side MCP requires a signed-in Letta Cloud agent; the local backend does not support it.");
+    return 1;
+  }
+  const agentId = resolveServerMcpAgentId(stringValue4(parsed.values.agent), stringValue4(parsed.values["agent-id"]));
+  if (!agentId) {
+    stderr("Agent id required: pass --agent <id> or set LETTA_AGENT_ID/AGENT_ID.");
+    return 1;
+  }
+  await (deps.initializeSettings ?? (() => settingsManager.initialize()))();
+  const client = await (deps.getClient ?? defaultGetClient)();
+  try {
+    if (action3 === "list" || action3 === "list-servers" || action3 === "list_servers") {
+      printJson2(stdout, {
+        agent_id: agentId,
+        servers: await listAgentConnectedMcpServers(client, agentId)
+      });
+      return 0;
+    }
+    if (action3 === "tools" || action3 === "list-tools" || action3 === "list_tools") {
+      if (!mcpServerId) {
+        stderr("Usage: letta server-mcp tools <mcp-server-id> [--agent <id>]");
+        return 1;
+      }
+      printJson2(stdout, {
+        agent_id: agentId,
+        mcp_server_id: mcpServerId,
+        tools: await listAgentConnectedMcpTools(client, agentId, mcpServerId)
+      });
+      return 0;
+    }
+    if (action3 === "run" || action3 === "call" || action3 === "run-tool" || action3 === "run_tool") {
+      if (!mcpServerId || !toolId) {
+        stderr("Usage: letta server-mcp run <mcp-server-id> <tool-id> [--args '<json>'] [--agent <id>]");
+        return 1;
+      }
+      printJson2(stdout, {
+        agent_id: agentId,
+        mcp_server_id: mcpServerId,
+        tool_id: toolId,
+        result: await runAgentConnectedMcpTool({
+          client,
+          agentId,
+          mcpServerId,
+          toolId,
+          args: parseToolArgs2(parsed.values.args)
+        })
+      });
+      return 0;
+    }
+    stderr(`Unknown server-mcp action: ${action3}`);
+    printUsage13(stdout);
+    return 1;
+  } catch (error4) {
+    stderr(error4 instanceof Error ? error4.message : String(error4));
+    return 1;
+  }
+}
+var init_server_mcp = __esm(() => {
+  init_backend2();
+  init_client2();
+  init_mcp_servers2();
+  init_settings_manager();
+});
+
 // src/auth/LettaLoginView.tsx
 import { hostname as hostname5 } from "node:os";
 async function completeLettaLogin(tokens, options) {
@@ -416095,7 +416455,7 @@ var init_setup6 = __esm(async () => {
 });
 
 // src/cli/subcommands/setup.ts
-function printUsage13() {
+function printUsage14() {
   console.log(`
 Usage:
   letta setup
@@ -416106,12 +416466,12 @@ Re-run the interactive setup menu to choose local mode or sign in with Letta.
 async function runSetupSubcommand(argv) {
   const [arg, ...rest4] = argv;
   if (arg === "help" || arg === "--help" || arg === "-h") {
-    printUsage13();
+    printUsage14();
     return 0;
   }
   if (arg || rest4.length > 0) {
     console.error(`Unexpected arguments: ${[arg, ...rest4].filter(Boolean).join(" ")}`);
-    printUsage13();
+    printUsage14();
     return 1;
   }
   await settingsManager.initialize();
@@ -416126,8 +416486,8 @@ var init_setup7 = __esm(async () => {
 // src/cli/subcommands/shared-memory.ts
 import { existsSync as existsSync59 } from "node:fs";
 import { join as join75 } from "node:path";
-import { parseArgs as parseArgs16 } from "node:util";
-function printUsage14() {
+import { parseArgs as parseArgs17 } from "node:util";
+function printUsage15() {
   console.log(`
 Usage:
   letta shared-memory list [--agent <id>]
@@ -416162,7 +416522,7 @@ Examples:
 `.trim());
 }
 function parseSharedMemoryArgs(argv) {
-  return parseArgs16({
+  return parseArgs17({
     args: argv,
     options: SHARED_MEMORY_OPTIONS,
     strict: true,
@@ -416238,12 +416598,12 @@ async function runSharedMemorySubcommand(argv, deps = {}) {
     parsed = parseSharedMemoryArgs(argv);
   } catch (error4) {
     console.error(error4 instanceof Error ? error4.message : String(error4));
-    printUsage14();
+    printUsage15();
     return 1;
   }
   const [action3, reference] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage14();
+    printUsage15();
     return 0;
   }
   if (isLocalBackendEnvEnabled()) {
@@ -416348,7 +416708,7 @@ async function runSharedMemorySubcommand(argv, deps = {}) {
       return result2.failed > 0 ? 1 : 0;
     }
     console.error(`Unknown action: ${action3}`);
-    printUsage14();
+    printUsage15();
     return 1;
   } catch (error4) {
     console.error(error4 instanceof Error ? error4.message : String(error4));
@@ -417856,8 +418216,8 @@ import {
 import { mkdir as mkdir15, readdir as readdir14 } from "node:fs/promises";
 import { tmpdir as tmpdir11 } from "node:os";
 import { basename as basename27, dirname as dirname34, join as join76, normalize as normalize5, resolve as resolve37, sep as sep8 } from "node:path";
-import { parseArgs as parseArgs17, TextDecoder as TextDecoder2, TextEncoder as TextEncoder2 } from "node:util";
-function printUsage15() {
+import { parseArgs as parseArgs18, TextDecoder as TextDecoder2, TextEncoder as TextEncoder2 } from "node:util";
+function printUsage16() {
   console.log(`
 Usage:
   letta install <thing> [--agent <id> | -n <agent name>] [--force]
@@ -417884,7 +418244,7 @@ Options:
 `.trim());
 }
 function parseSkillsArgs(argv) {
-  return parseArgs17({
+  return parseArgs18({
     args: argv,
     options: SKILLS_OPTIONS,
     strict: true,
@@ -418532,17 +418892,17 @@ async function runInstall(argv, options = {}) {
     parsed = parseSkillsArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage15();
+    printUsage16();
     return 1;
   }
   const [specifier] = parsed.positionals;
   if (parsed.values.help || !specifier || specifier === "help") {
-    printUsage15();
+    printUsage16();
     return 0;
   }
   if (parsed.positionals.length > 1) {
     console.error(`Unexpected argument: ${parsed.positionals[1]}`);
-    printUsage15();
+    printUsage16();
     return 1;
   }
   if (specifier.startsWith("npm:")) {
@@ -418633,16 +418993,16 @@ async function runList2(argv) {
     parsed = parseSkillsArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage15();
+    printUsage16();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage15();
+    printUsage16();
     return 0;
   }
   if (parsed.positionals.length > 0) {
     console.error(`Unexpected argument: ${parsed.positionals[0]}`);
-    printUsage15();
+    printUsage16();
     return 1;
   }
   try {
@@ -418663,17 +419023,17 @@ async function runDelete(argv) {
     parsed = parseSkillsArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage15();
+    printUsage16();
     return 1;
   }
   const [skillName] = parsed.positionals;
   if (parsed.values.help || !skillName || skillName === "help") {
-    printUsage15();
+    printUsage16();
     return 0;
   }
   if (parsed.positionals.length > 1) {
     console.error(`Unexpected argument: ${parsed.positionals[1]}`);
-    printUsage15();
+    printUsage16();
     return 1;
   }
   const agentId = getExplicitAgentId2(parsed.values);
@@ -418713,11 +419073,11 @@ async function runSkillsSubcommand(argv) {
     case "help":
     case "--help":
     case "-h":
-      printUsage15();
+      printUsage16();
       return 0;
     default:
       console.error(`Unknown action: ${action3}`);
-      printUsage15();
+      printUsage16();
       return 1;
   }
 }
@@ -418736,8 +419096,8 @@ var init_skills4 = __esm(() => {
 });
 
 // src/cli/subcommands/teleport.ts
-import { parseArgs as parseArgs18 } from "node:util";
-function printUsage16() {
+import { parseArgs as parseArgs19 } from "node:util";
+function printUsage17() {
   console.log(`
 Usage:
   letta teleport list
@@ -418760,7 +419120,7 @@ Notes:
 `.trim());
 }
 function parseTeleportArgs(argv) {
-  return parseArgs18({
+  return parseArgs19({
     args: argv,
     options: TELEPORT_OPTIONS,
     strict: true,
@@ -418833,12 +419193,12 @@ async function runTeleportSubcommand(argv, deps = {}) {
     parsed = parseTeleportArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : error4}`);
-    printUsage16();
+    printUsage17();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage16();
+    printUsage17();
     return 0;
   }
   try {
@@ -419274,8 +419634,8 @@ var init_review = () => {};
 
 // src/cli/subcommands/trajectories.ts
 import { readFile as readFile29 } from "node:fs/promises";
-import { parseArgs as parseArgs19 } from "node:util";
-function printUsage17() {
+import { parseArgs as parseArgs20 } from "node:util";
+function printUsage18() {
   console.log(`
 Usage:
   letta trajectories export [options]
@@ -419413,7 +419773,7 @@ ${results.length} session(s) matched "${keyword}"`);
   return 0;
 }
 function parseTrajectoriesArgs(argv) {
-  return parseArgs19({
+  return parseArgs20({
     args: argv,
     options: TRAJECTORIES_OPTIONS,
     strict: true,
@@ -419426,12 +419786,12 @@ async function runTrajectoriesSubcommand(argv) {
     parsed = parseTrajectoriesArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage17();
+    printUsage18();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || action3 === "help" || !action3) {
-    printUsage17();
+    printUsage18();
     return parsed.values.help || action3 === "help" ? 0 : 1;
   }
   const asJson = Boolean(parsed.values.json);
@@ -419463,7 +419823,7 @@ async function runTrajectoriesSubcommand(argv) {
   }
   if (action3 !== "export") {
     console.error(`Unknown command: ${action3}`);
-    printUsage17();
+    printUsage18();
     return 1;
   }
   const options = {
@@ -421012,9 +421372,9 @@ class ChannelRichDraftStreamerImpl {
       return;
     }
     const record3 = asRecord10(chunk2);
-    const messageType = stringValue4(record3?.message_type);
+    const messageType = stringValue5(record3?.message_type);
     if (messageType === "tool_return_message") {
-      const toolCallId = stringValue4(record3?.tool_call_id);
+      const toolCallId = stringValue5(record3?.tool_call_id);
       if (toolCallId) {
         this.finishCall(toolCallId);
       }
@@ -421307,14 +421667,14 @@ function extractToolCallFragments2(record3) {
   const fragments = [];
   for (const rawToolCall of rawToolCalls) {
     const toolCall = asRecord10(rawToolCall);
-    const toolCallId = stringValue4(toolCall?.tool_call_id);
+    const toolCallId = stringValue5(toolCall?.tool_call_id);
     if (!toolCallId) {
       continue;
     }
     fragments.push({
       toolCallId,
-      name: stringValue4(toolCall?.name),
-      argumentsDelta: stringValue4(toolCall?.arguments)
+      name: stringValue5(toolCall?.name),
+      argumentsDelta: stringValue5(toolCall?.arguments)
     });
   }
   return fragments;
@@ -421434,7 +421794,7 @@ function buildDraftId(seed) {
 function asRecord10(value) {
   return value && typeof value === "object" ? value : null;
 }
-function stringValue4(value) {
+function stringValue5(value) {
   return typeof value === "string" ? value : undefined;
 }
 var MESSAGE_CHANNEL_TOOL_NAMES, DEFAULT_DRAFT_DEBOUNCE_MS = 1000, MIN_DRAFT_TEXT_LENGTH = 1;
@@ -424302,14 +424662,14 @@ var exports_channel_gateway = {};
 __export(exports_channel_gateway, {
   runChannelGatewaySubcommand: () => runChannelGatewaySubcommand
 });
-import { parseArgs as parseArgs20 } from "node:util";
+import { parseArgs as parseArgs21 } from "node:util";
 function isGatewayCommandEnvelope(value) {
   return Boolean(value && typeof value === "object" && "type" in value && value.type === "command" && "requestId" in value && typeof value.requestId === "string" && "command" in value && value.command && typeof value.command === "object");
 }
 async function runChannelGatewaySubcommand(argv) {
   let values3;
   try {
-    ({ values: values3 } = parseArgs20({
+    ({ values: values3 } = parseArgs21({
       args: argv,
       strict: true,
       allowPositionals: false,
@@ -424448,6 +424808,7 @@ function subcommandNeedsEarlyBackendMode(command) {
     case "sandbox":
     case "secret":
     case "server":
+    case "server-mcp":
     case "shared-memory":
     case "skills":
     case "teleport":
@@ -424490,6 +424851,8 @@ async function runSubcommand(argv) {
       return runTeleportSubcommand(rest4);
     case "server":
       return runServerSubcommand(rest4);
+    case "server-mcp":
+      return runServerMcpSubcommand(rest4);
     case "remote":
       return runListenSubcommand(rest4);
     case "connect":
@@ -424535,6 +424898,7 @@ var init_router = __esm(async () => {
   init_messages10();
   init_sandbox2();
   init_secret();
+  init_server_mcp();
   init_shared_memory();
   init_skills4();
   init_teleport2();
@@ -442494,7 +442858,7 @@ var init_mcp_client = __esm(() => {
   init_streamableHttp();
   DEFAULT_CLIENT_INFO = {
     name: "letta-code",
-    version: "0.31.0"
+    version: "0.31.2"
   };
 });
 
@@ -462371,110 +462735,6 @@ var init_LettaLoginOverlay = __esm(async () => {
   jsx_dev_runtime63 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
-// src/backend/api/mcp-servers.ts
-function withTimeout2(promise2, timeoutMs, label) {
-  let timer;
-  const timeout = new Promise((_4, reject2) => {
-    timer = setTimeout(() => reject2(new Error(`${label} timed out after ${timeoutMs}ms`)), timeoutMs);
-  });
-  return Promise.race([promise2, timeout]).finally(() => {
-    if (timer !== undefined)
-      clearTimeout(timer);
-  });
-}
-function listServerMcpServers(client, timeoutMs = 1e4) {
-  return withTimeout2(client.mcpServers.list(), timeoutMs, "Listing server-side MCP servers");
-}
-async function listLiveServerMcpTools(client, serverName, timeoutMs = 15000) {
-  const result2 = await withTimeout2(client.get(`/v1/tools/mcp/servers/${encodeURIComponent(serverName)}/tools`), timeoutMs, `Listing tools for MCP server "${serverName}"`);
-  if (!Array.isArray(result2))
-    return [];
-  return result2.filter((tool) => typeof tool === "object" && tool !== null && typeof tool.name === "string");
-}
-async function loadServerMcpEntries(client, timeoutMs = 15000) {
-  const servers = await listServerMcpServers(client, timeoutMs);
-  return Promise.all(servers.map(async (server2) => {
-    try {
-      const tools = await listLiveServerMcpTools(client, server2.server_name, timeoutMs);
-      return { server: server2, tools };
-    } catch (cause) {
-      return {
-        server: server2,
-        tools: [],
-        toolsError: cause instanceof Error ? cause.message : String(cause)
-      };
-    }
-  }));
-}
-function parseMcpMetadata(tool) {
-  const metadata = tool.metadata_;
-  const mcp = metadata?.mcp;
-  if (typeof mcp !== "object" || mcp === null)
-    return null;
-  const { server_id, server_name } = mcp;
-  return {
-    ...typeof server_id === "string" && { serverId: server_id },
-    ...typeof server_name === "string" && { serverName: server_name }
-  };
-}
-async function listAgentMcpAttachments(client, agentId) {
-  const attachments = [];
-  for await (const tool of client.agents.tools.list(agentId, { limit: 100 })) {
-    if (tool.tool_type !== "external_mcp" || !tool.id || !tool.name)
-      continue;
-    attachments.push({
-      toolId: tool.id,
-      toolName: tool.name,
-      ...parseMcpMetadata(tool)
-    });
-  }
-  return attachments;
-}
-function attachmentsForEntry(entry, attachments) {
-  return attachments.filter((attachment) => attachment.serverId && entry.server.id ? attachment.serverId === entry.server.id : attachment.serverName === entry.server.server_name);
-}
-function attachedToolNamesForEntry(entry, attachments) {
-  return new Set(attachmentsForEntry(entry, attachments).map((attachment) => attachment.toolName));
-}
-async function registerServerMcpTool(client, serverName, toolName) {
-  const result2 = await client.post(`/v1/tools/mcp/servers/${encodeURIComponent(serverName)}/${encodeURIComponent(toolName)}`);
-  if (typeof result2?.id !== "string") {
-    throw new Error(`Registering MCP tool "${toolName}" on server "${serverName}" returned no tool id`);
-  }
-  return { id: result2.id };
-}
-async function attachServerMcpTools(client, agentId, serverName, toolNames) {
-  await Promise.all(toolNames.map(async (toolName) => {
-    const { id: id2 } = await registerServerMcpTool(client, serverName, toolName);
-    await client.agents.tools.attach(id2, { agent_id: agentId });
-  }));
-}
-async function detachServerMcpTools(client, agentId, toolIds) {
-  await Promise.all(toolIds.map((toolId) => client.agents.tools.detach(toolId, { agent_id: agentId })));
-}
-function refreshServerMcpServer(client, mcpServerId, agentId) {
-  return client.mcpServers.refresh(mcpServerId, { agent_id: agentId });
-}
-function planServerMcpToggle(entry, attachments) {
-  const attached = attachmentsForEntry(entry, attachments);
-  if (attached.length > 0) {
-    return {
-      action: "detach",
-      toolIds: attached.map((attachment) => attachment.toolId)
-    };
-  }
-  return { action: "attach", toolNames: entry.tools.map((tool) => tool.name) };
-}
-function describeServerMcpTarget(server2) {
-  if ("server_url" in server2 && server2.server_url) {
-    return server2.server_url;
-  }
-  if ("command" in server2 && server2.command) {
-    return [server2.command, ...server2.args ?? []].join(" ");
-  }
-  return "";
-}
-
 // src/cli/components/McpSelector.tsx
 function buildMcpRows(localStates, serverEntries) {
   return [
@@ -462591,6 +462851,7 @@ var import_react87, jsx_dev_runtime64, SOLID_LINE12 = "─", DISPLAY_PAGE_SIZE2
 var init_McpSelector = __esm(async () => {
   init_backend2();
   init_client2();
+  init_mcp_servers2();
   init_truncate_text();
   init_use_terminal_width();
   init_mcp_oauth();
@@ -472220,7 +472481,7 @@ var init_ToolCallMessageRich = __esm(async () => {
       let shellSemanticKind = null;
       let hasShellDescription = false;
       if (!isQuestionTool(rawName)) {
-        const parseArgs21 = () => {
+        const parseArgs22 = () => {
           if (!argsText.trim()) {
             return { formatted: null, parseable: true };
           }
@@ -472234,7 +472495,7 @@ var init_ToolCallMessageRich = __esm(async () => {
             return { formatted: null, parseable: false };
           }
         };
-        const { formatted, parseable } = parseArgs21();
+        const { formatted, parseable } = parseArgs22();
         const argsComplete = parseable || line.phase === "running" || line.phase === "finished" || !isStreaming;
         if (!argsComplete) {
           args = "(…)";
@@ -474450,7 +474711,7 @@ function updateCommandResult(buffersRef, refreshDerived, cmdId, input, output, s
   buffersRef.current.byId.set(cmdId, line);
   refreshDerived();
 }
-function parseArgs21(msg) {
+function parseArgs22(msg) {
   return msg.trim().split(/\s+/).filter(Boolean);
 }
 function formatConnectUsage() {
@@ -474832,7 +475093,7 @@ ${formatBedrockUsage2()}`, false);
   }
 }
 async function handleConnect(ctx, msg) {
-  const parts = parseArgs21(msg);
+  const parts = parseArgs22(msg);
   const providerToken = parts[1];
   if (!providerToken) {
     addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, formatConnectUsage(), false);
@@ -505768,9 +506029,7 @@ USAGE
   letta -p "..."        One-off prompt in headless mode (no TTY UI)
 
   # maintenance
-  letta update          Manually check for updates and install if available
-  letta upgrade         Alias for \`letta update\`
-  letta --update/--upgrade Aliases for \`letta update\`
+  letta update          Check for updates and install (aliases: upgrade, --update, --upgrade)
   letta memory ...      Memory filesystem subcommands
   letta agents ...      Agents subcommands (JSON-only)
   letta environments ... List available remote environments (JSON-only)
@@ -505779,6 +506038,7 @@ USAGE
   letta mods ...        List and manage local mods
   letta sandbox ...     Transfer files to or from the current Cloud sandbox
   letta server ...      Run a remote environment, channels, or the App Server
+  letta server-mcp ...  Use MCP servers connected to an agent
   letta connect ...     Connect providers from terminal
   letta backend ...     Show or set the default backend
   letta setup           Re-run first-run setup
@@ -505810,6 +506070,7 @@ SUBCOMMANDS
   letta mods enable <package-spec>
   letta mods disable <package-spec>
   letta mods remove <package-spec>
+  letta server-mcp list|tools|run ... [--agent <id>]
   letta server [--env-name <name> | --listen [url]] [options]
   letta connect <provider> [options]
   letta install <thing> [--agent <id> | -n <name>]
@@ -509630,4 +509891,4 @@ function registerBunOAuthFlows() {
 registerBunOAuthFlows();
 await init_src5().then(() => exports_src2);
 
-//# debugId=987215013A023F6264756E2164756E21
+//# debugId=48BEECE3782D14CC64756E2164756E21