@dxos/protocols 0.4.10-main.93fda5f → 0.4.10-main.94f946a

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_config from "../config";
 import * as dxos_devtools_host from "../devtools/host";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "../echo/model/document";
 import * as dxos_echo_model_messenger from "../echo/model/messenger";
 import * as dxos_echo_model_text from "../echo/model/text";
 import * as dxos_echo_object from "../echo/object";
+import * as dxos_echo_query from "../echo/query";
 import * as dxos_echo_service from "../echo/service";
 import * as dxos_echo_snapshot from "../echo/snapshot";
 import * as dxos_echo_timeframe from "../echo/timeframe";
@@ -60,6 +60,181 @@ import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";
 import * as example_testing_rpc from "../../example/testing/rpc";
 import * as google_protobuf from "../../google/protobuf";
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface Metrics {
+    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
+    values?: Metrics.KeyPair[];
+}
+export namespace Metrics {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export interface KeyPair {
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        key?: string;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        value?: dxos_value.Value;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        stats?: dxos_value.Stats;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface ControlMetricsRequest {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    reset?: boolean;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    record?: boolean;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface ControlMetricsResponse {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    recording?: boolean;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface QueryMetricsRequest {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    interval?: number;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface QueryMetricsResponse {
+    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
+    metrics: Metrics;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export enum LogLevel {
+    TRACE = 5,
+    DEBUG = 10,
+    INFO = 11,
+    WARN = 12,
+    ERROR = 13
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface QueryLogsRequest {
+    filters?: QueryLogsRequest.Filter[];
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    options?: QueryLogsRequest.MatchingOptions;
+}
+export namespace QueryLogsRequest {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export enum MatchingOptions {
+        INCLUSIVE = 1,
+        EXPLICIT = 2
+    }
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export interface Filter {
+        level: LogLevel;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        pattern?: string;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface LogEntry {
+    level: LogLevel;
+    message: string;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    context?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    meta?: LogEntry.Meta;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    error?: dxos_error.Error;
+    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
+}
+export namespace LogEntry {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export interface Meta {
+        file: string;
+        line: number;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        scope?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        resourceId?: number;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface LoggingService {
+    controlMetrics: (request: ControlMetricsRequest, options?: RequestOptions) => Promise<ControlMetricsResponse>;
+    queryMetrics: (request: QueryMetricsRequest, options?: RequestOptions) => Stream<QueryMetricsResponse>;
+    queryLogs: (request: QueryLogsRequest, options?: RequestOptions) => Stream<LogEntry>;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -629,7 +804,8 @@ export namespace CreateEpochRequest {
     export enum Migration {
         NONE = 0,
         INIT_AUTOMERGE = 1,
-        PRUNE_AUTOMERGE_ROOT_HISTORY = 2
+        PRUNE_AUTOMERGE_ROOT_HISTORY = 2,
+        FRAGMENT_AUTOMERGE_ROOT = 3
     }
 }
 /**
@@ -658,14 +834,6 @@ export interface SpacesService {
     queryCredentials: (request: QueryCredentialsRequest, options?: RequestOptions) => Stream<dxos_halo_credentials.Credential>;
     createEpoch: (request: CreateEpochRequest, options?: RequestOptions) => Promise<void>;
 }
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/services.proto}
- */
-export interface IndexService {
-    setConfig: (request: dxos_echo_indexing.IndexConfig, options?: RequestOptions) => Promise<void>;
-    find: (request: dxos_agent_query.QueryRequest, options?: RequestOptions) => Promise<dxos_agent_query.QueryResponse>;
-}
 /**
  * Represents the invitation state passed between client and service.
  *
@@ -749,6 +917,27 @@ export interface Invitation {
      *   - proto3_optional = true
      */
     lifetime?: number;
+    /**
+     * Whether an invitation can be used multiple times.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    multiUse?: boolean;
+    /**
+     * Guest's keypair required for AuthMethod.KNOWN_PUBLIC_KEY.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    guestKeypair?: AdmissionKeypair;
+    /**
+     * Present on Type.DELEGATED invitations.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    delegationCredentialId?: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
 }
 export namespace Invitation {
     /**
@@ -757,7 +946,7 @@ export namespace Invitation {
      */
     export enum Type {
         INTERACTIVE = 0,
-        OFFLINE = 1,
+        DELEGATED = 1,
         MULTIUSE = 2
     }
     /**
@@ -774,7 +963,8 @@ export namespace Invitation {
      */
     export enum AuthMethod {
         NONE = 0,
-        SHARED_SECRET = 1
+        SHARED_SECRET = 1,
+        KNOWN_PUBLIC_KEY = 2
     }
     /**
      * Defined in:
@@ -793,6 +983,18 @@ export namespace Invitation {
         EXPIRED = 9
     }
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface AdmissionKeypair {
+    publicKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    privateKey?: ReturnType<(typeof substitutions)["dxos.keys.PrivateKey"]["decode"]>;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -879,7 +1081,6 @@ export interface InvitationsService {
     authenticate: (request: AuthenticationRequest, options?: RequestOptions) => Promise<void>;
     cancelInvitation: (request: CancelInvitationRequest, options?: RequestOptions) => Promise<void>;
     queryInvitations: (request: void, options?: RequestOptions) => Stream<QueryInvitationsResponse>;
-    loadPersistentInvitations: (request: void, options?: RequestOptions) => Promise<LoadPersistentInvitationsResponse>;
 }
 /**
  * Defined in:
@@ -923,178 +1124,3 @@ export interface NetworkService {
     updateConfig: (request: UpdateConfigRequest, options?: RequestOptions) => Promise<void>;
     queryStatus: (request: void, options?: RequestOptions) => Stream<NetworkStatus>;
 }
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface Metrics {
-    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
-    values?: Metrics.KeyPair[];
-}
-export namespace Metrics {
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export interface KeyPair {
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        key?: string;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        value?: dxos_value.Value;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        stats?: dxos_value.Stats;
-    }
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface ControlMetricsRequest {
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    reset?: boolean;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    record?: boolean;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface ControlMetricsResponse {
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    recording?: boolean;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface QueryMetricsRequest {
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    interval?: number;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface QueryMetricsResponse {
-    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
-    metrics: Metrics;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export enum LogLevel {
-    TRACE = 5,
-    DEBUG = 10,
-    INFO = 11,
-    WARN = 12,
-    ERROR = 13
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface QueryLogsRequest {
-    filters?: QueryLogsRequest.Filter[];
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    options?: QueryLogsRequest.MatchingOptions;
-}
-export namespace QueryLogsRequest {
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export enum MatchingOptions {
-        INCLUSIVE = 1,
-        EXPLICIT = 2
-    }
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export interface Filter {
-        level: LogLevel;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        pattern?: string;
-    }
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface LogEntry {
-    level: LogLevel;
-    message: string;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    context?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    meta?: LogEntry.Meta;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    error?: dxos_error.Error;
-    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
-}
-export namespace LogEntry {
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export interface Meta {
-        file: string;
-        line: number;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        scope?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        resourceId?: number;
-    }
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface LoggingService {
-    controlMetrics: (request: ControlMetricsRequest, options?: RequestOptions) => Promise<ControlMetricsResponse>;
-    queryMetrics: (request: QueryMetricsRequest, options?: RequestOptions) => Stream<QueryMetricsResponse>;
-    queryLogs: (request: QueryLogsRequest, options?: RequestOptions) => Stream<LogEntry>;
-}

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "./agent/dashboard";
 import * as dxos_agent_echoproxy from "./agent/echoproxy";
 import * as dxos_agent_epoch from "./agent/epoch";
 import * as dxos_agent_functions from "./agent/functions";
-import * as dxos_agent_query from "./agent/query";
 import * as dxos_bot from "./bot";
 import * as dxos_client_services from "./client/services";
 import * as dxos_devtools_host from "./devtools/host";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "./echo/model/document";
 import * as dxos_echo_model_messenger from "./echo/model/messenger";
 import * as dxos_echo_model_text from "./echo/model/text";
 import * as dxos_echo_object from "./echo/object";
+import * as dxos_echo_query from "./echo/query";
 import * as dxos_echo_service from "./echo/service";
 import * as dxos_echo_snapshot from "./echo/snapshot";
 import * as dxos_echo_timeframe from "./echo/timeframe";
@@ -292,19 +292,17 @@ export namespace Runtime {
          */
         remoteSource?: string;
         /**
-         * Connect to and serve client services to a remote proxy.
-         *
          * Options:
          *   - proto3_optional = true
          */
-        devtoolsProxy?: string;
+        remoteSourceAuthenticationToken?: string;
         /**
-         * Enable E.object api
+         * Connect to and serve client services to a remote proxy.
          *
          * Options:
          *   - proto3_optional = true
          */
-        useReactiveObjectApi?: boolean;
+        devtoolsProxy?: string;
     }
     export namespace Client {
         /**
@@ -333,6 +331,8 @@ export namespace Runtime {
              */
             dataRoot?: string;
             /**
+             * @deprecated
+             *
              * Options:
              *   - proto3_optional = true
              */

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_client_services from "../client/services";
 import * as dxos_config from "../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "../echo/model/document";
 import * as dxos_echo_model_messenger from "../echo/model/messenger";
 import * as dxos_echo_model_text from "../echo/model/text";
 import * as dxos_echo_object from "../echo/object";
+import * as dxos_echo_query from "../echo/query";
 import * as dxos_echo_service from "../echo/service";
 import * as dxos_echo_snapshot from "../echo/snapshot";
 import * as dxos_echo_timeframe from "../echo/timeframe";

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_client_services from "../client/services";
 import * as dxos_config from "../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "../echo/model/document";
 import * as dxos_echo_model_messenger from "../echo/model/messenger";
 import * as dxos_echo_model_text from "../echo/model/text";
 import * as dxos_echo_object from "../echo/object";
+import * as dxos_echo_query from "../echo/query";
 import * as dxos_echo_service from "../echo/service";
 import * as dxos_echo_snapshot from "../echo/snapshot";
 import * as dxos_echo_timeframe from "../echo/timeframe";

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_client_services from "../client/services";
 import * as dxos_config from "../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "./model/document";
 import * as dxos_echo_model_messenger from "./model/messenger";
 import * as dxos_echo_model_text from "./model/text";
 import * as dxos_echo_object from "./object";
+import * as dxos_echo_query from "./query";
 import * as dxos_echo_service from "./service";
 import * as dxos_echo_snapshot from "./snapshot";
 import * as dxos_echo_timeframe from "./timeframe";

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_client_services from "../client/services";
 import * as dxos_config from "../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "./model/document";
 import * as dxos_echo_model_messenger from "./model/messenger";
 import * as dxos_echo_model_text from "./model/text";
 import * as dxos_echo_object from "./object";
+import * as dxos_echo_query from "./query";
 import * as dxos_echo_service from "./service";
 import * as dxos_echo_snapshot from "./snapshot";
 import * as dxos_echo_timeframe from "./timeframe";

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_client_services from "../client/services";
 import * as dxos_config from "../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "./model/document";
 import * as dxos_echo_model_messenger from "./model/messenger";
 import * as dxos_echo_model_text from "./model/text";
 import * as dxos_echo_object from "./object";
+import * as dxos_echo_query from "./query";
 import * as dxos_echo_service from "./service";
 import * as dxos_echo_snapshot from "./snapshot";
 import * as dxos_echo_timeframe from "./timeframe";

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_client_services from "../client/services";
 import * as dxos_config from "../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "./model/document";
 import * as dxos_echo_model_messenger from "./model/messenger";
 import * as dxos_echo_model_text from "./model/text";
 import * as dxos_echo_object from "./object";
+import * as dxos_echo_query from "./query";
 import * as dxos_echo_service from "./service";
 import * as dxos_echo_snapshot from "./snapshot";
 import * as dxos_echo_timeframe from "./timeframe";

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../agent/dashboard";
 import * as dxos_agent_echoproxy from "../agent/echoproxy";
 import * as dxos_agent_epoch from "../agent/epoch";
 import * as dxos_agent_functions from "../agent/functions";
-import * as dxos_agent_query from "../agent/query";
 import * as dxos_bot from "../bot";
 import * as dxos_client_services from "../client/services";
 import * as dxos_config from "../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_model_document from "./model/document";
 import * as dxos_echo_model_messenger from "./model/messenger";
 import * as dxos_echo_model_text from "./model/text";
 import * as dxos_echo_object from "./object";
+import * as dxos_echo_query from "./query";
 import * as dxos_echo_service from "./service";
 import * as dxos_echo_snapshot from "./snapshot";
 import * as dxos_echo_timeframe from "./timeframe";

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../../agent/dashboard";
 import * as dxos_agent_echoproxy from "../../agent/echoproxy";
 import * as dxos_agent_epoch from "../../agent/epoch";
 import * as dxos_agent_functions from "../../agent/functions";
-import * as dxos_agent_query from "../../agent/query";
 import * as dxos_bot from "../../bot";
 import * as dxos_client_services from "../../client/services";
 import * as dxos_config from "../../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_metadata from "../metadata";
 import * as dxos_echo_model_messenger from "./messenger";
 import * as dxos_echo_model_text from "./text";
 import * as dxos_echo_object from "../object";
+import * as dxos_echo_query from "../query";
 import * as dxos_echo_service from "../service";
 import * as dxos_echo_snapshot from "../snapshot";
 import * as dxos_echo_timeframe from "../timeframe";
@@ -78,7 +78,6 @@ export interface Value {
     object?: KeyValueObject;
     array?: Array;
     reference?: Reference;
-    yjs?: YJS;
 }
 /**
  * Ordered collection of values.

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

@@ -4,7 +4,6 @@ import * as dxos_agent_dashboard from "../../agent/dashboard";
 import * as dxos_agent_echoproxy from "../../agent/echoproxy";
 import * as dxos_agent_epoch from "../../agent/epoch";
 import * as dxos_agent_functions from "../../agent/functions";
-import * as dxos_agent_query from "../../agent/query";
 import * as dxos_bot from "../../bot";
 import * as dxos_client_services from "../../client/services";
 import * as dxos_config from "../../config";
@@ -18,6 +17,7 @@ import * as dxos_echo_metadata from "../metadata";
 import * as dxos_echo_model_document from "./document";
 import * as dxos_echo_model_text from "./text";
 import * as dxos_echo_object from "../object";
+import * as dxos_echo_query from "../query";
 import * as dxos_echo_service from "../service";
 import * as dxos_echo_snapshot from "../snapshot";
 import * as dxos_echo_timeframe from "../timeframe";