@dxos/protocols 0.5.9-next.a50ff17 → 0.6.0

package/dist/esm/src/proto/gen/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA+DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AA6iB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,642GAA642G,CAAC,CAAC,CAAC;AACt82G,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAkB,UAAU,EAAE,aAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAgEhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAqjB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,i14GAAi14G,CAAC,CAAC,CAAC;AAC144G,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAkB,UAAU,EAAE,aAAa,CAAC,CAAC"}

package/dist/esm/src/testing.d.ts

@@ -1,5 +1,5 @@
 import { Timeframe } from '@dxos/timeframe';
 import type { FeedMessage } from './proto/gen/dxos/echo/feed';
-import { type ItemID } from './types';
-export declare const createTestItemMutation: (objectId: ItemID, key: string, value: string, timeframe?: Timeframe) => FeedMessage;
+import { type ObjectId } from './types';
+export declare const createTestItemMutation: (objectId: ObjectId, key: string, value: string, timeframe?: Timeframe) => FeedMessage;
 //# sourceMappingURL=testing.d.ts.map

package/dist/esm/src/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAOtC,eAAO,MAAM,sBAAsB,aACvB,MAAM,OACX,MAAM,SACJ,MAAM,4BAEZ,WAsBD,CAAC"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,SAAS,CAAC;AAOxC,eAAO,MAAM,sBAAsB,aACvB,QAAQ,OACb,MAAM,SACJ,MAAM,4BAEZ,WAsBD,CAAC"}

package/dist/esm/src/testing.js.map

