@dxos/edge-client 0.9.0 → 0.9.1-staging.ee54ba693a

package/dist/lib/neutral/chunk-J5LGTIGS.mjs

@@ -0,0 +1,10 @@
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+
+export {
+  __export
+};
+//# sourceMappingURL=chunk-J5LGTIGS.mjs.map

package/dist/lib/neutral/chunk-J5LGTIGS.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": [],
+  "sourcesContent": [],
+  "mappings": "",
+  "names": []
+}

package/dist/lib/neutral/cors-proxy.mjs

@@ -1,6 +1,7 @@
 import {
   proxyFetchLegacy
 } from "./chunk-WQKMEZJR.mjs";
+import "./chunk-J5LGTIGS.mjs";
 export {
   proxyFetchLegacy
 };

package/dist/lib/neutral/edge-ws-muxer.mjs

@@ -3,6 +3,7 @@ import {
   CLOUDFLARE_RPC_MAX_BYTES,
   WebSocketMuxer
 } from "./chunk-L5ZHLJ4B.mjs";
+import "./chunk-J5LGTIGS.mjs";
 export {
   CLOUDFLARE_MESSAGE_MAX_BYTES,
   CLOUDFLARE_RPC_MAX_BYTES,

package/dist/lib/neutral/index.mjs

@@ -10,19 +10,20 @@ import {
   protocol,
   toUint8Array
 } from "./chunk-L5ZHLJ4B.mjs";
+import "./chunk-J5LGTIGS.mjs";
 
 // src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
 // src/auth.ts
-import { createCredential, signPresentation } from "@dxos/credentials";
+import { createCredential, createDidFromIdentityKey, signPresentation } from "@dxos/credentials";
 import { invariant } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
-import { PublicKey } from "@dxos/keys";
+import { IdentityDid, PublicKey } from "@dxos/keys";
 var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
 var createDeviceEdgeIdentity = async (signer, key) => {
   return {
-    identityKey: key.toHex(),
+    identityDid: await createDidFromIdentityKey(key),
     peerKey: key.toHex(),
     presentCredentials: async ({ challenge }) => {
       return signPresentation({
@@ -60,7 +61,7 @@ var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, creden
     })
   ];
   return {
-    identityKey: identityKey.toHex(),
+    identityDid: await createDidFromIdentityKey(identityKey),
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
       invariant(chain, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 56, S: void 0, A: ["chain", ""] });
@@ -106,10 +107,10 @@ var createTestHaloEdgeIdentity = async (signer, identityKey, deviceKey) => {
   ]);
 };
 var createStubEdgeIdentity = () => {
-  const identityKey = PublicKey.random();
   const deviceKey = PublicKey.random();
   return {
-    identityKey: identityKey.toHex(),
+    // Random placeholder DID — the stub never authenticates or connects; a real identity replaces it.
+    identityDid: IdentityDid.random(),
     peerKey: deviceKey.toHex(),
     presentCredentials: async () => {
       throw new Error("Stub identity does not support authentication.");
@@ -184,7 +185,7 @@ var EdgeWsConnection = class extends Resource {
   get info() {
     return {
       open: this.isOpen,
-      identity: this._identity.identityKey,
+      identity: this._identity.identityDid,
       device: this._identity.peerKey
     };
   }
@@ -459,7 +460,7 @@ var EdgeClient = class extends Resource2 {
     return {
       open: this.isOpen,
       status: this.status,
-      identity: this._identity.identityKey,
+      identity: this._identity.identityDid,
       device: this._identity.peerKey
     };
   }
@@ -474,14 +475,14 @@ var EdgeClient = class extends Resource2 {
       messagesReceived: this._currentConnection?.messagesReceived ?? 0
     };
   }
-  get identityKey() {
-    return this._identity.identityKey;
+  get identityDid() {
+    return this._identity.identityDid;
   }
   get peerKey() {
     return this._identity.peerKey;
   }
   setIdentity(identity) {
-    if (identity.identityKey !== this._identity.identityKey || identity.peerKey !== this._identity.peerKey) {
+    if (identity.identityDid !== this._identity.identityDid || identity.peerKey !== this._identity.peerKey) {
       log2("Edge identity changed", {
         identity,
         oldIdentity: this._identity
@@ -505,7 +506,7 @@ var EdgeClient = class extends Resource2 {
     if (!this._currentConnection) {
       throw new EdgeConnectionClosedError();
     }
-    if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityKey !== this.identityKey)) {
+    if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityDid !== this.identityDid)) {
       throw new EdgeIdentityChangedError();
     }
     const traceCtx = ctx.getAttribute(TRACE_SPAN_ATTRIBUTE);
@@ -530,7 +531,7 @@ var EdgeClient = class extends Resource2 {
           try {
             listener();
           } catch (error) {
-            log2.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 123, S: this });
+            log2.catch(error, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 124, S: this });
           }
         }
       });
@@ -543,11 +544,11 @@ var EdgeClient = class extends Resource2 {
   async _open() {
     log2("opening...", {
       info: this.info
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 133, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 134, S: this });
     this._persistentLifecycle.open().catch((err) => {
       log2.warn("Error while opening connection", {
         err
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 137, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 138, S: this });
     });
     scheduleTaskInterval2(this._ctx, async () => {
       if (!this._currentConnection) {
@@ -562,7 +563,7 @@ var EdgeClient = class extends Resource2 {
   async _close() {
     log2("closing...", {
       peerKey: this._identity.peerKey
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 152, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 153, S: this });
     this._closeCurrentConnection();
     await this._persistentLifecycle.close();
   }
@@ -571,10 +572,10 @@ var EdgeClient = class extends Resource2 {
       return void 0;
     }
     const identity = this._identity;
-    const path = `/ws/${identity.identityKey}/${identity.peerKey}`;
+    const path = `/ws/${identity.identityDid}/${identity.peerKey}`;
     const protocolHeader = this._config.disableAuth ? void 0 : await this._createAuthHeader(path);
     if (this._identity !== identity) {
-      log2("identity changed during auth header request", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 166, S: this });
+      log2("identity changed during auth header request", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 167, S: this });
       return void 0;
     }
     const restartRequired = new Trigger();
@@ -582,7 +583,7 @@ var EdgeClient = class extends Resource2 {
     log2("Opening websocket", {
       url: url.toString(),
       protocolHeader
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 171, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 172, S: this });
     const connection = new EdgeWsConnection(identity, {
       url,
       protocolHeader,
@@ -595,7 +596,7 @@ var EdgeClient = class extends Resource2 {
           this._ready.wake();
           this._notifyReconnected();
         } else {
-          log2.verbose("connected callback ignored, because connection is not active", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 187, S: this });
+          log2.verbose("connected callback ignored, because connection is not active", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 188, S: this });
         }
       },
       onRestartRequired: () => {
@@ -603,7 +604,7 @@ var EdgeClient = class extends Resource2 {
           this._closeCurrentConnection();
           void this._persistentLifecycle.scheduleRestart();
         } else {
-          log2.verbose("restart requested by inactive connection", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 195, S: this });
+          log2.verbose("restart requested by inactive connection", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 196, S: this });
         }
         restartRequired.wake();
       },
@@ -614,7 +615,7 @@ var EdgeClient = class extends Resource2 {
           log2.verbose("ignored a message on inactive connection", {
             from: message.source,
             type: message.payload?.typeUrl
-          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 203, S: this });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 204, S: this });
         }
       }
     });
