@letta-ai/letta-agent-sdk 0.5.4 → 0.5.6

package/README.md

@@ -10,14 +10,6 @@ Build applications with stateful agents powered by the [Letta agent harness](htt
 npm install @letta-ai/letta-agent-sdk
 ```
 
-The `0.4.x` SDK line requires the matching single-socket
-`@letta-ai/letta-code` app-server release. Release `letta-code` first, then
-replace the SDK's package dependency with that published version before
-publishing `0.4.0`; the development branch intentionally does not name an
-unpublished package version.
-
-Local execution requires Node.js 22.19 or newer.
-
 ## Quick start
 
 ```ts
@@ -127,6 +119,32 @@ await using session = client.createSession(agentId, {
 });
 ```
 
+Local execution (embedded Letta Code harness / app server) requires Node.js 22.19 or newer.
+
+### MCP tools
+
+Pass stdio MCP servers as session options. The SDK starts them in the session
+cwd, namespaces their tools as `mcp__<server>__<tool>`, and exposes them through
+Letta Code's external-tool protocol. Servers are closed with the session.
+
+```ts
+await using session = client.createSession(agentId, {
+  cwd: process.cwd(),
+  mcpServers: [
+    {
+      name: "filesystem",
+      command: "npx",
+      args: ["-y", "@modelcontextprotocol/server-filesystem", process.cwd()],
+    },
+  ],
+});
+```
+
+MCP stdio processes require the Node package entry; they are not available from
+`@letta-ai/letta-agent-sdk/client` in browser or React Native environments. For
+a simple smoke test, the official `@modelcontextprotocol/server-everything`
+package runs over stdio with `npx -y @modelcontextprotocol/server-everything`.
+
 ### Managed Cloud sandbox repositories
 
 Cloud sessions can clone up to 10 GitHub repositories into the managed

package/dist/app-server-session.d.ts

@@ -66,6 +66,7 @@ export declare class AppServerSession extends RemoteClientSessionCore {
     private readonly remoteOptions;
     private ownedConnection;
     private externalTools;
+    private mcpBridge;
     private removeExternalToolHandler;
     private removeControlRequestHandler;
     constructor(remoteOptions: AppServerSessionOptions, mode: AppServerSessionMode);

package/dist/app-server-session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-server-session.d.ts","sourceRoot":"","sources":["../src/app-server-session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-server-session.d.ts","sourceRoot":"","sources":["../src/app-server-session.ts"],"names":[],"mappings":"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"}

package/dist/client-entry.js

@@ -8615,6 +8615,20 @@ function buildCanUseToolContext(request, requestId) {
   return context;
 }
 
+// src/mcp-runtime.ts
+var connector = null;
+async function connectMcpServers(servers, options = {}) {
+  if (!servers || servers.length === 0) {
+    return { tools: [], close: async () => {
+      return;
+    } };
+  }
+  if (!connector) {
+    throw new Error("MCP stdio servers require the Node package entry '@letta-ai/letta-agent-sdk'; they are not available from '@letta-ai/letta-agent-sdk/client'.");
+  }
+  return connector(servers, options);
+}
+
 // src/remote-session-protocol.ts
 var FAILURE_STOP_REASONS = new Set([
   "error",
@@ -9021,6 +9035,7 @@ function normalizeSendMessage(message) {
 class RemoteTurnCoordinator {
   label;
   requestTimeoutMs;
+  autoHandlesToolApprovals;
   onDeviceStatus;
   streamQueue = [];
   streamResolvers = [];
@@ -9034,6 +9049,7 @@ class RemoteTurnCoordinator {
   constructor(config) {
     this.label = config.label;
     this.requestTimeoutMs = config.requestTimeoutMs;
+    this.autoHandlesToolApprovals = config.autoHandlesToolApprovals === true;
     this.onDeviceStatus = config.onDeviceStatus;
   }
   get activeTurnStartedAt() {
@@ -9210,6 +9226,8 @@ class RemoteTurnCoordinator {
     if (!hadTurnEvidence)
       return;
     if (status === "WAITING_ON_APPROVAL") {
+      if (this.autoHandlesToolApprovals)
+        return;
       this.completeActiveTurn({
         runtime: active.runtime,
         stopReason: "requires_approval",
@@ -9447,6 +9465,7 @@ class RemoteClientSessionCore {
     this.turns = new RemoteTurnCoordinator({
       label: config.label,
       requestTimeoutMs: config.requestTimeoutMs,
+      autoHandlesToolApprovals: mode.kind === "session" && typeof mode.options.canUseTool === "function",
       onDeviceStatus: (status) => this.emitDeviceStatus(status)
     });
   }
@@ -10212,37 +10231,72 @@ function runtimeScopeFromMessage(message) {
   }
   return null;
 }
-function registerAppServerControlRequestHandler(config) {
-  return config.client.onMessage((rawMessage, channel) => {
-    const message = rawMessage;
-    if (channel !== "control" || message.type !== "control_request")
-      return;
-    respondToAppServerControlRequest(config, message).catch(() => {});
-  });
-}
-async function respondToAppServerControlRequest(config, message) {
-  const runtime = runtimeScopeFromMessage(message) ?? config.getRuntime();
-  if (!runtime)
-    return;
-  const requestId = typeof message.request_id === "string" ? message.request_id : undefined;
+var MAX_CACHED_TOOL_APPROVALS = 256;
+function parseToolApprovalRequest(message, fallbackRuntime) {
+  const runtime = runtimeScopeFromMessage(message) ?? fallbackRuntime;
+  const requestId = typeof message.request_id === "string" ? message.request_id : null;
   const request = message.request;
-  if (!requestId || !request || typeof request !== "object")
-    return;
+  if (!runtime || !requestId || !request || typeof request !== "object")
+    return null;
   const requestRecord = request;
   if (requestRecord.subtype !== "can_use_tool")
-    return;
+    return null;
   const toolName = typeof requestRecord.tool_name === "string" ? requestRecord.tool_name : "unknown";
   const toolInput = requestRecord.input && typeof requestRecord.input === "object" && !Array.isArray(requestRecord.input) ? requestRecord.input : {};
-  const decision = await resolveAppServerToolApproval(config.getOptions(), toolName, toolInput, buildCanUseToolContext(requestRecord, requestId));
-  config.client.input({
+  return {
+    key: JSON.stringify([runtime.agent_id, runtime.conversation_id, requestId]),
     runtime,
+    requestId,
+    toolName,
+    toolInput,
+    context: buildCanUseToolContext(requestRecord, requestId)
+  };
+}
+function sendToolApprovalResponse(client, request, decision) {
+  client.input({
+    runtime: request.runtime,
     payload: {
       kind: "approval_response",
-      request_id: requestId,
+      request_id: request.requestId,
       decision: toAppServerApprovalDecision(decision)
     }
   });
 }
+function registerAppServerControlRequestHandler(config) {
+  const approvals = new Map;
+  return config.client.onMessage((rawMessage, channel) => {
+    const message = rawMessage;
+    if (channel !== "control" || message.type !== "control_request")
+      return;
+    const request = parseToolApprovalRequest(message, config.getRuntime());
+    if (!request)
+      return;
+    const cached = approvals.get(request.key);
+    if (cached) {
+      if (cached.sent) {
+        cached.decision.then((decision) => sendToolApprovalResponse(config.client, cached.request, decision)).catch(() => {
+          return;
+        });
+      }
+      return;
+    }
+    if (approvals.size >= MAX_CACHED_TOOL_APPROVALS) {
+      const oldest = approvals.keys().next().value;
+      if (oldest !== undefined)
+        approvals.delete(oldest);
+    }
+    const entry = {
+      decision: resolveAppServerToolApproval(config.getOptions(), request.toolName, request.toolInput, request.context),
+      sent: false,
+      request
+    };
+    approvals.set(request.key, entry);
+    entry.decision.then((decision) => {
+      entry.sent = true;
+      sendToolApprovalResponse(config.client, request, decision);
+    }).catch(() => approvals.delete(request.key));
+  });
+}
 
 class AppServerRuntimeController {
   client;
@@ -10363,6 +10417,7 @@ class AppServerSession extends RemoteClientSessionCore {
   remoteOptions;
   ownedConnection = null;
   externalTools = new Map;
+  mcpBridge = null;
   removeExternalToolHandler = null;
   removeControlRequestHandler = null;
   constructor(remoteOptions, mode) {
@@ -10389,6 +10444,14 @@ class AppServerSession extends RemoteClientSessionCore {
       ...this.remoteOptions.WebSocket ? { WebSocket: this.remoteOptions.WebSocket } : {},
       ...this.remoteOptions.requestTimeoutMs !== undefined ? { requestTimeoutMs: this.remoteOptions.requestTimeoutMs } : {}
     }));
+    const options = this.currentOptions();
+    this.mcpBridge = await connectMcpServers("mcpServers" in options ? options.mcpServers : undefined, {
+      cwd: options.cwd,
+      reservedToolNames: this.externalTools.keys()
+    });
+    for (const tool of this.mcpBridge.tools) {
+      this.externalTools.set(tool.name, tool);
+    }
     this.removeControlRequestHandler = registerAppServerControlRequestHandler({
       client,
       getRuntime: () => this.runtime,
@@ -10418,6 +10481,8 @@ class AppServerSession extends RemoteClientSessionCore {
       this.removeExternalToolHandler = null;
       this.removeControlRequestHandler?.();
       this.removeControlRequestHandler = null;
+      this.mcpBridge?.close();
+      this.mcpBridge = null;
       client.close();
       throw error;
     }
@@ -10427,6 +10492,8 @@ class AppServerSession extends RemoteClientSessionCore {
     this.removeExternalToolHandler = null;
     this.removeControlRequestHandler?.();
     this.removeControlRequestHandler = null;
+    this.mcpBridge?.close();
+    this.mcpBridge = null;
     this.ownedConnection?.close();
     this.ownedConnection = null;
   }
@@ -10464,7 +10531,7 @@ class AppServerSession extends RemoteClientSessionCore {
     if (options.skillSources !== undefined) {
       command.skill_sources = [...new Set(options.skillSources)];
     }
-    const groups = externalToolGroups(options.tools);
+    const groups = externalToolGroups([...this.externalTools.values()]);
     if (groups)
       command.external_tools = groups;
     if (this.mode.kind === "create-agent") {
@@ -11084,6 +11151,7 @@ class CloudEnvironmentSession extends RemoteClientSessionCore {
   removeExternalToolHandler = null;
   removeControlRequestHandler = null;
   externalTools = new Map;
+  mcpBridge = null;
   managedSandbox = null;
   sandboxRefreshTimer = null;
   sandboxRefreshInFlight = null;
@@ -11131,6 +11199,14 @@ class CloudEnvironmentSession extends RemoteClientSessionCore {
       }),
       requestTimeoutMs: this.cloudOptions.requestTimeoutMs ?? DEFAULT_TURN_TIMEOUT_MS
     }));
+    const options = this.currentOptions();
+    this.mcpBridge = await connectMcpServers("mcpServers" in options ? options.mcpServers : undefined, {
+      cwd: options.cwd,
+      reservedToolNames: this.externalTools.keys()
+    });
+    for (const tool of this.mcpBridge.tools) {
+      this.externalTools.set(tool.name, tool);
+    }
     this.removeControlRequestHandler = registerAppServerControlRequestHandler({
       client,
       getRuntime: () => this.runtime,
@@ -11162,6 +11238,8 @@ class CloudEnvironmentSession extends RemoteClientSessionCore {
       this.removeExternalToolHandler = null;
       this.removeControlRequestHandler?.();
       this.removeControlRequestHandler = null;
+      this.mcpBridge?.close();
+      this.mcpBridge = null;
       client.close();
       await this.cleanupManagedSandbox();
       await this.cleanupSessionRepositories(resolved.runtime.agent_id, resolved.runtime.conversation_id);
@@ -11188,7 +11266,7 @@ class CloudEnvironmentSession extends RemoteClientSessionCore {
     if (options.skillSources !== undefined) {
       command.skill_sources = [...new Set(options.skillSources)];
     }
-    const groups = externalToolGroups(options.tools);
+    const groups = externalToolGroups([...this.externalTools.values()]);
     if (groups)
       command.external_tools = groups;
     return await client.runtimeStart(command);
@@ -11214,6 +11292,8 @@ class CloudEnvironmentSession extends RemoteClientSessionCore {
     this.removeExternalToolHandler = null;
     this.removeControlRequestHandler?.();
     this.removeControlRequestHandler = null;
+    this.mcpBridge?.close();
+    this.mcpBridge = null;
     this.cleanupManagedSandbox();
     if (this.runtime?.agent_id) {
       this.cleanupSessionRepositories(this.runtime.agent_id, this.runtime.conversation_id);
@@ -12169,4 +12249,4 @@ export {
   CloudManagedSandboxExpiredError
 };
 
-//# debugId=A7FA3320F5313CB664756E2164756E21
+//# debugId=6301765BD48499AE64756E2164756E21