libfx 0.0.11 → 0.0.13

package/node.js

@@ -13,13 +13,14 @@ import {
   encodeXtermKeyEvent,
   fxSdkApiVersion,
   listModels,
+  normalizeAgentOptions,
   supportsJspi,
   xtermAdapter,
 } from "./fx-sdk.js";
 
 export { encodeXtermKeyEvent, fxSdkApiVersion, listModels, supportsJspi, xtermAdapter };
 export const libfxApiVersion = 2;
-const nativeCoreApiVersion = 3;
+const nativeCoreApiVersion = 4;
 
 const fetchOperationStale = 0;
 const fetchOperationApplied = 1;
@@ -345,7 +346,12 @@ export async function getBackendInfo(value = {}) {
 }
 
 function createNativeCoreRuntime(addon, options) {
-  const { apiKey, model, effort, fast, gatewayChatUrl } = options;
+  const { apiKey, model, effort, fast, ultrafast, gatewayChatUrl } = options;
+  if (ultrafast !== undefined && addon.supportsUltrafast !== true) {
+    const error = new Error("native addon does not support the ultrafast option");
+    error.code = "LIBFX_NATIVE_CAPABILITY_UNAVAILABLE";
+    throw error;
+  }
   const core = addon.createCore({
     apiKey,
     home: options.home ?? homedir(),
@@ -353,6 +359,7 @@ function createNativeCoreRuntime(addon, options) {
     ...(model === undefined ? {} : { model }),
     ...(effort === undefined ? {} : { effort }),
     ...(fast === undefined ? {} : { fast }),
+    ...(ultrafast === undefined ? {} : { ultrafast }),
     ...(gatewayChatUrl === undefined ? {} : { gatewayChatUrl }),
   });
   let readyFd;
@@ -390,7 +397,7 @@ function createNativeCoreRuntime(addon, options) {
     readySocket.destroy();
     void readyClosed.then(() => exitedResolve(code));
   };
-  const pumpFetch = async (request) => {
+  const pumpFetch = async (request, body) => {
     const controller = new AbortController();
     const state = { handle: request.handle, controller };
     fetchState = state;
@@ -398,7 +405,7 @@ function createNativeCoreRuntime(addon, options) {
       const response = await (options.fetch ?? globalThis.fetch)(request.url, {
         method: request.method,
         headers: new Headers(JSON.parse(request.headers).map(({ name, value }) => [name, value])),
-        body: request.body?.length ? Buffer.from(request.body, "base64") : undefined,
+        body: body.length ? body : undefined,
         signal: controller.signal,
       });
       const started = addon.startCoreFetchResponse(core, state.handle, response.status);
@@ -447,8 +454,9 @@ function createNativeCoreRuntime(addon, options) {
           fetchState.controller.abort();
         }
       } else {
+        // The core hands over JSON metadata and the raw request body separately.
         const fetchRequest = addon.takeCoreFetch(core);
-        if (fetchRequest) void pumpFetch(JSON.parse(fetchRequest.toString("utf8")));
+        if (fetchRequest) void pumpFetch(JSON.parse(fetchRequest.request.toString("utf8")), fetchRequest.body);
       }
       if (addon.coreExitCode(core) !== 0) {
         finish(1, new Error("native output delivery failed"));
@@ -493,6 +501,12 @@ function createNativeCoreRuntime(addon, options) {
     exited,
     get error() { return outputError; },
     write(data) { addon.writeCore(core, Buffer.from(data)); },
+    // The addon copies attachment bytes before returning.
+    writeAttachment(id, bytes) {
+      addon.writeCoreAttachment(core, id, Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength));
+    },
+    takeAttachment(id) { return addon.takeCoreAttachment(core, id); },
+    discardAttachments() { addon.discardCoreAttachments(core); },
     closeStdin() { addon.closeCore(core); },
     abortHostEffects,
     abort(error) {
@@ -513,10 +527,11 @@ function createNativeAgent(addon, options) {
 }
 
 async function createWithFallback(surface, nativeMethod, wasmFactory, defaultWasm, options) {
-  const { nativeAddon, backend = "auto", ...runtimeOptions } = options ?? {};
+  const { nativeAddon, backend = "auto", ...unvalidatedOptions } = options ?? {};
   if (!new Set(["auto", "native", "wasm"]).has(backend)) {
     throw new TypeError('backend must be "auto", "native", or "wasm"');
   }
+  const runtimeOptions = surface === "agent" ? normalizeAgentOptions(unvalidatedOptions) : unvalidatedOptions;
 
   let nativeError;
   let nativeAttempted = false;
@@ -530,7 +545,8 @@ async function createWithFallback(surface, nativeMethod, wasmFactory, defaultWas
         return await native.backend[nativeMethod](runtimeOptions);
       } catch (error) {
         nativeError = error;
-        if (backend === "native") throw error;
+        if (backend === "native" || error?.code === "LIBFX_MODEL_UNSUPPORTED_FAST" ||
+          error?.code === "LIBFX_MODEL_UNSUPPORTED_EFFORT") throw error;
       }
     }
     if (backend === "native") {
@@ -549,9 +565,6 @@ async function createWithFallback(surface, nativeMethod, wasmFactory, defaultWas
 }
 
 export async function createFxAgent(options = {}) {
-  if (options != null && Object.hasOwn(Object(options), "env")) {
-    throw new TypeError("createFxAgent() does not accept env; pass apiKey and model directly");
-  }
   return createWithFallback(
     "agent",
     "createCore",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libfx",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Embed fx agents and terminals in JavaScript hosts",
   "type": "module",
   "repository": {