@dxos/protocols 0.6.7 → 0.6.8-main.046e6cf

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;AAiEhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAikB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,g/+GAAg/+G,CAAC,CAAC,CAAC;AACzi/G,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;AAiEhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAkkB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,s//GAAs//G,CAAC,CAAC,CAAC;AAC/igH,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAkB,UAAU,EAAE,aAAa,CAAC,CAAC"}

package/dist/esm/src/proto/substitutions.d.ts

@@ -54,10 +54,8 @@ declare const _default: {
         decode: (value: any) => import("@dxos/codec-protobuf").Struct;
     };
     'google.protobuf.Any': {
-        encode: (value: {
-            '@type': string;
-        }, context: import("@dxos/codec-protobuf").TypeMapperContext, schema: import("@dxos/codec-protobuf").Schema<any, {}>, options: import("@dxos/codec-protobuf").EncodingOptions) => any;
-        decode: (value: any, context: import("@dxos/codec-protobuf").TypeMapperContext, schema: import("@dxos/codec-protobuf").Schema<any, {}>, options: import("@dxos/codec-protobuf").EncodingOptions) => any;
+        encode: (value: import("@dxos/codec-protobuf").WithTypeUrl<{}>, context: import("@dxos/codec-protobuf").TypeMapperContext, schema: import("@dxos/codec-protobuf").Schema<any>, options: import("@dxos/codec-protobuf").EncodingOptions) => any;
+        decode: (value: any, context: import("@dxos/codec-protobuf").TypeMapperContext, schema: import("@dxos/codec-protobuf").Schema<any>, options: import("@dxos/codec-protobuf").EncodingOptions) => import("@dxos/codec-protobuf").WithTypeUrl<any>;
     };
 };
 export default _default;

