@letta-ai/letta-code 0.31.9 → 0.31.11

package/letta.js

@@ -3757,29 +3757,6 @@ var init_oauth = __esm(() => {
   };
 });
 
-// src/auth/oauth-refresh.ts
-async function refreshAccessTokenSingleFlight(refreshToken2, deviceId, deviceName, refresh = refreshAccessToken2) {
-  const refreshKey = `${refreshToken2}\x00${deviceId}`;
-  const existing = inFlightRefreshes.get(refreshKey);
-  if (existing) {
-    return await existing;
-  }
-  const pending = refresh(refreshToken2, deviceId, deviceName);
-  inFlightRefreshes.set(refreshKey, pending);
-  try {
-    return await pending;
-  } finally {
-    if (inFlightRefreshes.get(refreshKey) === pending) {
-      inFlightRefreshes.delete(refreshKey);
-    }
-  }
-}
-var inFlightRefreshes;
-var init_oauth_refresh = __esm(() => {
-  init_oauth();
-  inFlightRefreshes = new Map;
-});
-
 // src/agent/agent-id.ts
 function isLocalAgentId(agentId) {
   return agentId.startsWith("agent-local-");
@@ -5418,98 +5395,12 @@ var init_settings_manager = __esm(() => {
   settingsManager = globalThis.__lettaSettingsManager;
 });
 
-// src/utils/timing.ts
-function isTimingsEnabled() {
-  const val = process.env.LETTA_DEBUG_TIMINGS;
-  return val === "1" || val === "true";
-}
-function formatDuration(ms) {
-  if (ms < 1000)
-    return `${Math.round(ms)}ms`;
-  return `${(ms / 1000).toFixed(2)}s`;
-}
-function formatTimestamp(date) {
-  return date.toISOString().slice(11, 23);
-}
-function logTiming(message) {
-  if (isTimingsEnabled()) {
-    console.error(`[timing] ${message}`);
-  }
-}
-function markMilestone(name) {
-  const now = performance.now();
-  milestones.set(name, now);
-  if (firstMilestoneTime === null) {
-    firstMilestoneTime = now;
-  }
-  if (isTimingsEnabled()) {
-    const relative = now - firstMilestoneTime;
-    console.error(`[timing] MILESTONE ${name} at +${formatDuration(relative)} (${formatTimestamp(new Date)})`);
-  }
-}
-function measureSinceMilestone(label, fromMilestone) {
-  if (!isTimingsEnabled())
-    return;
-  const startTime = milestones.get(fromMilestone);
-  if (startTime === undefined) {
-    console.error(`[timing] WARNING: milestone "${fromMilestone}" not found for measurement "${label}"`);
-    return;
-  }
-  const duration = performance.now() - startTime;
-  console.error(`[timing] ${label}: ${formatDuration(duration)}`);
-}
-function reportAllMilestones() {
-  if (!isTimingsEnabled() || milestones.size === 0)
-    return;
-  const first = firstMilestoneTime ?? 0;
-  console.error(`[timing] ======== MILESTONE SUMMARY ========`);
-  const sorted = [...milestones.entries()].sort((a, b) => a[1] - b[1]);
-  let prevTime = first;
-  for (const [name, time] of sorted) {
-    const relativeToStart = time - first;
-    const delta = time - prevTime;
-    const deltaStr = prevTime === first ? "" : ` (+${formatDuration(delta)})`;
-    console.error(`[timing]   +${formatDuration(relativeToStart).padStart(8)} ${name}${deltaStr}`);
-    prevTime = time;
-  }
-  console.error(`[timing] =====================================`);
-}
-function createTimingFetch(baseFetch) {
-  return async (input, init) => {
-    const start = performance.now();
-    const startTime = formatTimestamp(new Date);
-    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
-    const method = init?.method || "GET";
-    let path2;
-    try {
-      path2 = new URL(url).pathname;
-    } catch {
-      path2 = url;
-    }
-    logTiming(`${method} ${path2} started at ${startTime}`);
-    try {
-      const response = await baseFetch(input, init);
-      const duration = performance.now() - start;
-      logTiming(`${method} ${path2} -> ${formatDuration(duration)} (status: ${response.status})`);
-      return response;
-    } catch (error) {
-      const duration = performance.now() - start;
-      logTiming(`${method} ${path2} -> FAILED after ${formatDuration(duration)}`);
-      throw error;
-    }
-  };
-}
-var milestones, firstMilestoneTime = null;
-var init_timing = __esm(() => {
-  milestones = new Map;
-});
-
 // package.json
 var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.31.9",
+    version: "0.31.11",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.10",
@@ -5753,266 +5644,6 @@ var init_package = __esm(() => {
   };
 });
 