@@ -649,7 +650,7 @@ var EdgeClient = class extends Resource2 {
       } catch (err) {
         log2.error("ws reconnect listener failed", {
           err
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 244, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 245, S: this });
       }
     }
   }
@@ -661,7 +662,7 @@ var EdgeClient = class extends Resource2 {
         log2.error("ws incoming message processing failed", {
           err,
           payload: protocol.getPayloadType(message)
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 255, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 256, S: this });
       }
     }
   }
@@ -677,7 +678,7 @@ var EdgeClient = class extends Resource2 {
       log2.warn("no auth challenge from edge", {
         status: response.status,
         statusText: response.statusText
-      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 271, S: this });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 272, S: this });
       return void 0;
     }
   }
@@ -759,7 +760,7 @@ var BaseHttpClient = class {
     return this._baseUrl;
   }
   setIdentity(identity) {
-    if (this._edgeIdentity?.identityKey !== identity.identityKey || this._edgeIdentity?.peerKey !== identity.peerKey) {
+    if (this._edgeIdentity?.identityDid !== identity.identityDid || this._edgeIdentity?.peerKey !== identity.peerKey) {
       this._edgeIdentity = identity;
       this._authHeader = void 0;
     }
@@ -934,7 +935,46 @@ var ByokError = class extends BaseError.extend("ByokError", "BYOK authentication
     });
   }
 };
