@letta-ai/letta-code 0.31.2 → 0.31.3

package/letta.js

@@ -5509,7 +5509,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.31.2",
+    version: "0.31.3",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.10",
@@ -111856,7 +111856,8 @@ var init_skills3 = __esm(() => {
   init_skill_sources();
   LOCAL_AGENT_EXCLUDED_BUNDLED_SKILLS = new Set([
     "image-generation",
-    "managing-shared-memory"
+    "managing-shared-memory",
+    "using-cloud-mcp"
   ]);
   PROJECT_SKILLS_DIR = join23(".agents", "skills");
   GLOBAL_SKILLS_DIR = join23(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
@@ -197190,6 +197191,330 @@ var init_channels = __esm(() => {
   };
 });
 
+// src/backend/api/mcp-servers.ts
+function getString(record3, key2) {
+  const value = record3[key2];
+  return typeof value === "string" ? value : null;
+}
+function parseAgentConnectedMcpServer(value) {
+  if (!isRecord(value)) {
+    return null;
+  }
+  const id2 = getString(value, "id");
+  const serverName = getString(value, "server_name");
+  const serverType = getString(value, "mcp_server_type");
+  if (!id2 || !serverName || !serverType) {
+    return null;
+  }
+  const target2 = getString(value, "server_url") ?? [
+    getString(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 = getString(value, "id");
+  const name = getString(value, "name");
+  if (!id2 || !name) {
+    return null;
+  }
+  const description = getString(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 = getString(value, "status") ?? "unknown";
+  return {
+    status,
+    funcReturn: value.func_return,
+    stdout: value.stdout,
+    stderr: value.stderr
+  };
+}
+function withTimeout(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 withTimeout(client.mcpServers.list(), timeoutMs, "Listing server-side MCP servers");
+}
+async function listAgentConnectedMcpServers(client, agentId, timeoutMs = 1e4) {
+  const result2 = await withTimeout(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 withTimeout(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 withTimeout(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 withTimeout(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/cloud-mcp.ts
+import { parseArgs as parseArgs4 } from "node:util";
+function printUsage4(stdout = console.log) {
+  stdout(`
+Usage:
+  letta cloud-mcp list [--agent <id>]
+  letta cloud-mcp tools <mcp-server-id> [--agent <id>]
+  letta cloud-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 parseCloudMcpArgs(argv) {
+  return parseArgs4({
+    args: argv,
+    options: {
+      help: { type: "boolean", short: "h" },
+      agent: { type: "string" },
+      "agent-id": { type: "string" },
+      args: { type: "string" }
+    },
+    strict: true,
+    allowPositionals: true
+  });
+}
+function stringValue3(value) {
+  return typeof value === "string" ? value : undefined;
+}
+function resolveCloudMcpAgentId(agent, agentId, env4 = process.env) {
+  return (agent || agentId || env4.LETTA_AGENT_ID || env4.AGENT_ID || "").trim();
+}
+function parseToolArgs(value) {
+  const raw2 = stringValue3(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 printJson(stdout, result2) {
+  stdout(JSON.stringify(result2, null, 2));
+}
+async function defaultGetClient() {
+  const client = await getClient();
+  return client;
+}
+async function runCloudMcpSubcommand(argv, deps = {}) {
+  const stdout = deps.stdout ?? console.log;
+  const stderr = deps.stderr ?? console.error;
+  let parsed;
+  try {
+    parsed = parseCloudMcpArgs(argv);
+  } catch (error4) {
+    const message = error4 instanceof Error ? error4.message : String(error4);
+    stderr(`Error: ${message}`);
+    printUsage4(stdout);
+    return 1;
+  }
+  const [action3, mcpServerId, toolId] = parsed.positionals;
+  if (parsed.values.help || !action3 || action3 === "help") {
+    printUsage4(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 = resolveCloudMcpAgentId(stringValue3(parsed.values.agent), stringValue3(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") {
+      printJson(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 cloud-mcp tools <mcp-server-id> [--agent <id>]");
+        return 1;
+      }
+      printJson(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 cloud-mcp run <mcp-server-id> <tool-id> [--args '<json>'] [--agent <id>]");
+        return 1;
+      }
+      printJson(stdout, {
+        agent_id: agentId,
+        mcp_server_id: mcpServerId,
+        tool_id: toolId,
+        result: await runAgentConnectedMcpTool({
+          client,
+          agentId,
+          mcpServerId,
+          toolId,
+          args: parseToolArgs(parsed.values.args)
+        })
+      });
+      return 0;
+    }
+    stderr(`Unknown cloud-mcp action: ${action3}`);
+    printUsage4(stdout);
+    return 1;
+  } catch (error4) {
+    stderr(error4 instanceof Error ? error4.message : String(error4));
+    return 1;
+  }
+}
+var init_cloud_mcp = __esm(() => {
+  init_backend2();
+  init_client2();
+  init_mcp_servers2();
+  init_settings_manager();
+});
+
 // src/auth/openai-oauth.ts
 import http3 from "node:http";
 function renderOAuthPage(options) {
@@ -198313,7 +198638,7 @@ var init_connect_normalize = __esm(() => {
 // src/cli/subcommands/connect.ts
 import { createInterface as createInterface6 } from "node:readline/promises";
 import { Writable } from "node:stream";
-import { parseArgs as parseArgs4 } from "node:util";
+import { parseArgs as parseArgs5 } from "node:util";
 function readStringOption(value) {
   if (typeof value === "string") {
     return value;
@@ -198405,7 +198730,7 @@ async function runConnectSubcommand(argv, deps = {}) {
   const io = { ...DEFAULT_DEPS2, ...deps };
   let parsed;
   try {
-    parsed = parseArgs4({
+    parsed = parseArgs5({
       args: argv,
       options: CONNECT_OPTIONS,
       strict: true,
@@ -207615,8 +207940,8 @@ var init_cron_task_ref = __esm(async () => {
 });
 
 // src/cli/subcommands/cron.ts
-import { parseArgs as parseArgs5 } from "node:util";
-function printUsage4() {
+import { parseArgs as parseArgs6 } from "node:util";
+function printUsage5() {
   console.log(`
 Usage:
   letta cron add --prompt <text> --every <interval> [options]
@@ -207670,7 +207995,7 @@ Output is JSON.
 `.trim());
 }
 function parseCronArgs(argv) {
-  return parseArgs5({
+  return parseArgs6({
     args: argv,
     options: CRON_OPTIONS,
     strict: true,
@@ -208226,12 +208551,12 @@ async function runCronSubcommand(argv) {
     parsed = parseCronArgs(argv);
   } catch (err) {
     console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
-    printUsage4();
+    printUsage5();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage4();
+    printUsage5();
     return 0;
   }
   switch (action3) {
@@ -208248,7 +208573,7 @@ async function runCronSubcommand(argv) {
       return handleDelete(parsed.values, parsed.positionals);
     default:
       console.error(`Unknown action: ${action3}`);
-      printUsage4();
+      printUsage5();
       return 1;
   }
 }
@@ -208841,12 +209166,12 @@ function rowToolCalls(row, index, diagnostics2) {
   }
   return calls;
 }
-function contentText2(content) {
+function contentText(content) {
   if (typeof content === "string") {
     if (content.startsWith(CONTENT_JSON_PREFIX)) {
       const encoded = content.slice(CONTENT_JSON_PREFIX.length);
       try {
-        return contentText2(JSON.parse(encoded));
+        return contentText(JSON.parse(encoded));
       } catch {
         return encoded;
       }
@@ -208932,7 +209257,7 @@ var init_hermes = __esm(() => {
           });
         };
         if (row.role === "user") {
-          const content = contentText2(row.content);
+          const content = contentText(row.content);
           if (content) {
             emit({
               type: "message",
@@ -208952,7 +209277,7 @@ var init_hermes = __esm(() => {
               ...timestamp ? { timestamp } : {}
             });
           }
-          const content = contentText2(row.content);
+          const content = contentText(row.content);
           if (content) {
             emit({
               type: "message",
@@ -208975,7 +209300,7 @@ var init_hermes = __esm(() => {
         if (row.role === "tool") {
           emit({
             type: "tool_result",
-            content: contentText2(row.content),
+            content: contentText(row.content),
             ...typeof row.tool_call_id === "string" && row.tool_call_id ? { callId: row.tool_call_id } : {},
             ...timestamp ? { timestamp } : {}
           });
@@ -213827,8 +214152,8 @@ var init_reflection_launcher = __esm(() => {
 });
 
 // src/cli/subcommands/dream.ts
-import { parseArgs as parseArgs6 } from "node:util";
-function printUsage5() {
+import { parseArgs as parseArgs7 } from "node:util";
+function printUsage6() {
   console.log(`
 Usage:
   letta dream [options]
@@ -213865,7 +214190,7 @@ Notes:
 `.trim());
 }
 function parseDreamArgs(argv) {
-  return parseArgs6({
+  return parseArgs7({
     args: argv,
     options: DREAM_OPTIONS,
     strict: true,
@@ -213882,17 +214207,17 @@ async function runDreamSubcommand(argv) {
   } catch (error4) {
     const message = error4 instanceof Error ? error4.message : String(error4);
     console.error(`Error: ${message}`);
-    printUsage5();
+    printUsage6();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || action3 === "help") {
-    printUsage5();
+    printUsage6();
     return 0;
   }
   if (action3) {
     console.error(`Unknown argument: ${action3}`);
-    printUsage5();
+    printUsage6();
     return 1;
   }
   const asJson = Boolean(parsed.values.json);
@@ -214118,8 +214443,8 @@ var init_dream = __esm(() => {
 });
 
 // src/cli/subcommands/environments.ts
-import { parseArgs as parseArgs7 } from "node:util";
-function printUsage6() {
+import { parseArgs as parseArgs8 } from "node:util";
+function printUsage7() {
   console.log(`
 Usage:
   letta environments list [options]
@@ -214187,7 +214512,7 @@ function scoreCurrentEnvironment(environment2, options) {
   return score;
 }
 function parseEnvironmentsArgs(argv) {
-  return parseArgs7({
+  return parseArgs8({
     args: argv,
     options: ENVIRONMENTS_OPTIONS,
     strict: true,
@@ -214201,17 +214526,17 @@ async function runEnvironmentsSubcommand(argv, deps = {}) {
   } catch (error4) {
     const message = error4 instanceof Error ? error4.message : String(error4);
     console.error(`Error: ${message}`);
-    printUsage6();
+    printUsage7();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage6();
+    printUsage7();
     return 0;
   }
   if (action3 !== "list" && action3 !== "current") {
     console.error(`Unknown action: ${action3}`);
-    printUsage6();
+    printUsage7();
     return 1;
   }
   await (deps.initializeSettings ?? (() => settingsManager.initialize()))();
@@ -241963,9 +242288,9 @@ ${lanes.join(`
     function isJsonEqual(a2, b3) {
       return a2 === b3 || typeof a2 === "object" && a2 !== null && typeof b3 === "object" && b3 !== null && equalOwnProperties(a2, b3, isJsonEqual);
     }
-    function parsePseudoBigInt(stringValue3) {
+    function parsePseudoBigInt(stringValue4) {
       let log2Base;
-      switch (stringValue3.charCodeAt(1)) {
+      switch (stringValue4.charCodeAt(1)) {
         case 98:
         case 66:
           log2Base = 1;
@@ -241979,19 +242304,19 @@ ${lanes.join(`
           log2Base = 4;
           break;
         default:
-          const nIndex = stringValue3.length - 1;
+          const nIndex = stringValue4.length - 1;
           let nonZeroStart = 0;
-          while (stringValue3.charCodeAt(nonZeroStart) === 48) {
+          while (stringValue4.charCodeAt(nonZeroStart) === 48) {
             nonZeroStart++;
           }
-          return stringValue3.slice(nonZeroStart, nIndex) || "0";
+          return stringValue4.slice(nonZeroStart, nIndex) || "0";
       }
-      const startIndex = 2, endIndex = stringValue3.length - 1;
+      const startIndex = 2, endIndex = stringValue4.length - 1;
       const bitsNeeded = (endIndex - startIndex) * log2Base;
       const segments = new Uint16Array((bitsNeeded >>> 4) + (bitsNeeded & 15 ? 1 : 0));
       for (let i4 = endIndex - 1, bitOffset = 0;i4 >= startIndex; i4--, bitOffset += log2Base) {
         const segment = bitOffset >>> 4;
-        const digitChar = stringValue3.charCodeAt(i4);
+        const digitChar = stringValue4.charCodeAt(i4);
         const digit = digitChar <= 57 ? digitChar - 48 : 10 + digitChar - (digitChar <= 70 ? 65 : 97);
         const shiftedDigit = digit << (bitOffset & 15);
         segments[segment] |= shiftedDigit;
@@ -395054,7 +395379,7 @@ function toRunsArray(listResponse) {
   }
   return [];
 }
-function withTimeout(promise, timeoutMs, timeoutMessage) {
+function withTimeout2(promise, timeoutMs, timeoutMessage) {
   return new Promise((resolve35, reject2) => {
     const timer = setTimeout(() => reject2(new Error(timeoutMessage)), timeoutMs);
     promise.then((value) => {
@@ -395068,7 +395393,7 @@ function withTimeout(promise, timeoutMs, timeoutMessage) {
 }
 async function discoverFallbackRunIdWithTimeout(ctx) {
   const client = await getClient();
-  return withTimeout(discoverFallbackRunIdForResume(client, ctx), FALLBACK_RUN_DISCOVERY_TIMEOUT_MS, `Fallback run discovery timed out after ${FALLBACK_RUN_DISCOVERY_TIMEOUT_MS}ms`);
+  return withTimeout2(discoverFallbackRunIdForResume(client, ctx), FALLBACK_RUN_DISCOVERY_TIMEOUT_MS, `Fallback run discovery timed out after ${FALLBACK_RUN_DISCOVERY_TIMEOUT_MS}ms`);
 }
 async function discoverFallbackRunIdForResume(client, ctx) {
   const statuses = ["running"];
@@ -395796,7 +396121,7 @@ function formatMissingRequiredArgsReason(toolName, parsedArgs, missingRequiredAr
   }
   return base2;
 }
-function parseToolArgs(rawArgs) {
+function parseToolArgs2(rawArgs) {
   const raw2 = rawArgs ?? "";
   const trimmed = raw2.trim();
   if (!trimmed) {
@@ -395841,7 +396166,7 @@ async function classifyApprovals(approvals, opts = {}) {
       });
       continue;
     }
-    const argsParse = parseToolArgs(approval.toolArgs);
+    const argsParse = parseToolArgs2(approval.toolArgs);
     const parsedArgs = argsParse.parsedArgs;
     if (argsParse.parseFailed) {
       debugWarn("approval-classification", `Tool call ${approval.toolCallId} (${toolName}) had unparseable arguments ` + `(${argsParse.rawLength} chars); treating as empty`);
@@ -405803,7 +406128,7 @@ function getNumber(record3, keys3) {
   }
   return null;
 }
-function getString(record3, keys3) {
+function getString2(record3, keys3) {
   const value = getValue(record3, keys3);
   if (typeof value === "string" && value.trim())
     return value.trim();
@@ -405889,7 +406214,7 @@ function normalizeCredits(raw2, rateLimit) {
   const resetCredits = getRecord(raw2, ["rate_limit_reset_credits", "rateLimitResetCredits"]) ?? getRecord(rateLimit, ["rate_limit_reset_credits", "rateLimitResetCredits"]);
   if (!credits && !resetCredits)
     return null;
-  const balance = getString(credits, ["balance", "credit_balance", "amount"]);
+  const balance = getString2(credits, ["balance", "credit_balance", "amount"]);
   const availableCount = getNumber(credits, ["available_count", "availableCount", "count"]) ?? getNumber(resetCredits, ["available_count", "availableCount", "count"]);
   const hasCredits = getBoolean(credits, ["has_credits", "hasCredits"]);
   const unlimited = getBoolean(credits, ["unlimited", "is_unlimited"]);
@@ -405908,8 +406233,8 @@ function normalizeIndividualLimit(raw2, nowMs) {
   const record3 = getRecord(raw2, ["individual_limit", "individualLimit"]) ?? getRecord(spendControl, ["individual_limit", "individualLimit"]);
   if (!record3)
     return null;
-  const limit3 = getString(record3, ["limit"]);
-  const used = getString(record3, ["used"]);
+  const limit3 = getString2(record3, ["limit"]);
+  const used = getString2(record3, ["used"]);
   const remainingPercent = getNumber(record3, [
     "remaining_percent",
     "remainingPercent"
@@ -405938,10 +406263,10 @@ function normalizeCloudUsageWindow(value, fallbackLabel, nowMs) {
   const record3 = asRecord8(value);
   if (!record3)
     return null;
-  return normalizeUsageWindow(record3, getString(record3, ["label", "name"]) ?? fallbackLabel, nowMs);
+  return normalizeUsageWindow(record3, getString2(record3, ["label", "name"]) ?? fallbackLabel, nowMs);
 }
 function normalizeAdditionalRateLimit(details, index, nowMs) {
-  const label = getString(details, [
+  const label = getString2(details, [
     "limit_name",
     "limitName",
     "metered_feature",
@@ -405967,7 +406292,7 @@ function getRateLimitReachedType(raw2) {
   if (typeof value === "string" && value.trim())
     return value.trim();
   const record3 = asRecord8(value);
-  return getString(record3, ["type", "kind"]);
+  return getString2(record3, ["type", "kind"]);
 }
 function formatPercent(value) {
   const rounded = Math.round(value);
@@ -406082,7 +406407,7 @@ function normalizeWhamUsageResponse(input) {
   const snapshotWithoutSummary = {
     providerName: input.providerName,
     fetchedAt,
-    planType: getString(raw2, ["plan_type", "planType"]),
+    planType: getString2(raw2, ["plan_type", "planType"]),
     limitReached: getBoolean(rateLimit, ["limit_reached", "limitReached"]) ?? getBoolean(spendControl, ["reached"]),
     rateLimitReachedType: getRateLimitReachedType(raw2),
     primary,
@@ -406101,18 +406426,18 @@ function normalizeCloudChatGPTUsageResponse(input) {
   if (!raw2)
     return null;
   const nowMs = input.nowMs ?? Date.now();
-  const fetchedAt = getString(raw2, ["fetchedAt", "fetched_at"]) ?? new Date(nowMs).toISOString();
+  const fetchedAt = getString2(raw2, ["fetchedAt", "fetched_at"]) ?? new Date(nowMs).toISOString();
   const additional = getRecordArray(raw2, [
     "additional",
     "additional_rate_limits",
     "additionalRateLimits"
   ]).map((window2, index) => normalizeCloudUsageWindow(window2, `limit ${index + 1}`, nowMs)).filter((window2) => !!window2);
   const snapshotWithoutSummary = {
-    providerName: getString(raw2, ["providerName", "provider_name"]) ?? input.providerName,
+    providerName: getString2(raw2, ["providerName", "provider_name"]) ?? input.providerName,
     fetchedAt,
-    planType: getString(raw2, ["planType", "plan_type"]),
+    planType: getString2(raw2, ["planType", "plan_type"]),
     limitReached: getBoolean(raw2, ["limitReached", "limit_reached"]),
-    rateLimitReachedType: getString(raw2, [
+    rateLimitReachedType: getString2(raw2, [
       "rateLimitReachedType",
       "rate_limit_reached_type"
     ]),
@@ -406124,7 +406449,7 @@ function normalizeCloudChatGPTUsageResponse(input) {
   };
   return {
     ...snapshotWithoutSummary,
-    summary: getString(raw2, ["summary"]) ?? formatChatGPTUsageSnapshot(snapshotWithoutSummary, new Date(nowMs))
+    summary: getString2(raw2, ["summary"]) ?? formatChatGPTUsageSnapshot(snapshotWithoutSummary, new Date(nowMs))
   };
 }
 function retryAfterMs(response) {
@@ -406149,7 +406474,7 @@ async function readJsonRecord(response) {
   }
 }
 function responseMessage(raw2, fallback) {
-  return getString(raw2 ?? undefined, ["message", "error", "detail"]) ?? fallback;
+  return getString2(raw2 ?? undefined, ["message", "error", "detail"]) ?? fallback;
 }
 function chatGPTUsageError(code2, message, retryAfter) {
   return {
@@ -409908,7 +410233,7 @@ var init_app_server_openai_common = __esm(() => {
 function asRecord9(value) {
   return value !== null && typeof value === "object" ? value : null;
 }
-function stringValue3(value) {
+function stringValue4(value) {
   return typeof value === "string" ? value : undefined;
 }
 function extractToolCallFragments(record3) {
@@ -409922,12 +410247,12 @@ function extractToolCallFragments(record3) {
     if (!toolCall) {
       continue;
     }
-    const toolCallId = stringValue3(toolCall.tool_call_id);
+    const toolCallId = stringValue4(toolCall.tool_call_id);
     if (!toolCallId) {
       continue;
     }
-    const name = stringValue3(toolCall.name) ?? null;
-    const argumentsDelta = stringValue3(toolCall.arguments) ?? null;
+    const name = stringValue4(toolCall.name) ?? null;
+    const argumentsDelta = stringValue4(toolCall.arguments) ?? null;
     fragments.push({ toolCallId, name, argumentsDelta });
   }
   return fragments;
@@ -409967,7 +410292,7 @@ function extractToolReturns(record3) {
       if (!rec) {
         continue;
       }
-      const toolCallId = stringValue3(rec.tool_call_id);
+      const toolCallId = stringValue4(rec.tool_call_id);
       const status = asToolReturnStatus2(rec.status);
       if (!toolCallId || !status) {
         continue;
@@ -409982,7 +410307,7 @@ function extractToolReturns(record3) {
       return results;
     }
   }
-  const topLevelToolCallId = stringValue3(record3.tool_call_id);
+  const topLevelToolCallId = stringValue4(record3.tool_call_id);
   const topLevelStatus = asToolReturnStatus2(record3.status);
   if (!topLevelToolCallId || !topLevelStatus) {
     return [];
@@ -410070,13 +410395,13 @@ function createToolLifecycleTracker(onEvent) {
       return;
     }
     const record3 = delta2;
-    const messageType = stringValue3(record3.message_type);
-    const toolCallId = stringValue3(record3.tool_call_id);
+    const messageType = stringValue4(record3.message_type);
+    const toolCallId = stringValue4(record3.tool_call_id);
     if (messageType === "client_tool_start" && toolCallId) {
       const state = getOrCreate(toolCallId);
       state.clientManaged = true;
       if (!state.name)
-        state.name = stringValue3(record3.tool_name) ?? null;
+        state.name = stringValue4(record3.tool_name) ?? null;
       return;
     }
     if (messageType === "client_tool_end" && toolCallId) {
@@ -411663,7 +411988,7 @@ var init_gateway_supervisor = __esm(() => {
 
 // src/cli/subcommands/listen.tsx
 import { hostname as hostname4 } from "node:os";
-import { parseArgs as parseArgs8 } from "node:util";
+import { parseArgs as parseArgs9 } from "node:util";
 import { MessageChannel as MessageChannel2 } from "node:worker_threads";
 function PromptEnvName(props) {
   const [value, setValue] = import_react33.useState("");
@@ -411776,7 +412101,7 @@ function printListenUsage() {
 async function runListenSubcommand(argv) {
   let values3;
   try {
-    ({ values: values3 } = parseArgs8({
+    ({ values: values3 } = parseArgs9({
       args: argv,
       options: LISTEN_OPTIONS,
       strict: true,
@@ -412684,15 +413009,15 @@ var init_transcript_migration = __esm(() => {
 });
 
 // src/cli/subcommands/local-backend.ts
-import { parseArgs as parseArgs9 } from "node:util";
+import { parseArgs as parseArgs10 } from "node:util";
 function parseLocalBackendArgs(argv) {
-  return parseArgs9({
+  return parseArgs10({
     args: argv,
     options: LOCAL_BACKEND_OPTIONS,
     strict: true
   });
 }
-function printUsage7() {
+function printUsage8() {
   console.log(`
 Usage:
   letta local-backend migrate-transcripts [--storage-dir <path>] [--dry-run]
@@ -412705,12 +413030,12 @@ before it is replaced.
 async function runLocalBackendSubcommand(argv) {
   const [command, ...rest4] = argv;
   if (!command || command === "help" || command === "--help" || command === "-h") {
-    printUsage7();
+    printUsage8();
     return command ? 0 : 1;
   }
   if (command !== "migrate-transcripts") {
     console.error(`Unknown local-backend command: ${command}`);
-    printUsage7();
+    printUsage8();
     return 1;
   }
   let parsed;
@@ -412719,11 +413044,11 @@ async function runLocalBackendSubcommand(argv) {
   } catch (error4) {
     const message = error4 instanceof Error ? error4.message : String(error4);
     console.error(`Error: ${message}`);
-    printUsage7();
+    printUsage8();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage7();
+    printUsage8();
     return 0;
   }
   const storageDir = parsed.values["storage-dir"] ?? getLocalBackendStorageDir();
@@ -412771,7 +413096,7 @@ function printText(total, files, top, quiet) {
     console.log(`  ${formatNumber(row.tokens).padStart(8)}  ${row.path}`);
   }
 }
-function printJson(total, files) {
+function printJson2(total, files) {
   console.log(JSON.stringify({
     total_tokens: total,
     files
@@ -412812,7 +413137,7 @@ async function runMemoryTokensAction(options) {
   }
   const { total, files } = estimate;
   if (format5 === "json") {
-    printJson(total, files);
+    printJson2(total, files);
   } else {
     printText(total, files, top, options.quiet);
   }
@@ -412827,8 +413152,8 @@ var init_memory_tokens = __esm(() => {
 import { cpSync, existsSync as existsSync55, mkdirSync as mkdirSync39, rmSync as rmSync12, statSync as statSync19 } from "node:fs";
 import { readdir as readdir13 } from "node:fs/promises";
 import { dirname as dirname32, join as join72 } from "node:path";
-import { parseArgs as parseArgs10 } from "node:util";
-function printUsage8() {
+import { parseArgs as parseArgs11 } from "node:util";
+function printUsage9() {
   console.log(`
 Usage:
   letta memory status [--agent <id>]
@@ -412861,7 +413186,7 @@ function getAgentId3(agentFromArgs, agentIdFromArgs) {
   return agentFromArgs || agentIdFromArgs || process.env.LETTA_AGENT_ID || "";
 }
 function parseMemoryArgs(argv) {
-  return parseArgs10({
+  return parseArgs11({
     args: argv,
     options: MEMORY_OPTIONS,
     strict: true,
@@ -412922,12 +413247,12 @@ async function runMemorySubcommand(argv) {
   } catch (error4) {
     const message = error4 instanceof Error ? error4.message : String(error4);
     console.error(`Error: ${message}`);
-    printUsage8();
+    printUsage9();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage8();
+    printUsage9();
     return 0;
   }
   const agentId = getAgentId3(parsed.values.agent, parsed.values["agent-id"]);
@@ -413070,7 +413395,7 @@ async function runMemorySubcommand(argv) {
     return 1;
   }
   console.error(`Unknown action: ${action3}`);
-  printUsage8();
+  printUsage9();
   return 1;
 }
 var MEMORY_OPTIONS;
@@ -413429,8 +413754,8 @@ var init_message_search = __esm(() => {
 // src/cli/subcommands/messages.ts
 import { writeFile as writeFile17 } from "node:fs/promises";
 import { resolve as resolve35 } from "node:path";
-import { parseArgs as parseArgs11 } from "node:util";
-function printUsage9() {
+import { parseArgs as parseArgs12 } from "node:util";
+function printUsage10() {
   console.log(`
 Usage:
   letta messages search --query <text> [options]
@@ -413515,7 +413840,7 @@ function pageItems4(page) {
   return [];
 }
 function parseMessagesArgs(argv) {
-  return parseArgs11({
+  return parseArgs12({
     args: argv,
     options: MESSAGES_OPTIONS,
     strict: true,
@@ -413529,12 +413854,12 @@ async function runMessagesSubcommand(argv, deps = {}) {
   } catch (error4) {
     const message = error4 instanceof Error ? error4.message : String(error4);
     console.error(`Error: ${message}`);
-    printUsage9();
+    printUsage10();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage9();
+    printUsage10();
     return 0;
   }
   try {
@@ -413776,7 +414101,7 @@ async function runMessagesSubcommand(argv, deps = {}) {
     return 1;
   }
   console.error(`Unknown action: ${action3}`);
-  printUsage9();
+  printUsage10();
   return 1;
 }
 var MESSAGES_OPTIONS;
@@ -414806,8 +415131,8 @@ var init_package_scaffolder = __esm(() => {
 
 // src/cli/subcommands/mods.ts
 import { dirname as dirname33, join as join74 } from "node:path";
-import { parseArgs as parseArgs12 } from "node:util";
-function printUsage10() {
+import { parseArgs as parseArgs13 } from "node:util";
+function printUsage11() {
   console.log(`
 Usage:
   letta mods list [--agent <id>]
@@ -414824,7 +415149,7 @@ Options:
 `.trim());
 }
 function parseModsArgs(argv) {
-  return parseArgs12({
+  return parseArgs13({
     args: argv,
     options: MODS_OPTIONS,
     strict: true,
@@ -414832,7 +415157,7 @@ function parseModsArgs(argv) {
   });
 }
 function parseModsPackageArgs(argv) {
-  return parseArgs12({
+  return parseArgs13({
     args: argv,
     options: MODS_PACKAGE_OPTIONS,
     strict: true,
@@ -414930,16 +415255,16 @@ async function runList(argv, options = {}) {
     parsed = parseModsArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage10();
+    printUsage11();
     return 0;
   }
   if (parsed.positionals.length > 0) {
     console.error(`Unexpected argument: ${parsed.positionals[0]}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   const agentId = getExplicitAgentId(parsed.values);
@@ -414956,27 +415281,27 @@ async function runPackageMutation(action3, argv, options = {}) {
     parsed = parseModsArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage10();
+    printUsage11();
     return 0;
   }
   if (getExplicitAgentId(parsed.values)) {
     console.error(`--agent is only supported for 'letta mods list'.`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   const [specifier, extra] = parsed.positionals;
   if (!specifier) {
     console.error(`Missing package specifier.`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   if (extra) {
     console.error(`Unexpected argument: ${extra}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   try {
@@ -415002,27 +415327,27 @@ async function runPackageUpdate(argv, options = {}) {
     parsed = parseModsArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage10();
+    printUsage11();
     return 0;
   }
   if (getExplicitAgentId(parsed.values)) {
     console.error(`--agent is not supported for 'letta mods update'.`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   const [specifier, extra] = parsed.positionals;
   if (!specifier) {
     console.error(`Missing package specifier.`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   if (extra) {
     console.error(`Unexpected argument: ${extra}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   try {
@@ -415044,33 +415369,33 @@ async function runPackageScaffold(argv) {
     parsed = parseModsPackageArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : String(error4)}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage10();
+    printUsage11();
     return 0;
   }
   if (getExplicitAgentId(parsed.values)) {
     console.error(`--agent is not supported for 'letta mods package'.`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   const [sourceFile, extra] = parsed.positionals;
   if (!sourceFile) {
     console.error(`Missing mod file.`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   if (extra) {
     console.error(`Unexpected argument: ${extra}`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   const packageName = parsed.values.name;
   if (typeof packageName !== "string" || !packageName.trim()) {
     console.error(`Missing required --name <package-name>.`);
-    printUsage10();
+    printUsage11();
     return 1;
   }
   try {
@@ -415092,7 +415417,7 @@ async function runPackageScaffold(argv) {
 async function runModsSubcommand(argv, options = {}) {
   const [action3, ...rest4] = argv;
   if (!action3 || action3 === "help" || action3 === "--help" || action3 === "-h") {
-    printUsage10();
+    printUsage11();
     return 0;
   }
   switch (action3) {
@@ -415108,7 +415433,7 @@ async function runModsSubcommand(argv, options = {}) {
       return runPackageMutation(action3, rest4, options);
     default:
       console.error(`Unknown mods action: ${action3}`);
-      printUsage10();
+      printUsage11();
       return 1;
   }
 }
@@ -415188,8 +415513,8 @@ var init_sandbox_files = __esm(() => {
 // src/cli/subcommands/sandbox.ts
 import { readFile as readFile25, stat as stat17, writeFile as writeFile18 } from "node:fs/promises";
 import { basename as basename26, resolve as resolve36 } from "node:path";
-import { parseArgs as parseArgs13 } from "node:util";
-function printUsage11() {
+import { parseArgs as parseArgs14 } from "node:util";
+function printUsage12() {
   console.log(`
 Usage:
   letta sandbox upload <local-path>
@@ -415203,7 +415528,7 @@ Notes:
 `.trim());
 }
 function parseSandboxArgs(argv) {
-  return parseArgs13({
+  return parseArgs14({
     args: argv,
     options: SANDBOX_OPTIONS,
     strict: true,
@@ -415243,17 +415568,17 @@ async function runSandboxSubcommand(argv, deps = {}) {
     parsed = parseSandboxArgs(argv);
   } catch (error4) {
     console.error(`Error: ${error4 instanceof Error ? error4.message : error4}`);
-    printUsage11();
+    printUsage12();
     return 1;
   }
   const [action3, path48] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage11();
+    printUsage12();
     return 0;
   }
   if (action3 !== "upload" && action3 !== "download" || !path48) {
     console.error("Error: expected upload or download with a file path");
-    printUsage11();
+    printUsage12();
     return 1;
   }
   try {
@@ -415297,8 +415622,8 @@ var init_sandbox2 = __esm(() => {
 });
 
 // src/cli/subcommands/secret.ts
-import { parseArgs as parseArgs14 } from "node:util";
-function printUsage12() {
+import { parseArgs as parseArgs15 } from "node:util";
+function printUsage13() {
   console.log(`
 Usage:
   letta secret set KEY --env SOURCE_VAR   Set KEY from environment variable SOURCE_VAR
@@ -415323,7 +415648,7 @@ Notes:
 `.trim());
 }
 function parseSecretArgs(argv) {
-  return parseArgs14({
+  return parseArgs15({
     args: argv,
     options: SECRET_OPTIONS,
     strict: true,
@@ -415358,11 +415683,11 @@ async function runSecretSubcommand(argv, deps = {}) {
     parsed = parseSecretArgs(argv);
   } catch (error4) {
     printError(error4);
-    printUsage12();
+    printUsage13();
     return 1;
   }
   if (parsed.values.help || parsed.positionals.length === 0) {
-    printUsage12();
+    printUsage13();
     return parsed.values.help ? 0 : 1;
   }
   const [verb, rawKey, rawValue] = parsed.positionals;
@@ -415372,7 +415697,7 @@ async function runSecretSubcommand(argv, deps = {}) {
   }
   switch (verb) {
     case "help": {
-      printUsage12();
+      printUsage13();
       return 0;
     }
     case "list": {
@@ -415480,7 +415805,7 @@ async function runSecretSubcommand(argv, deps = {}) {
     }
     default: {
       console.error(`Unknown subcommand '${verb ?? ""}'.`);
-      printUsage12();
+      printUsage13();
       return 1;
     }
   }
@@ -415498,7 +415823,7 @@ var init_secret = __esm(() => {
 });
 
 // src/cli/subcommands/app-server.ts
-import { parseArgs as parseArgs15 } from "node:util";
+import { parseArgs as parseArgs16 } from "node:util";
 function printAppServerHelp() {
   console.log(`Usage: letta server --listen [url]
 
@@ -415546,7 +415871,7 @@ Stopped App Server (${signal}).`);
 async function runAppServerSubcommand(argv) {
   let parsed;
   try {
-    parsed = parseArgs15({
+    parsed = parseArgs16({
       args: argv,
       allowPositionals: false,
       options: {
@@ -415713,330 +416038,6 @@ 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) {
@@ -424808,7 +424809,7 @@ function subcommandNeedsEarlyBackendMode(command) {
     case "sandbox":
     case "secret":
     case "server":
-    case "server-mcp":
+    case "cloud-mcp":
     case "shared-memory":
     case "skills":
     case "teleport":
@@ -424851,8 +424852,8 @@ async function runSubcommand(argv) {
       return runTeleportSubcommand(rest4);
     case "server":
       return runServerSubcommand(rest4);
-    case "server-mcp":
-      return runServerMcpSubcommand(rest4);
+    case "cloud-mcp":
+      return runCloudMcpSubcommand(rest4);
     case "remote":
       return runListenSubcommand(rest4);
     case "connect":
@@ -424890,6 +424891,7 @@ var init_router = __esm(async () => {
   init_agents6();
   init_backend3();
   init_channels();
+  init_cloud_mcp();
   init_connect();
   init_dream();
   init_environments3();
@@ -424898,7 +424900,6 @@ var init_router = __esm(async () => {
   init_messages10();
   init_sandbox2();
   init_secret();
-  init_server_mcp();
   init_shared_memory();
   init_skills4();
   init_teleport2();
@@ -442858,7 +442859,7 @@ var init_mcp_client = __esm(() => {
   init_streamableHttp();
   DEFAULT_CLIENT_INFO = {
     name: "letta-code",
-    version: "0.31.2"
+    version: "0.31.3"
   };
 });
 
@@ -506038,7 +506039,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 cloud-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
@@ -506070,7 +506071,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 cloud-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>]
@@ -509891,4 +509892,4 @@ function registerBunOAuthFlows() {
 registerBunOAuthFlows();
 await init_src5().then(() => exports_src2);
 
-//# debugId=48BEECE3782D14CC64756E2164756E21
+//# debugId=B393760B54BCD06F64756E2164756E21