@letta-ai/letta-agent-sdk 0.8.79 → 0.8.80

package/dist/external-tools.d.ts

@@ -1,4 +1,4 @@
-import type { AppServerExternalToolCallHandler } from "@letta-ai/letta-code/app-server-client";
+import type { AppServerClient, AppServerExternalToolCallHandler } from "@letta-ai/letta-code/app-server-client";
 import type { RuntimeScope } from "./remote-session-protocol.js";
 import type { AnyAgentTool } from "./types.js";
 /** The `external_tools` groups that advertise client tools to the runtime. */
@@ -7,5 +7,9 @@ export declare function externalToolGroups(tools: AnyAgentTool[] | undefined): A
  * Run a runtime's external tool call against the client tools by name.
  * `fallbackRuntime` covers listeners that send calls without a `runtime`.
  */
-export declare function createExternalToolCallHandler(externalTools: Map<string, AnyAgentTool>, fallbackRuntime?: () => RuntimeScope | null): AppServerExternalToolCallHandler;
+export declare function createExternalToolCallHandler(externalTools: Map<string, AnyAgentTool>, fallbackRuntime?: () => RuntimeScope | null): CancellableToolCallHandler;
+type CancellableToolCallHandler = (request: Parameters<AppServerExternalToolCallHandler>[0], signal?: AbortSignal) => ReturnType<AppServerExternalToolCallHandler>;
+/** Own response arbitration so cancellation and completion cannot both reply. */
+export declare function registerExternalToolCallHandler(client: AppServerClient, handler: CancellableToolCallHandler): () => void;
+export {};
 //# sourceMappingURL=external-tools.d.ts.map

package/dist/external-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"external-tools.d.ts","sourceRoot":"","sources":["../src/external-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAC/F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAwB,YAAY,EAAE,MAAM,YAAY,CAAC;AAErE,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAYhH;AAID;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACxC,eAAe,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,GAC1C,gCAAgC,CAwClC"}
+{"version":3,"file":"external-tools.d.ts","sourceRoot":"","sources":["../src/external-tools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,gCAAgC,EAAE,MAAM,wCAAwC,CAAC;AAChH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAwB,YAAY,EAAE,MAAM,YAAY,CAAC;AAErE,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAahH;AAID;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACxC,eAAe,CAAC,EAAE,MAAM,YAAY,GAAG,IAAI,GAC1C,0BAA0B,CAwC5B;AAED,KAAK,0BAA0B,GAAG,CAChC,OAAO,EAAE,UAAU,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC,EACxD,MAAM,CAAC,EAAE,WAAW,KACjB,UAAU,CAAC,gCAAgC,CAAC,CAAC;AAElD,iFAAiF;AACjF,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,0BAA0B,GAClC,MAAM,IAAI,CAuCZ"}

package/dist/index.js

@@ -9536,18 +9536,39 @@ function onceSocketEvent(socket, type, listener) {
   });
   return detach;
 }