+var UsageQuotaExceededError = class extends BaseError.extend("UsageQuotaExceededError", "Usage quota exceeded") {
+};
 var requestInitTagKey = "@effect/platform/FetchHttpClient/FetchOptions";
+var isUserDefinedAnthropicTool = (tool) => tool.input_schema != null && typeof tool.input_schema === "object";
+var patchAnthropicMessagesRequestBody = (body) => {
+  if (body == null) {
+    return body;
+  }
+  const decodeBody = () => {
+    if (typeof body === "string") {
+      return body;
+    }
+    if (body instanceof Uint8Array) {
+      return new TextDecoder().decode(body);
+    }
+    return void 0;
+  };
+  const text = decodeBody();
+  if (text == null) {
+    return body;
+  }
+  try {
+    const payload = JSON.parse(text);
+    if (!Array.isArray(payload.tools)) {
+      return body;
+    }
+    payload.tools = payload.tools.map((tool) => isUserDefinedAnthropicTool(tool) ? {
+      ...tool,
+      eager_input_streaming: true
+    } : tool);
+    const patched = JSON.stringify(payload);
+    return typeof body === "string" ? patched : new TextEncoder().encode(patched);
+  } catch {
+    return body;
+  }
+};
+var readStreamBody = (stream) => Effect2.promise(async () => {
+  const response = new Response(stream);
+  return await response.text();
+});
 var EdgeAiHttpClient = class _EdgeAiHttpClient {
   static make = (getClient) => HttpClient.make((request, url, signal, fiber) => {
     const edgeClient = getClient();
@@ -947,13 +987,13 @@ var EdgeAiHttpClient = class _EdgeAiHttpClient {
         ...options,
         method: request.method,
         headers,
-        body,
+        body: patchAnthropicMessagesRequestBody(body),
         signal
       })),
       catch: (cause) => {
         log5.error("Failed to fetch", {
           cause
-        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 60, S: this });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file7, L: 106, S: this });
         return new HttpClientError.RequestError({
           request,
           reason: "Transport",
@@ -977,6 +1017,19 @@ var EdgeAiHttpClient = class _EdgeAiHttpClient {
           })
         }))));
       }
+      if (!carriedByok && response.status === 429) {
+        return Effect2.tryPromise({
+          try: () => response.clone().json(),
+          catch: () => void 0
+        }).pipe(Effect2.orElseSucceed(() => void 0), Effect2.flatMap((body2) => Effect2.fail(new HttpClientError.ResponseError({
+          request,
+          response: httpResponse,
+          reason: "StatusCode",
+          cause: new UsageQuotaExceededError({
+            message: body2?.error?.message
+          })
+        }))));
+      }
       return Effect2.succeed(httpResponse);
     }));
     switch (request.body._tag) {
@@ -986,7 +1039,7 @@ var EdgeAiHttpClient = class _EdgeAiHttpClient {
       case "FormData":
         return send(request.body.formData);
       case "Stream":
-        return Stream.toReadableStreamEffect(request.body.stream).pipe(Effect2.flatMap(send));
+        return Stream.toReadableStreamEffect(request.body.stream).pipe(Effect2.flatMap((readable) => readStreamBody(readable)), Effect2.flatMap((text) => send(text)));
     }
     return send(void 0);
   });