@@ -1 +1 @@
-{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,EAAE;AACF,WAAW;AACX,EAAE;AAEF,kEAAkE;AAClE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAgB,EAChB,GAAW,EACX,KAAa,EACb,SAAS,GAAG,IAAI,SAAS,EAAE,EACd,EAAE,CAAC,CAAC;IACjB,SAAS;IACT,OAAO,EAAE;QACP,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,OAAO,EAAE;oBACP;wBACE,QAAQ;wBACR,SAAS,EAAE;4BACT;gCACE,KAAK,EAAE;oCACL,OAAO,EAAE,qBAAqB;oCAC9B,OAAO,EAAE,MAAM;oCACf,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;iCAC9F;6BACF;yBACF;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,EAAE;AACF,WAAW;AACX,EAAE;AAEF,kEAAkE;AAClE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAkB,EAClB,GAAW,EACX,KAAa,EACb,SAAS,GAAG,IAAI,SAAS,EAAE,EACd,EAAE,CAAC,CAAC;IACjB,SAAS;IACT,OAAO,EAAE;QACP,IAAI,EAAE;YACJ,KAAK,EAAE;gBACL,OAAO,EAAE;oBACP;wBACE,QAAQ;wBACR,SAAS,EAAE;4BACT;gCACE,KAAK,EAAE;oCACL,OAAO,EAAE,qBAAqB;oCAC9B,OAAO,EAAE,MAAM;oCACf,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;iCAC9F;6BACF;yBACF;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAC,CAAC"}

package/dist/esm/src/types.d.ts

@@ -2,7 +2,7 @@ import { type TypedProtoMessage } from '@dxos/codec-protobuf';
 import { type PublicKey } from '@dxos/keys';
 import { type Timeframe } from '@dxos/timeframe';
 import { type TYPES } from './proto';
-import { type FeedMessage, type CredentialsMessage } from './proto/gen/dxos/echo/feed';
+import { type CredentialsMessage, type FeedMessage } from './proto/gen/dxos/echo/feed';
 import { type EchoObjectBatch } from './proto/gen/dxos/echo/object';
 export type TypedMessage = TypedProtoMessage<TYPES>;
 export type FeedMeta = {
@@ -29,6 +29,5 @@ export interface IEchoStream {
     meta: MutationMetaWithTimeframe;
     batch: EchoObjectBatch;
 }
-export type ItemID = string;
-export type ItemType = string;
+export type ObjectId = string;
 //# sourceMappingURL=types.d.ts.map

package/dist/esm/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAGpE,MAAM,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAGpD,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,OAAO,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,CAAC,CAAC;CACT,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAEtD,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,yBAA0B,SAAQ,YAAY;IAC7D,SAAS,EAAE,SAAS,CAAC;CACtB;AAGD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAGD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,yBAAyB,CAAC;IAChC,KAAK,EAAE,eAAe,CAAC;CACxB;AAID,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AAC5B,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAGpE,MAAM,MAAM,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAGpD,MAAM,MAAM,QAAQ,GAAG;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,OAAO,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,CAAC,CAAC;CACT,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAEtD,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,yBAA0B,SAAQ,YAAY;IAC7D,SAAS,EAAE,SAAS,CAAC;CACtB;AAGD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAGD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,yBAAyB,CAAC;IAChC,KAAK,EAAE,eAAe,CAAC;CACxB;AAGD,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/protocols",
-  "version": "0.5.9-next.a50ff17",
+  "version": "0.6.0",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,10 +33,12 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/codec-protobuf": "0.5.9-next.a50ff17",
-    "@dxos/invariant": "0.5.9-next.a50ff17",
-    "@dxos/keys": "0.5.9-next.a50ff17",
-    "@dxos/timeframe": "0.5.9-next.a50ff17"
+    "@effect/schema": "^0.67.16",
+    "@dxos/codec-protobuf": "0.6.0",
+    "@dxos/invariant": "0.6.0",
+    "@dxos/util": "0.6.0",
+    "@dxos/timeframe": "0.6.0",
+    "@dxos/keys": "0.6.0"
   },
   "devDependencies": {
     "glob": "~7.1.6"

package/src/errors/errors.ts

@@ -4,9 +4,9 @@
 
 import { PublicKey } from '@dxos/keys';
 
-import { ApiError, DatabaseError, SystemError, BaseError } from './base-errors';
+import { ApiError, BaseError, DatabaseError, SystemError } from './base-errors';
 import { registerError, registerErrorMessageContext, registerErrorNoArgs } from './helpers';
-import type { ItemID } from '../types';
+import type { ObjectId } from '../types';
 
 /**
  * Thrown when request was terminated because the RPC endpoint has been closed.
@@ -180,7 +180,7 @@ registerError('SPACE_NOT_FOUND', (_, context) => {
 });
 
 export class EntityNotFoundError extends DatabaseError {
-  constructor(entityId: ItemID) {
+  constructor(entityId: ObjectId) {
     super('ITEM_NOT_FOUND', 'Item not found.', { entityId });
   }
 }

package/src/index.ts

@@ -10,3 +10,4 @@ export * from './testing';
 export * from './tracing';
 export * from './types';
 export * from './query';
+export * from './profile-archive';

package/src/params.ts

@@ -0,0 +1,14 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import * as S from '@effect/schema/Schema';
+
+import { ParamKeyAnnotation } from '@dxos/util';
+
+// TODO(burdon): Use uniformly for processing params.
+export const InvitationUrl = S.Struct({
+  accessToken: S.String,
+  deviceInvitationCode: S.String.pipe(ParamKeyAnnotation('deviceInvitationCode')),
+  spaceInvitationCode: S.String.pipe(ParamKeyAnnotation('spaceInvitationCode')),
+});

package/src/profile-archive.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+/**
+ * Saved in a CBOR encoded file, with `.dxprofile` extension.
+ */
+export type ProfileArchive = {
+  meta: {
+    timestamp: string;
+  };
+  storage: ProfileArchiveEntry[];
+};
+
+export type ProfileArchiveEntry = {
+  type: ProfileArchiveEntryType;
+  key: string | Uint8Array;
+  value: string | Uint8Array;
+};
+
+export enum ProfileArchiveEntryType {
+  FILE = 1,
+  KEY_VALUE = 2,
+}

package/src/proto/dxos/client/services.proto

@@ -186,12 +186,18 @@ service DevicesService {
 //
 
 message Contact {
-  halo.credentials.ProfileDocument profile = 1;
+  dxos.keys.PublicKey identityKey = 2;
+  optional halo.credentials.ProfileDocument profile = 1;
+  repeated dxos.keys.PublicKey commonSpaces = 3;
+}
+
+message ContactBook {
+  repeated Contact contacts = 1;
 }
 
 service ContactsService {
-  rpc UpdateContact(google.protobuf.Empty) returns (Contact);
-  rpc QueryContacts(google.protobuf.Empty) returns (stream Contact);
+  rpc GetContacts(google.protobuf.Empty) returns (ContactBook);
+  rpc QueryContacts(google.protobuf.Empty) returns (stream ContactBook);
 }
 
 //
@@ -300,6 +306,9 @@ message Space {
 
     /// All mutations known to exist on the network.
     optional dxos.echo.timeframe.TimeframeVector known_data_timeframe = 17;
+
+    /// URL of the current space root automerge document.
+    optional string space_root_url = 22;
   }
 
   string id = 5;
@@ -388,6 +397,24 @@ message UpdateMemberRoleRequest {
   dxos.halo.credentials.SpaceMember.Role new_role = 3;
 }
 
+message AdmitContactRequest {
+  Contact contact = 1;
+  dxos.halo.credentials.SpaceMember.Role role = 2;
+  dxos.keys.PublicKey space_key = 3;
+}
+
+message ContactAdmission {
+  dxos.halo.credentials.Credential credential = 1;
+}
+
+message JoinSpaceResponse {
+  Space space = 1;
+}
+
+message JoinBySpaceKeyRequest {
+  dxos.keys.PublicKey space_key = 1;
+}
+
 service SpacesService {
   rpc CreateSpace(google.protobuf.Empty) returns (Space);
   rpc UpdateSpace(UpdateSpaceRequest) returns (google.protobuf.Empty);
@@ -395,6 +422,9 @@ service SpacesService {
 
   rpc UpdateMemberRole(UpdateMemberRoleRequest) returns (google.protobuf.Empty);
 
+  rpc AdmitContact(AdmitContactRequest) returns (google.protobuf.Empty);
+  rpc JoinBySpaceKey(JoinBySpaceKeyRequest) returns (JoinSpaceResponse);
+
   /// Broadcast an ephemeral message to the space swarm.
   rpc PostMessage(PostMessageRequest) returns (google.protobuf.Empty);
   /// Subscribe to messages from the space swarm.

package/src/proto/dxos/echo/model/document.proto

@@ -61,8 +61,7 @@ message KeyValueObject {
  * Reference to an Item.
  */
 message Reference {
-  // TODO(dmaretskyi): Rename `id`.
-  string itemId = 1;
+  string object_id = 1;
 
   /// "space", or "protobuf"
   optional string protocol = 2;
@@ -111,10 +110,10 @@ message Query {
  */
 message ObjectSnapshot {
   optional string type                = 1;
-  optional Reference type_ref = 4;
+  optional Reference type_ref         = 4;
 
   Value root                          = 2;
-  optional Value meta                          = 3;
+  optional Value meta                 = 3;
 }
 
 /**
@@ -146,12 +145,12 @@ message YJS {
  * Set of mutations.
  */
 message ObjectMutationSet {
-  // depereacted
+  // deprecated
   optional string type = 1;
   optional Reference type_ref = 4;
 
-  repeated ObjectMutation mutations   = 2;
+  repeated ObjectMutation mutations = 2;
 
   // Mutations for the `meta` keyspace.
-  repeated ObjectMutation meta_mutations   = 3;
+  repeated ObjectMutation meta_mutations = 3;
 }

package/src/proto/dxos/echo/query.proto

@@ -30,6 +30,7 @@ message Heads {
 message QueryResult {
   string id = 1;
   string spaceId = 4;
+  string documentId = 5;
   /// @deprecated Use spaceId.
   dxos.keys.PublicKey spaceKey = 2;
   float rank = 3;

package/src/proto/dxos/mesh/teleport/admission-discovery.proto

@@ -0,0 +1,23 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+syntax = "proto3";
+
+import "dxos/halo/credentials.proto";
+import "dxos/keys.proto";
+
+package dxos.mesh.teleport;
+
+message GetAdmissionCredentialRequest {
+  dxos.keys.PublicKey space_key = 1;
+  dxos.keys.PublicKey member_key = 2;
+}
+
+message GetAdmissionCredentialResponse {
+  dxos.halo.credentials.Credential admission_credential = 1;
+}
+
+service AdmissionDiscoveryService {
+  rpc GetAdmissionCredential(GetAdmissionCredentialRequest) returns (GetAdmissionCredentialResponse);
+}

package/src/proto/gen/dxos/agent/dashboard.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/agent/echoproxy.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/agent/epoch.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/agent/functions.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/bot.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "./mesh/protocol";
 import * as dxos_mesh_replicator from "./mesh/replicator";
 import * as dxos_mesh_signal from "./mesh/signal";
 import * as dxos_mesh_swarm from "./mesh/swarm";
+import * as dxos_mesh_teleport from "./mesh/teleport";
 import * as dxos_mesh_teleport_auth from "./mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "./mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "./mesh/teleport/blobsync";

package/src/proto/gen/dxos/client/services.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";
@@ -516,15 +517,28 @@ export interface DevicesService {
  *   {@link file://./../../../dxos/client/services.proto}
  */
 export interface Contact {
-    profile: dxos_halo_credentials.ProfileDocument;
+    identityKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    profile?: dxos_halo_credentials.ProfileDocument;
+    commonSpaces?: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>[];
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface ContactBook {
+    contacts?: Contact[];
 }
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
  */
 export interface ContactsService {
-    updateContact: (request: void, options?: RequestOptions) => Promise<Contact>;
-    queryContacts: (request: void, options?: RequestOptions) => Stream<Contact>;
+    getContacts: (request: void, options?: RequestOptions) => Promise<ContactBook>;
+    queryContacts: (request: void, options?: RequestOptions) => Stream<ContactBook>;
 }
 /**
  * Defined in:
@@ -727,6 +741,13 @@ export namespace Space {
          *   - proto3_optional = true
          */
         knownDataTimeframe?: ReturnType<(typeof substitutions)["dxos.echo.timeframe.TimeframeVector"]["decode"]>;
+        /**
+         * URL of the current space root automerge document.
+         *
+         * Options:
+         *   - proto3_optional = true
+         */
+        spaceRootUrl?: string;
     }
 }
 /**
@@ -842,6 +863,36 @@ export interface UpdateMemberRoleRequest {
     memberKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
     newRole: dxos_halo_credentials.SpaceMember.Role;
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface AdmitContactRequest {
+    contact: Contact;
+    role: dxos_halo_credentials.SpaceMember.Role;
+    spaceKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface ContactAdmission {
+    credential: dxos_halo_credentials.Credential;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface JoinSpaceResponse {
+    space: Space;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface JoinBySpaceKeyRequest {
+    spaceKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -851,6 +902,8 @@ export interface SpacesService {
     updateSpace: (request: UpdateSpaceRequest, options?: RequestOptions) => Promise<void>;
     querySpaces: (request: void, options?: RequestOptions) => Stream<QuerySpacesResponse>;
     updateMemberRole: (request: UpdateMemberRoleRequest, options?: RequestOptions) => Promise<void>;
+    admitContact: (request: AdmitContactRequest, options?: RequestOptions) => Promise<void>;
+    joinBySpaceKey: (request: JoinBySpaceKeyRequest, options?: RequestOptions) => Promise<JoinSpaceResponse>;
     /**
      * Broadcast an ephemeral message to the space swarm.
      */

package/src/proto/gen/dxos/config.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "./mesh/protocol";
 import * as dxos_mesh_replicator from "./mesh/replicator";
 import * as dxos_mesh_signal from "./mesh/signal";
 import * as dxos_mesh_swarm from "./mesh/swarm";
+import * as dxos_mesh_teleport from "./mesh/teleport";
 import * as dxos_mesh_teleport_auth from "./mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "./mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "./mesh/teleport/blobsync";

package/src/proto/gen/dxos/devtools/host.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/devtools/swarm.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/blob.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/feed.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/filter.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/indexing.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/metadata.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/model/document.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../../mesh/protocol";
 import * as dxos_mesh_replicator from "../../mesh/replicator";
 import * as dxos_mesh_signal from "../../mesh/signal";
 import * as dxos_mesh_swarm from "../../mesh/swarm";
+import * as dxos_mesh_teleport from "../../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../../mesh/teleport/blobsync";
@@ -115,7 +116,7 @@ export interface KeyValueObject {
  *   {@link file://./../../../../dxos/echo/model/document.proto}
  */
 export interface Reference {
-    itemId: string;
+    objectId: string;
     /**
      * "space", or "protobuf"
      *

package/src/proto/gen/dxos/echo/model/messenger.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../../mesh/protocol";
 import * as dxos_mesh_replicator from "../../mesh/replicator";
 import * as dxos_mesh_signal from "../../mesh/signal";
 import * as dxos_mesh_swarm from "../../mesh/swarm";
+import * as dxos_mesh_teleport from "../../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/model/text.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../../mesh/protocol";
 import * as dxos_mesh_replicator from "../../mesh/replicator";
 import * as dxos_mesh_signal from "../../mesh/signal";
 import * as dxos_mesh_swarm from "../../mesh/swarm";
+import * as dxos_mesh_teleport from "../../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/object.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/query.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";
@@ -91,6 +92,7 @@ export interface Heads {
 export interface QueryResult {
     id: string;
     spaceId: string;
+    documentId: string;
     /**
      * @deprecated Use spaceId.
      */

package/src/proto/gen/dxos/echo/service.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/snapshot.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/echo/timeframe.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../mesh/protocol";
 import * as dxos_mesh_replicator from "../mesh/replicator";
 import * as dxos_mesh_signal from "../mesh/signal";
 import * as dxos_mesh_swarm from "../mesh/swarm";
+import * as dxos_mesh_teleport from "../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../mesh/teleport/blobsync";

package/src/proto/gen/dxos/error.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "./mesh/protocol";
 import * as dxos_mesh_replicator from "./mesh/replicator";
 import * as dxos_mesh_signal from "./mesh/signal";
 import * as dxos_mesh_swarm from "./mesh/swarm";
+import * as dxos_mesh_teleport from "./mesh/teleport";
 import * as dxos_mesh_teleport_auth from "./mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "./mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "./mesh/teleport/blobsync";

package/src/proto/gen/dxos/gravity.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "./mesh/protocol";
 import * as dxos_mesh_replicator from "./mesh/replicator";
 import * as dxos_mesh_signal from "./mesh/signal";
 import * as dxos_mesh_swarm from "./mesh/swarm";
+import * as dxos_mesh_teleport from "./mesh/teleport";
 import * as dxos_mesh_teleport_auth from "./mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "./mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "./mesh/teleport/blobsync";

package/src/proto/gen/dxos/halo/credentials/auth.ts

@@ -42,6 +42,7 @@ import * as dxos_mesh_protocol from "../../mesh/protocol";
 import * as dxos_mesh_replicator from "../../mesh/replicator";
 import * as dxos_mesh_signal from "../../mesh/signal";
 import * as dxos_mesh_swarm from "../../mesh/swarm";
+import * as dxos_mesh_teleport from "../../mesh/teleport";
 import * as dxos_mesh_teleport_auth from "../../mesh/teleport/auth";
 import * as dxos_mesh_teleport_automerge from "../../mesh/teleport/automerge";
 import * as dxos_mesh_teleport_blobsync from "../../mesh/teleport/blobsync";