-function waitForSocketOpen(socket) {
+function waitForSocketOpen(socket, timeoutMs) {
   if (socket.readyState === WEBSOCKET_OPEN_STATE) {
     return Promise.resolve();
   }
-  return new Promise((resolve, reject) => {
+  return new Promise((resolvePromise, rejectPromise) => {
+    let settled = false;
+    const resolve = () => {
+      if (settled)
+        return;
+      settled = true;
+      resolvePromise();
+    };
+    const reject = (error) => {
+      if (settled)
+        return;
+      settled = true;
+      rejectPromise(error);
+    };
     let detachOpen = () => {};
     let detachError = () => {};
+    let detachClose = () => {};
     let detachResponse = () => {};
     let detachBody = () => {};
+    let upgradeRejected = false;
+    const timer = timeoutMs > 0 ? setTimeout(() => {
+      cleanup();
+      reject(new Error(`App-server WebSocket failed to open: timed out after ${timeoutMs}ms`));
+    }, timeoutMs) : undefined;
     const cleanup = () => {
+      clearTimeout(timer);
       detachOpen();
       detachError();
+      detachClose();
       detachResponse();
       detachBody();
     };
@@ -9559,6 +9580,7 @@ function waitForSocketOpen(socket) {
       const onResponse = (_request, response) => {
         if (!response)
           return;
+        upgradeRejected = true;
         const request = _request;
         let body = Buffer.alloc(0);
         let finished = false;
@@ -9600,6 +9622,12 @@ function waitForSocketOpen(socket) {
       cleanup();
       reject(new Error(`App-server WebSocket failed to open: ${String(event)}`));
     });
+    detachClose = onceSocketEvent(socket, "close", () => {
+      if (upgradeRejected)
+        return;
+      cleanup();
+      reject(new Error("App-server WebSocket failed to open: closed before opening"));
+    });
   });
 }
 function rawEventData(event) {
@@ -9667,7 +9695,7 @@ class AppServerClient {
     });
   }
   async connect() {
-    await waitForSocketOpen(this.socket);
+    await waitForSocketOpen(this.socket, this.requestTimeoutMs);
     return this;
   }
   close() {
@@ -13294,6 +13322,7 @@ function externalToolGroups(tools) {
     return;
   return [
     {
+      capabilities: { external_tool_call_cancel: true },
       tools: tools.map((tool) => ({
         name: tool.name,
         label: tool.label,
@@ -13306,14 +13335,14 @@ function externalToolGroups(tools) {
 var MAX_REMEMBERED_EXTERNAL_TOOL_CALLS = 200;
 function createExternalToolCallHandler(externalTools, fallbackRuntime) {
   const calls = new Map;
-  const execute = async (request) => {
+  const execute = async (request, signal) => {
     const tool = externalTools.get(request.tool_name);
     if (!tool) {
       throw new Error(`Unknown external tool: ${request.tool_name}`);
     }
     const runtime = request.runtime ?? fallbackRuntime?.() ?? null;
     const context = runtime ? { toolCallId: request.tool_call_id, agentId: runtime.agent_id, conversationId: runtime.conversation_id } : undefined;
-    const result = await tool.execute(request.tool_call_id, request.input, undefined, undefined, context);
+    const result = await tool.execute(request.tool_call_id, request.input, signal, undefined, context);
     return {
       content: result.content.map((part) => ({
         type: part.type,
@@ -13324,15 +13353,15 @@ function createExternalToolCallHandler(externalTools, fallbackRuntime) {
       ...result.isError === true ? { is_error: true } : {}
     };
   };
-  return (request) => {
+  return (request, signal) => {
     const requestId = request.request_id;
     if (typeof requestId !== "string" || requestId.length === 0) {
-      return execute(request);
+      return execute(request, signal);
     }
     const existing = calls.get(requestId);
     if (existing)
       return existing;
-    const call = execute(request);
+    const call = execute(request, signal);
     calls.set(requestId, call);
     while (calls.size > MAX_REMEMBERED_EXTERNAL_TOOL_CALLS) {
       const oldest = calls.keys().next().value;
@@ -13343,6 +13372,49 @@ function createExternalToolCallHandler(externalTools, fallbackRuntime) {
     return call;
   };
 }
+function registerExternalToolCallHandler(client, handler) {
+  const pending = new Map;
+  const completed = new Set;
+  const remove = client.onMessage((raw, channel) => {
+    if (channel !== "control")
+      return;
+    const message = raw;
+    const requestId = message.request_id;
+    if (typeof requestId !== "string")
+      return;
+    if (message.type === "external_tool_call_cancel") {
+      const call = pending.get(requestId);
+      if (!call)
+        return;
+      call.finish({ error: "cancelled" });
+      call.controller.abort(message.reason);
+      return;
+    }
+    if (message.type !== "external_tool_call_request" || pending.has(requestId) || completed.has(requestId))
+      return;
+    const controller = new AbortController;
+    const finish = (response) => {
+      if (!pending.delete(requestId))
+        return;
+      completed.add(requestId);
+      if (completed.size > MAX_REMEMBERED_EXTERNAL_TOOL_CALLS)
+        completed.delete(completed.values().next().value);
+      client.send({ type: "external_tool_call_response", request_id: requestId, ...response });
+    };
+    pending.set(requestId, { controller, finish });
+    try {
+      Promise.resolve(handler(raw, controller.signal)).then((result) => finish({ result }), (error) => finish({ error: error instanceof Error ? error.message : String(error) }));
+    } catch (error) {
+      finish({ error: error instanceof Error ? error.message : String(error) });
+    }
+  });
+  return () => {
+    remove();
+    for (const call of pending.values())
+      call.controller.abort();
+    pending.clear();
+  };
+}
 
 // src/runtime-tool-policy.ts
 var RUNTIME_TOOL_POLICY_CAPABILITY = "runtime_tool_policy";
@@ -15167,7 +15239,7 @@ class AppServerSession extends RemoteClientSessionCore {
       getOptions: () => this.currentOptions()
     });
     if (this.externalTools.size > 0 || this.inheritedTools) {
-      this.removeExternalToolHandler = client.onExternalToolCall(createExternalToolCallHandler(this.externalTools, () => this.runtime));
+      this.removeExternalToolHandler = registerExternalToolCallHandler(client, createExternalToolCallHandler(this.externalTools, () => this.runtime));
     }
     try {
       await client.connect();
@@ -16272,7 +16344,7 @@ class CloudEnvironmentSession extends RemoteClientSessionCore {
       getOptions: () => this.currentOptions()
     });
     if (this.externalTools.size > 0) {
-      this.removeExternalToolHandler = client.onExternalToolCall(createExternalToolCallHandler(this.externalTools, () => this.runtime));
+      this.removeExternalToolHandler = registerExternalToolCallHandler(client, createExternalToolCallHandler(this.externalTools, () => this.runtime));
     }
   }
   cleanupTransportHandlers() {
@@ -17030,12 +17102,12 @@ class ToolRegistry {
       ...this.options.WebSocket ? { WebSocket: this.options.WebSocket } : {},
       ...this.options.requestTimeoutMs !== undefined ? { requestTimeoutMs: this.options.requestTimeoutMs } : {}
     }));
-    client.onExternalToolCall(async (request) => {
+    registerExternalToolCallHandler(client, async (request, signal) => {
       const runtime = request.runtime;
       const entry = runtime && [...this.entries].find((candidate) => candidate.runtimes.some((r) => runtimeKey(r) === runtimeKey(runtime)));
       if (!entry)
         throw new Error(`No tools registered for conversation ${runtime?.conversation_id}`);
-      return entry.call(request);
+      return entry.call(request, signal);
     });
     try {
       await client.connect();
@@ -35463,7 +35535,7 @@ class StreamableHTTPClientTransport {
 }
 var DEFAULT_CLIENT_INFO = {
   name: "letta-code",
-  version: "0.34.49"
+  version: "0.34.50"
 };
 async function connectMcpServer(config2, options = {}) {
   let client = new Client(options.clientInfo ?? DEFAULT_CLIENT_INFO);
@@ -36491,4 +36563,4 @@ export {
   CloudManagedSandboxExpiredError
 };
 
-//# debugId=AFB0BEDEFE911CAD64756E2164756E21
+//# debugId=FF481D2B70CB9B5D64756E2164756E21