-// src/backend/api/memfs-git-proxy.ts
-var exports_memfs_git_proxy = {};
-__export(exports_memfs_git_proxy, {
-  getMemfsServerUrl: () => getMemfsServerUrl,
-  getMemfsGitProxyRewriteConfig: () => getMemfsGitProxyRewriteConfig,
-  LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV: () => LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV
-});
-function isLocalhostUrl(value) {
-  if (!value)
-    return false;
-  try {
-    const parsed = new URL(value);
-    return ["localhost", "127.0.0.1", "::1", "[::1]"].includes(parsed.hostname);
-  } catch {
-    return false;
-  }
-}
-function trimBaseUrl(value) {
-  return value.trim().replace(/\/+$/, "");
-}
-function getMemfsServerUrl() {
-  let settings = null;
-  try {
-    settings = settingsManager.getSettings();
-  } catch {}
-  const configuredMemfsUrl = process.env.LETTA_MEMFS_BASE_URL || settings?.env?.LETTA_MEMFS_BASE_URL;
-  if (configuredMemfsUrl) {
-    return configuredMemfsUrl;
-  }
-  return LETTA_CLOUD_API_URL;
-}
-function getMemfsGitProxyRewriteConfig(env = process.env) {
-  const rawProxyBaseUrl = env[LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV]?.trim();
-  if (!rawProxyBaseUrl || !isLocalhostUrl(rawProxyBaseUrl)) {
-    return null;
-  }
-  const memfsBaseUrl = trimBaseUrl(getMemfsServerUrl());
-  if (!memfsBaseUrl.includes("api.letta.com")) {
-    return null;
-  }
-  const proxyBaseUrl = trimBaseUrl(rawProxyBaseUrl);
-  const proxyPrefix = `${proxyBaseUrl}/v1/git/`;
-  const memfsPrefix = `${memfsBaseUrl}/v1/git/`;
-  return {
-    proxyBaseUrl,
-    memfsBaseUrl,
-    proxyPrefix,
-    memfsPrefix,
-    configKey: `url.${proxyPrefix}.insteadOf`,
-    configValue: memfsPrefix
-  };
-}
-var LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV = "LETTA_MEMFS_GIT_PROXY_BASE_URL";
-var init_memfs_git_proxy = __esm(() => {
-  init_oauth();
-  init_settings_manager();
-});
-
-// src/backend/api/client.ts
-var exports_client = {};
-__export(exports_client, {
-  getServerUrl: () => getServerUrl,
-  getRuntimeEnvironmentDeviceId: () => getRuntimeEnvironmentDeviceId,
-  getMemfsServerUrl: () => getMemfsServerUrl,
-  getMemfsGitProxyRewriteConfig: () => getMemfsGitProxyRewriteConfig,
-  getClientDefaultHeaders: () => getClientDefaultHeaders,
-  getClient: () => getClient,
-  consumeLastSDKDiagnostic: () => consumeLastSDKDiagnostic,
-  clearLastSDKDiagnostic: () => clearLastSDKDiagnostic,
-  __testOverrideGetClient: () => __testOverrideGetClient,
-  LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV: () => LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV
-});
-import { hostname } from "node:os";
-function __testOverrideGetClient(factory) {
-  _testClientOverride = factory;
-}
-function safeDiagnosticString(value) {
-  if (value === null || value === undefined) {
-    return "";
-  }
-  if (typeof value === "string") {
-    return value;
-  }
-  try {
-    return JSON.stringify(value);
-  } catch {
-    return String(value);
-  }
-}
-function truncateDiagnostic(value) {
-  const text = safeDiagnosticString(value);
-  if (text.length <= SDK_DIAGNOSTIC_MAX_LEN) {
-    return text;
-  }
-  return `${text.slice(0, SDK_DIAGNOSTIC_MAX_LEN)}...[truncated, was ${text.length}b]`;
-}
-function captureSDKErrorDiagnostic(args) {
-  const diagnosticLine = truncateDiagnostic(args.map((arg) => safeDiagnosticString(arg)).join(" "));
-  const previous = lastSDKDiagnostic ?? { lines: [] };
-  lastSDKDiagnostic = {
-    lines: [...previous.lines, diagnosticLine].slice(-SDK_DIAGNOSTIC_MAX_LINES)
-  };
-}
-function consumeLastSDKDiagnostic() {
-  const diag = lastSDKDiagnostic;
-  lastSDKDiagnostic = null;
-  if (!diag || diag.lines.length === 0) {
-    return null;
-  }
-  return `sdk_error=${diag.lines.join(" || ")}`;
-}
-function clearLastSDKDiagnostic() {
-  lastSDKDiagnostic = null;
-}
-function getServerUrl() {
-  const settings = settingsManager.getSettings();
-  return process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
-}
-function getNodeRoutingHeader() {
-  const raw = process.env.LETTA_NODE;
-  if (raw === undefined || raw.trim() === "") {
-    return {};
-  }
-  const enabled = NODE_HEADER_ENABLED_VALUES.has(raw.trim().toLowerCase());
-  return { "x-letta-node": enabled ? "1" : "0" };
-}
-function getRuntimeEnvironmentDeviceId() {
-  return process.env[RUNTIME_ENVIRONMENT_DEVICE_ID_ENV]?.trim() || settingsManager.getOrCreateDeviceId();
-}
-function getClientDefaultHeaders() {
-  return {
-    "X-Letta-Source": "letta-code",
-    "User-Agent": `letta-code/${package_default.version}`,
-    "X-Letta-Environment-Device-Id": getRuntimeEnvironmentDeviceId(),
-    ...getNodeRoutingHeader(),
-    ...process.env.LETTA_MEMFS_BACKEND === "hosted" ? { "x-letta-memfs-backend": "hosted" } : {}
-  };
-}
-async function getClient() {
-  if (_testClientOverride) {
-    return await _testClientOverride();
-  }
-  const baseSettings = settingsManager.getSettings();
-  const cachedTokens = settingsManager.getCachedSecureTokens();
-  const cachedSettings = {
-    ...baseSettings,
-    env: {
-      ...baseSettings.env,
-      ...cachedTokens.apiKey && { LETTA_API_KEY: cachedTokens.apiKey }
-    },
-    refreshToken: cachedTokens.refreshToken ?? baseSettings.refreshToken
-  };
-  const settings = process.env.LETTA_API_KEY || cachedSettings.env?.LETTA_API_KEY || cachedSettings.refreshToken ? cachedSettings : await settingsManager.getSettingsWithSecureTokens();
-  let apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
-  if (!process.env.LETTA_API_KEY) {
-    if (apiKey) {
-      _cachedApiKey = apiKey;
-    } else if (_cachedApiKey) {
-      apiKey = _cachedApiKey;
-    }
-  }
-  if (!process.env.LETTA_API_KEY && settings.tokenExpiresAt && settings.refreshToken) {
-    const now = Date.now();
-    const expiresAt = settings.tokenExpiresAt;
-    if (!apiKey || expiresAt - now < 5 * 60 * 1000) {
-      try {
-        const deviceId = settingsManager.getOrCreateDeviceId();
-        const deviceName = hostname();
-        const tokens = await refreshAccessTokenSingleFlight(settings.refreshToken, deviceId, deviceName);
-        settingsManager.updateSettings({
-          env: { LETTA_API_KEY: tokens.access_token },
-          refreshToken: tokens.refresh_token || settings.refreshToken,
-          tokenExpiresAt: now + tokens.expires_in * 1000
-        });
-        apiKey = tokens.access_token;
-        _cachedApiKey = tokens.access_token;
-      } catch (error) {
-        trackBoundaryError({
-          errorType: "auth_token_refresh_failed",
-          error,
-          context: "auth_client_token_refresh"
-        });
-        console.error("Failed to refresh access token:", error);
-        console.error(`
-If you experience this issue multiple times, move ~/.letta to ~/.letta_backup, and re-run 'letta' to re-authenticate`);
-        throw new Error(`Failed to refresh access token: ${error instanceof Error ? error.message : String(error)}`);
-      }
-    }
-  }
-  const baseURL = process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
-  if (!apiKey && baseURL === LETTA_CLOUD_API_URL) {
-    console.error("Missing LETTA_API_KEY");
-    console.error("Run 'letta' to configure authentication, or set LETTA_API_KEY to your API key");
-    console.error(new Error("getClient() called without credentials").stack);
-    throw new Error("Missing LETTA_API_KEY. Run 'letta' to configure authentication, or set LETTA_API_KEY to your API key.");
-  }
-  const client = new Letta({
-    apiKey,
-    baseURL,
-    logger: sdkLogger,
-    timeout: Number(process.env.LETTA_REQUEST_TIMEOUT_MS) || 10 * 60 * 1000,
-    defaultHeaders: getClientDefaultHeaders(),
-    ...isTimingsEnabled() && { fetch: createTimingFetch(fetch) }
-  });
-  const MESSAGE_CACHE_MAX = 32;
-  const messageCache = new Map;
-  const origRetrieveMessage = client.messages.retrieve.bind(client.messages);
-  client.messages.retrieve = (...args) => {
-    const messageId = args[0];
-    const cached = messageCache.get(messageId);
-    if (cached) {
-      messageCache.delete(messageId);
-      messageCache.set(messageId, cached);
-      return cached;
-    }
-    const promise = origRetrieveMessage(...args);
-    messageCache.set(messageId, promise);
-    if (messageCache.size > MESSAGE_CACHE_MAX) {
-      const oldest = messageCache.keys().next().value;
-      if (oldest !== undefined)
-        messageCache.delete(oldest);
-    }
-    promise.catch(() => messageCache.delete(messageId));
-    return promise;
-  };
-  return client;
-}
-var SDK_DIAGNOSTIC_MAX_LEN = 400, SDK_DIAGNOSTIC_MAX_LINES = 4, lastSDKDiagnostic = null, _cachedApiKey, _testClientOverride = null, sdkLogger, NODE_HEADER_ENABLED_VALUES, RUNTIME_ENVIRONMENT_DEVICE_ID_ENV = "LETTA_RUNTIME_ENVIRONMENT_DEVICE_ID";
-var init_client2 = __esm(() => {
-  init_letta_client();
-  init_oauth();
-  init_oauth_refresh();
-  init_settings_manager();
-  init_error_reporting();
-  init_debug();
-  init_timing();
-  init_package();
-  init_memfs_git_proxy();
-  sdkLogger = {
-    error: (...args) => {
-      try {
-        captureSDKErrorDiagnostic(args);
-      } catch {}
-      if (isDebugEnabled()) {
-        console.error(...args);
-      }
-    },
-    warn: (...args) => {
-      console.warn(...args);
-    },
-    info: (...args) => {
-      console.info(...args);
-    },
-    debug: (...args) => {
-      console.debug(...args);
-    }
-  };
-  NODE_HEADER_ENABLED_VALUES = new Set(["1", "true", "yes"]);
-});
-
 // src/backend/api/http-headers.ts
 function getLettaCodeHeaders(apiKey) {
   return {
@@ -6140,8 +5771,8 @@ function parseUrl(value, options = {}) {
     return null;
   }
 }
-function isLoopbackHostname(hostname2) {
-  const normalized = hostname2.toLowerCase();
+function isLoopbackHostname(hostname) {
+  const normalized = hostname.toLowerCase();
   return normalized === "localhost" || normalized === "0.0.0.0" || normalized === "::1" || normalized === "[::1]" || normalized.startsWith("127.");
 }
 function isLoopbackUrl(value, options = {}) {
@@ -6150,6 +5781,15 @@ function isLoopbackUrl(value, options = {}) {
 }
 
 // src/backend/api/metadata.ts
+function getFeedbackClientType(env = process.env) {
+  if (env.LETTA_DESKTOP_MODE === "1") {
+    return "desktop";
+  }
+  if (env.LETTA_RUNTIME_ENVIRONMENT_DEVICE_ID) {
+    return "chat.letta.com";
+  }
+  return "cli";
+}
 async function getBalanceMetadata() {
   return apiRequest("GET", "/v1/metadata/balance");
 }
@@ -6198,6 +5838,38 @@ var init_metadata = __esm(() => {
   init_request();
 });
 
+// src/backend/api/server-url.ts
+var exports_server_url = {};
+__export(exports_server_url, {
+  isCloudServerUrl: () => isCloudServerUrl,
+  getServerUrl: () => getServerUrl
+});
+function getServerUrl() {
+  const settings = settingsManager.getSettings();
+  return process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
+}
+function isCloudServerUrl(serverUrl) {
+  let resolved = serverUrl;
+  if (resolved === undefined) {
+    try {
+      resolved = getServerUrl();
+    } catch {
+      resolved = process.env.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
+    }
+  }
+  try {
+    const parsed = new URL(resolved);
+    const cloud = new URL(LETTA_CLOUD_API_URL);
+    return parsed.hostname === cloud.hostname;
+  } catch {
+    return false;
+  }
+}
+var init_server_url = __esm(() => {
+  init_oauth();
+  init_settings_manager();
+});
+
 // src/version.ts
 var exports_version = {};
 __export(exports_version, {
@@ -6725,9 +6397,9 @@ class TelemetryManager {
 var telemetry;
 var init_telemetry = __esm(() => {
   init_oauth();
-  init_client2();
   init_health();
   init_metadata();
+  init_server_url();
   init_paths();
   init_settings_manager();
   init_debug();
@@ -6776,6 +6448,370 @@ function buildCreatedAgentTags(options = {}) {
 }
 var LETTA_CODE_ORIGIN_TAG = "origin:letta-code", ONBOARDING_ORIGIN_TAG = "origin:onboarding", LETTA_CODE_SUBAGENT_TAG = "role:subagent", GIT_MEMORY_ENABLED_TAG = "git-memory-enabled";
 
+// src/auth/oauth-refresh.ts
+async function refreshAccessTokenSingleFlight(refreshToken2, deviceId, deviceName, refresh = refreshAccessToken2) {
+  const refreshKey = `${refreshToken2}\x00${deviceId}`;
+  const existing = inFlightRefreshes.get(refreshKey);
+  if (existing) {
+    return await existing;
+  }
+  const pending = refresh(refreshToken2, deviceId, deviceName);
+  inFlightRefreshes.set(refreshKey, pending);
+  try {
+    return await pending;
+  } finally {
+    if (inFlightRefreshes.get(refreshKey) === pending) {
+      inFlightRefreshes.delete(refreshKey);
+    }
+  }
+}
+var inFlightRefreshes;
+var init_oauth_refresh = __esm(() => {
+  init_oauth();
+  inFlightRefreshes = new Map;
+});
+
+// src/utils/timing.ts
+function isTimingsEnabled() {
+  const val = process.env.LETTA_DEBUG_TIMINGS;
+  return val === "1" || val === "true";
+}
+function formatDuration(ms) {
+  if (ms < 1000)
+    return `${Math.round(ms)}ms`;
+  return `${(ms / 1000).toFixed(2)}s`;
+}
+function formatTimestamp(date) {
+  return date.toISOString().slice(11, 23);
+}
+function logTiming(message) {
+  if (isTimingsEnabled()) {
+    console.error(`[timing] ${message}`);
+  }
+}
+function markMilestone(name) {
+  const now = performance.now();
+  milestones.set(name, now);
+  if (firstMilestoneTime === null) {
+    firstMilestoneTime = now;
+  }
+  if (isTimingsEnabled()) {
+    const relative = now - firstMilestoneTime;
+    console.error(`[timing] MILESTONE ${name} at +${formatDuration(relative)} (${formatTimestamp(new Date)})`);
+  }
+}
+function measureSinceMilestone(label, fromMilestone) {
+  if (!isTimingsEnabled())
+    return;
+  const startTime = milestones.get(fromMilestone);
+  if (startTime === undefined) {
+    console.error(`[timing] WARNING: milestone "${fromMilestone}" not found for measurement "${label}"`);
+    return;
+  }
+  const duration = performance.now() - startTime;
+  console.error(`[timing] ${label}: ${formatDuration(duration)}`);
+}
+function reportAllMilestones() {
+  if (!isTimingsEnabled() || milestones.size === 0)
+    return;
+  const first = firstMilestoneTime ?? 0;
+  console.error(`[timing] ======== MILESTONE SUMMARY ========`);
+  const sorted = [...milestones.entries()].sort((a, b) => a[1] - b[1]);
+  let prevTime = first;
+  for (const [name, time] of sorted) {
+    const relativeToStart = time - first;
+    const delta = time - prevTime;
+    const deltaStr = prevTime === first ? "" : ` (+${formatDuration(delta)})`;
+    console.error(`[timing]   +${formatDuration(relativeToStart).padStart(8)} ${name}${deltaStr}`);
+    prevTime = time;
+  }
+  console.error(`[timing] =====================================`);
+}
+function createTimingFetch(baseFetch) {
+  return async (input, init) => {
+    const start = performance.now();
+    const startTime = formatTimestamp(new Date);
+    const url = typeof input === "string" ? input : input instanceof URL ? input.href : input.url;
+    const method = init?.method || "GET";
+    let path2;
+    try {
+      path2 = new URL(url).pathname;
+    } catch {
+      path2 = url;
+    }
+    logTiming(`${method} ${path2} started at ${startTime}`);
+    try {
+      const response = await baseFetch(input, init);
+      const duration = performance.now() - start;
+      logTiming(`${method} ${path2} -> ${formatDuration(duration)} (status: ${response.status})`);
+      return response;
+    } catch (error) {
+      const duration = performance.now() - start;
+      logTiming(`${method} ${path2} -> FAILED after ${formatDuration(duration)}`);
+      throw error;
+    }
+  };
+}
+var milestones, firstMilestoneTime = null;
+var init_timing = __esm(() => {
+  milestones = new Map;
+});
+
+// src/backend/api/memfs-git-proxy.ts
+var exports_memfs_git_proxy = {};
+__export(exports_memfs_git_proxy, {
+  getMemfsServerUrl: () => getMemfsServerUrl,
+  getMemfsGitProxyRewriteConfig: () => getMemfsGitProxyRewriteConfig,
+  LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV: () => LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV
+});
+function isLocalhostUrl(value) {
+  if (!value)
+    return false;
+  try {
+    const parsed = new URL(value);
+    return ["localhost", "127.0.0.1", "::1", "[::1]"].includes(parsed.hostname);
+  } catch {
+    return false;
+  }
+}
+function trimBaseUrl(value) {
+  return value.trim().replace(/\/+$/, "");
+}
+function getMemfsServerUrl() {
+  let settings = null;
+  try {
+    settings = settingsManager.getSettings();
+  } catch {}
+  const configuredMemfsUrl = process.env.LETTA_MEMFS_BASE_URL || settings?.env?.LETTA_MEMFS_BASE_URL;
+  if (configuredMemfsUrl) {
+    return configuredMemfsUrl;
+  }
+  return LETTA_CLOUD_API_URL;
+}
+function getMemfsGitProxyRewriteConfig(env = process.env) {
+  const rawProxyBaseUrl = env[LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV]?.trim();
+  if (!rawProxyBaseUrl || !isLocalhostUrl(rawProxyBaseUrl)) {
+    return null;
+  }
+  const memfsBaseUrl = trimBaseUrl(getMemfsServerUrl());
+  if (!memfsBaseUrl.includes("api.letta.com")) {
+    return null;
+  }
+  const proxyBaseUrl = trimBaseUrl(rawProxyBaseUrl);
+  const proxyPrefix = `${proxyBaseUrl}/v1/git/`;
+  const memfsPrefix = `${memfsBaseUrl}/v1/git/`;
+  return {
+    proxyBaseUrl,
+    memfsBaseUrl,
+    proxyPrefix,
+    memfsPrefix,
+    configKey: `url.${proxyPrefix}.insteadOf`,
+    configValue: memfsPrefix
+  };
+}
+var LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV = "LETTA_MEMFS_GIT_PROXY_BASE_URL";
+var init_memfs_git_proxy = __esm(() => {
+  init_oauth();
+  init_settings_manager();
+});
+
+// src/backend/api/client.ts
+var exports_client = {};
+__export(exports_client, {
+  getRuntimeEnvironmentDeviceId: () => getRuntimeEnvironmentDeviceId,
+  getMemfsServerUrl: () => getMemfsServerUrl,
+  getMemfsGitProxyRewriteConfig: () => getMemfsGitProxyRewriteConfig,
+  getClientDefaultHeaders: () => getClientDefaultHeaders,
+  getClient: () => getClient,
+  consumeLastSDKDiagnostic: () => consumeLastSDKDiagnostic,
+  clearLastSDKDiagnostic: () => clearLastSDKDiagnostic,
+  __testOverrideGetClient: () => __testOverrideGetClient,
+  LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV: () => LETTA_MEMFS_GIT_PROXY_BASE_URL_ENV
+});
+import { hostname } from "node:os";
+function __testOverrideGetClient(factory) {
+  _testClientOverride = factory;
+}
+function safeDiagnosticString(value) {
+  if (value === null || value === undefined) {
+    return "";
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+function truncateDiagnostic(value) {
+  const text = safeDiagnosticString(value);
+  if (text.length <= SDK_DIAGNOSTIC_MAX_LEN) {
+    return text;
+  }
+  return `${text.slice(0, SDK_DIAGNOSTIC_MAX_LEN)}...[truncated, was ${text.length}b]`;
+}
+function captureSDKErrorDiagnostic(args) {
+  const diagnosticLine = truncateDiagnostic(args.map((arg) => safeDiagnosticString(arg)).join(" "));
+  const previous = lastSDKDiagnostic ?? { lines: [] };
+  lastSDKDiagnostic = {
+    lines: [...previous.lines, diagnosticLine].slice(-SDK_DIAGNOSTIC_MAX_LINES)
+  };
+}
+function consumeLastSDKDiagnostic() {
+  const diag = lastSDKDiagnostic;
+  lastSDKDiagnostic = null;
+  if (!diag || diag.lines.length === 0) {
+    return null;
+  }
+  return `sdk_error=${diag.lines.join(" || ")}`;
+}
+function clearLastSDKDiagnostic() {
+  lastSDKDiagnostic = null;
+}
+function getNodeRoutingHeader() {
+  const raw = process.env.LETTA_NODE;
+  if (raw === undefined || raw.trim() === "") {
+    return {};
+  }
+  const enabled = NODE_HEADER_ENABLED_VALUES.has(raw.trim().toLowerCase());
+  return { "x-letta-node": enabled ? "1" : "0" };
+}
+function getRuntimeEnvironmentDeviceId() {
+  return process.env[RUNTIME_ENVIRONMENT_DEVICE_ID_ENV]?.trim() || settingsManager.getOrCreateDeviceId();
+}
+function getClientDefaultHeaders() {
+  return {
+    "X-Letta-Source": "letta-code",
+    "User-Agent": `letta-code/${package_default.version}`,
+    "X-Letta-Environment-Device-Id": getRuntimeEnvironmentDeviceId(),
+    ...getNodeRoutingHeader(),
+    ...process.env.LETTA_MEMFS_BACKEND === "hosted" ? { "x-letta-memfs-backend": "hosted" } : {}
+  };
+}
+async function getClient() {
+  if (_testClientOverride) {
+    return await _testClientOverride();
+  }
+  const baseSettings = settingsManager.getSettings();
+  const cachedTokens = settingsManager.getCachedSecureTokens();
+  const cachedSettings = {
+    ...baseSettings,
+    env: {
+      ...baseSettings.env,
+      ...cachedTokens.apiKey && { LETTA_API_KEY: cachedTokens.apiKey }
+    },
+    refreshToken: cachedTokens.refreshToken ?? baseSettings.refreshToken
+  };
+  const settings = process.env.LETTA_API_KEY || cachedSettings.env?.LETTA_API_KEY || cachedSettings.refreshToken ? cachedSettings : await settingsManager.getSettingsWithSecureTokens();
+  let apiKey = process.env.LETTA_API_KEY || settings.env?.LETTA_API_KEY;
+  if (!process.env.LETTA_API_KEY) {
+    if (apiKey) {
+      _cachedApiKey = apiKey;
+    } else if (_cachedApiKey) {
+      apiKey = _cachedApiKey;
+    }
+  }
+  if (!process.env.LETTA_API_KEY && settings.tokenExpiresAt && settings.refreshToken) {
+    const now = Date.now();
+    const expiresAt = settings.tokenExpiresAt;
+    if (!apiKey || expiresAt - now < 5 * 60 * 1000) {
+      try {
+        const deviceId = settingsManager.getOrCreateDeviceId();
+        const deviceName = hostname();
+        const tokens = await refreshAccessTokenSingleFlight(settings.refreshToken, deviceId, deviceName);
+        settingsManager.updateSettings({
+          env: { LETTA_API_KEY: tokens.access_token },
+          refreshToken: tokens.refresh_token || settings.refreshToken,
+          tokenExpiresAt: now + tokens.expires_in * 1000
+        });
+        apiKey = tokens.access_token;
+        _cachedApiKey = tokens.access_token;
+      } catch (error) {
+        trackBoundaryError({
+          errorType: "auth_token_refresh_failed",
+          error,
+          context: "auth_client_token_refresh"
+        });
+        console.error("Failed to refresh access token:", error);
+        console.error(`
+If you experience this issue multiple times, move ~/.letta to ~/.letta_backup, and re-run 'letta' to re-authenticate`);
+        throw new Error(`Failed to refresh access token: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    }
+  }
+  const baseURL = process.env.LETTA_BASE_URL || settings.env?.LETTA_BASE_URL || LETTA_CLOUD_API_URL;
+  if (!apiKey && baseURL === LETTA_CLOUD_API_URL) {
+    console.error("Missing LETTA_API_KEY");
+    console.error("Run 'letta' to configure authentication, or set LETTA_API_KEY to your API key");
+    console.error(new Error("getClient() called without credentials").stack);
+    throw new Error("Missing LETTA_API_KEY. Run 'letta' to configure authentication, or set LETTA_API_KEY to your API key.");
+  }
+  const client = new Letta({
+    apiKey,
+    baseURL,
+    logger: sdkLogger,
+    timeout: Number(process.env.LETTA_REQUEST_TIMEOUT_MS) || 10 * 60 * 1000,
+    defaultHeaders: getClientDefaultHeaders(),
+    ...isTimingsEnabled() && { fetch: createTimingFetch(fetch) }
+  });
+  const MESSAGE_CACHE_MAX = 32;
+  const messageCache = new Map;
+  const origRetrieveMessage = client.messages.retrieve.bind(client.messages);
+  client.messages.retrieve = (...args) => {
+    const messageId = args[0];
+    const cached = messageCache.get(messageId);
+    if (cached) {
+      messageCache.delete(messageId);
+      messageCache.set(messageId, cached);
+      return cached;
+    }
+    const promise = origRetrieveMessage(...args);
+    messageCache.set(messageId, promise);
+    if (messageCache.size > MESSAGE_CACHE_MAX) {
+      const oldest = messageCache.keys().next().value;
+      if (oldest !== undefined)
+        messageCache.delete(oldest);
+    }
+    promise.catch(() => messageCache.delete(messageId));
+    return promise;
+  };
+  return client;
+}
+var SDK_DIAGNOSTIC_MAX_LEN = 400, SDK_DIAGNOSTIC_MAX_LINES = 4, lastSDKDiagnostic = null, _cachedApiKey, _testClientOverride = null, sdkLogger, NODE_HEADER_ENABLED_VALUES, RUNTIME_ENVIRONMENT_DEVICE_ID_ENV = "LETTA_RUNTIME_ENVIRONMENT_DEVICE_ID";
+var init_client2 = __esm(() => {
+  init_letta_client();
+  init_oauth();
+  init_oauth_refresh();
+  init_settings_manager();
+  init_error_reporting();
+  init_debug();
+  init_timing();
+  init_package();
+  init_memfs_git_proxy();
+  sdkLogger = {
+    error: (...args) => {
+      try {
+        captureSDKErrorDiagnostic(args);
+      } catch {}
+      if (isDebugEnabled()) {
+        console.error(...args);
+      }
+    },
+    warn: (...args) => {
+      console.warn(...args);
+    },
+    info: (...args) => {
+      console.info(...args);
+    },
+    debug: (...args) => {
+      console.debug(...args);
+    }
+  };
+  NODE_HEADER_ENABLED_VALUES = new Set(["1", "true", "yes"]);
+});
+
 // src/utils/text-files.ts
 import { readFile as readFile2, writeFile as writeFile2 } from "node:fs/promises";
 function getUtf16Bom(bytes) {
@@ -88170,6 +88206,30 @@ var init_tool_return_clamp = __esm(() => {
   init_truncation();
 });
 
+// src/tools/task-tool-assets.ts
+function stripComputerFromTaskSchema(schema5) {
+  const properties4 = schema5.properties;
+  if (!properties4 || !Object.hasOwn(properties4, "computer")) {
+    return schema5;
+  }
+  const { computer: _computer, ...rest3 } = properties4;
+  return { ...schema5, properties: rest3 };
+}
+function stripComputerFromTaskDescription(description) {
+  const start = description.indexOf(COMPUTER_SECTION_HEADING);
+  if (start === -1) {
+    return description;
+  }
+  const afterHeading = start + COMPUTER_SECTION_HEADING.length;
+  const next = description.indexOf(`
+## `, afterHeading);
+  const removed = next === -1 ? description.slice(0, start) : description.slice(0, start) + description.slice(next + 1);
+  return removed.replace(/\n{3,}/g, `
+
+`).trimEnd();
+}
+var COMPUTER_SECTION_HEADING = "## Running on Another Computer";
+
 // src/tools/define-tool.ts
 function defineTool(input) {
   return {
@@ -90810,6 +90870,9 @@ function createSharedReminderState() {
     hasSentSecretsInfo: false,
     pendingSecretsInfoRefresh: false,
     lastSentSecretNamesKey: null,
+    hasSentMcpServersInfo: false,
+    lastSentMcpServerNamesKey: null,
+    lastMcpServersFetchedAtMs: null,
     lastNotifiedPermissionMode: null,
     turnCount: 0,
     pendingReflectionTrigger: false,
@@ -90826,6 +90889,8 @@ function markPostCompactionContextRemindersPending(state) {
   state.hasSentSessionContext = false;
   state.pendingSessionContextReason ??= "post_compaction";
   state.hasSentSecretsInfo = false;
+  state.hasSentMcpServersInfo = false;
+  state.lastMcpServersFetchedAtMs = null;
   state.lastNotifiedPermissionMode = null;
 }
 function syncReminderStateFromContextTracker(state, contextTracker) {
@@ -93661,7 +93726,7 @@ var LETTA_BIN_ARGS_ENV = "LETTA_CODE_BIN_ARGS_JSON", SHELL_SHIM_DIR_NAME = "lett
 var init_shell_env = __esm(() => {
   init_context();
   init_memory_filesystem2();
-  init_client2();
+  init_server_url();
   init_paths();
   init_runtime_context();
   init_settings_manager();
@@ -113383,8 +113448,7 @@ var init_skills3 = __esm(() => {
   init_skill_sources();
   LOCAL_AGENT_EXCLUDED_BUNDLED_SKILLS = new Set([
     "image-generation",
-    "managing-shared-memory",
-    "using-cloud-mcp"
+    "managing-shared-memory"
   ]);
   PROJECT_SKILLS_DIR = join24(".agents", "skills");
   GLOBAL_SKILLS_DIR = join24(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
@@ -115525,6 +115589,17 @@ async function task(args) {
   if (!config) {
     return `Error: Invalid subagent type "${subagent_type}"`;
   }
+  if (typeof args.computer === "string" && args.computer.trim()) {
+    let environmentRouting = false;
+    try {
+      environmentRouting = getBackend().capabilities.environmentRouting;
+    } catch {
+      environmentRouting = false;
+    }
+    if (!environmentRouting) {
+      return "Error: The computer option requires a Letta Cloud backend. This backend has no connected computers; omit the computer field to run the subagent on the current machine.";
+    }
+  }
   let effectiveAgentId = args.agent_id;
   let effectiveConversationId = args.conversation_id;
   if (config.fork) {
@@ -118106,6 +118181,21 @@ ${WINDOWS_UNIFIED_EXEC_GUIDANCE}`;
 
 // src/tools/memory-tool-assets.ts
 async function resolveBackendSpecificToolAssets(name, description, inputSchema) {
+  if (name === "Task") {
+    let environmentRouting = false;
+    try {
+      environmentRouting = getBackend().capabilities.environmentRouting;
+    } catch {
+      environmentRouting = false;
+    }
+    if (!environmentRouting) {
+      return {
+        description: stripComputerFromTaskDescription(description),
+        inputSchema: stripComputerFromTaskSchema(inputSchema)
+      };
+    }
+    return { description, inputSchema };
+  }
   let isLocalMemfs = false;
   try {
     isLocalMemfs = getBackend().capabilities.localMemfs;
@@ -125779,7 +125869,7 @@ async function applyMemfsFlags(agentId, memfsFlag, options) {
   };
 }
 async function isLettaCloud() {
-  const { getServerUrl: getServerUrl2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
+  const { getServerUrl: getServerUrl2 } = await Promise.resolve().then(() => (init_server_url(), exports_server_url));
   const serverUrl = getServerUrl2();
   return serverUrl.includes("api.letta.com") || process.env.LETTA_MEMFS_LOCAL === "1" || process.env.LETTA_API_KEY === "local-desktop";
 }
@@ -130984,6 +131074,7 @@ var init_local_provider_errors = __esm(() => {
 var exports_fake_headless_backend = {};
 __export(exports_fake_headless_backend, {
   HeadlessBackend: () => HeadlessBackend,
+  HEADLESS_BACKEND_CAPABILITIES: () => HEADLESS_BACKEND_CAPABILITIES,
   FakeHeadlessBackend: () => HeadlessBackend
 });
 function createPage(items3) {
@@ -131077,16 +131168,7 @@ function isTerminalRun(run) {
 }
 
 class HeadlessBackend {
-  capabilities = {
-    remoteMemfs: false,
-    serverSideToolManagement: false,
-    serverSecrets: false,
-    agentFileImportExport: false,
-    promptRecompile: false,
-    byokProviderRefresh: false,
-    localModelCatalog: true,
-    localMemfs: false
-  };
+  capabilities = HEADLESS_BACKEND_CAPABILITIES;
   store;
   executor;
   runs = new Map;
@@ -131462,13 +131544,24 @@ class HeadlessBackend {
     };
   }
 }
-var FAKE_HEADLESS_MODEL = "dev/fake-headless";
+var FAKE_HEADLESS_MODEL = "dev/fake-headless", HEADLESS_BACKEND_CAPABILITIES;
 var init_fake_headless_backend = __esm(() => {
   init_model_handles();
   init_local_store();
   init_local_stream_chunks();
   init_constants2();
   init_local_provider_errors();
+  HEADLESS_BACKEND_CAPABILITIES = {
+    remoteMemfs: false,
+    serverSideToolManagement: false,
+    serverSecrets: false,
+    agentFileImportExport: false,
+    promptRecompile: false,
+    byokProviderRefresh: false,
+    localModelCatalog: true,
+    localMemfs: false,
+    environmentRouting: false
+  };
 });
 
 // src/backend/dev/headless-backend.ts
@@ -135121,13 +135214,8 @@ var init_local_backend = __esm(() => {
   init_system_prompt_compilation();
   LocalBackend = class LocalBackend extends HeadlessBackend {
     capabilities = {
-      remoteMemfs: false,
-      serverSideToolManagement: false,
-      serverSecrets: false,
-      agentFileImportExport: false,
+      ...HEADLESS_BACKEND_CAPABILITIES,
       promptRecompile: true,
-      byokProviderRefresh: false,
-      localModelCatalog: true,
       localMemfs: true
     };
     memoryDir;
@@ -135554,16 +135642,19 @@ function toApiConversationMessageListBody(body) {
 }
 
 class APIBackend {
-  capabilities = {
-    remoteMemfs: true,
-    serverSideToolManagement: true,
-    serverSecrets: true,
-    agentFileImportExport: true,
-    promptRecompile: true,
-    byokProviderRefresh: true,
-    localModelCatalog: false,
-    localMemfs: false
-  };
+  get capabilities() {
+    return {
+      remoteMemfs: true,
+      serverSideToolManagement: true,
+      serverSecrets: true,
+      agentFileImportExport: true,
+      promptRecompile: true,
+      byokProviderRefresh: true,
+      localModelCatalog: false,
+      localMemfs: false,
+      environmentRouting: isCloudServerUrl()
+    };
+  }
   getApiClientOverride;
   forkConversationOverride;
   constructor(deps = {}) {
@@ -135785,6 +135876,7 @@ function __testSetBackend(nextBackend) {
 }
 var DEFAULT_CONVERSATION_MESSAGE_ORDER = "desc", backend = null;
 var init_backend = __esm(() => {
+  init_server_url();
   init_backend_mode();
   init_local_backend();
   init_paths();
@@ -185598,6 +185690,8 @@ function buildChannelFeedbackPayload(submission) {
   return withDefinedValues2({
     message: submission.message,
     feature: CHANNEL_FEEDBACK_FEATURE,
+    submission_source: "slash_command",
+    client_type: process.env.LETTA_DESKTOP_MODE === "1" ? "desktop" : "cli",
     version: getVersion(),
     platform: process.platform,
     channel: submission.channel,
@@ -199352,330 +199446,6 @@ 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) {
@@ -200799,7 +200569,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 parseArgs5 } from "node:util";
+import { parseArgs as parseArgs4 } from "node:util";
 function readStringOption(value) {
   if (typeof value === "string") {
     return value;
@@ -200891,7 +200661,7 @@ async function runConnectSubcommand(argv, deps = {}) {
   const io = { ...DEFAULT_DEPS2, ...deps };
   let parsed;
   try {
-    parsed = parseArgs5({
+    parsed = parseArgs4({
       args: argv,
       options: CONNECT_OPTIONS,
       strict: true,
@@ -210101,8 +209871,8 @@ var init_cron_task_ref = __esm(async () => {
 });
 
 // src/cli/subcommands/cron.ts
-import { parseArgs as parseArgs6 } from "node:util";
-function printUsage5() {
+import { parseArgs as parseArgs5 } from "node:util";
+function printUsage4() {
   console.log(`
 Usage:
   letta cron add --prompt <text> --every <interval> [options]
@@ -210156,7 +209926,7 @@ Output is JSON.
 `.trim());
 }
 function parseCronArgs(argv) {
-  return parseArgs6({
+  return parseArgs5({
     args: argv,
     options: CRON_OPTIONS,
     strict: true,
@@ -210712,12 +210482,12 @@ async function runCronSubcommand(argv) {
     parsed = parseCronArgs(argv);
   } catch (err) {
     console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
-    printUsage5();
+    printUsage4();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage5();
+    printUsage4();
     return 0;
   }
   switch (action3) {
@@ -210734,7 +210504,7 @@ async function runCronSubcommand(argv) {
       return handleDelete(parsed.values, parsed.positionals);
     default:
       console.error(`Unknown action: ${action3}`);
-      printUsage5();
+      printUsage4();
       return 1;
   }
 }
@@ -210770,8 +210540,8 @@ var init_cron2 = __esm(async () => {
 });
 
 // src/cli/subcommands/environments.ts
-import { parseArgs as parseArgs7 } from "node:util";
-function printUsage6() {
+import { parseArgs as parseArgs6 } from "node:util";
+function printUsage5() {
   console.log(`
 Usage:
   letta environments list [options]
@@ -210839,7 +210609,7 @@ function scoreCurrentEnvironment(environment2, options) {
   return score;
 }
 function parseEnvironmentsArgs(argv) {
-  return parseArgs7({
+  return parseArgs6({
     args: argv,
     options: ENVIRONMENTS_OPTIONS,
     strict: true,
@@ -210853,17 +210623,17 @@ async function runEnvironmentsSubcommand(argv, deps = {}) {
   } catch (error4) {
     const message = error4 instanceof Error ? error4.message : String(error4);
     console.error(`Error: ${message}`);
-    printUsage6();
+    printUsage5();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage6();
+    printUsage5();
     return 0;
   }
   if (action3 !== "list" && action3 !== "current") {
     console.error(`Unknown action: ${action3}`);
-    printUsage6();
+    printUsage5();
     return 1;
   }
   await (deps.initializeSettings ?? (() => settingsManager.initialize()))();
@@ -210925,8 +210695,8 @@ var init_environments3 = __esm(() => {
 });
 
 // src/cli/subcommands/feedback.ts
-import { parseArgs as parseArgs8 } from "node:util";
-function printUsage7(stdout = console.log) {
+import { parseArgs as parseArgs7 } from "node:util";
+function printUsage6(stdout = console.log) {
   stdout(`
 Usage:
   letta feedback --message <text>
@@ -210944,7 +210714,7 @@ async function runFeedbackSubcommand(argv, deps = {}) {
   const stderr = deps.stderr ?? console.error;
   let parsed;
   try {
-    parsed = parseArgs8({
+    parsed = parseArgs7({
       args: argv,
       options: {
         help: { type: "boolean", short: "h" },
@@ -210955,11 +210725,11 @@ async function runFeedbackSubcommand(argv, deps = {}) {
     });
   } catch (error4) {
     stderr(error4 instanceof Error ? error4.message : String(error4));
-    printUsage7(stdout);
+    printUsage6(stdout);
     return 1;
   }
   if (parsed.values.help) {
-    printUsage7(stdout);
+    printUsage6(stdout);
     return 0;
   }
   const message = typeof parsed.values.message === "string" ? parsed.values.message.trim() : "";
@@ -210982,6 +210752,8 @@ async function runFeedbackSubcommand(argv, deps = {}) {
     await (deps.submitFeedback ?? submitFeedbackMetadata)(apiKey, (deps.getDeviceId ?? (() => settingsManager.getOrCreateDeviceId()))(), {
       message,
       feature: "letta-code-agent-feedback",
+      submission_source: "agent_skill",
+      client_type: (deps.getClientType ?? getFeedbackClientType)(),
       version: getVersion(),
       platform: process.platform,
       agent_id: agentId || undefined,
@@ -238705,9 +238477,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(stringValue4) {
+    function parsePseudoBigInt(stringValue3) {
       let log2Base;
-      switch (stringValue4.charCodeAt(1)) {
+      switch (stringValue3.charCodeAt(1)) {
         case 98:
         case 66:
           log2Base = 1;
@@ -238721,19 +238493,19 @@ ${lanes.join(`
           log2Base = 4;
           break;
         default:
-          const nIndex = stringValue4.length - 1;
+          const nIndex = stringValue3.length - 1;
           let nonZeroStart = 0;
-          while (stringValue4.charCodeAt(nonZeroStart) === 48) {
+          while (stringValue3.charCodeAt(nonZeroStart) === 48) {
             nonZeroStart++;
           }
-          return stringValue4.slice(nonZeroStart, nIndex) || "0";
+          return stringValue3.slice(nonZeroStart, nIndex) || "0";
       }
-      const startIndex = 2, endIndex = stringValue4.length - 1;
+      const startIndex = 2, endIndex = stringValue3.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 = stringValue4.charCodeAt(i4);
+        const digitChar = stringValue3.charCodeAt(i4);
         const digit = digitChar <= 57 ? digitChar - 48 : 10 + digitChar - (digitChar <= 70 ? 65 : 97);
         const shiftedDigit = digit << (bitOffset & 15);
         segments[segment] |= shiftedDigit;
@@ -391797,7 +391569,7 @@ function toRunsArray(listResponse) {
   }
   return [];
 }
-function withTimeout2(promise, timeoutMs, timeoutMessage) {
+function withTimeout(promise, timeoutMs, timeoutMessage) {
   return new Promise((resolve34, reject2) => {
     const timer = setTimeout(() => reject2(new Error(timeoutMessage)), timeoutMs);
     promise.then((value) => {
@@ -391811,7 +391583,7 @@ function withTimeout2(promise, timeoutMs, timeoutMessage) {
 }
 async function discoverFallbackRunIdWithTimeout(ctx) {
   const client = await getClient();
-  return withTimeout2(discoverFallbackRunIdForResume(client, ctx), FALLBACK_RUN_DISCOVERY_TIMEOUT_MS, `Fallback run discovery timed out after ${FALLBACK_RUN_DISCOVERY_TIMEOUT_MS}ms`);
+  return withTimeout(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"];
@@ -392548,7 +392320,7 @@ function formatMissingRequiredArgsReason(toolName, parsedArgs, missingRequiredAr
   }
   return base2;
 }
-function parseToolArgs2(rawArgs) {
+function parseToolArgs(rawArgs) {
   const raw2 = rawArgs ?? "";
   const trimmed = raw2.trim();
   if (!trimmed) {
@@ -392593,7 +392365,7 @@ async function classifyApprovals(approvals, opts = {}) {
       });
       continue;
     }
-    const argsParse = parseToolArgs2(approval.toolArgs);
+    const argsParse = parseToolArgs(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`);
@@ -403485,6 +403257,16 @@ var init_catalog = __esm(() => {
         "listen"
       ]
     },
+    {
+      id: "mcp-servers-info",
+      description: "MCP servers with tools available through letta mcp",
+      modes: [
+        "interactive",
+        "headless-one-shot",
+        "headless-bidirectional",
+        "listen"
+      ]
+    },
     {
       id: "permission-mode",
       description: "Permission mode reminder",
@@ -403520,6 +403302,167 @@ var init_catalog = __esm(() => {
   SHARED_REMINDER_BY_ID = new Map(SHARED_REMINDER_CATALOG.map((entry) => [entry.id, entry]));
 });
 
+// src/backend/api/unified-mcp.ts
+var exports_unified_mcp = {};
+__export(exports_unified_mcp, {
+  searchUnifiedMcpTools: () => searchUnifiedMcpTools,
+  runUnifiedMcpTool: () => runUnifiedMcpTool,
+  listUnifiedMcpTools: () => listUnifiedMcpTools,
+  listUnifiedMcpServers: () => listUnifiedMcpServers
+});
+function stringField2(value, key2) {
+  return typeof value[key2] === "string" ? value[key2] : null;
+}
+function recordField(value, ...names2) {
+  for (const name of names2) {
+    const field = value[name];
+    if (isRecord(field))
+      return field;
+  }
+  return;
+}
+function parseServer(value, registered) {
+  if (!isRecord(value))
+    return null;
+  const id2 = stringField2(value, "id");
+  const serverName = stringField2(value, "server_name") ?? (registered ? stringField2(registered, "server_name") : null);
+  const serverType = stringField2(value, "mcp_server_type") ?? (registered ? stringField2(registered, "mcp_server_type") : null) ?? "unknown";
+  if (!id2 || !serverName)
+    return null;
+  const serverUrl = stringField2(value, "server_url") ?? (registered ? stringField2(registered, "server_url") : null) ?? undefined;
+  const command = stringField2(value, "command") ?? (registered ? stringField2(registered, "command") : null) ?? undefined;
+  const argsValue = value.args ?? registered?.args;
+  const args = Array.isArray(argsValue) ? argsValue.filter((item) => typeof item === "string") : [];
+  const target2 = serverUrl ?? [command, ...args].filter(Boolean).join(" ");
+  return {
+    id: id2,
+    serverName,
+    serverType,
+    target: target2,
+    ...serverUrl ? { serverUrl } : {},
+    ...command ? { command, args } : {}
+  };
+}
+function parseTool(value) {
+  if (!isRecord(value))
+    return null;
+  const id2 = stringField2(value, "id");
+  const name = stringField2(value, "name");
+  if (!id2 || !name)
+    return null;
+  const description = stringField2(value, "description");
+  const jsonSchema = isRecord(value.json_schema) ? value.json_schema : {};
+  const inputSchema = isRecord(jsonSchema.parameters) ? jsonSchema.parameters : isRecord(value.args_json_schema) ? value.args_json_schema : { type: "object", properties: {} };
+  const title = stringField2(value, "title") ?? stringField2(jsonSchema, "title");
+  const outputSchema = recordField(value, "outputSchema", "output_schema") ?? recordField(jsonSchema, "outputSchema", "output_schema");
+  const annotations = recordField(value, "annotations") ?? recordField(jsonSchema, "annotations");
+  const execution = recordField(value, "execution") ?? recordField(jsonSchema, "execution");
+  const meta = recordField(value, "_meta") ?? recordField(jsonSchema, "_meta");
+  const iconsValue = value.icons ?? jsonSchema.icons;
+  const icons = Array.isArray(iconsValue) ? iconsValue.filter(isRecord) : undefined;
+  return {
+    id: id2,
+    name,
+    ...title ? { title } : {},
+    description,
+    inputSchema,
+    ...outputSchema ? { outputSchema } : {},
+    ...annotations ? { annotations } : {},
+    ...execution ? { execution } : {},
+    ...meta ? { _meta: meta } : {},
+    ...icons ? { icons } : {}
+  };
+}
+function parseRunResult(value) {
+  if (!isRecord(value))
+    throw new Error("Invalid MCP tool run response");
+  return {
+    status: stringField2(value, "status") ?? "unknown",
+    funcReturn: value.func_return,
+    stdout: value.stdout,
+    stderr: value.stderr
+  };
+}
+function parseSearchResult(value) {
+  if (!isRecord(value) || !isRecord(value.tool))
+    return null;
+  const toolId = stringField2(value.tool, "id");
+  const jsonSchema = value.tool.json_schema;
+  const score = value.combined_score;
+  if (!toolId || jsonSchema !== null && !isRecord(jsonSchema) || typeof score !== "number") {
+    return null;
+  }
+  return { toolId, jsonSchema, score };
+}
+async function withTimeout2(promise, timeoutMs, operation) {
+  let timer;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise((_resolve, reject2) => {
+        timer = setTimeout(() => reject2(new Error(`${operation} timed out after ${timeoutMs}ms`)), timeoutMs);
+      })
+    ]);
+  } finally {
+    if (timer)
+      clearTimeout(timer);
+  }
+}
+async function listUnifiedMcpServers(client, agentId, timeoutMs = 1e4) {
+  const value = await withTimeout2(client.get(`/v1/agents/${encodeURIComponent(agentId)}/mcp-servers`), timeoutMs, "Listing agent MCP servers");
+  if (!Array.isArray(value))
+    return [];
+  const needsEnrichment = value.some((item) => isRecord(item) && !stringField2(item, "mcp_server_type"));
+  const registeredById = new Map;
+  if (needsEnrichment && client.mcpServers) {
+    try {
+      const registered = await withTimeout2(client.mcpServers.list(), timeoutMs, "Listing registered MCP servers");
+      for (const item of registered) {
+        if (!isRecord(item))
+          continue;
+        const id2 = stringField2(item, "id");
+        if (id2)
+          registeredById.set(id2, item);
+      }
+    } catch {}
+  }
+  return value.map((item) => {
+    const registered = isRecord(item) ? registeredById.get(stringField2(item, "id") ?? "") : undefined;
+    return parseServer(item, registered);
+  }).filter((server2) => server2 !== null);
+}
+async function listUnifiedMcpTools(client, agentId, mcpServerId, timeoutMs = 1e4) {
+  const value = await withTimeout2(client.get(`/v1/agents/${encodeURIComponent(agentId)}/mcp-servers/${encodeURIComponent(mcpServerId)}/tools`), timeoutMs, "Listing agent MCP server tools");
+  if (!Array.isArray(value))
+    return [];
+  return value.map(parseTool).filter((tool) => tool !== null);
+}
+async function searchUnifiedMcpTools(params) {
+  const value = await withTimeout2(params.client.post(`/v1/agents/${encodeURIComponent(params.agentId)}/mcp-servers/tools/search`, {
+    body: {
+      query: params.query,
+      search_mode: params.searchMode,
+      limit: params.limit
+    }
+  }), params.timeoutMs ?? 60000, "Searching agent MCP tools");
+  if (!Array.isArray(value)) {
+    throw new Error("Invalid MCP tool search response");
+  }
+  const results = [];
+  for (const item of value) {
+    const result2 = parseSearchResult(item);
+    if (!result2)
+      throw new Error("Invalid MCP tool search result");
+    results.push(result2);
+  }
+  return results;
+}
+async function runUnifiedMcpTool(params) {
+  const value = await withTimeout2(params.client.post(`/v1/agents/${encodeURIComponent(params.agentId)}/mcp-servers/${encodeURIComponent(params.mcpServerId)}/tools/${encodeURIComponent(params.toolId)}/run`, { body: { args: params.args } }), params.timeoutMs ?? 60000, "Running agent MCP tool");
+  return parseRunResult(value);
+}
+var init_unified_mcp = () => {};
+
 // src/reminders/engine.ts
 async function buildAgentInfoReminder(context3) {
   if (!context3.systemInfoReminderEnabled || context3.state.hasSentAgentInfo) {
@@ -403579,6 +403522,80 @@ ${SYSTEM_REMINDER_CLOSE}`;
     return null;
   }
 }
+async function defaultListServerSideServers(agentId) {
+  let serverSideAvailable = false;
+  try {
+    const { getBackend: getBackend2 } = await Promise.resolve().then(() => (init_backend2(), exports_backend));
+    serverSideAvailable = getBackend2().capabilities.serverSideToolManagement;
+  } catch {
+    return null;
+  }
+  if (!serverSideAvailable) {
+    return null;
+  }
+  const { getClient: getClient2 } = await Promise.resolve().then(() => (init_client2(), exports_client));
+  const { getServerUrl: getServerUrl2 } = await Promise.resolve().then(() => (init_server_url(), exports_server_url));
+  const { LETTA_CLOUD_API_URL: LETTA_CLOUD_API_URL2 } = await Promise.resolve().then(() => (init_oauth(), exports_oauth));
+  const { listUnifiedMcpServers: listUnifiedMcpServers2, listUnifiedMcpTools: listUnifiedMcpTools2 } = await Promise.resolve().then(() => (init_unified_mcp(), exports_unified_mcp));
+  const client = await getClient2();
+  const allServers = await listUnifiedMcpServers2(client, agentId, 3000);
+  const servers = getServerUrl2() === LETTA_CLOUD_API_URL2 ? allServers.filter((server2) => server2.serverType !== "stdio") : allServers;
+  return Promise.all(servers.map(async (server2) => ({
+    name: server2.serverName,
+    toolCount: await listUnifiedMcpTools2(client, agentId, server2.id, 3000).then((tools) => tools.length).catch(() => null)
+  })));
+}
+function formatMcpServerEntry(entry) {
+  if (entry.toolCount === null) {
+    return entry.name;
+  }
+  return `${entry.name} (${entry.toolCount} ${entry.toolCount === 1 ? "tool" : "tools"})`;
+}
+async function buildMcpServersInfoReminderText(context3, deps = {}) {
+  try {
+    const now2 = Date.now();
+    const lastFetched = context3.state.lastMcpServersFetchedAtMs;
+    const due = !context3.state.hasSentMcpServersInfo || lastFetched === null || now2 - lastFetched > MCP_SERVERS_REFRESH_MS;
+    if (!due) {
+      return null;
+    }
+    context3.state.lastMcpServersFetchedAtMs = now2;
+    const localNames = (deps.getLocalServerNames ?? ((agentId) => settingsManager.getMcpServers(agentId).map((server2) => server2.name)))(context3.agent.id);
+    const entries = localNames.map((name) => ({
+      name,
+      toolCount: null
+    }));
+    const serverSideEntries = await (deps.listServerSideServers ?? defaultListServerSideServers)(context3.agent.id);
+    if (serverSideEntries) {
+      entries.push(...serverSideEntries);
+    }
+    const uniqueEntries = [
+      ...new Map(entries.map((entry) => [entry.name, entry])).values()
+    ];
+    const namesKey = uniqueEntries.map((entry) => `${entry.name}\x01${entry.toolCount ?? ""}`).join("\x00");
+    if (context3.state.hasSentMcpServersInfo && context3.state.lastSentMcpServerNamesKey === namesKey) {
+      return null;
+    }
+    context3.state.hasSentMcpServersInfo = true;
+    context3.state.lastSentMcpServerNamesKey = namesKey;
+    if (uniqueEntries.length === 0) {
+      return `${SYSTEM_REMINDER_OPEN}
+MCP servers with available tools: None
+${SYSTEM_REMINDER_CLOSE}`;
+    }
+    const rendered = uniqueEntries.map(formatMcpServerEntry).join(", ");
+    return `${SYSTEM_REMINDER_OPEN}
+MCP servers with available tools: ${rendered}
+Find tools (with schemas) with \`letta mcp search "<what you want to do>"\`, list one server's tools with \`letta mcp tools <server>\` (\`--full\` includes schemas, \`letta mcp schema <tool-name>\` fetches one), and invoke one with \`letta mcp call <tool-name> --args '{"key":"value"}'\`.
+${SYSTEM_REMINDER_CLOSE}`;
+  } catch (error4) {
+    debugLog("mcp", `Failed to build MCP servers reminder: ${error4 instanceof Error ? error4.message : String(error4)}`);
+    return null;
+  }
+}
+async function buildMcpServersInfoReminder(context3) {
+  return buildMcpServersInfoReminderText(context3);
+}
 async function buildSessionContextReminder(context3) {
   if (!context3.systemInfoReminderEnabled || context3.state.hasSentSessionContext) {
     return null;
@@ -403774,7 +403791,7 @@ function prependReminderPartsToContent(content, reminderParts) {
   }
   return [...reminderParts, { type: "text", text: text2 }];
 }
-var PERMISSION_MODE_DESCRIPTIONS, MAX_COMMAND_REMINDERS_PER_TURN = 10, MAX_TOOLSET_REMINDERS_PER_TURN = 5, MAX_COMMAND_INPUT_CHARS = 2000, MAX_COMMAND_OUTPUT_CHARS = 4000, MAX_TOOL_LIST_CHARS = 3000, sharedReminderProviders;
+var MCP_SERVERS_REFRESH_MS = 300000, PERMISSION_MODE_DESCRIPTIONS, MAX_COMMAND_REMINDERS_PER_TURN = 10, MAX_TOOLSET_REMINDERS_PER_TURN = 5, MAX_COMMAND_INPUT_CHARS = 2000, MAX_COMMAND_OUTPUT_CHARS = 4000, MAX_TOOL_LIST_CHARS = 3000, sharedReminderProviders;
 var init_engine3 = __esm(() => {
   init_agent_info();
   init_conversation_bootstrap();
@@ -403795,6 +403812,7 @@ var init_engine3 = __esm(() => {
     "agent-info": buildAgentInfoReminder,
     "conversation-bootstrap": buildConversationBootstrapReminderPart,
     "secrets-info": buildSecretsInfoReminder,
+    "mcp-servers-info": buildMcpServersInfoReminder,
     "session-context": buildSessionContextReminder,
     "permission-mode": buildPermissionModeReminder,
     "memory-git-sync": buildMemoryGitSyncReminder,
@@ -408138,7 +408156,7 @@ function getNumber(record3, keys3) {
   }
   return null;
 }
-function getString2(record3, keys3) {
+function getString(record3, keys3) {
   const value = getValue(record3, keys3);
   if (typeof value === "string" && value.trim())
     return value.trim();
@@ -408224,7 +408242,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 = getString2(credits, ["balance", "credit_balance", "amount"]);
+  const balance = getString(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"]);
@@ -408243,8 +408261,8 @@ function normalizeIndividualLimit(raw2, nowMs) {
   const record3 = getRecord(raw2, ["individual_limit", "individualLimit"]) ?? getRecord(spendControl, ["individual_limit", "individualLimit"]);
   if (!record3)
     return null;
-  const limit3 = getString2(record3, ["limit"]);
-  const used = getString2(record3, ["used"]);
+  const limit3 = getString(record3, ["limit"]);
+  const used = getString(record3, ["used"]);
   const remainingPercent = getNumber(record3, [
     "remaining_percent",
     "remainingPercent"
@@ -408273,10 +408291,10 @@ function normalizeCloudUsageWindow(value, fallbackLabel, nowMs) {
   const record3 = asRecord8(value);
   if (!record3)
     return null;
-  return normalizeUsageWindow(record3, getString2(record3, ["label", "name"]) ?? fallbackLabel, nowMs);
+  return normalizeUsageWindow(record3, getString(record3, ["label", "name"]) ?? fallbackLabel, nowMs);
 }
 function normalizeAdditionalRateLimit(details, index, nowMs) {
-  const label = getString2(details, [
+  const label = getString(details, [
     "limit_name",
     "limitName",
     "metered_feature",
@@ -408302,7 +408320,7 @@ function getRateLimitReachedType(raw2) {
   if (typeof value === "string" && value.trim())
     return value.trim();
   const record3 = asRecord8(value);
-  return getString2(record3, ["type", "kind"]);
+  return getString(record3, ["type", "kind"]);
 }
 function formatPercent(value) {
   const rounded = Math.round(value);
@@ -408417,7 +408435,7 @@ function normalizeWhamUsageResponse(input) {
   const snapshotWithoutSummary = {
     providerName: input.providerName,
     fetchedAt,
-    planType: getString2(raw2, ["plan_type", "planType"]),
+    planType: getString(raw2, ["plan_type", "planType"]),
     limitReached: getBoolean(rateLimit, ["limit_reached", "limitReached"]) ?? getBoolean(spendControl, ["reached"]),
     rateLimitReachedType: getRateLimitReachedType(raw2),
     primary,
@@ -408436,18 +408454,18 @@ function normalizeCloudChatGPTUsageResponse(input) {
   if (!raw2)
     return null;
   const nowMs = input.nowMs ?? Date.now();
-  const fetchedAt = getString2(raw2, ["fetchedAt", "fetched_at"]) ?? new Date(nowMs).toISOString();
+  const fetchedAt = getString(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: getString2(raw2, ["providerName", "provider_name"]) ?? input.providerName,
+    providerName: getString(raw2, ["providerName", "provider_name"]) ?? input.providerName,
     fetchedAt,
-    planType: getString2(raw2, ["planType", "plan_type"]),
+    planType: getString(raw2, ["planType", "plan_type"]),
     limitReached: getBoolean(raw2, ["limitReached", "limit_reached"]),
-    rateLimitReachedType: getString2(raw2, [
+    rateLimitReachedType: getString(raw2, [
       "rateLimitReachedType",
       "rate_limit_reached_type"
     ]),
@@ -408459,7 +408477,7 @@ function normalizeCloudChatGPTUsageResponse(input) {
   };
   return {
     ...snapshotWithoutSummary,
-    summary: getString2(raw2, ["summary"]) ?? formatChatGPTUsageSnapshot(snapshotWithoutSummary, new Date(nowMs))
+    summary: getString(raw2, ["summary"]) ?? formatChatGPTUsageSnapshot(snapshotWithoutSummary, new Date(nowMs))
   };
 }
 function retryAfterMs(response) {
@@ -408484,7 +408502,7 @@ async function readJsonRecord(response) {
   }
 }
 function responseMessage(raw2, fallback) {
-  return getString2(raw2 ?? undefined, ["message", "error", "detail"]) ?? fallback;
+  return getString(raw2 ?? undefined, ["message", "error", "detail"]) ?? fallback;
 }
 function chatGPTUsageError(code2, message, retryAfter) {
   return {
@@ -412253,7 +412271,7 @@ var init_app_server_openai_common = __esm(() => {
 function asRecord9(value) {
   return value !== null && typeof value === "object" ? value : null;
 }
-function stringValue4(value) {
+function stringValue3(value) {
   return typeof value === "string" ? value : undefined;
 }
 function extractToolCallFragments(record3) {
@@ -412267,12 +412285,12 @@ function extractToolCallFragments(record3) {
     if (!toolCall) {
       continue;
     }
-    const toolCallId = stringValue4(toolCall.tool_call_id);
+    const toolCallId = stringValue3(toolCall.tool_call_id);
     if (!toolCallId) {
       continue;
     }
-    const name = stringValue4(toolCall.name) ?? null;
-    const argumentsDelta = stringValue4(toolCall.arguments) ?? null;
+    const name = stringValue3(toolCall.name) ?? null;
+    const argumentsDelta = stringValue3(toolCall.arguments) ?? null;
     fragments.push({ toolCallId, name, argumentsDelta });
   }
   return fragments;
@@ -412312,7 +412330,7 @@ function extractToolReturns(record3) {
       if (!rec) {
         continue;
       }
-      const toolCallId = stringValue4(rec.tool_call_id);
+      const toolCallId = stringValue3(rec.tool_call_id);
       const status = asToolReturnStatus2(rec.status);
       if (!toolCallId || !status) {
         continue;
@@ -412327,7 +412345,7 @@ function extractToolReturns(record3) {
       return results;
     }
   }
-  const topLevelToolCallId = stringValue4(record3.tool_call_id);
+  const topLevelToolCallId = stringValue3(record3.tool_call_id);
   const topLevelStatus = asToolReturnStatus2(record3.status);
   if (!topLevelToolCallId || !topLevelStatus) {
     return [];
@@ -412415,13 +412433,13 @@ function createToolLifecycleTracker(onEvent) {
       return;
     }
     const record3 = delta2;
-    const messageType = stringValue4(record3.message_type);
-    const toolCallId = stringValue4(record3.tool_call_id);
+    const messageType = stringValue3(record3.message_type);
+    const toolCallId = stringValue3(record3.tool_call_id);
     if (messageType === "client_tool_start" && toolCallId) {
       const state = getOrCreate(toolCallId);
       state.clientManaged = true;
       if (!state.name)
-        state.name = stringValue4(record3.tool_name) ?? null;
+        state.name = stringValue3(record3.tool_name) ?? null;
       return;
     }
     if (messageType === "client_tool_end" && toolCallId) {
@@ -414008,7 +414026,7 @@ var init_gateway_supervisor = __esm(() => {
 
 // src/cli/subcommands/listen.tsx
 import { hostname as hostname4 } from "node:os";
-import { parseArgs as parseArgs9 } from "node:util";
+import { parseArgs as parseArgs8 } from "node:util";
 import { MessageChannel as MessageChannel2 } from "node:worker_threads";
 function PromptEnvName(props) {
   const [value, setValue] = import_react33.useState("");
@@ -414121,7 +414139,7 @@ function printListenUsage() {
 async function runListenSubcommand(argv) {
   let values3;
   try {
-    ({ values: values3 } = parseArgs9({
+    ({ values: values3 } = parseArgs8({
       args: argv,
       options: LISTEN_OPTIONS,
       strict: true,
@@ -415029,15 +415047,15 @@ var init_transcript_migration = __esm(() => {
 });
 
 // src/cli/subcommands/local-backend.ts
-import { parseArgs as parseArgs10 } from "node:util";
+import { parseArgs as parseArgs9 } from "node:util";
 function parseLocalBackendArgs(argv) {
-  return parseArgs10({
+  return parseArgs9({
     args: argv,
     options: LOCAL_BACKEND_OPTIONS,
     strict: true
   });
 }
-function printUsage8() {
+function printUsage7() {
   console.log(`
 Usage:
   letta local-backend migrate-transcripts [--storage-dir <path>] [--dry-run]
@@ -415050,12 +415068,12 @@ before it is replaced.
 async function runLocalBackendSubcommand(argv) {
   const [command, ...rest4] = argv;
   if (!command || command === "help" || command === "--help" || command === "-h") {
-    printUsage8();
+    printUsage7();
     return command ? 0 : 1;
   }
   if (command !== "migrate-transcripts") {
     console.error(`Unknown local-backend command: ${command}`);
-    printUsage8();
+    printUsage7();
     return 1;
   }
   let parsed;
@@ -415064,11 +415082,11 @@ async function runLocalBackendSubcommand(argv) {
   } catch (error4) {
     const message = error4 instanceof Error ? error4.message : String(error4);
     console.error(`Error: ${message}`);
-    printUsage8();
+    printUsage7();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage8();
+    printUsage7();
     return 0;
   }
   const storageDir = parsed.values["storage-dir"] ?? getLocalBackendStorageDir();
@@ -415090,160 +415108,6 @@ var init_local_backend2 = __esm(() => {
   };
 });
 
-// src/backend/api/unified-mcp.ts
-function stringField2(value, key2) {
-  return typeof value[key2] === "string" ? value[key2] : null;
-}
-function recordField(value, ...names2) {
-  for (const name of names2) {
-    const field = value[name];
-    if (isRecord(field))
-      return field;
-  }
-  return;
-}
-function parseServer(value, registered) {
-  if (!isRecord(value))
-    return null;
-  const id2 = stringField2(value, "id");
-  const serverName = stringField2(value, "server_name") ?? (registered ? stringField2(registered, "server_name") : null);
-  const serverType = stringField2(value, "mcp_server_type") ?? (registered ? stringField2(registered, "mcp_server_type") : null) ?? "unknown";
-  if (!id2 || !serverName)
-    return null;
-  const serverUrl = stringField2(value, "server_url") ?? (registered ? stringField2(registered, "server_url") : null) ?? undefined;
-  const command = stringField2(value, "command") ?? (registered ? stringField2(registered, "command") : null) ?? undefined;
-  const argsValue = value.args ?? registered?.args;
-  const args = Array.isArray(argsValue) ? argsValue.filter((item) => typeof item === "string") : [];
-  const target2 = serverUrl ?? [command, ...args].filter(Boolean).join(" ");
-  return {
-    id: id2,
-    serverName,
-    serverType,
-    target: target2,
-    ...serverUrl ? { serverUrl } : {},
-    ...command ? { command, args } : {}
-  };
-}
-function parseTool(value) {
-  if (!isRecord(value))
-    return null;
-  const id2 = stringField2(value, "id");
-  const name = stringField2(value, "name");
-  if (!id2 || !name)
-    return null;
-  const description = stringField2(value, "description");
-  const jsonSchema = isRecord(value.json_schema) ? value.json_schema : {};
-  const inputSchema = isRecord(jsonSchema.parameters) ? jsonSchema.parameters : isRecord(value.args_json_schema) ? value.args_json_schema : { type: "object", properties: {} };
-  const title = stringField2(value, "title") ?? stringField2(jsonSchema, "title");
-  const outputSchema = recordField(value, "outputSchema", "output_schema") ?? recordField(jsonSchema, "outputSchema", "output_schema");
-  const annotations = recordField(value, "annotations") ?? recordField(jsonSchema, "annotations");
-  const execution = recordField(value, "execution") ?? recordField(jsonSchema, "execution");
-  const meta = recordField(value, "_meta") ?? recordField(jsonSchema, "_meta");
-  const iconsValue = value.icons ?? jsonSchema.icons;
-  const icons = Array.isArray(iconsValue) ? iconsValue.filter(isRecord) : undefined;
-  return {
-    id: id2,
-    name,
-    ...title ? { title } : {},
-    description,
-    inputSchema,
-    ...outputSchema ? { outputSchema } : {},
-    ...annotations ? { annotations } : {},
-    ...execution ? { execution } : {},
-    ...meta ? { _meta: meta } : {},
-    ...icons ? { icons } : {}
-  };
-}
-function parseRunResult(value) {
-  if (!isRecord(value))
-    throw new Error("Invalid MCP tool run response");
-  return {
-    status: stringField2(value, "status") ?? "unknown",
-    funcReturn: value.func_return,
-    stdout: value.stdout,
-    stderr: value.stderr
-  };
-}
-function parseSearchResult(value) {
-  if (!isRecord(value) || !isRecord(value.tool))
-    return null;
-  const toolId = stringField2(value.tool, "id");
-  const jsonSchema = value.tool.json_schema;
-  const score = value.combined_score;
-  if (!toolId || jsonSchema !== null && !isRecord(jsonSchema) || typeof score !== "number") {
-    return null;
-  }
-  return { toolId, jsonSchema, score };
-}
-async function withTimeout3(promise, timeoutMs, operation) {
-  let timer;
-  try {
-    return await Promise.race([
-      promise,
-      new Promise((_resolve, reject2) => {
-        timer = setTimeout(() => reject2(new Error(`${operation} timed out after ${timeoutMs}ms`)), timeoutMs);
-      })
-    ]);
-  } finally {
-    if (timer)
-      clearTimeout(timer);
-  }
-}
-async function listUnifiedMcpServers(client, agentId, timeoutMs = 1e4) {
-  const value = await withTimeout3(client.get(`/v1/agents/${encodeURIComponent(agentId)}/mcp-servers`), timeoutMs, "Listing agent MCP servers");
-  if (!Array.isArray(value))
-    return [];
-  const needsEnrichment = value.some((item) => isRecord(item) && !stringField2(item, "mcp_server_type"));
-  const registeredById = new Map;
-  if (needsEnrichment && client.mcpServers) {
-    try {
-      const registered = await withTimeout3(client.mcpServers.list(), timeoutMs, "Listing registered MCP servers");
-      for (const item of registered) {
-        if (!isRecord(item))
-          continue;
-        const id2 = stringField2(item, "id");
-        if (id2)
-          registeredById.set(id2, item);
-      }
-    } catch {}
-  }
-  return value.map((item) => {
-    const registered = isRecord(item) ? registeredById.get(stringField2(item, "id") ?? "") : undefined;
-    return parseServer(item, registered);
-  }).filter((server2) => server2 !== null);
-}
-async function listUnifiedMcpTools(client, agentId, mcpServerId, timeoutMs = 1e4) {
-  const value = await withTimeout3(client.get(`/v1/agents/${encodeURIComponent(agentId)}/mcp-servers/${encodeURIComponent(mcpServerId)}/tools`), timeoutMs, "Listing agent MCP server tools");
-  if (!Array.isArray(value))
-    return [];
-  return value.map(parseTool).filter((tool) => tool !== null);
-}
-async function searchUnifiedMcpTools(params) {
-  const value = await withTimeout3(params.client.post(`/v1/agents/${encodeURIComponent(params.agentId)}/mcp-servers/tools/search`, {
-    body: {
-      query: params.query,
-      search_mode: params.searchMode,
-      limit: params.limit
-    }
-  }), params.timeoutMs ?? 60000, "Searching agent MCP tools");
-  if (!Array.isArray(value)) {
-    throw new Error("Invalid MCP tool search response");
-  }
-  const results = [];
-  for (const item of value) {
-    const result2 = parseSearchResult(item);
-    if (!result2)
-      throw new Error("Invalid MCP tool search result");
-    results.push(result2);
-  }
-  return results;
-}
-async function runUnifiedMcpTool(params) {
-  const value = await withTimeout3(params.client.post(`/v1/agents/${encodeURIComponent(params.agentId)}/mcp-servers/${encodeURIComponent(params.mcpServerId)}/tools/${encodeURIComponent(params.toolId)}/run`, { body: { args: params.args } }), params.timeoutMs ?? 60000, "Running agent MCP tool");
-  return parseRunResult(value);
-}
-var init_unified_mcp = () => {};
-
 // node_modules/pkce-challenge/dist/index.node.js
 async function getRandomValues(size2) {
   return (await crypto2).getRandomValues(new Uint8Array(size2));
@@ -432086,7 +431950,7 @@ var init_mcp_client = __esm(() => {
   init_streamableHttp();
   DEFAULT_CLIENT_INFO = {
     name: "letta-code",
-    version: "0.31.9"
+    version: "0.31.11"
   };
 });
 
@@ -432527,20 +432391,23 @@ function printMcpUsage(stdout) {
 Usage:
   letta mcp list [--agent <id>]
   letta mcp get <server> [--agent <id>]
-  letta mcp tools [server] [--agent <id>]
+  letta mcp tools [server] [--full] [--agent <id>]
+  letta mcp schema <tool-name> [--agent <id>]
   letta mcp search <query> [--mode <hybrid|vector|fts>] [--limit <n>] [--agent <id>]
   letta mcp call <tool-name> [--args '<json>' | --args-file <path|->] [--agent <id>]
 
 Commands:
   list      List MCP servers available to the agent
   get       Print one server's redacted connection configuration
-  tools     Print complete MCP tool schemas; names are accepted by call
+  tools     List tool names and descriptions; names are accepted by call
+  schema    Print one tool's complete schema
   search    Search tools available to the agent
   call      Call one exact tool name and print an MCP CallToolResult
 
 Options:
   --agent <id>       Agent ID. Defaults to LETTA_AGENT_ID or AGENT_ID
   --agent-id <id>    Alias for --agent
+  --full             Include complete schemas in tools output
   --mode <mode>      Search mode: hybrid (default), vector, or fts
   --limit <n>        Search result limit from 1 to 100 (default: 5)
   --args <json>      JSON object passed to a tool
@@ -432749,9 +432616,16 @@ var init_mcp_tool_names = __esm(async () => {
 });
 
 // src/cli/subcommands/mcp.ts
-import { parseArgs as parseArgs11 } from "node:util";
+import { parseArgs as parseArgs10 } from "node:util";
+function defaultIsHostedLettaCloud() {
+  try {
+    return getServerUrl() === LETTA_CLOUD_API_URL;
+  } catch {
+    return !process.env.LETTA_BASE_URL;
+  }
+}
 function parseMcpArgs(argv) {
-  return parseArgs11({
+  return parseArgs10({
     args: argv,
     options: {
       help: { type: "boolean", short: "h" },
@@ -432759,6 +432633,7 @@ function parseMcpArgs(argv) {
       "agent-id": { type: "string" },
       mode: { type: "string" },
       limit: { type: "string" },
+      full: { type: "boolean" },
       args: { type: "string" },
       "args-file": { type: "string" }
     },
@@ -432774,7 +432649,7 @@ function parseCommandLine(argv) {
   }
   return { action: action3, target: target2, values: parsed.values };
 }
-function stringValue5(value) {
+function stringValue4(value) {
   return typeof value === "string" ? value : undefined;
 }
 function getLocalServers(deps, agentId) {
@@ -432813,9 +432688,8 @@ function redactUrl(value) {
     const url2 = new URL(value);
     url2.username = "";
     url2.password = "";
-    const sensitive = /token|key|secret|password|signature|credential/i;
     for (const key2 of url2.searchParams.keys()) {
-      if (sensitive.test(key2))
+      if (SENSITIVE_NAME.test(key2))
         url2.searchParams.set(key2, "[REDACTED]");
     }
     return url2.toString();
@@ -432823,6 +432697,32 @@ function redactUrl(value) {
     return value;
   }
 }
+function redactArgs(args) {
+  const redacted = [];
+  let redactNext = false;
+  for (const arg of args) {
+    if (redactNext) {
+      redacted.push("[REDACTED]");
+      redactNext = false;
+      continue;
+    }
+    if (arg.startsWith("-")) {
+      const equalsIndex = arg.indexOf("=");
+      const flagName = equalsIndex === -1 ? arg : arg.slice(0, equalsIndex);
+      if (SENSITIVE_NAME.test(flagName)) {
+        if (equalsIndex === -1) {
+          redactNext = true;
+          redacted.push(arg);
+        } else {
+          redacted.push(`${flagName}=[REDACTED]`);
+        }
+        continue;
+      }
+    }
+    redacted.push(arg);
+  }
+  return redacted;
+}
 function serverDetails(target2) {
   if (target2.kind === "client") {
     const config2 = target2.config;
@@ -432838,7 +432738,7 @@ function serverDetails(target2) {
       name: config2.name,
       transport: "stdio",
       command: config2.command,
-      args: config2.args ?? [],
+      args: redactArgs(config2.args ?? []),
       ...config2.cwd ? { cwd: config2.cwd } : {},
       env: redactValues(config2.env)
     };
@@ -432852,7 +432752,7 @@ function serverDetails(target2) {
       name: server2.serverName,
       transport: "stdio",
       command: server2.command ?? server2.target.split(" ")[0] ?? "",
-      args: server2.args ?? [],
+      args: redactArgs(server2.args ?? []),
       env: {}
     };
   }
@@ -432942,7 +432842,10 @@ async function buildToolCatalog(deps, agentId, options = {}) {
   const connections = [];
   const usedNames = new Set;
   try {
-    const serverTargets = activeServers.filter((target2) => target2.kind === "server");
+    const hostedLettaCloud = (deps.isHostedLettaCloud ?? defaultIsHostedLettaCloud)();
+    const allServerTargets = activeServers.filter((target2) => target2.kind === "server");
+    const serverTargets = hostedLettaCloud ? allServerTargets.filter(({ server: server2 }) => server2.serverType !== "stdio") : allServerTargets;
+    const excludedHostedStdioServers = serverTargets.length !== allServerTargets.length;
     if (serverTargets.length > 0) {
       const client = await getServerClient(deps);
       const toolLists = await Promise.all(serverTargets.map(async ({ server: server2 }) => ({
@@ -433005,6 +432908,7 @@ async function buildToolCatalog(deps, agentId, options = {}) {
     }
     return {
       tools: catalog,
+      excludedHostedStdioServers,
       close: async () => {
         await Promise.allSettled(connections.map((connection) => connection.close()));
       }
@@ -433047,12 +432951,12 @@ function mcpToolResultFromServer(result2) {
     isError: !success || normalized.isError === true
   };
 }
-function printJson2(stdout, value) {
+function printJson(stdout, value) {
   stdout(JSON.stringify(value, null, 2));
 }
 async function runList(deps, agentId, stdout) {
   const servers = await listUnifiedServers(deps, agentId);
-  printJson2(stdout, servers.map(serverSummary));
+  printJson(stdout, servers.map(serverSummary));
   return 0;
 }
 async function runGet(deps, agentId, selector, stdout) {
@@ -433060,25 +432964,45 @@ async function runGet(deps, agentId, selector, stdout) {
     throw new McpCliError("invalid_arguments", "Usage: letta mcp get <server>");
   }
   const server2 = resolveServer(await listUnifiedServers(deps, agentId), selector);
-  printJson2(stdout, serverDetails(server2));
+  printJson(stdout, serverDetails(server2));
   return 0;
 }
-async function runTools(deps, agentId, serverSelector, stdout) {
+async function runTools(deps, agentId, serverSelector, full, stdout) {
   const catalog = await buildToolCatalog(deps, agentId, { serverSelector });
   try {
-    printJson2(stdout, catalog.tools.map((tool) => tool.schema));
+    printJson(stdout, catalog.tools.map((tool) => full ? tool.schema : {
+      name: tool.schema.name,
+      ...tool.schema.title ? { title: tool.schema.title } : {},
+      ...tool.schema.description ? { description: tool.schema.description } : {}
+    }));
   } finally {
     await catalog.close();
   }
   return 0;
 }
+async function runSchema(deps, agentId, toolName, stdout) {
+  if (!toolName) {
+    throw new McpCliError("invalid_arguments", "Usage: letta mcp schema <tool-name>");
+  }
+  const catalog = await buildToolCatalog(deps, agentId, { toolName });
+  try {
+    const tool = catalog.tools.find((candidate) => candidate.schema.name === toolName);
+    if (!tool) {
+      throw new McpCliError("tool_not_found", `MCP tool '${toolName}' is not available`);
+    }
+    printJson(stdout, tool.schema);
+    return 0;
+  } finally {
+    await catalog.close();
+  }
+}
 async function runSearch(parsed, deps, agentId, stdout) {
   const serverSearchAvailable = serverMcpAvailable(deps);
   const hasClientLocalServers = getLocalServers(deps, agentId).length > 0;
   return runMcpSearch({
     query: parsed.target,
-    mode: stringValue5(parsed.values.mode),
-    limit: stringValue5(parsed.values.limit),
+    mode: stringValue4(parsed.values.mode),
+    limit: stringValue4(parsed.values.limit),
     stdout,
     searchTools: async (request) => {
       if (!serverSearchAvailable) {
@@ -433111,15 +433035,20 @@ async function runSearch(parsed, deps, agentId, stdout) {
           catalogPromise
         ]);
         catalog = resolvedCatalog;
-        const serverResults = searchResults.map((result2) => {
+        const serverResults = searchResults.flatMap((result2) => {
           const callable = resolvedCatalog.tools.find((tool) => tool.target.kind === "server" && tool.target.toolId === result2.toolId);
           if (!callable) {
+            if (resolvedCatalog.excludedHostedStdioServers) {
+              return [];
+            }
             throw new Error(`MCP search returned unavailable tool '${result2.toolId}'`);
           }
-          return {
-            tool: result2.jsonSchema === null ? null : { ...result2.jsonSchema, name: callable.schema.name },
-            score: result2.score
-          };
+          return [
+            {
+              tool: result2.jsonSchema === null ? null : { ...result2.jsonSchema, name: callable.schema.name },
+              score: result2.score
+            }
+          ];
         });
         if (!includeLocal)
           return serverResults;
@@ -433142,7 +433071,7 @@ async function runCall(parsed, deps, agentId, stdout) {
   if (!toolName) {
     throw new McpCliError("invalid_arguments", "Usage: letta mcp call <tool-name> [--args '<json>']");
   }
-  const args = await loadMcpToolArgs(stringValue5(parsed.values.args), stringValue5(parsed.values["args-file"]), deps);
+  const args = await loadMcpToolArgs(stringValue4(parsed.values.args), stringValue4(parsed.values["args-file"]), deps);
   const catalog = await buildToolCatalog(deps, agentId, { toolName });
   try {
     const tool = catalog.tools.find((candidate) => candidate.schema.name === toolName);
@@ -433156,7 +433085,7 @@ async function runCall(parsed, deps, agentId, stdout) {
       toolId: tool.target.toolId,
       args
     }));
-    printJson2(stdout, result2);
+    printJson(stdout, result2);
     return result2.isError === true ? 2 : 0;
   } finally {
     await catalog.close();
@@ -433176,7 +433105,7 @@ async function runMcpSubcommand(argv, deps = {}) {
     printMcpUsage(stdout);
     return 0;
   }
-  const agentId = resolveMcpAgentId(stringValue5(parsed.values.agent), stringValue5(parsed.values["agent-id"]), deps.env ?? process.env);
+  const agentId = resolveMcpAgentId(stringValue4(parsed.values.agent), stringValue4(parsed.values["agent-id"]), deps.env ?? process.env);
   if (!agentId) {
     printMcpError(stderr, new McpCliError("agent_id_required", "No agent context found", "Pass --agent <agent-id> or set LETTA_AGENT_ID."));
     return 1;
@@ -433191,7 +433120,9 @@ async function runMcpSubcommand(argv, deps = {}) {
       case "tools":
       case "list-tools":
       case "list_tools":
-        return await runTools(deps, agentId, parsed.target, stdout);
+        return await runTools(deps, agentId, parsed.target, parsed.values.full === true, stdout);
+      case "schema":
+        return await runSchema(deps, agentId, parsed.target, stdout);
       case "search":
         return await runSearch(parsed, deps, agentId, stdout);
       case "call":
@@ -433207,9 +433138,12 @@ async function runMcpSubcommand(argv, deps = {}) {
     return 1;
   }
 }
+var SENSITIVE_NAME;
 var init_mcp = __esm(async () => {
+  init_oauth();
   init_backend2();
   init_client2();
+  init_server_url();
   init_unified_mcp();
   init_mcp_client();
   init_mcp_oauth();
@@ -433220,6 +433154,7 @@ var init_mcp = __esm(async () => {
     init_mcp_runtime(),
     init_mcp_tool_names()
   ]);
+  SENSITIVE_NAME = /token|key|secret|password|signature|credential|auth/i;
 });
 
 // src/cli/subcommands/memory-tokens.ts
@@ -433248,7 +433183,7 @@ function printText(total, files, top, quiet) {
     console.log(`  ${formatNumber(row.tokens).padStart(8)}  ${row.path}`);
   }
 }
-function printJson3(total, files) {
+function printJson2(total, files) {
   console.log(JSON.stringify({
     total_tokens: total,
     files
@@ -433289,7 +433224,7 @@ async function runMemoryTokensAction(options) {
   }
   const { total, files } = estimate;
   if (format5 === "json") {
-    printJson3(total, files);
+    printJson2(total, files);
   } else {
     printText(total, files, top, options.quiet);
   }
@@ -433304,8 +433239,8 @@ var init_memory_tokens = __esm(() => {
 import { cpSync, existsSync as existsSync57, mkdirSync as mkdirSync39, rmSync as rmSync12, statSync as statSync19 } from "node:fs";
 import { readdir as readdir12 } from "node:fs/promises";
 import { dirname as dirname31, join as join72 } from "node:path";
-import { parseArgs as parseArgs12 } from "node:util";
-function printUsage9() {
+import { parseArgs as parseArgs11 } from "node:util";
+function printUsage8() {
   console.log(`
 Usage:
   letta memory status [--agent <id>]
@@ -433338,7 +433273,7 @@ function getAgentId3(agentFromArgs, agentIdFromArgs) {
   return agentFromArgs || agentIdFromArgs || process.env.LETTA_AGENT_ID || "";
 }
 function parseMemoryArgs(argv) {
-  return parseArgs12({
+  return parseArgs11({
     args: argv,
     options: MEMORY_OPTIONS,
     strict: true,
@@ -433399,12 +433334,12 @@ async function runMemorySubcommand(argv) {
   } catch (error5) {
     const message = error5 instanceof Error ? error5.message : String(error5);
     console.error(`Error: ${message}`);
-    printUsage9();
+    printUsage8();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage9();
+    printUsage8();
     return 0;
   }
   const agentId = getAgentId3(parsed.values.agent, parsed.values["agent-id"]);
@@ -433548,7 +433483,7 @@ async function runMemorySubcommand(argv) {
     return 1;
   }
   console.error(`Unknown action: ${action3}`);
-  printUsage9();
+  printUsage8();
   return 1;
 }
 var MEMORY_OPTIONS;
@@ -433907,8 +433842,8 @@ var init_message_search = __esm(() => {
 // src/cli/subcommands/messages.ts
 import { writeFile as writeFile16 } from "node:fs/promises";
 import { resolve as resolve35 } from "node:path";
-import { parseArgs as parseArgs13 } from "node:util";
-function printUsage10() {
+import { parseArgs as parseArgs12 } from "node:util";
+function printUsage9() {
   console.log(`
 Usage:
   letta messages search --query <text> [options]
@@ -433993,7 +433928,7 @@ function pageItems4(page) {
   return [];
 }
 function parseMessagesArgs(argv) {
-  return parseArgs13({
+  return parseArgs12({
     args: argv,
     options: MESSAGES_OPTIONS,
     strict: true,
@@ -434007,12 +433942,12 @@ async function runMessagesSubcommand(argv, deps = {}) {
   } catch (error5) {
     const message = error5 instanceof Error ? error5.message : String(error5);
     console.error(`Error: ${message}`);
-    printUsage10();
+    printUsage9();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage10();
+    printUsage9();
     return 0;
   }
   try {
@@ -434254,7 +434189,7 @@ async function runMessagesSubcommand(argv, deps = {}) {
     return 1;
   }
   console.error(`Unknown action: ${action3}`);
-  printUsage10();
+  printUsage9();
   return 1;
 }
 var MESSAGES_OPTIONS;
@@ -435284,8 +435219,8 @@ var init_package_scaffolder = __esm(() => {
 
 // src/cli/subcommands/mods.ts
 import { dirname as dirname32, join as join74 } from "node:path";
-import { parseArgs as parseArgs14 } from "node:util";
-function printUsage11() {
+import { parseArgs as parseArgs13 } from "node:util";
+function printUsage10() {
   console.log(`
 Usage:
   letta mods list [--agent <id>]
@@ -435302,7 +435237,7 @@ Options:
 `.trim());
 }
 function parseModsArgs(argv) {
-  return parseArgs14({
+  return parseArgs13({
     args: argv,
     options: MODS_OPTIONS,
     strict: true,
@@ -435310,7 +435245,7 @@ function parseModsArgs(argv) {
   });
 }
 function parseModsPackageArgs(argv) {
-  return parseArgs14({
+  return parseArgs13({
     args: argv,
     options: MODS_PACKAGE_OPTIONS,
     strict: true,
@@ -435408,16 +435343,16 @@ async function runList2(argv, options = {}) {
     parsed = parseModsArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage11();
+    printUsage10();
     return 0;
   }
   if (parsed.positionals.length > 0) {
     console.error(`Unexpected argument: ${parsed.positionals[0]}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   const agentId = getExplicitAgentId(parsed.values);
@@ -435434,27 +435369,27 @@ async function runPackageMutation(action3, argv, options = {}) {
     parsed = parseModsArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage11();
+    printUsage10();
     return 0;
   }
   if (getExplicitAgentId(parsed.values)) {
     console.error(`--agent is only supported for 'letta mods list'.`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   const [specifier, extra] = parsed.positionals;
   if (!specifier) {
     console.error(`Missing package specifier.`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   if (extra) {
     console.error(`Unexpected argument: ${extra}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   try {
@@ -435480,27 +435415,27 @@ async function runPackageUpdate(argv, options = {}) {
     parsed = parseModsArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage11();
+    printUsage10();
     return 0;
   }
   if (getExplicitAgentId(parsed.values)) {
     console.error(`--agent is not supported for 'letta mods update'.`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   const [specifier, extra] = parsed.positionals;
   if (!specifier) {
     console.error(`Missing package specifier.`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   if (extra) {
     console.error(`Unexpected argument: ${extra}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   try {
@@ -435522,33 +435457,33 @@ async function runPackageScaffold(argv) {
     parsed = parseModsPackageArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage11();
+    printUsage10();
     return 0;
   }
   if (getExplicitAgentId(parsed.values)) {
     console.error(`--agent is not supported for 'letta mods package'.`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   const [sourceFile, extra] = parsed.positionals;
   if (!sourceFile) {
     console.error(`Missing mod file.`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   if (extra) {
     console.error(`Unexpected argument: ${extra}`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   const packageName = parsed.values.name;
   if (typeof packageName !== "string" || !packageName.trim()) {
     console.error(`Missing required --name <package-name>.`);
-    printUsage11();
+    printUsage10();
     return 1;
   }
   try {
@@ -435570,7 +435505,7 @@ async function runPackageScaffold(argv) {
 async function runModsSubcommand(argv, options = {}) {
   const [action3, ...rest4] = argv;
   if (!action3 || action3 === "help" || action3 === "--help" || action3 === "-h") {
-    printUsage11();
+    printUsage10();
     return 0;
   }
   switch (action3) {
@@ -435586,7 +435521,7 @@ async function runModsSubcommand(argv, options = {}) {
       return runPackageMutation(action3, rest4, options);
     default:
       console.error(`Unknown mods action: ${action3}`);
-      printUsage11();
+      printUsage10();
       return 1;
   }
 }
@@ -435666,8 +435601,8 @@ var init_sandbox_files = __esm(() => {
 // src/cli/subcommands/sandbox.ts
 import { readFile as readFile24, stat as stat16, writeFile as writeFile17 } from "node:fs/promises";
 import { basename as basename26, resolve as resolve36 } from "node:path";
-import { parseArgs as parseArgs15 } from "node:util";
-function printUsage12() {
+import { parseArgs as parseArgs14 } from "node:util";
+function printUsage11() {
   console.log(`
 Usage:
   letta sandbox upload <local-path>
@@ -435681,7 +435616,7 @@ Notes:
 `.trim());
 }
 function parseSandboxArgs(argv) {
-  return parseArgs15({
+  return parseArgs14({
     args: argv,
     options: SANDBOX_OPTIONS,
     strict: true,
@@ -435721,17 +435656,17 @@ async function runSandboxSubcommand(argv, deps = {}) {
     parsed = parseSandboxArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : error5}`);
-    printUsage12();
+    printUsage11();
     return 1;
   }
   const [action3, path48] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage12();
+    printUsage11();
     return 0;
   }
   if (action3 !== "upload" && action3 !== "download" || !path48) {
     console.error("Error: expected upload or download with a file path");
-    printUsage12();
+    printUsage11();
     return 1;
   }
   try {
@@ -435775,8 +435710,8 @@ var init_sandbox2 = __esm(() => {
 });
 
 // src/cli/subcommands/secret.ts
-import { parseArgs as parseArgs16 } from "node:util";
-function printUsage13() {
+import { parseArgs as parseArgs15 } from "node:util";
+function printUsage12() {
   console.log(`
 Usage:
   letta secret set KEY --env SOURCE_VAR   Set KEY from environment variable SOURCE_VAR
@@ -435801,7 +435736,7 @@ Notes:
 `.trim());
 }
 function parseSecretArgs(argv) {
-  return parseArgs16({
+  return parseArgs15({
     args: argv,
     options: SECRET_OPTIONS,
     strict: true,
@@ -435836,11 +435771,11 @@ async function runSecretSubcommand(argv, deps = {}) {
     parsed = parseSecretArgs(argv);
   } catch (error5) {
     printError(error5);
-    printUsage13();
+    printUsage12();
     return 1;
   }
   if (parsed.values.help || parsed.positionals.length === 0) {
-    printUsage13();
+    printUsage12();
     return parsed.values.help ? 0 : 1;
   }
   const [verb, rawKey, rawValue] = parsed.positionals;
@@ -435850,7 +435785,7 @@ async function runSecretSubcommand(argv, deps = {}) {
   }
   switch (verb) {
     case "help": {
-      printUsage13();
+      printUsage12();
       return 0;
     }
     case "list": {
@@ -435958,7 +435893,7 @@ async function runSecretSubcommand(argv, deps = {}) {
     }
     default: {
       console.error(`Unknown subcommand '${verb ?? ""}'.`);
-      printUsage13();
+      printUsage12();
       return 1;
     }
   }
@@ -435976,7 +435911,7 @@ var init_secret = __esm(() => {
 });
 
 // src/cli/subcommands/app-server.ts
-import { parseArgs as parseArgs17 } from "node:util";
+import { parseArgs as parseArgs16 } from "node:util";
 function printAppServerHelp() {
   console.log(`Usage: letta server --listen [url]
 
@@ -436024,7 +435959,7 @@ Stopped App Server (${signal}).`);
 async function runAppServerSubcommand(argv) {
   let parsed;
   try {
-    parsed = parseArgs17({
+    parsed = parseArgs16({
       args: argv,
       allowPositionals: false,
       options: {
@@ -436609,7 +436544,7 @@ var init_setup6 = __esm(async () => {
 });
 
 // src/cli/subcommands/setup.ts
-function printUsage14() {
+function printUsage13() {
   console.log(`
 Usage:
   letta setup
@@ -436620,12 +436555,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") {
-    printUsage14();
+    printUsage13();
     return 0;
   }
   if (arg || rest4.length > 0) {
     console.error(`Unexpected arguments: ${[arg, ...rest4].filter(Boolean).join(" ")}`);
-    printUsage14();
+    printUsage13();
     return 1;
   }
   await settingsManager.initialize();
@@ -436640,8 +436575,8 @@ var init_setup7 = __esm(async () => {
 // src/cli/subcommands/shared-memory.ts
 import { existsSync as existsSync61 } from "node:fs";
 import { join as join75 } from "node:path";
-import { parseArgs as parseArgs18 } from "node:util";
-function printUsage15() {
+import { parseArgs as parseArgs17 } from "node:util";
+function printUsage14() {
   console.log(`
 Usage:
   letta shared-memory list [--agent <id>]
@@ -436676,7 +436611,7 @@ Examples:
 `.trim());
 }
 function parseSharedMemoryArgs(argv) {
-  return parseArgs18({
+  return parseArgs17({
     args: argv,
     options: SHARED_MEMORY_OPTIONS,
     strict: true,
@@ -436752,12 +436687,12 @@ async function runSharedMemorySubcommand(argv, deps = {}) {
     parsed = parseSharedMemoryArgs(argv);
   } catch (error5) {
     console.error(error5 instanceof Error ? error5.message : String(error5));
-    printUsage15();
+    printUsage14();
     return 1;
   }
   const [action3, reference] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage15();
+    printUsage14();
     return 0;
   }
   if (isLocalBackendEnvEnabled()) {
@@ -436862,7 +436797,7 @@ async function runSharedMemorySubcommand(argv, deps = {}) {
       return result2.failed > 0 ? 1 : 0;
     }
     console.error(`Unknown action: ${action3}`);
-    printUsage15();
+    printUsage14();
     return 1;
   } catch (error5) {
     console.error(error5 instanceof Error ? error5.message : String(error5));
@@ -438370,8 +438305,8 @@ import {
 import { mkdir as mkdir14, readdir as readdir13 } from "node:fs/promises";
 import { tmpdir as tmpdir11 } from "node:os";
 import { basename as basename27, dirname as dirname33, join as join76, normalize as normalize5, resolve as resolve37, sep as sep8 } from "node:path";
-import { parseArgs as parseArgs19, TextDecoder as TextDecoder2, TextEncoder as TextEncoder2 } from "node:util";
-function printUsage16() {
+import { parseArgs as parseArgs18, TextDecoder as TextDecoder2, TextEncoder as TextEncoder2 } from "node:util";
+function printUsage15() {
   console.log(`
 Usage:
   letta install <thing> [--agent <id> | -n <agent name>] [--force]
@@ -438398,7 +438333,7 @@ Options:
 `.trim());
 }
 function parseSkillsArgs(argv) {
-  return parseArgs19({
+  return parseArgs18({
     args: argv,
     options: SKILLS_OPTIONS,
     strict: true,
@@ -439046,17 +438981,17 @@ async function runInstall(argv, options = {}) {
     parsed = parseSkillsArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage16();
+    printUsage15();
     return 1;
   }
   const [specifier] = parsed.positionals;
   if (parsed.values.help || !specifier || specifier === "help") {
-    printUsage16();
+    printUsage15();
     return 0;
   }
   if (parsed.positionals.length > 1) {
     console.error(`Unexpected argument: ${parsed.positionals[1]}`);
-    printUsage16();
+    printUsage15();
     return 1;
   }
   if (specifier.startsWith("npm:")) {
@@ -439147,16 +439082,16 @@ async function runList3(argv) {
     parsed = parseSkillsArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage16();
+    printUsage15();
     return 1;
   }
   if (parsed.values.help) {
-    printUsage16();
+    printUsage15();
     return 0;
   }
   if (parsed.positionals.length > 0) {
     console.error(`Unexpected argument: ${parsed.positionals[0]}`);
-    printUsage16();
+    printUsage15();
     return 1;
   }
   try {
@@ -439177,17 +439112,17 @@ async function runDelete(argv) {
     parsed = parseSkillsArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage16();
+    printUsage15();
     return 1;
   }
   const [skillName] = parsed.positionals;
   if (parsed.values.help || !skillName || skillName === "help") {
-    printUsage16();
+    printUsage15();
     return 0;
   }
   if (parsed.positionals.length > 1) {
     console.error(`Unexpected argument: ${parsed.positionals[1]}`);
-    printUsage16();
+    printUsage15();
     return 1;
   }
   const agentId = getExplicitAgentId2(parsed.values);
@@ -439227,11 +439162,11 @@ async function runSkillsSubcommand(argv) {
     case "help":
     case "--help":
     case "-h":
-      printUsage16();
+      printUsage15();
       return 0;
     default:
       console.error(`Unknown action: ${action3}`);
-      printUsage16();
+      printUsage15();
       return 1;
   }
 }
@@ -439250,8 +439185,8 @@ var init_skills4 = __esm(() => {
 });
 
 // src/cli/subcommands/teleport.ts
-import { parseArgs as parseArgs20 } from "node:util";
-function printUsage17() {
+import { parseArgs as parseArgs19 } from "node:util";
+function printUsage16() {
   console.log(`
 Usage:
   letta teleport list
@@ -439274,7 +439209,7 @@ Notes:
 `.trim());
 }
 function parseTeleportArgs(argv) {
-  return parseArgs20({
+  return parseArgs19({
     args: argv,
     options: TELEPORT_OPTIONS,
     strict: true,
@@ -439347,12 +439282,12 @@ async function runTeleportSubcommand(argv, deps = {}) {
     parsed = parseTeleportArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : error5}`);
-    printUsage17();
+    printUsage16();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || !action3 || action3 === "help") {
-    printUsage17();
+    printUsage16();
     return 0;
   }
   try {
@@ -439788,8 +439723,8 @@ var init_review = () => {};
 
 // src/cli/subcommands/trajectories.ts
 import { readFile as readFile28 } from "node:fs/promises";
-import { parseArgs as parseArgs21 } from "node:util";
-function printUsage18() {
+import { parseArgs as parseArgs20 } from "node:util";
+function printUsage17() {
   console.log(`
 Usage:
   letta trajectories export [options]
@@ -439927,7 +439862,7 @@ ${results.length} session(s) matched "${keyword}"`);
   return 0;
 }
 function parseTrajectoriesArgs(argv) {
-  return parseArgs21({
+  return parseArgs20({
     args: argv,
     options: TRAJECTORIES_OPTIONS,
     strict: true,
@@ -439940,12 +439875,12 @@ async function runTrajectoriesSubcommand(argv) {
     parsed = parseTrajectoriesArgs(argv);
   } catch (error5) {
     console.error(`Error: ${error5 instanceof Error ? error5.message : String(error5)}`);
-    printUsage18();
+    printUsage17();
     return 1;
   }
   const [action3] = parsed.positionals;
   if (parsed.values.help || action3 === "help" || !action3) {
-    printUsage18();
+    printUsage17();
     return parsed.values.help || action3 === "help" ? 0 : 1;
   }
   const asJson = Boolean(parsed.values.json);
@@ -439977,7 +439912,7 @@ async function runTrajectoriesSubcommand(argv) {
   }
   if (action3 !== "export") {
     console.error(`Unknown command: ${action3}`);
-    printUsage18();
+    printUsage17();
     return 1;
   }
   const options = {
@@ -441526,9 +441461,9 @@ class ChannelRichDraftStreamerImpl {
       return;
     }
     const record5 = asRecord10(chunk2);
-    const messageType = stringValue6(record5?.message_type);
+    const messageType = stringValue5(record5?.message_type);
     if (messageType === "tool_return_message") {
-      const toolCallId = stringValue6(record5?.tool_call_id);
+      const toolCallId = stringValue5(record5?.tool_call_id);
       if (toolCallId) {
         this.finishCall(toolCallId);
       }
@@ -441821,14 +441756,14 @@ function extractToolCallFragments2(record5) {
   const fragments = [];
   for (const rawToolCall of rawToolCalls) {
     const toolCall = asRecord10(rawToolCall);
-    const toolCallId = stringValue6(toolCall?.tool_call_id);
+    const toolCallId = stringValue5(toolCall?.tool_call_id);
     if (!toolCallId) {
       continue;
     }
     fragments.push({
       toolCallId,
-      name: stringValue6(toolCall?.name),
-      argumentsDelta: stringValue6(toolCall?.arguments)
+      name: stringValue5(toolCall?.name),
+      argumentsDelta: stringValue5(toolCall?.arguments)
     });
   }
   return fragments;
@@ -441948,7 +441883,7 @@ function buildDraftId(seed) {
 function asRecord10(value) {
   return value && typeof value === "object" ? value : null;
 }
-function stringValue6(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;
@@ -444816,14 +444751,14 @@ var exports_channel_gateway = {};
 __export(exports_channel_gateway, {
   runChannelGatewaySubcommand: () => runChannelGatewaySubcommand
 });
-import { parseArgs as parseArgs22 } 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 } = parseArgs22({
+    ({ values: values3 } = parseArgs21({
       args: argv,
       strict: true,
       allowPositionals: false,
@@ -444963,7 +444898,6 @@ function subcommandNeedsEarlyBackendMode(command) {
     case "sandbox":
     case "secret":
     case "server":
-    case "cloud-mcp":
     case "shared-memory":
     case "skills":
     case "teleport":
@@ -445008,8 +444942,6 @@ async function runSubcommand(argv) {
       return runTeleportSubcommand(rest4);
     case "server":
       return runServerSubcommand(rest4);
-    case "cloud-mcp":
-      return runCloudMcpSubcommand(rest4);
     case "feedback":
       return runFeedbackSubcommand(rest4);
     case "remote":
@@ -445047,7 +444979,6 @@ var init_router = __esm(async () => {
   init_agents6();
   init_backend3();
   init_channels();
-  init_cloud_mcp();
   init_connect();
   init_environments3();
   init_feedback3();
@@ -445283,8 +445214,8 @@ async function startDockerVersionCheck() {
 }
 var MINIMUM_DOCKER_VERSION = "0.16.6";
 var init_startup_docker_check = __esm(() => {
-  init_client2();
   init_health();
+  init_server_url();
 });
 
 // src/agent/bootstrap-tools.ts
@@ -446917,7 +446848,7 @@ async function ensureDefaultAgents(backend3, options) {
 }
 var MEMO_TAG = "default:memo", TUTOR_TAG = "default:tutorial", MEMO_PERSONA, MEMO_HUMAN, MEMO_DESCRIPTION = "The default Letta Code agent with persistent memory", DEFAULT_AGENT_CONFIGS;
 var init_defaults = __esm(() => {
-  init_client2();
+  init_server_url();
   init_settings_manager();
   init_create5();
   init_memory();
@@ -465759,6 +465690,110 @@ var init_LettaLoginOverlay = __esm(async () => {
   jsx_dev_runtime63 = __toESM(require_jsx_dev_runtime(), 1);
 });
 
+// src/backend/api/mcp-servers.ts
+function withTimeout3(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 withTimeout3(client.mcpServers.list(), timeoutMs, "Listing server-side MCP servers");
+}
+async function listLiveServerMcpTools(client, serverName2, timeoutMs = 15000) {
+  const result2 = await withTimeout3(client.get(`/v1/tools/mcp/servers/${encodeURIComponent(serverName2)}/tools`), timeoutMs, `Listing tools for MCP server "${serverName2}"`);
+  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, serverName2, toolName) {
+  const result2 = await client.post(`/v1/tools/mcp/servers/${encodeURIComponent(serverName2)}/${encodeURIComponent(toolName)}`);
+  if (typeof result2?.id !== "string") {
+    throw new Error(`Registering MCP tool "${toolName}" on server "${serverName2}" returned no tool id`);
+  }
+  return { id: result2.id };
+}
+async function attachServerMcpTools(client, agentId, serverName2, toolNames) {
+  await Promise.all(toolNames.map(async (toolName) => {
+    const { id: id2 } = await registerServerMcpTool(client, serverName2, 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 [
@@ -465875,7 +465910,6 @@ 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();
@@ -468917,6 +468951,7 @@ var init_generate_memory_viewer = __esm(() => {
   init_agents7();
   init_client2();
   init_request();
+  init_server_url();
   init_context_usage();
   init_local_memory_context();
   init_memory_viewer_template();
@@ -475505,7 +475540,7 @@ var init_ToolCallMessageRich = __esm(async () => {
       let shellSemanticKind = null;
       let hasShellDescription = false;
       if (!isQuestionTool(rawName)) {
-        const parseArgs23 = () => {
+        const parseArgs22 = () => {
           if (!argsText.trim()) {
             return { formatted: null, parseable: true };
           }
@@ -475519,7 +475554,7 @@ var init_ToolCallMessageRich = __esm(async () => {
             return { formatted: null, parseable: false };
           }
         };
-        const { formatted, parseable } = parseArgs23();
+        const { formatted, parseable } = parseArgs22();
         const argsComplete = parseable || line.phase === "running" || line.phase === "finished" || !isStreaming;
         if (!argsComplete) {
           args = "(…)";
@@ -477735,7 +477770,7 @@ function updateCommandResult(buffersRef, refreshDerived, cmdId, input, output, s
   buffersRef.current.byId.set(cmdId, line);
   refreshDerived();
 }
-function parseArgs23(msg) {
+function parseArgs22(msg) {
   return msg.trim().split(/\s+/).filter(Boolean);
 }
 function formatConnectUsage() {
@@ -478117,7 +478152,7 @@ ${formatBedrockUsage2()}`, false);
   }
 }
 async function handleConnect(ctx, msg) {
-  const parts = parseArgs23(msg);
+  const parts = parseArgs22(msg);
   const providerToken = parts[1];
   if (!providerToken) {
     addCommandResult(ctx.buffersRef, ctx.refreshDerived, msg, formatConnectUsage(), false);
@@ -497893,7 +497928,7 @@ var init_use_conversation_switching = __esm(async () => {
   init_create5();
   init_defaults();
   init_backend2();
-  init_client2();
+  init_server_url();
   init_app_urls();
   init_backfill();
   init_error_formatter();
@@ -497946,6 +497981,8 @@ function useFeedbackHandler(ctx) {
         await submitFeedbackMetadata(apiKey, settingsManager.getOrCreateDeviceId(), {
           message: resolvedMessage,
           feature: "letta-code",
+          submission_source: "slash_command",
+          client_type: getFeedbackClientType(),
           agent_id: agentId,
           session_id: telemetry.getSessionId(),
           run_id: lastRunIdRef.current ?? undefined,
@@ -509060,7 +509097,6 @@ USAGE
   letta teleport ...    Move the current conversation between environments
   letta messages ...    Messages subcommands (JSON-only)
   letta mcp ...         List, search, and call MCP servers available to an agent
-  letta cloud-mcp ...   Legacy server-side MCP commands (JSON-only)
   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
@@ -509088,7 +509124,6 @@ SUBCOMMANDS
   letta messages search --query <text> [--all-agents]
   letta messages list [--agent <id>]
   letta messages transcript --conversation <id> [--out <path>]
-  letta cloud-mcp list|tools|run ... [--agent <id>]
   letta mods list [--agent <id>]
   letta mods package <mod-file> --name <package-name> [--out <dir>]
   letta mods enable <package-spec>
@@ -512915,4 +512950,4 @@ function registerBunOAuthFlows() {
 registerBunOAuthFlows();
 await init_src5().then(() => exports_src2);
 
-//# debugId=201C7804F30F08EC64756E2164756E21
+//# debugId=A04282B12C1CC94F64756E2164756E21