@dxos/edge-client 0.9.1-main.c7dcc2e112 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/edge-client",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.10.0",
   "description": "EDGE Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -46,29 +46,29 @@
     "README.md"
   ],
   "dependencies": {
-    "@effect/platform": "0.96.1",
+    "@effect/platform": "0.96.2",
     "@opentelemetry/api": "^1.9.1",
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.17.1",
-    "@dxos/context": "0.9.1-main.c7dcc2e112",
-    "@dxos/credentials": "0.9.1-main.c7dcc2e112",
-    "@dxos/async": "0.9.1-main.c7dcc2e112",
-    "@dxos/errors": "0.9.1-main.c7dcc2e112",
-    "@dxos/effect": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/keyring": "0.9.1-main.c7dcc2e112",
-    "@dxos/keys": "0.9.1-main.c7dcc2e112",
-    "@dxos/node-std": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
-    "@dxos/crypto": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112"
+    "@dxos/async": "0.10.0",
+    "@dxos/effect": "0.10.0",
+    "@dxos/context": "0.10.0",
+    "@dxos/errors": "0.10.0",
+    "@dxos/crypto": "0.10.0",
+    "@dxos/invariant": "0.10.0",
+    "@dxos/keyring": "0.10.0",
+    "@dxos/keys": "0.10.0",
+    "@dxos/node-std": "0.10.0",
+    "@dxos/protocols": "0.10.0",
+    "@dxos/log": "0.10.0",
+    "@dxos/util": "0.10.0",
+    "@dxos/credentials": "0.10.0"
   },
   "devDependencies": {
-    "@dxos/test-utils": "0.9.1-main.c7dcc2e112"
+    "@dxos/test-utils": "0.10.0"
   },
   "peerDependencies": {
-    "effect": "3.21.3"
+    "effect": "3.21.4"
   },
   "publishConfig": {
     "access": "public"

package/src/auth.ts

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { createCredential, signPresentation } from '@dxos/credentials';
+import { createCredential, createDidFromIdentityKey, signPresentation } from '@dxos/credentials';
 import { type Signer } from '@dxos/crypto';
 import { invariant } from '@dxos/invariant';
 import { Keyring } from '@dxos/keyring';
-import { PublicKey } from '@dxos/keys';
+import { IdentityDid, PublicKey } from '@dxos/keys';
 import { type Chain, type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 
 import type { EdgeIdentity } from './edge-identity';
@@ -16,7 +16,7 @@ import type { EdgeIdentity } from './edge-identity';
  */
 export const createDeviceEdgeIdentity = async (signer: Signer, key: PublicKey): Promise<EdgeIdentity> => {
   return {
-    identityKey: key.toHex(),
+    identityDid: await createDidFromIdentityKey(key),
     peerKey: key.toHex(),
     presentCredentials: async ({ challenge }) => {
       return signPresentation({
@@ -68,7 +68,7 @@ export const createChainEdgeIdentity = async (
         ];
 
   return {
-    identityKey: identityKey.toHex(),
+    identityDid: await createDidFromIdentityKey(identityKey),
     peerKey: peerKey.toHex(),
     presentCredentials: async ({ challenge }) => {
       // TODO: make chain required after device invitation flow update release
@@ -126,10 +126,10 @@ export const createTestHaloEdgeIdentity = async (
 };
 
 export const createStubEdgeIdentity = (): EdgeIdentity => {
-  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.');

package/src/base-http-client.ts

@@ -71,7 +71,7 @@ export abstract class BaseHttpClient {
   }
 
   setIdentity(identity: EdgeIdentity): void {
-    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 = undefined;
     }

package/src/browser-rendering.ts

@@ -0,0 +1,39 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Context from 'effect/Context';
+import * as Schema from 'effect/Schema';
+
+import { type EdgeHttpClient } from './edge-http-client';
+
+/** Request body for EDGE `/ai/browser-rendering/markdown` (ai-service Browser Run markdown quick action). */
+export const MarkdownRequest = Schema.Struct({
+  url: Schema.optional(Schema.String),
+  html: Schema.optional(Schema.String),
+  gotoOptions: Schema.optional(
+    Schema.Struct({
+      waitUntil: Schema.optional(Schema.Literal('load', 'domcontentloaded', 'networkidle0', 'networkidle2')),
+      timeout: Schema.optional(Schema.Number),
+    }),
+  ),
+  rejectRequestPattern: Schema.optional(Schema.Array(Schema.String)),
+  userAgent: Schema.optional(Schema.String),
+  waitForSelector: Schema.optional(Schema.String),
+});
+
+export type MarkdownRequest = Schema.Schema.Type<typeof MarkdownRequest>;
+
+/** JSON body returned by Cloudflare Browser Run markdown quick action. */
+export const MarkdownResponse = Schema.Struct({
+  success: Schema.Boolean,
+  result: Schema.String,
+});
+
+export type MarkdownResponse = Schema.Schema.Type<typeof MarkdownResponse>;
+
+/** Authenticated EDGE HTTP client for operation handlers (e.g. browser markdown fetch). */
+export class EdgeHttpClientService extends Context.Tag('@dxos/edge-client/EdgeHttpClientService')<
+  EdgeHttpClientService,
+  EdgeHttpClient
+>() {}

package/src/edge-client.test.ts

@@ -158,7 +158,7 @@ describe('EdgeClient', () => {
 
   const textMessage = (message: string, source?: EdgeIdentity) =>
     protocol.createMessage(TextMessageSchema, {
-      source: source && { peerKey: source.peerKey, identityKey: source.identityKey },
+      source: source && { peerKey: source.peerKey, identityDid: source.identityDid },
       payload: { message },
     });
 

package/src/edge-client.ts

@@ -43,7 +43,8 @@ export type MessengerConfig = {
 export interface EdgeConnection extends Required<Lifecycle> {
   statusChanged: Event<EdgeStatus>;
   get info(): any;
-  get identityKey(): string;
+  /** Identity DID (`did:halo:…`) of the connected identity. */
+  get identityDid(): string;
   get peerKey(): string;
   get isOpen(): boolean;
   get status(): EdgeStatus;
@@ -88,7 +89,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
     return {
       open: this.isOpen,
       status: this.status,
-      identity: this._identity.identityKey,
+      identity: this._identity.identityDid,
       device: this._identity.peerKey,
     };
   }
@@ -108,8 +109,8 @@ export class EdgeClient extends Resource implements EdgeConnection {
     };
   }
 
-  get identityKey() {
-    return this._identity.identityKey;
+  get identityDid() {
+    return this._identity.identityDid;
   }
 
   get peerKey() {
@@ -117,7 +118,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
   }
 
   setIdentity(identity: EdgeIdentity) {
-    if (identity.identityKey !== this._identity.identityKey || identity.peerKey !== this._identity.peerKey) {
+    if (identity.identityDid !== this._identity.identityDid || identity.peerKey !== this._identity.peerKey) {
       log('Edge identity changed', { identity, oldIdentity: this._identity });
       this._identity = identity;
       this._closeCurrentConnection(new EdgeIdentityChangedError());
@@ -139,9 +140,10 @@ export class EdgeClient extends Resource implements EdgeConnection {
       throw new EdgeConnectionClosedError();
     }
 
+    // DX-1059: sources are DID-only; validate against identityDid.
     if (
       message.source &&
-      (message.source.peerKey !== this._identity.peerKey || message.source.identityKey !== this.identityKey)
+      (message.source.peerKey !== this._identity.peerKey || message.source.identityDid !== this.identityDid)
     ) {
       throw new EdgeIdentityChangedError();
     }
@@ -219,7 +221,7 @@ export class EdgeClient extends Resource implements EdgeConnection {
     }
 
     const identity = this._identity;
-    const path = `/ws/${identity.identityKey}/${identity.peerKey}`;
+    const path = `/ws/${identity.identityDid}/${identity.peerKey}`;
     const protocolHeader = this._config.disableAuth ? undefined : await this._createAuthHeader(path);
     if (this._identity !== identity) {
       log('identity changed during auth header request');

package/src/edge-http-client.ts

@@ -11,7 +11,7 @@ import * as Function from 'effect/Function';
 import { type Context } from '@dxos/context';
 import { EffectEx } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
-import { type PublicKey, type SpaceId } from '@dxos/keys';
+import { type SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import {
   type CompleteOAuthRegistrationRequest,
@@ -117,10 +117,10 @@ export class EdgeHttpClient extends BaseHttpClient {
 
   public getAgentStatus(
     ctx: Context,
-    request: { ownerIdentityKey: PublicKey },
+    request: { ownerIdentityDid: string },
     args?: EdgeHttpCallArgs,
   ): Promise<GetAgentStatusResponseBody> {
-    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',
     });
@@ -271,7 +271,10 @@ export class EdgeHttpClient extends BaseHttpClient {
     const formData = new FormData();
     formData.append('name', body.name ?? '');
     formData.append('version', body.version);
-    formData.append('ownerPublicKey', body.ownerPublicKey);
+    // The function owner is the authenticated identity (edge requires ownerUri === presenter DID).
+    // Prefer the connected identity's DID; otherwise use the DID supplied on the request body.
+    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)) {

package/src/edge-identity.ts

@@ -8,7 +8,11 @@ import { type Presentation } from '@dxos/protocols/proto/dxos/halo/credentials';
 
 export interface EdgeIdentity {
   peerKey: string;
-  identityKey: string;
+  /**
+   * Identity DID (`did:halo:…`) — the public identity segment of the edge WebSocket path.
+   * The router keys connections by the DID.
+   */
+  identityDid: string;
   /**
    * Returns credential presentation issued by the identity key.
    * Presentation must have the provided challenge.

package/src/edge-ws-connection.ts

@@ -60,7 +60,7 @@ export class EdgeWsConnection extends Resource {
   public get info() {
     return {
       open: this.isOpen,
-      identity: this._identity.identityKey,
+      identity: this._identity.identityDid,
       device: this._identity.peerKey,
     };
   }

package/src/edge-ws-muxer.test.ts

@@ -35,7 +35,7 @@ describe('WebSocketMuxerTest', () => {
 
 const textMessage = (message: string, source?: EdgeIdentity) =>
   protocol.createMessage(TextMessageSchema, {
-    source: source && { peerKey: source.peerKey, identityKey: source.identityKey },
+    source: source && { peerKey: source.peerKey, identityDid: source.identityDid },
     serviceId: 'test-service',
     payload: { message },
   });

package/src/hub-http-client.ts

@@ -6,6 +6,7 @@ import { type Context } from '@dxos/context';
 import {
   type CheckEmailExistsResponse,
   type GetAccountResponse,
+  type GetProfileUsageResponse,
   type IssueInvitationResponse,
   type ListAccountInvitationsResponse,
   type LoginRequest,
@@ -14,7 +15,6 @@ import {
   type RedeemInvitationCodeResponse,
   type RequestAccessRequest,
   type RequestAccessResponse,
-  type GetProfileUsageResponse,
   type ResendVerificationEmailResponse,
   type ValidateInvitationCodeResponse,
 } from '@dxos/protocols';

package/src/testing/test-utils.ts

@@ -106,7 +106,7 @@ const createResponseSender = (connection: () => WebSocketMuxer) => {
     void connection().send(
       buf.create(MessageSchema, {
         source: {
-          identityKey: recipient.identityKey,
+          identityDid: recipient.identityDid,
           peerKey: recipient.peerKey,
         },
         serviceId: request.serviceId!,