package/dist/esm/src/proto/substitutions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"substitutions.d.ts","sourceRoot":"","sources":["../../../../src/proto/substitutions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,aAAa;;wBAEN,SAAS;;;wBACT,GAAG;;;wBAKH,MAAM;;;wBACN,GAAG;;;4BAIC,SAAS;;;;;;yBAIZ,GAAG;;CAOvB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,wBAKE"}
+{"version":3,"file":"substitutions.d.ts","sourceRoot":"","sources":["../../../../src/proto/substitutions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,aAAa;;wBAEN,SAAS;;;wBACT,GAAG;;;wBAKH,MAAM;;;wBACN,GAAG;;;4BAIC,SAAS;;;;;;yBAIZ,GAAG;;CAOvB,CAAC;;;;;;;wBAtBkB,SAAS;;;wBACT,GAAG;;;wBAKH,MAAM;;;wBACN,GAAG;;;4BAIC,SAAS;;;;;;yBAIZ,GAAG;;;;;;;;;;;AASxB,wBAKE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/protocols",
-  "version": "0.6.7",
+  "version": "0.6.8-main.046e6cf",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -62,11 +62,11 @@
   "dependencies": {
     "@bufbuild/protobuf": "^2.0.0",
     "@effect/schema": "^0.67.16",
-    "@dxos/codec-protobuf": "0.6.7",
-    "@dxos/invariant": "0.6.7",
-    "@dxos/timeframe": "0.6.7",
-    "@dxos/util": "0.6.7",
-    "@dxos/keys": "0.6.7"
+    "@dxos/codec-protobuf": "0.6.8-main.046e6cf",
+    "@dxos/invariant": "0.6.8-main.046e6cf",
+    "@dxos/keys": "0.6.8-main.046e6cf",
+    "@dxos/timeframe": "0.6.8-main.046e6cf",
+    "@dxos/util": "0.6.8-main.046e6cf"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.35.0",

package/src/buf/index.ts

@@ -4,3 +4,5 @@
 
 export * as buf from '@bufbuild/protobuf';
 export * as bufWkt from '@bufbuild/protobuf/wkt';
+
+export { create as createBuf } from '@bufbuild/protobuf';

package/src/buf/proto/gen/dxos/echo/filter_pb.ts

@@ -19,12 +19,20 @@ import type { JsonObject, Message } from "@bufbuild/protobuf";
  * Describes the file dxos/echo/filter.proto.
  */
 export const file_dxos_echo_filter: GenFile = /*@__PURE__*/
-  fileDesc("ChZkeG9zL2VjaG8vZmlsdGVyLnByb3RvEhBkeG9zLmVjaG8uZmlsdGVyIoUDCgxRdWVyeU9wdGlvbnMSRgoHZGVsZXRlZBgBIAEoDjIwLmR4b3MuZWNoby5maWx0ZXIuUXVlcnlPcHRpb25zLlNob3dEZWxldGVkT3B0aW9uSACIAQESDgoGbW9kZWxzGAIgAygJEiQKBnNwYWNlcxgDIAMoCzIULmR4b3Mua2V5cy5QdWJsaWNLZXkSRwoNZGF0YV9sb2NhdGlvbhgEIAEoDjIrLmR4b3MuZWNoby5maWx0ZXIuUXVlcnlPcHRpb25zLkRhdGFMb2NhdGlvbkgBiAEBEhAKCHNwYWNlSWRzGAUgAygJIk4KEVNob3dEZWxldGVkT3B0aW9uEhAKDEhJREVfREVMRVRFRBAAEhAKDFNIT1dfREVMRVRFRBABEhUKEVNIT1dfREVMRVRFRF9PTkxZEAIiLgoMRGF0YUxvY2F0aW9uEgcKA0FMTBAAEgkKBUxPQ0FMEAESCgoGUkVNT1RFEAJCCgoIX2RlbGV0ZWRCEAoOX2RhdGFfbG9jYXRpb24i4wIKBkZpbHRlchIwCgpwcm9wZXJ0aWVzGAEgASgLMhcuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdEgAiAEBEjYKBHR5cGUYAiABKAsyIy5keG9zLmVjaG8ubW9kZWwuZG9jdW1lbnQuUmVmZXJlbmNlSAGIAQESEgoKb2JqZWN0X2lkcxgIIAMoCRIRCgR0ZXh0GAMgASgJSAKIAQESEAoDbm90GAQgASgISAOIAQESJQoDYW5kGAUgAygLMhguZHhvcy5lY2hvLmZpbHRlci5GaWx0ZXISJAoCb3IYBiADKAsyGC5keG9zLmVjaG8uZmlsdGVyLkZpbHRlchI0CgdvcHRpb25zGAcgASgLMh4uZHhvcy5lY2hvLmZpbHRlci5RdWVyeU9wdGlvbnNIBIgBAUINCgtfcHJvcGVydGllc0IHCgVfdHlwZUIHCgVfdGV4dEIGCgRfbm90QgoKCF9vcHRpb25zYgZwcm90bzM", [file_google_protobuf_struct, file_dxos_keys, file_dxos_echo_model_document]);
+  fileDesc("ChZkeG9zL2VjaG8vZmlsdGVyLnByb3RvEhBkeG9zLmVjaG8uZmlsdGVyIoUDCgxRdWVyeU9wdGlvbnMSEAoIc3BhY2VJZHMYBSADKAkSRgoHZGVsZXRlZBgBIAEoDjIwLmR4b3MuZWNoby5maWx0ZXIuUXVlcnlPcHRpb25zLlNob3dEZWxldGVkT3B0aW9uSACIAQESRwoNZGF0YV9sb2NhdGlvbhgEIAEoDjIrLmR4b3MuZWNoby5maWx0ZXIuUXVlcnlPcHRpb25zLkRhdGFMb2NhdGlvbkgBiAEBEiQKBnNwYWNlcxgDIAMoCzIULmR4b3Mua2V5cy5QdWJsaWNLZXkSDgoGbW9kZWxzGAIgAygJIk4KEVNob3dEZWxldGVkT3B0aW9uEhAKDEhJREVfREVMRVRFRBAAEhAKDFNIT1dfREVMRVRFRBABEhUKEVNIT1dfREVMRVRFRF9PTkxZEAIiLgoMRGF0YUxvY2F0aW9uEgcKA0FMTBAAEgkKBUxPQ0FMEAESCgoGUkVNT1RFEAJCCgoIX2RlbGV0ZWRCEAoOX2RhdGFfbG9jYXRpb24i4wIKBkZpbHRlchIwCgpwcm9wZXJ0aWVzGAEgASgLMhcuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdEgAiAEBEjYKBHR5cGUYAiABKAsyIy5keG9zLmVjaG8ubW9kZWwuZG9jdW1lbnQuUmVmZXJlbmNlSAGIAQESEgoKb2JqZWN0X2lkcxgIIAMoCRIRCgR0ZXh0GAMgASgJSAKIAQESEAoDbm90GAQgASgISAOIAQESJQoDYW5kGAUgAygLMhguZHhvcy5lY2hvLmZpbHRlci5GaWx0ZXISJAoCb3IYBiADKAsyGC5keG9zLmVjaG8uZmlsdGVyLkZpbHRlchI0CgdvcHRpb25zGAcgASgLMh4uZHhvcy5lY2hvLmZpbHRlci5RdWVyeU9wdGlvbnNIBIgBAUINCgtfcHJvcGVydGllc0IHCgVfdHlwZUIHCgVfdGV4dEIGCgRfbm90QgoKCF9vcHRpb25zYgZwcm90bzM", [file_google_protobuf_struct, file_dxos_keys, file_dxos_echo_model_document]);
 
 /**
  * @generated from message dxos.echo.filter.QueryOptions
  */
 export type QueryOptions = Message<"dxos.echo.filter.QueryOptions"> & {
+  /**
+   * *
+   * Query only in specific spaces.
+   *
+   * @generated from field: repeated string spaceIds = 5;
+   */
+  spaceIds: string[];
+
   /**
    * / Controls how deleted items are filtered.
    *
@@ -34,13 +42,12 @@ export type QueryOptions = Message<"dxos.echo.filter.QueryOptions"> & {
 
   /**
    * *
-   * Filter by model.
-   * @default * Only DocumentModel.
-   * To querty all models, use `models: ["*"]`.
+   * Query only local spaces, or remote on agent.
+   * @default `QueryOptions.DataLocation.LOCAL`
    *
-   * @generated from field: repeated string models = 2;
+   * @generated from field: optional dxos.echo.filter.QueryOptions.DataLocation data_location = 4;
    */
-  models: string[];
+  dataLocation?: QueryOptions_DataLocation;
 
   /**
    * *
@@ -53,20 +60,14 @@ export type QueryOptions = Message<"dxos.echo.filter.QueryOptions"> & {
 
   /**
    * *
-   * Query only local spaces, or remote on agent.
-   * @default `QueryOptions.DataLocation.LOCAL`
-   *
-   * @generated from field: optional dxos.echo.filter.QueryOptions.DataLocation data_location = 4;
-   */
-  dataLocation?: QueryOptions_DataLocation;
-
-  /**
-   * *
-   * Query only in specific spaces.
+   * Filter by model.
+   * @default * Only DocumentModel.
+   * To querty all models, use `models: ["*"]`.
+   * @deprecated
    *
-   * @generated from field: repeated string spaceIds = 5;
+   * @generated from field: repeated string models = 2;
    */
-  spaceIds: string[];
+  models: string[];
 };
 
 /**

package/src/buf/proto/gen/dxos/echo/query_pb.ts

@@ -6,8 +6,8 @@
 // @generated from file dxos/echo/query.proto (package dxos.echo.query, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
-import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
 import type { EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import type { PublicKey } from "../keys_pb";
@@ -24,7 +24,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file dxos/echo/query.proto.
  */
 export const file_dxos_echo_query: GenFile = /*@__PURE__*/
-  fileDesc("ChVkeG9zL2VjaG8vcXVlcnkucHJvdG8SD2R4b3MuZWNoby5xdWVyeSJaCgxRdWVyeVJlcXVlc3QSFAoHcXVlcnlJZBgBIAEoCUgAiAEBEigKBmZpbHRlchgCIAEoCzIYLmR4b3MuZWNoby5maWx0ZXIuRmlsdGVyQgoKCF9xdWVyeUlkIhcKBUhlYWRzEg4KBmhhc2hlcxgBIAMoCSJ0CgtRdWVyeVJlc3VsdBIKCgJpZBgBIAEoCRIPCgdzcGFjZUlkGAQgASgJEhIKCmRvY3VtZW50SWQYBSABKAkSJgoIc3BhY2VLZXkYAiABKAsyFC5keG9zLmtleXMuUHVibGljS2V5EgwKBHJhbmsYAyABKAIijwEKDVF1ZXJ5UmVzcG9uc2USFAoHcXVlcnlJZBgBIAEoCUgAiAEBEi0KB3Jlc3VsdHMYAiADKAsyHC5keG9zLmVjaG8ucXVlcnkuUXVlcnlSZXN1bHQSLQoHb2JqZWN0cxgDIAMoCzIcLmR4b3MuZWNoby5vYmplY3QuRWNob09iamVjdEIKCghfcXVlcnlJZDLdAQoMUXVlcnlTZXJ2aWNlEkQKCVNldENvbmZpZxIfLmR4b3MuZWNoby5pbmRleGluZy5JbmRleENvbmZpZxoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eRJMCglFeGVjUXVlcnkSHS5keG9zLmVjaG8ucXVlcnkuUXVlcnlSZXF1ZXN0Gh4uZHhvcy5lY2hvLnF1ZXJ5LlF1ZXJ5UmVzcG9uc2UwARI5CgdSZWluZGV4EhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5YgZwcm90bzM", [file_google_protobuf_empty, file_dxos_keys, file_dxos_echo_filter, file_dxos_echo_object, file_dxos_echo_indexing]);
+  fileDesc("ChVkeG9zL2VjaG8vcXVlcnkucHJvdG8SD2R4b3MuZWNoby5xdWVyeSKQAQoMUXVlcnlSZXF1ZXN0EhQKB3F1ZXJ5SWQYASABKAlIAIgBARIoCgZmaWx0ZXIYAiABKAsyGC5keG9zLmVjaG8uZmlsdGVyLkZpbHRlchI0CgpyZWFjdGl2aXR5GAMgASgOMiAuZHhvcy5lY2hvLnF1ZXJ5LlF1ZXJ5UmVhY3Rpdml0eUIKCghfcXVlcnlJZCIXCgVIZWFkcxIOCgZoYXNoZXMYASADKAki2gEKC1F1ZXJ5UmVzdWx0EgoKAmlkGAEgASgJEg8KB3NwYWNlSWQYBCABKAkSEgoKZG9jdW1lbnRJZBgFIAEoCRIMCgRyYW5rGAMgASgCEhoKDWRvY3VtZW50X2pzb24YCiABKAlIAIgBARIfChJkb2N1bWVudF9hdXRvbWVyZ2UYCyABKAxIAYgBARImCghzcGFjZUtleRgCIAEoCzIULmR4b3Mua2V5cy5QdWJsaWNLZXlCEAoOX2RvY3VtZW50X2pzb25CFQoTX2RvY3VtZW50X2F1dG9tZXJnZSKPAQoNUXVlcnlSZXNwb25zZRIUCgdxdWVyeUlkGAEgASgJSACIAQESLQoHcmVzdWx0cxgCIAMoCzIcLmR4b3MuZWNoby5xdWVyeS5RdWVyeVJlc3VsdBItCgdvYmplY3RzGAMgAygLMhwuZHhvcy5lY2hvLm9iamVjdC5FY2hvT2JqZWN0QgoKCF9xdWVyeUlkKi0KD1F1ZXJ5UmVhY3Rpdml0eRIMCghPTkVfU0hPVBAAEgwKCFJFQUNUSVZFEAEy3QEKDFF1ZXJ5U2VydmljZRJECglTZXRDb25maWcSHy5keG9zLmVjaG8uaW5kZXhpbmcuSW5kZXhDb25maWcaFi5nb29nbGUucHJvdG9idWYuRW1wdHkSTAoJRXhlY1F1ZXJ5Eh0uZHhvcy5lY2hvLnF1ZXJ5LlF1ZXJ5UmVxdWVzdBoeLmR4b3MuZWNoby5xdWVyeS5RdWVyeVJlc3BvbnNlMAESOQoHUmVpbmRleBIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eRoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eWIGcHJvdG8z", [file_google_protobuf_empty, file_dxos_keys, file_dxos_echo_filter, file_dxos_echo_object, file_dxos_echo_indexing]);
 
 /**
  * @generated from message dxos.echo.query.QueryRequest
@@ -39,6 +39,11 @@ export type QueryRequest = Message<"dxos.echo.query.QueryRequest"> & {
    * @generated from field: dxos.echo.filter.Filter filter = 2;
    */
   filter?: Filter;
+
+  /**
+   * @generated from field: dxos.echo.query.QueryReactivity reactivity = 3;
+   */
+  reactivity: QueryReactivity;
 };
 
 /**
@@ -89,17 +94,27 @@ export type QueryResult = Message<"dxos.echo.query.QueryResult"> & {
    */
   documentId: string;
 
+  /**
+   * @generated from field: float rank = 3;
+   */
+  rank: number;
+
+  /**
+   * @generated from field: optional string document_json = 10;
+   */
+  documentJson?: string;
+
+  /**
+   * @generated from field: optional bytes document_automerge = 11;
+   */
+  documentAutomerge?: Uint8Array;
+
   /**
    * / @deprecated Use spaceId.
    *
    * @generated from field: dxos.keys.PublicKey spaceKey = 2;
    */
   spaceKey?: PublicKey;
-
-  /**
-   * @generated from field: float rank = 3;
-   */
-  rank: number;
 };
 
 /**
@@ -136,6 +151,31 @@ export type QueryResponse = Message<"dxos.echo.query.QueryResponse"> & {
 export const QueryResponseSchema: GenMessage<QueryResponse> = /*@__PURE__*/
   messageDesc(file_dxos_echo_query, 3);
 
+/**
+ * @generated from enum dxos.echo.query.QueryReactivity
+ */
+export enum QueryReactivity {
+  /**
+   * / Returns a signle result.
+   *
+   * @generated from enum value: ONE_SHOT = 0;
+   */
+  ONE_SHOT = 0,
+
+  /**
+   * / Returns the initial result and then incremental reactive updates when the data source changes.
+   *
+   * @generated from enum value: REACTIVE = 1;
+   */
+  REACTIVE = 1,
+}
+
+/**
+ * Describes the enum dxos.echo.query.QueryReactivity.
+ */
+export const QueryReactivitySchema: GenEnum<QueryReactivity> = /*@__PURE__*/
+  enumDesc(file_dxos_echo_query, 0);
+
 /**
  * @generated from service dxos.echo.query.QueryService
  */

package/src/buf/proto/gen/dxos/echo/service_pb.ts

@@ -17,7 +17,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file dxos/echo/service.proto.
  */
 export const file_dxos_echo_service: GenFile = /*@__PURE__*/
-  fileDesc("ChdkeG9zL2VjaG8vc2VydmljZS5wcm90bxIRZHhvcy5lY2hvLnNlcnZpY2UiKwoQU3Vic2NyaWJlUmVxdWVzdBIXCg9zdWJzY3JpcHRpb25faWQYASABKAkiTAoWQmF0Y2hlZERvY3VtZW50VXBkYXRlcxIyCgd1cGRhdGVzGAEgAygLMiEuZHhvcy5lY2hvLnNlcnZpY2UuRG9jdW1lbnRVcGRhdGUiXAoNVXBkYXRlUmVxdWVzdBIXCg9zdWJzY3JpcHRpb25faWQYASABKAkSMgoHdXBkYXRlcxgCIAMoCzIhLmR4b3MuZWNoby5zZXJ2aWNlLkRvY3VtZW50VXBkYXRlIlkKGVVwZGF0ZVN1YnNjcmlwdGlvblJlcXVlc3QSFwoPc3Vic2NyaXB0aW9uX2lkGAEgASgJEg8KB2FkZF9pZHMYAyADKAkSEgoKcmVtb3ZlX2lkcxgEIAMoCSIkCgxGbHVzaFJlcXVlc3QSFAoMZG9jdW1lbnRfaWRzGAEgAygJIlcKDkRvY3VtZW50VXBkYXRlEhMKC2RvY3VtZW50X2lkGAEgASgJEhAKCG11dGF0aW9uGAIgASgMEhMKBmlzX25ldxgDIAEoCEgAiAEBQgkKB19pc19uZXcicwoMRG9jSGVhZHNMaXN0EjYKB2VudHJpZXMYASADKAsyJS5keG9zLmVjaG8uc2VydmljZS5Eb2NIZWFkc0xpc3QuRW50cnkaKwoFRW50cnkSEwoLZG9jdW1lbnRfaWQYASABKAkSDQoFaGVhZHMYAiADKAkiLwoXR2V0RG9jdW1lbnRIZWFkc1JlcXVlc3QSFAoMZG9jdW1lbnRfaWRzGAEgAygJIkoKGEdldERvY3VtZW50SGVhZHNSZXNwb25zZRIuCgVoZWFkcxgBIAEoCzIfLmR4b3MuZWNoby5zZXJ2aWNlLkRvY0hlYWRzTGlzdCJRCh9XYWl0VW50aWxIZWFkc1JlcGxpY2F0ZWRSZXF1ZXN0Ei4KBWhlYWRzGAEgASgLMh8uZHhvcy5lY2hvLnNlcnZpY2UuRG9jSGVhZHNMaXN0IisKE1JlSW5kZXhIZWFkc1JlcXVlc3QSFAoMZG9jdW1lbnRfaWRzGAEgAygJIiwKGEdldFNwYWNlU3luY1N0YXRlUmVxdWVzdBIQCghzcGFjZV9pZBgBIAEoCSKKAQoOU3BhY2VTeW5jU3RhdGUSOgoFcGVlcnMYASADKAsyKy5keG9zLmVjaG8uc2VydmljZS5TcGFjZVN5bmNTdGF0ZS5QZWVyU3RhdGUaPAoJUGVlclN0YXRlEg8KB3BlZXJfaWQYASABKAkSHgoWZG9jdW1lbnRzX3RvX3JlY29uY2lsZRgCIAEoBTKZBgoLRGF0YVNlcnZpY2USXQoJU3Vic2NyaWJlEiMuZHhvcy5lY2hvLnNlcnZpY2UuU3Vic2NyaWJlUmVxdWVzdBopLmR4b3MuZWNoby5zZXJ2aWNlLkJhdGNoZWREb2N1bWVudFVwZGF0ZXMwARJaChJVcGRhdGVTdWJzY3JpcHRpb24SLC5keG9zLmVjaG8uc2VydmljZS5VcGRhdGVTdWJzY3JpcHRpb25SZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5EkIKBlVwZGF0ZRIgLmR4b3MuZWNoby5zZXJ2aWNlLlVwZGF0ZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkSQAoFRmx1c2gSHy5keG9zLmVjaG8uc2VydmljZS5GbHVzaFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkSawoQR2V0RG9jdW1lbnRIZWFkcxIqLmR4b3MuZWNoby5zZXJ2aWNlLkdldERvY3VtZW50SGVhZHNSZXF1ZXN0GisuZHhvcy5lY2hvLnNlcnZpY2UuR2V0RG9jdW1lbnRIZWFkc1Jlc3BvbnNlEmYKGFdhaXRVbnRpbEhlYWRzUmVwbGljYXRlZBIyLmR4b3MuZWNoby5zZXJ2aWNlLldhaXRVbnRpbEhlYWRzUmVwbGljYXRlZFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkSTgoMUmVJbmRleEhlYWRzEiYuZHhvcy5lY2hvLnNlcnZpY2UuUmVJbmRleEhlYWRzUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eRI/Cg1VcGRhdGVJbmRleGVzEhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5EmMKEUdldFNwYWNlU3luY1N0YXRlEisuZHhvcy5lY2hvLnNlcnZpY2UuR2V0U3BhY2VTeW5jU3RhdGVSZXF1ZXN0GiEuZHhvcy5lY2hvLnNlcnZpY2UuU3BhY2VTeW5jU3RhdGViBnByb3RvMw", [file_dxos_keys, file_google_protobuf_empty]);
+  fileDesc("ChdkeG9zL2VjaG8vc2VydmljZS5wcm90bxIRZHhvcy5lY2hvLnNlcnZpY2UiPQoQU3Vic2NyaWJlUmVxdWVzdBIXCg9zdWJzY3JpcHRpb25faWQYASABKAkSEAoIc3BhY2VfaWQYAiABKAkiTAoWQmF0Y2hlZERvY3VtZW50VXBkYXRlcxIyCgd1cGRhdGVzGAEgAygLMiEuZHhvcy5lY2hvLnNlcnZpY2UuRG9jdW1lbnRVcGRhdGUiXAoNVXBkYXRlUmVxdWVzdBIXCg9zdWJzY3JpcHRpb25faWQYASABKAkSMgoHdXBkYXRlcxgCIAMoCzIhLmR4b3MuZWNoby5zZXJ2aWNlLkRvY3VtZW50VXBkYXRlIlkKGVVwZGF0ZVN1YnNjcmlwdGlvblJlcXVlc3QSFwoPc3Vic2NyaXB0aW9uX2lkGAEgASgJEg8KB2FkZF9pZHMYAyADKAkSEgoKcmVtb3ZlX2lkcxgEIAMoCSIkCgxGbHVzaFJlcXVlc3QSFAoMZG9jdW1lbnRfaWRzGAEgAygJIlcKDkRvY3VtZW50VXBkYXRlEhMKC2RvY3VtZW50X2lkGAEgASgJEhAKCG11dGF0aW9uGAIgASgMEhMKBmlzX25ldxgDIAEoCEgAiAEBQgkKB19pc19uZXcicwoMRG9jSGVhZHNMaXN0EjYKB2VudHJpZXMYASADKAsyJS5keG9zLmVjaG8uc2VydmljZS5Eb2NIZWFkc0xpc3QuRW50cnkaKwoFRW50cnkSEwoLZG9jdW1lbnRfaWQYASABKAkSDQoFaGVhZHMYAiADKAkiLwoXR2V0RG9jdW1lbnRIZWFkc1JlcXVlc3QSFAoMZG9jdW1lbnRfaWRzGAEgAygJIkoKGEdldERvY3VtZW50SGVhZHNSZXNwb25zZRIuCgVoZWFkcxgBIAEoCzIfLmR4b3MuZWNoby5zZXJ2aWNlLkRvY0hlYWRzTGlzdCJRCh9XYWl0VW50aWxIZWFkc1JlcGxpY2F0ZWRSZXF1ZXN0Ei4KBWhlYWRzGAEgASgLMh8uZHhvcy5lY2hvLnNlcnZpY2UuRG9jSGVhZHNMaXN0IisKE1JlSW5kZXhIZWFkc1JlcXVlc3QSFAoMZG9jdW1lbnRfaWRzGAEgAygJIiwKGEdldFNwYWNlU3luY1N0YXRlUmVxdWVzdBIQCghzcGFjZV9pZBgBIAEoCSKKAQoOU3BhY2VTeW5jU3RhdGUSOgoFcGVlcnMYASADKAsyKy5keG9zLmVjaG8uc2VydmljZS5TcGFjZVN5bmNTdGF0ZS5QZWVyU3RhdGUaPAoJUGVlclN0YXRlEg8KB3BlZXJfaWQYASABKAkSHgoWZG9jdW1lbnRzX3RvX3JlY29uY2lsZRgCIAEoBTKZBgoLRGF0YVNlcnZpY2USXQoJU3Vic2NyaWJlEiMuZHhvcy5lY2hvLnNlcnZpY2UuU3Vic2NyaWJlUmVxdWVzdBopLmR4b3MuZWNoby5zZXJ2aWNlLkJhdGNoZWREb2N1bWVudFVwZGF0ZXMwARJaChJVcGRhdGVTdWJzY3JpcHRpb24SLC5keG9zLmVjaG8uc2VydmljZS5VcGRhdGVTdWJzY3JpcHRpb25SZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5EkIKBlVwZGF0ZRIgLmR4b3MuZWNoby5zZXJ2aWNlLlVwZGF0ZVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkSQAoFRmx1c2gSHy5keG9zLmVjaG8uc2VydmljZS5GbHVzaFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkSawoQR2V0RG9jdW1lbnRIZWFkcxIqLmR4b3MuZWNoby5zZXJ2aWNlLkdldERvY3VtZW50SGVhZHNSZXF1ZXN0GisuZHhvcy5lY2hvLnNlcnZpY2UuR2V0RG9jdW1lbnRIZWFkc1Jlc3BvbnNlEmYKGFdhaXRVbnRpbEhlYWRzUmVwbGljYXRlZBIyLmR4b3MuZWNoby5zZXJ2aWNlLldhaXRVbnRpbEhlYWRzUmVwbGljYXRlZFJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkSTgoMUmVJbmRleEhlYWRzEiYuZHhvcy5lY2hvLnNlcnZpY2UuUmVJbmRleEhlYWRzUmVxdWVzdBoWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eRI/Cg1VcGRhdGVJbmRleGVzEhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5EmMKEUdldFNwYWNlU3luY1N0YXRlEisuZHhvcy5lY2hvLnNlcnZpY2UuR2V0U3BhY2VTeW5jU3RhdGVSZXF1ZXN0GiEuZHhvcy5lY2hvLnNlcnZpY2UuU3BhY2VTeW5jU3RhdGViBnByb3RvMw", [file_dxos_keys, file_google_protobuf_empty]);
 
 /**
  * @generated from message dxos.echo.service.SubscribeRequest
@@ -27,6 +27,11 @@ export type SubscribeRequest = Message<"dxos.echo.service.SubscribeRequest"> & {
    * @generated from field: string subscription_id = 1;
    */
   subscriptionId: string;
+
+  /**
+   * @generated from field: string space_id = 2;
+   */
+  spaceId: string;
 };
 
 /**

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

@@ -23,21 +23,6 @@ message QueryOptions {
     SHOW_DELETED_ONLY = 2;
   }
 
-  /// Controls how deleted items are filtered.
-  optional ShowDeletedOption deleted = 1;
-
-  /**
-   * Filter by model.
-   * @default * Only DocumentModel.
-   * To querty all models, use `models: ["*"]`.
-   */
-  repeated string models = 2;
-
-  /**
-   * Query only in specific spaces.
-   * @deprecated Use `spaceIds` instead.
-   */
-  repeated dxos.keys.PublicKey spaces = 3;
 
   enum DataLocation {
     ALL = 0;
@@ -45,16 +30,37 @@ message QueryOptions {
     REMOTE = 2;
   }
 
+  /**
+   * Query only in specific spaces.
+   */
+  repeated string spaceIds = 5;
+
+  /// Controls how deleted items are filtered.
+  optional ShowDeletedOption deleted = 1;
+
   /**
     * Query only local spaces, or remote on agent.
     * @default `QueryOptions.DataLocation.LOCAL`
     */
   optional DataLocation data_location = 4;
 
+  //
+  // Deprecated
+  //
+
   /**
    * Query only in specific spaces.
+   * @deprecated Use `spaceIds` instead.
    */
-  repeated string spaceIds = 5;
+  repeated dxos.keys.PublicKey spaces = 3;
+
+  /**
+   * Filter by model.
+   * @default * Only DocumentModel.
+   * To querty all models, use `models: ["*"]`.
+   * @deprecated
+   */
+  repeated string models = 2;
 }
 
 /**

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

@@ -16,6 +16,7 @@ package dxos.echo.query;
 message QueryRequest {
   optional string queryId = 1;
   dxos.echo.filter.Filter filter = 2;
+  QueryReactivity reactivity = 3;
 }
 
 /**
@@ -31,9 +32,21 @@ message QueryResult {
   string id = 1;
   string spaceId = 4;
   string documentId = 5;
+  float rank = 3;
+
+  optional string document_json = 10;
+  optional bytes document_automerge = 11;
+  
   /// @deprecated Use spaceId.
   dxos.keys.PublicKey spaceKey = 2;
-  float rank = 3;
+}
+
+enum QueryReactivity {
+  /// Returns a signle result.
+  ONE_SHOT = 0;
+
+  /// Returns the initial result and then incremental reactive updates when the data source changes.
+  REACTIVE = 1;
 }
 
 message QueryResponse {

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

@@ -11,6 +11,7 @@ package dxos.echo.service;
 
 message SubscribeRequest {
   string subscription_id = 1;
+  string space_id = 2;
 }
 
 message BatchedDocumentUpdates {