@@ -1033,7 +1086,7 @@ var EdgeHttpClient = class extends BaseHttpClient {
     });
   }
   getAgentStatus(ctx, request, args) {
-    return this._call(ctx, new URL(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, this.baseUrl), {
+    return this._call(ctx, new URL(`/users/${request.ownerIdentityDid}/agent/status`, this.baseUrl), {
       ...args,
       method: "GET"
     });
@@ -1142,7 +1195,8 @@ var EdgeHttpClient = class extends BaseHttpClient {
     const formData = new FormData();
     formData.append("name", body.name ?? "");
     formData.append("version", body.version);
-    formData.append("ownerPublicKey", body.ownerPublicKey);
+    const ownerUri = this._edgeIdentity?.identityDid ?? body.ownerUri;
+    formData.append("ownerUri", ownerUri);
     formData.append("entryPoint", body.entryPoint);
     body.runtime && formData.append("runtime", body.runtime);
     for (const [filename, content] of Object.entries(body.assets)) {
@@ -1240,10 +1294,17 @@ var EdgeHttpClient = class extends BaseHttpClient {
       method: "GET"
     });
   }
-  async getRegistryPluginVersions(ctx, repo, args) {
-    return this._call(ctx, new URL(`/registry/plugins/${encodeURIComponent(repo)}/versions`, this.baseUrl), {
-      ...args,
-      method: "GET"
+  /**
+  * Uploads a built plugin bundle to the registry's R2-backed hosting. Authenticated
+  * with the caller's hub identity (verifiable presentation) — `setIdentity` must
+  * have been called. Returns the canonical `moduleUrl` (the hosted `manifest.json`).
+  */
+  async uploadPluginBundle(ctx, request, args) {
+    return this._call(ctx, new URL("/registry/upload", this.baseUrl), {
+      body: request,
+      method: "POST",
+      auth: true,
+      ...args
     });
   }
   //
@@ -1334,6 +1395,7 @@ var getFileMimeType = (filename) => [
 ].some((ext) => filename.endsWith(ext)) ? "application/javascript+module" : filename.endsWith(".wasm") ? "application/wasm" : "application/octet-stream";
 
 // src/hub-http-client.ts
+import { createUrl as createUrl2 } from "@dxos/util";
 var HubHttpClient = class extends BaseHttpClient {
   constructor(hubUrl, options) {
     super(hubUrl, options);
@@ -1414,6 +1476,18 @@ var HubHttpClient = class extends BaseHttpClient {
       method: "POST"
     });
   }
+  /**
+  * Rolling-window usage and effective limits for the authenticated identity.
+  * Served from the per-user metering DO; optional `windowSeconds` defaults to the largest limit window.
+  */
+  async getProfileUsage(ctx, query, args) {
+    return this._call(ctx, createUrl2(new URL("/api/metering/profile/usage", this.baseUrl), {
+      windowSeconds: query?.windowSeconds
+    }), {
+      ...args,
+      method: "GET"
+    });
+  }
 };
 export {
   BaseHttpClient,
@@ -1428,6 +1502,7 @@ export {
   HttpConfig,
   HubHttpClient,
   Protocol,
+  UsageQuotaExceededError,
   WebSocketMuxer,
   createChainEdgeIdentity,
   createDeviceEdgeIdentity,
@@ -1437,6 +1512,7 @@ export {
   encodeAuthHeader,
   getTypename,
   handleAuthChallenge,
+  patchAnthropicMessagesRequestBody,
   protocol,
   proxyFetchLegacy,
   requestInitTagKey,